Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | p2p/discover: add support for counting findnode failures | Péter Szilágyi | 2015-05-27 | 2 | -3/+25 |
| | |||||
* | Merge pull request #1108 from karalabe/fine-seeding | Felix Lange | 2015-05-27 | 5 | -20/+52 |
|\ | | | | | Fine tune seeder and p2p peer handling | ||||
| * | cmd/geth: fix js console test for p2p server update | Péter Szilágyi | 2015-05-27 | 1 | -1/+3 |
| | | |||||
| * | p2p: fix Self() panic if listening is disabled | Péter Szilágyi | 2015-05-27 | 1 | -0/+9 |
| | | |||||
| * | cmd/geth, cmd/utils, eth, p2p: pass and honor a no discovery flag | Péter Szilágyi | 2015-05-27 | 4 | -9/+37 |
| | | |||||
| * | eth, p2p: start the p2p server even if maxpeers == 0 | Péter Szilágyi | 2015-05-26 | 2 | -10/+3 |
| | | |||||
* | | Merge pull request #1111 from obscuren/neg_tx_check | Jeffrey Wilcke | 2015-05-27 | 4 | -2/+20 |
|\ \ | | | | | | | core: check negative value transactions. Closes #1109 | ||||
| * | | core: check negative value transactions. Closes #1109 | obscuren | 2015-05-27 | 4 | -2/+20 |
|/ / | |||||
* | | Merge pull request #1090 from fjl/jsre-fixes | Jeffrey Wilcke | 2015-05-27 | 5 | -176/+124 |
|\ \ | | | | | | | jsre: fixes for concurrent use, improved timer handling | ||||
| * | | cmd/geth, jsre, rpc: run all JS code on the event loop | Felix Lange | 2015-05-25 | 5 | -176/+124 |
| | | | | | | | | | | | | | | | | | | Some JSRE methods (PrettyPrint, ToVal) bypassed the event loop. All calls to the JS VM are now wrapped. In order to make this somewhat more foolproof, the otto VM is now a local variable inside the event loop. | ||||
* | | | Merge pull request #1086 from debris/solidity_std | Jeffrey Wilcke | 2015-05-27 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | common/compiler: compile solidity contracts with std library | ||||
| * | | | compile solidity contracts with std library | Marek Kotewicz | 2015-05-25 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #1106 from karalabe/silence-useless-downloader-log | Jeffrey Wilcke | 2015-05-27 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | eth/downloader: silence "Added N blocks from..." if N == 0 | ||||
| * | | | eth/downloader: silence "Added N blocks from..." if N == 0 | Péter Szilágyi | 2015-05-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | core: prevent crash when last block fails | obscuren | 2015-05-26 | 1 | -6/+16 |
|/ / / | |||||
* | | | cmd/geth: bumped version to 0.9.24 | obscuren | 2015-05-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1014 from fjl/p2p-dialer-3000 | Jeffrey Wilcke | 2015-05-26 | 30 | -1468/+7980 |
|\ \ \ | | | | | | | | | p2p: new dialer, peer management without locks | ||||
| * | | | p2p: decrease frameReadTimeout to 30s | Felix Lange | 2015-05-25 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | This detects hanging connections sooner. We send a ping every 15s and other implementation have similar limits. | ||||
| * | | | p2p: new dialer, peer management without locks | Felix Lange | 2015-05-25 | 11 | -1329/+2118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most visible change is event-based dialing, which should be an improvement over the timer-based system that we have at the moment. The dialer gets a chance to compute new tasks whenever peers change or dials complete. This is better than checking peers on a timer because dials happen faster. The dialer can now make more precise decisions about whom to dial based on the peer set and we can test those decisions without actually opening any sockets. Peer management is easier to test because the tests can inject connections at checkpoints (after enc handshake, after protocol handshake). Most of the handshake stuff is now part of the RLPx code. It could be exported or move to its own package because it is no longer entangled with Server logic. | ||||
| * | | | p2p/discover: add ReadRandomNodes | Felix Lange | 2015-05-25 | 2 | -1/+83 |
| | | | | |||||
| * | | | p2p: decrease maximum message size for devp2p to 1kB | Felix Lange | 2015-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The previous limit was 10MB which is unacceptable for all kinds of reasons, the most important one being that we don't want to allow the remote side to make us allocate 10MB at handshake time. | ||||
| * | | | Godeps: add github.com/davecgh/go-spew | Felix Lange | 2015-05-25 | 16 | -0/+5776 |
| | | | | |||||
| * | | | p2p: delete Server.Broadcast | Felix Lange | 2015-05-25 | 4 | -136/+0 |
| | | | | |||||
| * | | | eth: stop p2p.Server on shutdown | Felix Lange | 2015-05-25 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1099 from obscuren/fork_fix | Jeffrey Wilcke | 2015-05-26 | 9 | -4481/+6478 |
|\ \ \ | | | | | | | | | Fork fix | ||||
| * | | | tests: removed missing block test | obscuren | 2015-05-26 | 1 | -4/+0 |
| | | | | |||||
| * | | | core: ban hash 38f5bb...a714bc | obscuren | 2015-05-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Hash 38f5bbbffd74804820ffa4bab0cd540e9de229725afb98c1a7e57936f4a714bc ignored. | ||||
| * | | | core/vm: Fork fix. Removal of appending 0 bytes in memset | obscuren | 2015-05-26 | 1 | -6/+2 |
| | | | | |||||
| * | | | tests: updated | obscuren | 2015-05-26 | 6 | -4471/+6475 |
|/ / / | |||||
* | | | Merge pull request #1102 from karalabe/maintain-block-origins | Jeffrey Wilcke | 2015-05-26 | 5 | -23/+39 |
|\ \ \ | | | | | | | | | eth, eth/downloader: surface downloaded block origin, drop on error | ||||
| * | | | eth, eth/downloader: surface downloaded block origin, drop on error | Péter Szilágyi | 2015-05-26 | 5 | -23/+39 |
| | | | | |||||
* | | | | Merge pull request #1101 from obscuren/issue-1096 | Jeffrey Wilcke | 2015-05-26 | 1 | -15/+3 |
|\ \ \ \ | |/ / / |/| | | | core/vm: Cleanups & SUB output fix. Closes #1096 | ||||
| * | | | core/vm: Cleanups & SUB output fix. Closes #1096 | obscuren | 2015-05-26 | 1 | -15/+3 |
| | | | | |||||
* | | | | Merge pull request #1078 from carver/patch-1 | Felix Lange | 2015-05-25 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | eth: expand acronym in log message from TD | ||||
| * | | | expand acronym in log message from TD | Jason Carver | 2015-05-23 | 1 | -1/+1 |
| | |/ | |/| | | | | to total difficulty | ||||
* | | | Merge pull request #1066 from karalabe/peer-db-polishes | Felix Lange | 2015-05-25 | 3 | -25/+99 |
|\ \ \ | |/ / |/| | | p2p/discover: evacuate self from node database during iterations | ||||
| * | | p2p/discover: fix #838, evacuate self entries from the node db | Péter Szilágyi | 2015-05-22 | 3 | -25/+99 |
| | | | |||||
| * | | p2p/discover: fix database presistency test folder | Péter Szilágyi | 2015-05-22 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #1077 from obscuren/disasm | Jeffrey Wilcke | 2015-05-22 | 2 | -1/+29 |
|\ \ \ | |_|/ |/| | | core/vm, rpc: added disasm to `ext_` RPC | ||||
| * | | core/vm, rpc: added disasm to `ext_` RPC | obscuren | 2015-05-22 | 2 | -1/+29 |
|/ / | |||||
* | | Merge pull request #1076 from obscuren/rpc_sign | Jeffrey Wilcke | 2015-05-22 | 2 | -42/+42 |
|\ \ | | | | | | | core: added RPC sign back in | ||||
| * | | core: added RPC sign back in | obscuren | 2015-05-22 | 2 | -42/+42 |
| | | | |||||
* | | | Merge pull request #1072 from Gustav-Simonsson/add_random_tests | Jeffrey Wilcke | 2015-05-22 | 1 | -16/+10 |
|\ \ \ | | | | | | | | | Add StateTests/RandomTests and VMTests/RandomTests | ||||
| * | | | Add StateTests/RandomTests and VMTests/RandomTests | Gustav Simonsson | 2015-05-22 | 1 | -16/+10 |
| |/ / | |||||
* | | | Merge pull request #1074 from bas-vk/issue1068 | Jeffrey Wilcke | 2015-05-22 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | make registrar available in console | ||||
| * | | make registrar available in console | Bas van Kervel | 2015-05-22 | 1 | -1/+1 |
|/ / | |||||
* | | miner: moved break INSIDE the switch ... | obscuren | 2015-05-22 | 1 | -4/+5 |
| | | |||||
* | | Merge branch 'release/0.9.23' into develop | obscuren | 2015-05-22 | 2 | -1/+3 |
|\ \ | |/ |/| | |||||
| * | miner: on downloader.Done/Fail stop immediately. Ignore pending evs | obscuren | 2015-05-22 | 1 | -0/+2 |
| | | |||||
| * | cmd/geth: bump version 0.9.23 | obscuren | 2015-05-22 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1055 from ethersphere/autodag | Jeffrey Wilcke | 2015-05-22 | 4 | -1/+127 |
|\ | | | | | automatic DAG pregeneration for smooth epoch transitions | ||||
| * | automatic DAG pregeneration for smooth epoch transitions | zelig | 2015-05-21 | 4 | -1/+127 |
| | | | | | | | | | | | | | | | | - backend: AutoDAG bool flag passed from cli/eth.Config to ethereum, autoDAG loop started if true - backend: autoDAG loop start/stop, remove previous DAG - cli: AutoDAG bool flag, off by default, but automatically ON if mining - admin jsre: add startAutoDAG stopAutoDAG and makeDAG in miner section - switch on/off DAG autogeneration when miner started/stopped on console | ||||
* | | Merge pull request #1064 from karalabe/downloader-attacks | Jeffrey Wilcke | 2015-05-22 | 6 | -28/+99 |
|\ \ | | | | | | | Fix two additional download vulnerabilities | ||||
| * | | eth, eth/downloader: remove duplicate consts, bump hash fetch to 2K | Péter Szilágyi | 2015-05-21 | 6 | -13/+14 |
| | | | |||||
| * | | eth/downloader: circumvent a forged block chain with known parent attack | Péter Szilágyi | 2015-05-21 | 2 | -13/+56 |
| | | | |||||
| * | | eth/downloader: prevent a peer from dripping bad hashes | Péter Szilágyi | 2015-05-21 | 2 | -9/+36 |
| | | | |||||
* | | | Merge pull request #1063 from bas-vk/issue1053 | Jeffrey Wilcke | 2015-05-21 | 1 | -2/+5 |
|\ \ \ | |_|/ |/| | | prefix dapp key/value entries in extradb | ||||
| * | | prefix dapp key/value entries in extradb | Bas van Kervel | 2015-05-21 | 1 | -2/+5 |
|/ / | |||||
* | | Merge pull request #1062 from Gustav-Simonsson/tests_updates | Jeffrey Wilcke | 2015-05-21 | 7 | -31/+9209 |
|\ \ | | | | | | | Tests updates | ||||
| * | | Add wrapper for BlockTests/bcWalletTest.json | Gustav Simonsson | 2015-05-18 | 1 | -0/+4 |
| | | | |||||
| * | | Handle call depth exception for CREATE | Gustav Simonsson | 2015-05-18 | 1 | -0/+6 |
| | | | |||||
| * | | Update Ethereum JSON test files | Gustav Simonsson | 2015-05-18 | 5 | -31/+9199 |
| | | | |||||
* | | | Merge pull request #1059 from obscuren/cleanup | Jeffrey Wilcke | 2015-05-21 | 5 | -36/+37 |
|\ \ \ | |/ / |/| | | Cleanup | ||||
| * | | miner: one-shot update loop | obscuren | 2015-05-21 | 1 | -0/+6 |
| | | | |||||
| * | | eth: reduced max open files for LevelDB | obscuren | 2015-05-21 | 1 | -1/+1 |
| | | | |||||
| * | | ethdb: documentation and corruption recovery | obscuren | 2015-05-21 | 1 | -8/+13 |
| | | | |||||
| * | | core: switched back to `set.Set` for uncle verification | obscuren | 2015-05-21 | 1 | -24/+14 |
| | | | |||||
| * | | xeth: removed `Value` | obscuren | 2015-05-21 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #1043 from obscuren/test_fixes | Jeffrey Wilcke | 2015-05-20 | 3 | -13/+35 |
|\ \ | | | | | | | core/vm: optimisation on RETURN and updated tests | ||||
| * | | tests: added conditional skip on long running VM tests | obscuren | 2015-05-20 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | Set the TEST_VM_COMPLEX env var to test complex vm tests which require a lot of ram and quite some time. | ||||
| * | | core/vm: RETURN op code returns pointer to memory rather than copy | obscuren | 2015-05-20 | 3 | -5/+17 |
| | | | |||||
| * | | tests/vm: updated tests and skipped output for specific tests | obscuren | 2015-05-20 | 1 | -8/+11 |
| | | | | | | | | | | | | Skipped tests due to large return value | ||||
* | | | Merge pull request #1049 from zsfelfoldi/receipts | Jeffrey Wilcke | 2015-05-20 | 2 | -0/+34 |
|\ \ \ | | | | | | | | | Storing tx receipts in extraDb | ||||
| * | | | Storing tx receipts in extraDb | zsfelfoldi | 2015-05-20 | 2 | -0/+34 |
| | |/ | |/| | |||||
* | | | Merge pull request #1048 from ethersphere/cli-fixes | Jeffrey Wilcke | 2015-05-20 | 15 | -645/+2305 |
|\ \ \ | | | | | | | | | CLI, JSRE admin and Solc improvements | ||||
| * | | | rpc: NewNotAvailableError instead of NewNotImplementedError if no solc | zelig | 2015-05-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix eth.sign. now implemented in admin jsre until web3.js has it . | zelig | 2015-05-20 | 4 | -43/+68 |
| | | | | |||||
| * | | | multiple contract source for solidity compiler: returns contract array if ↵ | zelig | 2015-05-20 | 6 | -74/+91 |
| | | | | | | | | | | | | | | | | multiple contracts. fixes #1023 | ||||
| * | | | update web3.js to 0.4.2 | zelig | 2015-05-20 | 1 | -475/+2061 |
| | | | | |||||
| * | | | add usage doc to wallet import | zelig | 2015-05-20 | 1 | -1/+9 |
| | | | | |||||
| * | | | remove solc flair | zelig | 2015-05-20 | 1 | -1/+2 |
| | | | | |||||
| * | | | solc now in ethereum, fixes solc path setting; setSolc() didnt work | zelig | 2015-05-20 | 6 | -15/+26 |
| | | | | |||||
| * | | | fix solc tests unskip | zelig | 2015-05-20 | 6 | -38/+50 |
| |/ / | |||||
* | | | Merge pull request #1050 from karalabe/handle-slow-download-tester | Jeffrey Wilcke | 2015-05-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | eth/downloader: fix test to it doesn't time out on a slow machine | ||||
| * | | | eth/downloader: fix test to it doesn't time out on a slow machine | Péter Szilágyi | 2015-05-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1051 from karalabe/fix-odd-naming | Jeffrey Wilcke | 2015-05-20 | 2 | -7/+7 |
|\ \ \ \ | |_|/ / |/| | | | eth: fix odd method names in peer set | ||||
| * | | | eth: fix odd method names in peer set | Péter Szilágyi | 2015-05-20 | 2 | -7/+7 |
|/ / / | |||||
* | | | Merge pull request #1044 from obscuren/thread_safe_block_cache | Jeffrey Wilcke | 2015-05-20 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | core: block cache Has method thread safe | ||||
| * | | | core: block cache Has method thread safe | obscuren | 2015-05-20 | 1 | -0/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #1046 from tgerring/issue1045 | Jeffrey Wilcke | 2015-05-20 | 1 | -10/+21 |
|\ \ \ | |/ / |/| | | Allow unlocking multiple accounts | ||||
| * | | Support multiple account unlock attempts | Taylor Gerring | 2015-05-20 | 1 | -3/+10 |
| | | | |||||
| * | | Allow unlocking multiple accounts #1045 | Taylor Gerring | 2015-05-20 | 1 | -9/+13 |
| | | | | | | | | | | | | Separate accounts with spaces when using --unlock | ||||
* | | | core: skipped tests while cache disabled | obscuren | 2015-05-20 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #1035 from karalabe/eth-threadsafe-peers | Jeffrey Wilcke | 2015-05-19 | 3 | -68/+150 |
|\ \ | | | | | | | eth: make the peer-set thread safe | ||||
| * | | eth: remote a superfluous peerSet method | Péter Szilágyi | 2015-05-19 | 1 | -12/+0 |
| | | | |||||
| * | | eth: make the peer set thread safe | Péter Szilágyi | 2015-05-19 | 3 | -68/+162 |
| |/ | |||||
* | | Merge pull request #1036 from tgerring/issue884 | Jeffrey Wilcke | 2015-05-19 | 2 | -8/+21 |
|\ \ | | | | | | | JSON RPC null field updates | ||||
| * | | Use bytes.Repeat() instead of 32-byte literal | Taylor Gerring | 2015-05-19 | 1 | -1/+2 |
| | | | |||||
| * | | XEth comment clarification | Taylor Gerring | 2015-05-18 | 1 | -2/+5 |
| | | | |||||
| * | | Cleanup | Taylor Gerring | 2015-05-18 | 1 | -3/+1 |
| | | | |||||
| * | | Return nil for certain fields on eth_getTransactionByHash when not part of a ↵ | Taylor Gerring | 2015-05-18 | 1 | -3/+7 |
| | | | | | | | | | | | | block | ||||
| * | | Return nil for certain fields on eth_getBlockByNumber pending | Taylor Gerring | 2015-05-18 | 1 | -0/+7 |
| | | | |||||
* | | | core: disable cash tmp | obscuren | 2015-05-19 | 1 | -3/+5 |
| | | | |||||
* | | | Merge pull request #1034 from obscuren/tx_pool_fix | Jeffrey Wilcke | 2015-05-19 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Nonce fix for failing transactions | ||||
| * | | | xeth: remove nonce on error. Fixes #1026 | obscuren | 2015-05-19 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #1022 from obscuren/parallel_nonce_checks | Jeffrey Wilcke | 2015-05-19 | 9 | -25/+119 |
|\ \ \ | | | | | | | | | Parallelise nonce checks | ||||
| * | | | core: fixed tests | obscuren | 2015-05-19 | 3 | -8/+15 |
| | | | | |||||
| * | | | core: chain manager no longer exports genesis block | obscuren | 2015-05-19 | 2 | -2/+4 |
| | | | | |||||
| * | | | miner: stale block notification | obscuren | 2015-05-19 | 1 | -1/+7 |
| | | | | |||||
| * | | | core: parallelise nonce checking when processing blocks | obscuren | 2015-05-18 | 4 | -15/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | ChainManager now uses a parallel approach to block processing where all nonces are checked seperatly from the block processing process. This speeds up the process by about 3 times on my i7 | ||||
* | | | | Merge pull request #1033 from tgerring/issue1010 | Jeffrey Wilcke | 2015-05-19 | 3 | -33/+70 |
|\ \ \ \ | |_|_|/ |/| | | | Add "removedb" command to Geth | ||||
| * | | | Remove unused confirm() method | Taylor Gerring | 2015-05-19 | 1 | -14/+0 |
| | | | | |||||
| * | | | Refactor user prompts into utils | Taylor Gerring | 2015-05-19 | 3 | -49/+50 |
| | | | | |||||
| * | | | Add user confirmation for removedb | Taylor Gerring | 2015-05-19 | 1 | -5/+40 |
| | | | | |||||
| * | | | Add "removedb" command to Geth | Taylor Gerring | 2015-05-18 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | Removes the state and blockchain databases | ||||
* | | | | Merge pull request #1032 from tgerring/issue1025 | Jeffrey Wilcke | 2015-05-18 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | Multiple CORS domains support | ||||
| * | | | Permit multiple CORS domains | Taylor Gerring | 2015-05-18 | 1 | -1/+2 |
|/ / / | | | | | | | | | | Separated by spaces | ||||
* | | | Merge pull request #1031 from bas-vk/issue1012 | Jeffrey Wilcke | 2015-05-18 | 1 | -12/+13 |
|\ \ \ | |_|/ |/| | | fixed race condition in miner | ||||
| * | | fixed issue when miner is not stopping af stop command | Bas van Kervel | 2015-05-18 | 1 | -0/+6 |
| | | | |||||
| * | | fixed race condition in miner | Bas van Kervel | 2015-05-18 | 1 | -12/+7 |
|/ / | |||||
* | | core: bugfix test 2. set => hash map | obscuren | 2015-05-18 | 1 | -14/+23 |
| | | |||||
* | | ret | obscuren | 2015-05-18 | 1 | -0/+1 |
| | | |||||
* | | core: tmp diagnostic logs | obscuren | 2015-05-18 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'hotfix/0.9.22' into develop | obscuren | 2015-05-18 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | cmd/geth: fixed ver num | obscuren | 2015-05-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'hotfix/0.9.21-1' | obscuren | 2015-05-16 | 5 | -27/+36 |
| |\ | |||||
* | \ | Merge pull request #1021 from obscuren/global_chain_lock | Jeffrey Wilcke | 2015-05-17 | 1 | -44/+43 |
|\ \ \ | | | | | | | | | core: global chain insert lock | ||||
| * | | | core: global chain insert lock | obscuren | 2015-05-17 | 1 | -44/+43 |
| | | | | |||||
* | | | | Merge pull request #1011 from obscuren/upgradedb_fix | Jeffrey Wilcke | 2015-05-16 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | cmd/geth: delete state db on upgradedb command | ||||
| * | | | cmd/geth: delete state db on upgradedb command | obscuren | 2015-05-16 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge branch 'hotfix/0.9.21.1' into develop | obscuren | 2015-05-16 | 4 | -27/+35 |
|\ \ \ | | |/ | |/| | |||||
| * | | cmd/geth: hotfix bump | obscuren | 2015-05-16 | 1 | -1/+1 |
| | | | |||||
| * | | core: further improved uncle error messages | obscuren | 2015-05-16 | 1 | -8/+8 |
| | | | |||||
| * | | eth/downloader: moved start event | obscuren | 2015-05-16 | 2 | -2/+3 |
| | | | | | | | | | | | | Start event has moved because it could possibly could stall the miner | ||||
| * | | Adjust miner coinbase and not just miner worker coinbase | Vitalik Buterin | 2015-05-16 | 1 | -0/+1 |
| | | | |||||
| * | | miner: mutex locks on cpu agent. Closes #1007 | obscuren | 2015-05-16 | 1 | -16/+23 |
| |/ | |||||
| * | Merge branch 'release/0.9.21' | obscuren | 2015-05-16 | 200 | -3242/+611118 |
| |\ | |||||
| * \ | Merge branch 'release/0.9.20' | obscuren | 2015-05-13 | 54 | -617/+4653 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum | obscuren | 2015-05-10 | 0 | -0/+0 |
| |\ \ \ | |||||
* | | | | | Adjust miner coinbase and not just miner worker coinbase | Vitalik Buterin | 2015-05-16 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'release/0.9.21' into develop | obscuren | 2015-05-16 | 6 | -8/+6 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | core, cmd/geth, cmd/mist: cleanup. bump version 0.9.21 | obscuren | 2015-05-16 | 4 | -7/+3 |
| | | | | | |||||
| * | | | | xeth: set balance max balance to from in call. Closes #951 | obscuren | 2015-05-16 | 2 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #989 from obscuren/develop | Jeffrey Wilcke | 2015-05-16 | 4 | -9/+20 |
|\ \ \ \ | | | | | | | | | | | core, miner: fork resolving and restart miner after sync op | ||||
| * | | | | eth, cmd/geth: start mining from console respects CLI flag | obscuren | 2015-05-16 | 2 | -1/+3 |
| | | | | | |||||
| * | | | | miner: properly check for mining operation on Register | obscuren | 2015-05-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | core, miner: fork resolving and restart miner after sync op | obscuren | 2015-05-16 | 2 | -7/+16 |
|/ / / / | | | | | | | | | | | | | Fork resolving fixes #940 | ||||
* | | | | Merge pull request #996 from karalabe/fix-potential-crosscheck-race | Jeffrey Wilcke | 2015-05-16 | 1 | -5/+7 |
|\ \ \ \ | | | | | | | | | | | eth/downloader: circumvent download race between crosscheck and hashes | ||||
| * | | | | eth/downloader: circumvent download race between crosscheck and hashes | Péter Szilágyi | 2015-05-16 | 1 | -5/+7 |
| | | | | | |||||
* | | | | | Merge pull request #997 from karalabe/fix-shitty-test-server-issue | Jeffrey Wilcke | 2015-05-16 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | eth/downloader: fix #992, where tests may time out on a slow machine | ||||
| * | | | | eth/downloader: fix #992, where tests may time out on a slow machine | Péter Szilágyi | 2015-05-16 | 1 | -0/+6 |
|/ / / / | |||||
* | | | | Merge pull request #995 from ↵ | Jeffrey Wilcke | 2015-05-16 | 20 | -2741/+420841 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Gustav-Simonsson/update_state_tests_and_vm_create_return Update state tests and vm create return | ||||
| * | | | | Add StateTests/RandomTests but skip for now | Gustav Simonsson | 2015-05-16 | 1 | -0/+21 |
| | | | | | |||||
| * | | | | Update StateTests and nil create return on failed code deposit | Gustav Simonsson | 2015-05-16 | 2 | -2/+13 |
| | | | | | |||||
| * | | | | Update Ethereum JSON tests | Gustav Simonsson | 2015-05-15 | 17 | -2734/+420801 |
| | | | | | |||||
| * | | | | unskip StateTests/stTransactionTest and use test tx nonce | Gustav Simonsson | 2015-05-15 | 2 | -5/+6 |
| | | | | | |||||
* | | | | | Merge pull request #994 from karalabe/fix-cancel-double-close | Jeffrey Wilcke | 2015-05-16 | 1 | -3/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | eth/downloader: fix cancel channel double close | ||||
| * | | | | | eth/downloader: fix cancel channel double close | Péter Szilágyi | 2015-05-16 | 1 | -3/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #988 from karalabe/fix-downloader-vulnerabilities | Jeffrey Wilcke | 2015-05-15 | 4 | -122/+336 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix downloader vulnerabilities | ||||
| * | | | | eth/downloader: circumvent a fake blockchain attack | Péter Szilágyi | 2015-05-15 | 2 | -27/+58 |
| | | | | | |||||
| * | | | | eth/downloader: don't penalize for stale cross checks | Péter Szilágyi | 2015-05-15 | 1 | -7/+17 |
| | | | | | |||||
| * | | | | eth, eth/downloader: detect and handle madeup hash attacks | Péter Szilágyi | 2015-05-15 | 4 | -43/+110 |
| | | | | | |||||
| * | | | | eth: drop a sync peer if it sends an invalid hash chain | Péter Szilágyi | 2015-05-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | eth/downloader: circumvent hash reordering attacks | Péter Szilágyi | 2015-05-15 | 3 | -49/+88 |
| | | | | | |||||
| * | | | | eth/downloader: check sync after failed attacks | Péter Szilágyi | 2015-05-15 | 2 | -7/+23 |
| | | | | | |||||
| * | | | | eth/downloader: add a test for detecting missing blocks | Péter Szilágyi | 2015-05-15 | 2 | -8/+24 |
| | | | | | |||||
| * | | | | eth, eth/downloader: prevent hash repeater attack | Péter Szilágyi | 2015-05-15 | 4 | -15/+50 |
|/ / / / | |||||
* | | | | Merge pull request #987 from obscuren/develop | Jeffrey Wilcke | 2015-05-15 | 12 | -35/+110 |
|\ \ \ \ | | | | | | | | | | | Miner updates and downloader events | ||||
| * | | | | eth/downloader: fixed test | obscuren | 2015-05-15 | 2 | -2/+4 |
| | | | | | |||||
| * | | | | core: fixed mining strategy | obscuren | 2015-05-15 | 2 | -10/+16 |
| | | | | | |||||
| * | | | | eth, eth/downloader, miner: use download events to check miner start | obscuren | 2015-05-15 | 6 | -18/+83 |
| | | | | | |||||
| * | | | | core: changed how head events are checked | obscuren | 2015-05-15 | 2 | -2/+4 |
| | | | | | |||||
| * | | | | core: improved uncle messages | obscuren | 2015-05-15 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #984 from tgerring/issue924 | Jeffrey Wilcke | 2015-05-15 | 1 | -3/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | Omit replies for RPC notification requests | ||||
| * | | | | | Unreverse ordering | Taylor Gerring | 2015-05-15 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Omit replies for notification requests | Taylor Gerring | 2015-05-15 | 1 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | When Id is missing, the client does not want a response | ||||
* | | | | | | Merge pull request #975 from obscuren/develop | Jeffrey Wilcke | 2015-05-15 | 1 | -11/+13 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | core: changed log message for forks. closes #952 | ||||
| * | | | | | core: changed log message for forks. closes #952 | obscuren | 2015-05-14 | 1 | -11/+13 |
| | | | | | | |||||
* | | | | | | Merge pull request #983 from tgerring/issue958 | Jeffrey Wilcke | 2015-05-15 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Format contract code as hexdata | ||||
| * | | | | | | Format contract code as hexdata | Taylor Gerring | 2015-05-15 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #982 from tgerring/issue962 | Jeffrey Wilcke | 2015-05-15 | 1 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Check for error on DB fetch of tx | ||||
| * | | | | | | Check for error on DB fetch of tx | Taylor Gerring | 2015-05-15 | 1 | -1/+5 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #980 from fjl/geth-test-no-scrypt | Jeffrey Wilcke | 2015-05-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | cmd/geth: use plain keystore for JS tests | ||||
| * | | | | | cmd/geth: use plain keystore for JS tests | Felix Lange | 2015-05-14 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | This reduces the time it takes to run the tests back to 3 seconds. | ||||
* | | | | | Merge pull request #974 from karalabe/downloader-fix-unknown-parent-attack | Jeffrey Wilcke | 2015-05-14 | 4 | -38/+92 |
|\ \ \ \ \ | | | | | | | | | | | | | eth, eth/downloader: handle a potential unknown parent attack | ||||
| * | | | | | eth/downloader: add a small additional check to the test | Péter Szilágyi | 2015-05-14 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | eth/downloader: remove a previous leftover | Péter Szilágyi | 2015-05-14 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | eth, eth/downloader: remove parent verification from the downlaoder | Péter Szilágyi | 2015-05-14 | 4 | -46/+17 |
| | | | | | | |||||
| * | | | | | eth, eth/downloader: handle a potential unknown parent attack | Péter Szilágyi | 2015-05-14 | 3 | -31/+112 |
| | | | | | | |||||
* | | | | | | Merge pull request #971 from fjl/p2p-limit-tweaks | Jeffrey Wilcke | 2015-05-14 | 7 | -64/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | p2p: tweak connection limits | ||||
| * | | | | | | p2p/discover: limit open files for node database | Felix Lange | 2015-05-14 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | p2p: remove testlog | Felix Lange | 2015-05-14 | 3 | -51/+0 |
| | | | | | | | |||||
| * | | | | | | p2p/discover: bump maxBondingPingPongs to 16 | Felix Lange | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should increase the speed a bit because all findnode results (up to 16) can be verified at the same time. | ||||
| * | | | | | | p2p: log remote reason when disconnect is requested | Felix Lange | 2015-05-14 | 2 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The returned reason is currently not used except for the log message. This change makes the log messages a bit more useful. The handshake code also returns the remote reason. | ||||
| * | | | | | | p2p: bump maxAcceptConns and defaultDialTimout | Felix Lange | 2015-05-14 | 1 | -2/+2 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | On the test network, we've seen that it becomes harder to connect if the queues are so short. | ||||
* | | | | | | Merge pull request #973 from bas-vk/issue972 | Jeffrey Wilcke | 2015-05-14 | 2 | -0/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Introduced default unlock duration when an account is unlocked from t… | ||||
| * | | | | | | Introduced default unlock duration when an account is unlocked from the console | Bas van Kervel | 2015-05-14 | 2 | -0/+10 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #960 from fjl/nat-fixes | Jeffrey Wilcke | 2015-05-14 | 142 | -25/+189479 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | p2p/nat: fix UPnP auto discovery | ||||
| * | | | | | | | cmd/utils: print messages from package log through glog | Felix Lange | 2015-05-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the dependencies use package log. This change ensures that the log output looks uniform and respects glog flags. | ||||
| * | | | | | | | p2p/nat: tweak port mapping log messages and levels | Felix Lange | 2015-05-14 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People stil get confused about the messages. This commit changes the levels so that the only thing printed at the default level (info) is a successful mapping. | ||||
| * | | | | | | | Godeps: bump github.com/huin/goupnp to c57ae84 | Felix Lange | 2015-05-14 | 138 | -1/+189186 |
| | | | | | | | | |||||
| * | | | | | | | p2p/nat: add test for UPnP auto discovery via SSDP | Felix Lange | 2015-05-14 | 1 | -0/+223 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test listens for multicast UDP packets on the default interface because I couldn't get it to work reliably on loopback without massive changes to goupnp. This means that the test might fail when there is a UPnP-enabled router attached on that interface. I checked that locally by looping the test and it passes reliably because the local SSDP server always responds faster. | ||||
| * | | | | | | | p2p/nat: fix concurrent access to autodisc Interface | Felix Lange | 2015-05-14 | 2 | -17/+63 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent calls to Interface methods on autodisc could return a "not discovered" error if the discovery did not finish before the call. autodisc.wait expected the done channel to carry the found Interface but it was closed instead. The fix is to use sync.Once for now, which is easier to get right. And there is a test. Finally. This will have to change again when we introduce re-discovery. | ||||
* | | | | | | | Merge pull request #969 from Gustav-Simonsson/ethash_improve_hashrate_update2 | Jeffrey Wilcke | 2015-05-14 | 5 | -116/+48 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make read of ethash hashrate atomic and update ethash godep | ||||
| * | | | | | | | Make read of ethash hashrate atomic and update ethash godep | Gustav Simonsson | 2015-05-14 | 5 | -116/+48 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #950 from karalabe/downloader-cancel-sync | Jeffrey Wilcke | 2015-05-14 | 1 | -32/+37 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | eth/downloader: fix deliveries to check for sync cancels | ||||
| * | | | | | | | eth/downloader: remove a redundant sync progress check | Péter Szilágyi | 2015-05-13 | 1 | -4/+0 |
| | | | | | | | | |||||
| * | | | | | | | eth/downloader: add a user sync notificaton | Péter Szilágyi | 2015-05-13 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | eth/downloader: sync the cancel channel during cancel too | Péter Szilágyi | 2015-05-13 | 1 | -21/+4 |
| | | | | | | | | |||||
| * | | | | | | | eth/downloader: fix deliveries to check for sync cancels | Péter Szilágyi | 2015-05-13 | 1 | -10/+31 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #949 from bas-vk/issue944 | Jeffrey Wilcke | 2015-05-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | removed invalid filename characters | ||||
| * | | | | | | | removed invalid filename characters | Bas van Kervel | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #970 from ethereum/vitalik_quick_test | Jeffrey Wilcke | 2015-05-14 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Created separate family and ancestors environment objects | ||||
| * | | | | | | | Combined two loops | Vitalik Buterin | 2015-05-14 | 1 | -3/+1 |
| | | | | | | | | |||||
| * | | | | | | | Created separate family and ancestors environment objects | Vitalik Buterin | 2015-05-14 | 1 | -2/+10 |
|/ / / / / / / | |||||
* | | / / / / | Fixed max uncle count error message | Vitalik Buterin | 2015-05-14 | 1 | -1/+1 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #966 from fjl/fixup-discover-chunked-neighbors | Felix Lange | 2015-05-14 | 2 | -32/+49 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | p2p/discover: fix out-of-bounds slicing for chunked neighbors packets | ||||
| * | | | | | | p2p/discover: fix out-of-bounds slicing for chunked neighbors packets | Felix Lange | 2015-05-14 | 2 | -32/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code assumed that Table.closest always returns at least 13 nodes. This is not true for small tables (e.g. during bootstrap). | ||||
* | | | | | | | Merge pull request #963 from Gustav-Simonsson/fix_keystore_crypto_comments | Jeffrey Wilcke | 2015-05-14 | 1 | -6/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Update keystore code comments | ||||
| * | | | | | | Update keystore code comments | Gustav Simonsson | 2015-05-14 | 1 | -6/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #965 from subtly/patch-1 | Felix Lange | 2015-05-14 | 2 | -4/+20 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Better UDP & interop. Limit all received datagrams to 1280bytes. | ||||
| * | | | | | | fix test. | subtly | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Manual send of multiple neighbours packets. Test receiving multiple ↵ | subtly | 2015-05-14 | 2 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | neighbours packets. | ||||
| * | | | | | | UDP Interop. Limit datagrams to 1280bytes. | subtly | 2015-05-14 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have a UDP which specifies any messages that will be 4KB. Aside from being implemented for months and a necessity for encryption and piggy-backing packets, 1280bytes is ideal, and, means this TODO can be completed! Why 1280 bytes? * It's less than the default MTU for most WAN/LAN networks. That means fewer fragmented datagrams (esp on well-connected networks). * Fragmented datagrams and dropped packets suck and add latency while OS waits for a dropped fragment to never arrive (blocking readLoop()) * Most of our packets are < 1280 bytes. * 1280 bytes is minimum datagram size and MTU for IPv6 -- on IPv6, a datagram < 1280bytes will *never* be fragmented. UDP datagrams are dropped. A lot! And fragmented datagrams are worse. If a datagram has a 30% chance of being dropped, then a fragmented datagram has a 60% chance of being dropped. More importantly, we have signed packets and can't do anything with a packet unless we receive the entire datagram because the signature can't be verified. The same is true when we have encrypted packets. So the solution here to picking an ideal buffer size for receiving datagrams is a number under 1400bytes. And the lower-bound value for IPv6 of 1280 bytes make's it a non-decision. On IPv4 most ISPs and 3g/4g/let networks have an MTU just over 1400 -- and *never* over 1500. Never -- that means packets over 1500 (in reality: ~1450) bytes are fragmented. And probably dropped a lot. Just to prove the point, here are pings sending non-fragmented packets over wifi/ISP, and a second set of pings via cell-phone tethering. It's important to note that, if *any* router between my system and the EC2 node has a lower MTU, the message would not go through: On wifi w/normal ISP: localhost:Debug $ ping -D -s 1450 52.6.250.242 PING 52.6.250.242 (52.6.250.242): 1450 data bytes 1458 bytes from 52.6.250.242: icmp_seq=0 ttl=42 time=104.831 ms 1458 bytes from 52.6.250.242: icmp_seq=1 ttl=42 time=119.004 ms ^C --- 52.6.250.242 ping statistics --- 2 packets transmitted, 2 packets received, 0.0% packet loss round-trip min/avg/max/stddev = 104.831/111.918/119.004/7.087 ms localhost:Debug $ ping -D -s 1480 52.6.250.242 PING 52.6.250.242 (52.6.250.242): 1480 data bytes ping: sendto: Message too long ping: sendto: Message too long Request timeout for icmp_seq 0 ping: sendto: Message too long Request timeout for icmp_seq 1 Tethering to O2: localhost:Debug $ ping -D -s 1480 52.6.250.242 PING 52.6.250.242 (52.6.250.242): 1480 data bytes ping: sendto: Message too long ping: sendto: Message too long Request timeout for icmp_seq 0 ^C --- 52.6.250.242 ping statistics --- 2 packets transmitted, 0 packets received, 100.0% packet loss localhost:Debug $ ping -D -s 1450 52.6.250.242 PING 52.6.250.242 (52.6.250.242): 1450 data bytes 1458 bytes from 52.6.250.242: icmp_seq=0 ttl=42 time=107.844 ms 1458 bytes from 52.6.250.242: icmp_seq=1 ttl=42 time=105.127 ms 1458 bytes from 52.6.250.242: icmp_seq=2 ttl=42 time=120.483 ms 1458 bytes from 52.6.250.242: icmp_seq=3 ttl=42 time=102.136 ms | ||||
* | | | | | | Merge pull request #954 from karalabe/fix-downloader-nil-panic | Péter Szilágyi | 2015-05-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | eth/downloader: fix nil panic caused by wrong variable use | ||||
| * | | | | | eth/downloader: fix nil panic caused by wrong variable use | Péter Szilágyi | 2015-05-13 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #948 from karalabe/fix-downlaoder-activepeer-shadow | Jeffrey Wilcke | 2015-05-13 | 3 | -24/+16 |
|\ \ \ \ \ | |/ / / / |/| | | | | eth/downloader: fix active peer shadowing, polish func names | ||||
| * | | | | eth/downloader: fix active peer shadowing, polish func names | Péter Szilágyi | 2015-05-13 | 3 | -24/+16 |
|/ / / / | |||||
* | | | | Merge pull request #946 from Gustav-Simonsson/fix_geth_unlock_account | Jeffrey Wilcke | 2015-05-13 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Fix hex conversion in --unlock and log when successful | ||||
| * | | | | Fix hex conversion in --unlock and log when successful | Gustav Simonsson | 2015-05-13 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Merge branch 'release/0.9.20' into develop | obscuren | 2015-05-13 | 2 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | eth: 100% tx propagation | obscuren | 2015-05-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | cmd/geth: bump version to 0.9.20 | obscuren | 2015-05-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #631 from Gustav-Simonsson/improve_key_store_crypto | Jeffrey Wilcke | 2015-05-13 | 22 | -196/+241 |
|\ \ \ | | | | | | | | | Improve key store crypto | ||||
| * | | | Change default keystore dir | Gustav Simonsson | 2015-05-13 | 5 | -6/+6 |
| | | | | |||||
| * | | | Fix address type in js test | Gustav Simonsson | 2015-05-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix hex conversion bug in RPC for byte slices | Gustav Simonsson | 2015-05-12 | 1 | -1/+8 |
| | | | | |||||
| * | | | Fix natspec test (again x2) types | Gustav Simonsson | 2015-05-12 | 1 | -1/+2 |
| | | | | |||||
| * | | | Update key store to new spec but keep address field for now | Gustav Simonsson | 2015-05-12 | 7 | -72/+59 |
| | | | | | | | | | | | | | | | | * Also fix address types post-rebase | ||||
| * | | | Fix natspec e2e test accounts type (again) | Gustav Simonsson | 2015-05-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix HEX hack in xeth accounts() | Gustav Simonsson | 2015-05-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Address pull request comments; key header and hex encoding | Gustav Simonsson | 2015-05-12 | 3 | -31/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Remove key header from unencrypted key file format and replace it with a version field * Change encoding of bytes in key files from base64 to hex | ||||
| * | | | Revert "Add key header to unencrypted key file" | Gustav Simonsson | 2015-05-12 | 2 | -16/+8 |
| | | | | | | | | | | | | | | | | This reverts commit a94d4ba0b53c4558ab838aaed635a2ff66ddfa53. | ||||
| * | | | Fix common.Address / []byte type conversions | Gustav Simonsson | 2015-05-12 | 2 | -2/+2 |
| | | | | |||||
| * | | | Add key header to unencrypted key file | Gustav Simonsson | 2015-05-12 | 2 | -8/+16 |
| | | | | |||||
| * | | | Add key header to encrypted keys | Gustav Simonsson | 2015-05-12 | 2 | -7/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add key header containing key version, kdf and kdf params * Store key header as JSON in the key file * Read in KDF params from key header * Include key header in MAC calculation and MAC verification | ||||
| * | | | Correct accounts hex in XETH API | Gustav Simonsson | 2015-05-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use common.Address type for accounts.Address | Gustav Simonsson | 2015-05-12 | 11 | -64/+69 |
| | | | | |||||
| * | | | Improve key store passphrase crypto | Gustav Simonsson | 2015-05-12 | 4 | -23/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Change MAC-then-Encrypt to Encrypt-then-MAC * Change AES256 to AES128 * Use first 16 bytes of KDF derived key for AES and remaining 16 for MAC | ||||
| * | | | Remove the awesome, ever misunderstood entropy mixing | Gustav Simonsson | 2015-05-12 | 4 | -64/+15 |
|/ / / |