aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | mocha test initMarek Kotewicz2015-01-091-0/+49
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into developMarek Kotewicz2015-01-121-2/+26
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Update README.mdMarek Kotewicz2015-01-111-17/+25
| | | | | | | | | | |
| | | * | | | | | | | Update README.mdMarek Kotewicz2015-01-111-1/+17
| | | | | | | | | | |
| * | | | | | | | | | Various fixes to ethereum.js and client web API stuff.Gav Wood2015-01-124-7/+11
| | | | | | | | | | |
| * | | | | | | | | | Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into developGav Wood2015-01-1214-8/+209
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libjsqrc/ethereumjs/.travis.yml libjsqrc/ethereumjs/README.md libjsqrc/ethereumjs/dist/ethereum.js libjsqrc/ethereumjs/dist/ethereum.js.map libjsqrc/ethereumjs/lib/abi.js libjsqrc/ethereumjs/package.json
| * | | | / / / / / default padding changed to 0Marek Kotewicz2015-01-104-4/+4
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | rerun gulpMarek Kotewicz2015-01-092-3/+2
| | | | | | | | |
| * | | | | | | | missing fromAsciiMarek Kotewicz2015-01-094-5/+6
| | | | | | | | |
| * | | | | | | | method signature length definedMarek Kotewicz2015-01-094-9/+17
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of https://github.com/ethereum/ethereum.jsMarek Kotewicz2015-01-092-2/+4
| |\| | | | | |
| | * | | | | | module var fixJeffrey Wilcke2015-01-091-1/+2
| | | | | | | |
| | * | | | | | module var fixJeffrey Wilcke2015-01-091-1/+2
| | |/ / / / /
| * | | | | | version upgradedMarek Kotewicz2015-01-091-1/+1
| | | | | | |
| * | | | | | sha3 method signatureMarek Kotewicz2015-01-095-12/+40
| |/ / / / /
| * | | | | missing jshint ignoreMarek Kotewicz2015-01-083-3/+3
| | | | | |
| * | | | | fixed exampleMarek Kotewicz2015-01-081-1/+1
| | | | | |
| * | | | | version upgradeMarek Kotewicz2015-01-081-1/+1
| | | | | |
| * | | | | fixes for node.jsMarek Kotewicz2015-01-088-66/+61
| | | | | |
| * | | | | gulpfile modifications, default build set to devMarek Kotewicz2015-01-074-68/+1213
| | | | | |
| * | | | | Merge pull request #22 from debris/stringsMarek Kotewicz2015-01-074-13/+60
| |\ \ \ \ \ | | | | | | | | | | | | | | strings, real, ureal paddings and implicit paddings for uint, int and hash
| | * | | | | real, ureal paddings and implicit paddings for uint, int and hashMarek Kotewicz2015-01-074-19/+48
| | | | | | |
| | * | | | | solidity string supportMarek Kotewicz2015-01-074-13/+31
| | | | | | |
| * | | | | | Merge pull request #21 from debris/masterMarek Kotewicz2015-01-0710-26/+27
| |\| | | | | | | | | | | | | | | | | | | fixed gulp build
| | * | | | | fixed tabsMarek Kotewicz2015-01-061-3/+3
| | | | | | |
| | * | | | | bring back todosMarek Kotewicz2015-01-064-0/+4
| | | | | | |
| | * | | | | renamed example/index.html -> example/balance.htmlMarek Kotewicz2015-01-061-0/+0
| | | | | | |
| | * | | | | fixed gulp buildMarek Kotewicz2015-01-069-26/+23
| |/ / / / /
| * | | | | bring back toHexcaktux2014-12-311-0/+10
| | | | | |
| * | | | | Lots of fixes.Gav Wood2014-12-226-44/+102
| | | | | |
| * | | | | Merge pull request #15 from debris/masterJeffrey Wilcke2014-12-169-55/+93
| |\ \ \ \ \ | | | | | | | | | | | | | | changes from cpp-ethereum
| | * | | | | common changesMarek Kotewicz2014-11-184-5/+10
| | | | | | |
| | * | | | | Merge pull request #1 from cubedro/masterMarek Kotewicz2014-11-182-6/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fixed autoprovider bug
| | | * | | | | Updated versionMarian Oancea2014-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version from npm in order to publish the update
| | | * | | | | Merge pull request #11 from debris/masterMarian OANCΞA2014-11-1811-25/+206
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | Update
| | * | | | | | added eth_serpent, contract separated to another fileMarek Kotewicz2014-11-177-48/+81
| |/ / / / / /
| * | | | | | Merge pull request #13 from frewsxcv/masterJeffrey Wilcke2014-11-151-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Enable JSHint linting
| | * | | | | | Enable JSHint lintingCorey Farwell2014-11-151-1/+4
| |/ / / / / /
| * | | | | | Merge pull request #12 from debris/masterJeffrey Wilcke2014-11-157-40/+354
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | simplifie contract creation && calls, improved added examples
| | * | | | | | improved contracts interfaceMarek Kotewicz2014-11-149-21/+166
| | | | | | | |
| * | | | | | | Merge pull request #10 from cubedro/masterJeffrey Wilcke2014-11-1528-620/+1290
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | NPM module with minification for browser integration.
| * \ \ \ \ \ \ \ Merge pull request #11 from ethereum/revert-6-masterJeffrey Wilcke2014-11-156-26/+21
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Run JSHint on all code using Travis CI"
| | * | | | | | | | Revert "Run JSHint on all code using Travis CI"Jeffrey Wilcke2014-11-156-26/+21
| |/ / / / / / / /
| * | | | | | | | Merge pull request #6 from frewsxcv/masterJeffrey Wilcke2014-11-156-21/+26
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Run JSHint on all code using Travis CI
| | * | | | | | | | Don't run 'npm test'Corey Farwell2014-11-031-2/+2
| | | | | | | | | |
| | * | | | | | | | Fix JSHint errorsCorey Farwell2014-11-034-21/+17
| | | | | | | | | |
| | * | | | | | | | Enable Travis CICorey Farwell2014-11-032-0/+9
| |/ / / / / / / /
| | | | * | | | | Fixed require web3 bugMarian Oancea2014-11-182-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed error "Cannot find module './web3'" in autoprovider.js
| | | | * | | | | Merge pull request #10 from debris/abiMarian OANCΞA2014-11-188-39/+208
| | | |/| | | | | | | |/|/ / / / / | | | | | | | | Abi
| | | * | | | | improved exampleMarek Kotewicz2014-11-141-18/+22
| | | | | | | |
| | | * | | | | added storageAtMarek Kotewicz2014-11-144-3/+4
| | | | | | | |
| | | * | | | | contract objectMarek Kotewicz2014-11-136-14/+21
| | | | | | | |
| | | * | | | | abi output formattingMarek Kotewicz2014-11-135-46/+115
| | | | | | | |
| | | * | | | | qt version also requires abiMarek Kotewicz2014-11-131-0/+1
| | | | | | | |
| | | * | | | | changes to make everything workMarek Kotewicz2014-11-135-9/+14
| | | | | | | |
| | | * | | | | abi, the beginningMarek Kotewicz2014-11-135-9/+91
| | |/ / / / /
| | * | | | | Merge pull request #9 from debris/autoproviderMarian OANCΞA2014-11-114-9/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | common fixes
| | | * | | | | common fixesMarek Kotewicz2014-11-114-9/+6
| | | | | | | |
| | * | | | | | Merge pull request #8 from debris/autoproviderMarian OANCΞA2014-11-1111-489/+629
| | |\| | | | | | | | | | | | | | | | | | | | | Autoprovider
| | | * | | | | autoprovider, buildQt not builds only necessery files, fixed gulpfileMarek Kotewicz2014-11-118-15/+153
| | | | | | | |
| | | * | | | | retabed filesMarek Kotewicz2014-11-114-474/+476
| | |/ / / / /
| | * | | | | Merge branch 'debris-subprotocol_prefix_merge'Marian Oancea2014-11-117-81/+97
| | |\ \ \ \ \
| | | * | | | | fixed merge conflictsMarian Oancea2014-11-117-81/+97
| | |/| | | | |
| | | * | | | | gulp qt taskMarek Kotewicz2014-11-112-26/+46
| | | | | | | |
| | | * | | | | merged subprotocol prefixMarek Kotewicz2014-11-115-58/+54
| | | | | | | |
| | * | | | | | Changed npm & bower versionMarian Oancea2014-11-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version for next npm publish
| | * | | | | | Fixed jshint warningsMarian Oancea2014-11-105-13/+13
| | | | | | | |
| | * | | | | | Prepare for PRMarian Oancea2014-11-103-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed repo urls from package.json, bower.json and readme
| | * | | | | | Merge pull request #6 from cubedro/developMarian OANCΞA2014-11-102-14/+22
| | |\| | | | | | | | | | | | | | | | | | | | | Changes from debris
| | | * | | | | Merge pull request #5 from cubedro/debris-error_handling_fixMarian OANCΞA2014-11-101-1/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Debris error handling fix
| | | | * \ \ \ \ fix merge conflictsMarian Oancea2014-11-101-1/+4
| | | | |\ \ \ \ \
| | | | | * | | | | corresponding changes from cpp-ethereumMarek Kotewicz2014-11-071-1/+3
| | | | | | | | | |
| | | * | | | | | | Merge branch 'debris-error_handling_fix' into developMarian Oancea2014-11-103-20/+27
| | | |\| | | | | |
| | | | * | | | | | fix merge conflictsMarian Oancea2014-11-102-13/+18
| | | |/| | | | | | | | |/| | | | | | |
| | | | * | | | | | missing semicolonsMarek Kotewicz2014-11-071-2/+2
| | | | | | | | | |
| | | | * | | | | | proper error handling proposalMarek Kotewicz2014-11-072-13/+18
| | | | |/ / / / /
| | * | / / / / / Added npm versionMarian Oancea2014-11-101-7/+9
| | |/ / / / / /
| | * | | | | | RefactoringMarian Oancea2014-11-0713-827/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed browser fixes Updated gulp to bypass native browser objects Added source map for dist
| | * | | | | | node < 0.10 fails travis build => remove 0.6 & 0.8Marian Oancea2014-11-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from travis.yml
| | * | | | | | gulp >= 3.4.0Marian Oancea2014-11-061-1/+1
| | | | | | | |
| | * | | | | | Updated all dependency versionsMarian Oancea2014-11-061-7/+7
| | | | | | | |
| | * | | | | | Update dependencies to pass travis buildMarian Oancea2014-11-061-2/+2
| | | | | | | |
| | * | | | | | Update dependencies & travis.ymlMarian Oancea2014-11-062-4/+2
| | | | | | | |
| | * | | | | | updated travis.ymlMarian Oancea2014-11-061-3/+9
| | | | | | | |
| | * | | | | | more json fixesMarian Oancea2014-11-062-4/+7
| | | | | | | |
| | * | | | | | updated bower.json ignoreMarian Oancea2014-11-061-1/+1
| | | | | | | |
| | * | | | | | bower small fixMarian Oancea2014-11-061-1/+1
| | | | | | | |
| | * | | | | | Updated bower.json & ReadmeMarian Oancea2014-11-063-1/+13
| | | | | | | |
| | * | | | | | Updated package.jsonMarian Oancea2014-11-064-27/+36
| | | | | | | |
| | * | | | | | Fixed indentMarian Oancea2014-11-065-962/+946
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed indent so we can compare differences in PR.
| | * | | | | | Converted to node moduleMarian Oancea2014-11-0624-653/+1785
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converted to npm package Added brower Added browserify with minification Updated Readme
| | * | | | | | Merge pull request #1 from cubedro/exampleMarian OANCΞA2014-11-051-11/+18
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | example
| | | * | | | | exampleMarek Kotewicz2014-11-041-11/+18
| | |/ / / / /
| | * | | | | lgplMarek Kotewicz2014-11-034-16/+16
| | | | | | |
| | * | | | | licenseMarek Kotewicz2014-10-314-0/+87
| |/ / / / /
| * | | | | transacton => transactionJeffrey Wilcke2014-10-311-1/+1
| | | | | |
| * | | | | Added account propJeffrey Wilcke2014-10-311-0/+1
| | | | | |
| * | | | | Fixed Qt providerJeffrey Wilcke2014-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | * postData => postMessage * JSON.parse parsed wrong data on 'onmessage'
| * | | | | Merge pull request #1 from debris/masterJeffrey Wilcke2014-10-315-366/+364
| |\ \ \ \ \ | | | | | | | | | | | | | | Http JSON-RPC provider, http polling, little refactor, whisper
| | * | | | | changes to make whisper workingMarek Kotewicz2014-10-302-5/+9
| | | | | | |
| | * | | | | filters refactoredMarek Kotewicz2014-10-292-66/+36
| | | | | | |
| | * | | | | polling whisper in progressMarek Kotewicz2014-10-291-30/+49
| | | | | | |
| | * | | | | http renamed to httprpcMarek Kotewicz2014-10-282-7/+8
| | | | | | |
| | * | | | | db and shhMarek Kotewicz2014-10-281-0/+29
| | | | | | |
| | * | | | | cleaner promisesMarek Kotewicz2014-10-281-276/+137
| | | | | | |
| | * | | | | http pollingMarek Kotewicz2014-10-232-11/+62
| | | | | | |
| | * | | | | warning when provider is not setMarek Kotewicz2014-10-222-1/+1
| | | | | | |
| | * | | | | messageHandler expects object instead of stringMarek Kotewicz2014-10-224-7/+16
| | | | | | |
| | * | | | | block, transaction, uncle by hash and number separatelyMarek Kotewicz2014-10-223-9/+8
| | | | | | |
| | * | | | | http providerMarek Kotewicz2014-10-222-15/+70
| |/ / / / /
| * | | | | Updated propertiesobscuren2014-10-211-14/+4
| | | | | |
| * | | | | Updated readmeobscuren2014-10-211-2/+2
| | | | | |
| * | | | | Fixed setting providers to the right objectobscuren2014-10-213-4/+9
| | | | | |
| * | | | | Qt providerobscuren2014-10-211-0/+15
| | | | | |
| * | | | | Moved WebSocketProviderobscuren2014-10-211-0/+51
| | | | | |
| * | | | | Removed Keyobscuren2014-10-211-1/+1
| | | | | |
| * | | | | Updated according to the new Generic JSON RPC APIobscuren2014-10-212-265/+227
| | | | | |
| * | | | | push data instead of assignobscuren2014-10-071-20/+3
| | | | | |
| * | | | | Added eth providersobscuren2014-10-021-45/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An ethereum provider provides an interface from which communication can be done.
| * | | | | How to spawn a websocket nodeobscuren2014-10-011-0/+10
| | | | | |
| * | | | | Readmeobscuren2014-10-011-0/+8
| | | | | |
| * | | | | initobscuren2014-10-013-0/+577
| / / / /
* | | | | removed old js yet againobscuren2015-01-2939-7018/+0
| | | | |
* | | | | default http rpc onobscuren2015-01-291-1/+1
| | | | |
* | | | | Merge branch 'develop' into qt5.4obscuren2015-01-2915-61/+1174
|\| | | | | |/ / / |/| | |
| * | | Merge branch 'develop' into Gustav-Simonsson-key_store_and_accounts_integrationobscuren2015-01-2943-24/+4400
| |\ \ \
| * \ \ \ Merge branch 'key_store_and_accounts_integration' of ↵obscuren2015-01-295-27/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/Gustav-Simonsson/go-ethereum into Gustav-Simonsson-key_store_and_accounts_integration
| | * | | | Address pull request commentsGustav Simonsson2015-01-285-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use crypto.Sign instead of directly calling secp256k1 lib * Rename UserAccount to Account and Addr to Address (for consistency) * Change AccountManager.Sign to take ptr to Account instead of address byte array * Simplify copying of Accounts in Accounts() * PubkeyToAddress and GetEntropyCSPRNG now exported
| * | | | | Implemented contract ABIobscuren2015-01-278-2/+971
| | | | | |
| * | | | | Merge branch 'key_store_and_accounts_integration' of ↵obscuren2015-01-277-55/+205
| |\| | | | | | | | | | | | | | | | | | | | | | https://github.com/Gustav-Simonsson/go-ethereum into Gustav-Simonsson-key_store_and_accounts_integration
| | * | | | Add accounts package and refactor key storesGustav Simonsson2015-01-267-55/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add initial UserAccount and AccountManager structs * Add NewAccount, Sign and Accounts functions * Refactor key stores to use key address as main identifier while keeping the UUID. * Use key address as file/dir names instead of UUID
* | | | | | Merge branch 'develop' into qt5.4obscuren2015-01-294-5/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | upped pvobscuren2015-01-292-2/+2
| | | | | |
| * | | | | changed lost keyobscuren2015-01-292-2/+8
| | | | | |
| * | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-01-291-2/+2
| |\ \ \ \ \
| | * | | | | Update go to latest versionTaylor Gerring2015-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using git instead of mercurial
* | | | | | | Added webengine initializerobscuren2015-01-296-0/+733
| | | | | | |
* | | | | | | removed key while in the process of moving to the new key storageobscuren2015-01-299-714/+63
| | | | | | |
* | | | | | | Merge branch 'jsonrpc' into qt5.4obscuren2015-01-2917-348/+299
|\ \ \ \ \ \ \
| * | | | | | | further cleaned up xeth interfaceobscuren2015-01-2915-133/+123
| | | | | | | |
| * | | | | | | clean up of xethobscuren2015-01-293-249/+210
| | | | | | | |
* | | | | | | | merge jsonrpcobscuren2015-01-2922-516/+350
|\| | | | | | |
| * | | | | | | moving to a better xethobscuren2015-01-2913-454/+141
| | | | | | | |
| * | | | | | | Merge branch 'jsonrpc' of github.com-obscure:ethereum/go-ethereum into jsonrpcobscuren2015-01-2811-60/+214
| |\ \ \ \ \ \ \
| | * | | | | | | Rename api var for clarityTaylor Gerring2015-01-282-7/+6
| | | | | | | | |
| | * | | | | | | Return a websocker.Handler of the functionTaylor Gerring2015-01-281-1/+1
| | | | | | | | |
| | * | | | | | | Rename transport to wsTaylor Gerring2015-01-282-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup object naming for clarity
| | * | | | | | | Add wsport flag to MistTaylor Gerring2015-01-282-1/+3
| | | | | | | | |
| | * | | | | | | Update CLI to use new Websocket RPCTaylor Gerring2015-01-284-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use “wsport” flag to change default port
| | * | | | | | | New simplified Websocket transportTaylor Gerring2015-01-281-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses rpc.EthereumApi abstraction
| | * | | | | | | Indicate port in startup log messageTaylor Gerring2015-01-281-1/+3
| | | | | | | | |
| | * | | | | | | Move HTTP transport to sub package of RPCTaylor Gerring2015-01-286-53/+66
| | | | | | | | |
* | | | | | | | | switched to obscuren/qmlobscuren2015-01-2810-10/+10
| | | | | | | | |
* | | | | | | | | Updated assets & moved messagesobscuren2015-01-289-65/+81
| | | | | | | | |
* | | | | | | | | Allow CORS *obscuren2015-01-281-0/+2
| | | | | | | | |
* | | | | | | | | Added big numbersobscuren2015-01-281-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'develop' into qt5.4obscuren2015-01-2834-0/+4018
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | new ethereum.jsobscuren2015-01-2834-0/+4018
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | removed old ethereum.jsobscuren2015-01-2825-2938/+0
| | | | | | | |
* | | | | | | | updated messagesobscuren2015-01-282-31/+19
| | | | | | | |
* | | | | | | | Merge branch 'jsonrpc' into qt5.4obscuren2015-01-2812-353/+965
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'develop' into jsonrpcobscuren2015-01-286-31/+389
| |\| | | | | | | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'chfast-pr/evmjit' into developobscuren2015-01-274-18/+370
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 'pr/evmjit' of https://github.com/chfast/go-ethereum into ↵obscuren2015-01-277-133/+209
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | chfast-pr/evmjit
| | | | * | | | Update JitVm to new EVM JIT ABI (C interface)Paweł Bylica2015-01-271-17/+11
| | | | | | | |
| | | | * | | | Update EVM JIT runtime data layoutPaweł Bylica2015-01-261-41/+30
| | | | | | | |
| | | | * | | | Merge remote-tracking branch 'upstream/develop' into evmjitPaweł Bylica2015-01-262-13/+19
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | | * | | | JitVm code cleanups & refactoring. Some memory copies eliminated (i.e. in ↵Paweł Bylica2015-01-231-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SHA3 calculation)
| | | | * | | | Merge remote-tracking branch 'upstream/develop' into pr/evmjitPaweł Bylica2015-01-2311-119/+184
| | | | |\| | |
| | | * | | | | Merge branch 'pr/evmjit' of https://github.com/chfast/go-ethereum into ↵obscuren2015-01-234-18/+375
| | | |\| | | | | | | | |_|/ / | | | |/| | | | | | | | | | chfast-pr/evmjit
| | | | * | | JitVM: the EVM JIT bridgePaweł Bylica2015-01-234-18/+375
| | | | | | |
| * | | | | | Merge branch 'develop' into jsonrpcobscuren2015-01-2385-399/+7742
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Move GetRequestReply to EthereumApiTaylor Gerring2015-01-213-51/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Off of jsonWrapper
| * | | | | | Move argument types to separate fileTaylor Gerring2015-01-212-211/+218
| | | | | | |
| * | | | | | Move websockets out of cmd/utilTaylor Gerring2015-01-212-29/+22
| | | | | | |
| * | | | | | Merge branch 'develop' into jsonrpcTaylor Gerring2015-01-21250-5516/+2182894
| |\ \ \ \ \ \
| * | | | | | | Stub missing UnmarshalJSON methodsTaylor Gerring2015-01-131-0/+16
| | | | | | | |
| * | | | | | | cleanupTaylor Gerring2015-01-134-16/+5
| | | | | | | |
| * | | | | | | Add support for CodeAtTaylor Gerring2015-01-133-2/+58
| | | | | | | |
| * | | | | | | Added license headersTaylor Gerring2015-01-134-0/+64
| | | | | | | |
| * | | | | | | cleanupTaylor Gerring2015-01-132-46/+9
| | | | | | | |
| * | | | | | | begin conversion to rpc over httpTaylor Gerring2015-01-135-263/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per specification at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC
* | | | | | | | reworking messages => logobscuren2015-01-285-114/+76
| | | | | | | |
* | | | | | | | Reworking browserobscuren2015-01-253-38/+241
| |_|_|/ / / / |/| | | | | |
* | | | | | | Updated readme with badgesobscuren2015-01-251-14/+12
| | | | | | |
* | | | | | | Gitter linkobscuren2015-01-251-0/+2
| | | | | | |
* | | | | | | Skip for travisobscuren2015-01-251-0/+2
| | | | | | |
* | | | | | | skipping for travisobscuren2015-01-251-0/+4
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'Gustav-Simonsson-import_presale_keys' into developobscuren2015-01-235-50/+125
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'import_presale_keys' of ↵obscuren2015-01-235-50/+125
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Gustav-Simonsson/go-ethereum into Gustav-Simonsson-import_presale_keys Conflicts: crypto/crypto.go
| * | | | | CamelCase aesCBCDecryptGustav Simonsson2015-01-222-3/+3
| | | | | |
| * | | | | Add ImportPreSaleKeyGustav Simonsson2015-01-214-49/+123
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | * ImportPreSaleKey takes a KeyStore, a presale key JSON (e.g. file content) and a password string. It stores the key in the given key store. * Refactored common AES decryption and moved some functions to crypto.go
* | | | | Use curve params instead of hardcoded 32 bytesobscuren2015-01-231-1/+1
| | | | |
* | | | | Pad private key when signing & length check for hashes in signobscuren2015-01-232-2/+19
| | | | |
* | | | | UI Updatesobscuren2015-01-225-67/+40
|/ / / / | | | | | | | | | | | | | | | | * Browser now has tabs * Fixed a callback issue
* | | | updated testsobscuren2015-01-2218-35/+502
| | | |
* | | | Moved `obscuren` secp256k1-goobscuren2015-01-2253-6/+6433
| | | |
* | | | Moved sha3 from `obscuren`obscuren2015-01-225-3/+390
| | | |
* | | | Future blocks not allowedobscuren2015-01-221-21/+4
| | | |
* | | | Updated browser & pass view to callback functionobscuren2015-01-222-231/+245
| |/ / |/| |
* | | fixed url bug in browserobscuren2015-01-212-14/+0
| | |
* | | StdVm by defaultobscuren2015-01-206-8/+14
| | |
* | | Hide browser bar when coming from a DApp urlobscuren2015-01-201-24/+28
| | |
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-01-205-0/+556
|\ \ \
| * \ \ Merge pull request #259 from Gustav-Simonsson/developJeffrey Wilcke2015-01-205-0/+556
| |\ \ \ | | | | | | | | | | KeyStore (Low level key functionality)
| | * | | Address pull request commentsGustav Simonsson2015-01-202-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | * Further simplify "constructor" function's allocation of structs * Fix formatting
| | * | | Address pull request commentsGustav Simonsson2015-01-202-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | * Allocate with composite literal instead of new * Remove check of number of bytes read from rand
| | * | | Update code commentsGustav Simonsson2015-01-161-6/+4
| | | | |
| | * | | Address pull request commentsGustav Simonsson2015-01-164-215/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove flags field from key struct * Change JSON struct fields from string to []byte * Change GenerateNewKey API to take io.Reader for random source * Remove mixing entropy source function * Use testing Fatal in tests
| | * | | Address pull request commentsGustav Simonsson2015-01-164-84/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Simplify scrypt constants with const block * Add key store constructors and make their types private * Simplify key store and file namings to be less Java Enterprise™ * Change test error logging to use t.Error(err) * Reduce number of naked returns (just like my ex-gf) * Simplify file reading path code
| | * | | Add new key_store interface and two new key storesGustav Simonsson2015-01-165-0/+685
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new generic key_store interface * Add new plaintext key store storing unprotected keys on disk * Add new encrypted key store storing encrypted keys on disk * Add new entropy mixing function using OS and go runtime sources
* | | | | Minor browser improvementsobscuren2015-01-193-6/+30
| | | | |
* | | | | Added 0 key proof errorobscuren2015-01-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Private key \x00\x00...\x00 returns the _exact_ same public key as \x11 \x11...\x11. Currently investigating.
* | | | | Moved connection errors to DebugDetail levelobscuren2015-01-191-2/+2
| | | | |
* | | | | VmDebug => StdVmobscuren2015-01-191-1/+1
| | | | |
* | | | | Print error instead of returning for seed node errobscuren2015-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Returning an error would indicate a complete failure initialising the Ethereum backend. Instead we should print the message and continue.
* | | | | VmDebug => StdVmobscuren2015-01-194-990/+951
|/ / / /
* | | | Merge pull request #260 from fjl/rlp-encoderJeffrey Wilcke2015-01-194-3/+23
|\ \ \ \ | | | | | | | | | | rlp: allow encoding non-empty interface values
| * | | | rlp: allow encoding non-empty interface valuesFelix Lange2015-01-164-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs to be supported because []someInterface does occur sometimes. Funny enough, the fix involves changes to the decoder. makeDecoder cannot return an error for non-empty interfaces anymore because the type cache builds both decoder and writer. Do the check at 'runtime' instead.
* | | | | Fixed difficultyobscuren2015-01-182-7/+5
| | | | | | | | | | | | | | | | | | | | Difficulty was broken when refactored.
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-01-166-24/+869
|\ \ \ \ \
| * | | | | Merge pull request #257 from fjl/rlp-encoderJeffrey Wilcke2015-01-166-24/+869
| |\| | | | | | |/ / / | |/| | | rlp: add functions for encoding
| | * | | rlp: fix Decode benchmarksFelix Lange2015-01-151-8/+10
| | | | |
| | * | | rlp: add functions for encodingFelix Lange2015-01-156-17/+860
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm reasonably confident that the encoding matches the output of ethutil.Encode for values that it supports. Some of the tests have been adpated from the Ethereum testing repository. There are still TODOs in the code.
* | | | Add defer rescued back inobscuren2015-01-161-0/+5
| | | |
* | | | updated testsobscuren2015-01-1514-0/+2167178
| | | |
* | | | Changed public whisper api not to reveal temporary private keysobscuren2015-01-154-431/+474
|/ / /
* | | Updated testsobscuren2015-01-1418-20/+584
| | |
* | | Default datadir for mist is now shared with CLI (.ethereum)obscuren2015-01-131-1/+1
| | |
* | | Fixed consensus issueobscuren2015-01-134-6/+4
| | |
* | | Fixed whisper messagesobscuren2015-01-136-34/+58
| | | | | | | | | | | | | | | | | | | | | * Whisper protocol wasn't properly suppling envelope slices * Message history wasn't properly propagated * Added 'Messages' method, filtering any current envelope with the supplied filter.
* | | updated testsobscuren2015-01-137-108/+248
| | |
* | | remove pre compiled for testsobscuren2015-01-133-32/+41
| | |
* | | Merge pull request #254 from chfast/pr/jitvm_stubJeffrey Wilcke2015-01-133-0/+34
|\ \ \ | | | | | | | | JitVm struct stub. Forwards calls to DebugVm.
| * | | JitVm struct stub. Forwards calls to DebugVm.Paweł Bylica2015-01-133-0/+34
| | | |
* | | | updated testsobscuren2015-01-134-14/+20
| | | |
* | | | Added manual triggering of filtersobscuren2015-01-135-9/+51
|/ / /
* | | updated testsobscuren2015-01-127-18/+317
| | |
* | | updated testsobscuren2015-01-129-13/+247
| | |
* | | updated testsobscuren2015-01-128-26/+186
| | |
* | | pre-powobscuren2015-01-125-2/+50
| | |
* | | removed accidental qt depobscuren2015-01-111-2/+2
| | |
* | | Implemented filter for ws + fixesobscuren2015-01-1010-93/+144
| | | | | | | | | | | | | | | | | | | | | * proper 0xhex * filters fixed * start of filter manager * accounts for ws. Closes #246
* | | Moved the TD method from block processor.obscuren2015-01-103-41/+31
| | |
* | | Cast to string for hashable typeobscuren2015-01-101-1/+1
| | |
* | | updated testsobscuren2015-01-1051-90/+5577
| | |
* | | mem fixes for vm. Changed uncle inclusion testsobscuren2015-01-103-14/+46
| | |
* | | Limit hashes. Closes #249obscuren2015-01-091-0/+7
| | |
* | | Merge branch 'ethersphere-develop' into developobscuren2015-01-098-191/+500
|\ \ \
| * \ \ Merge branch 'develop' of https://github.com/ethersphere/go-ethereum into ↵obscuren2015-01-098-191/+500
| |\ \ \ | | | | | | | | | | | | | | | ethersphere-develop