Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | miner: provide coinbase when starting the miner | Felix Lange | 2015-03-12 | 8 | -87/+74 |
| | | | | | | | | | | This avoids having to query the coinbase when creating the miner, which in turn eliminates the dreaded startup error when no accounts are set up. Later, this will also allow us to simply restart the miner when the user picks a different coinbase. This causes a lot of changes in other packages. These are included in this commit because they're impossible to separate. | ||||
* | Comment out broken test (return type does not exist) | Taylor Gerring | 2015-03-12 | 1 | -4/+5 |
| | |||||
* | Merge branch 'fjl-unencrypted-keys' into develop | obscuren | 2015-03-12 | 2 | -16/+29 |
|\ | |||||
| * | merge | obscuren | 2015-03-12 | 2 | -16/+29 |
|/| | |||||
| * | cmd/ethereum: add a flag to switch to unencrytped keystore | Felix Lange | 2015-03-11 | 2 | -14/+28 |
| | | | | | | | | | | | | | | | | | | This is mostly for automated tests. The tests can use the following commands to start the node: ethereum --unencrypted-keys account new ... ethereum --unencrypted-keys | ||||
* | | Merge branch 'rpcfrontier' into develop | obscuren | 2015-03-12 | 19 | -1881/+3180 |
|\ \ | |||||
| * | | Lowered default gas price and increased default gas limit | obscuren | 2015-03-12 | 3 | -10/+17 |
| | | | |||||
| * | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into ↵ | obscuren | 2015-03-12 | 4 | -15/+56 |
| |\ \ | | | | | | | | | | | | | rpcfrontier | ||||
| | * | | Rename Topic to Topics | Taylor Gerring | 2015-03-11 | 3 | -7/+7 |
| | | | | |||||
| | * | | Get Uncles | Taylor Gerring | 2015-03-11 | 1 | -1/+36 |
| | | | | |||||
| | * | | BlockHash must be a string | Taylor Gerring | 2015-03-11 | 1 | -1/+6 |
| | | | | |||||
| | * | | TxIndex -> Index | Taylor Gerring | 2015-03-11 | 3 | -6/+7 |
| | | | | |||||
| * | | | Default block number changes | obscuren | 2015-03-12 | 2 | -45/+27 |
| | | | | |||||
| * | | | Changed logging to use internal logger | obscuren | 2015-03-11 | 1 | -4/+4 |
| | | | | |||||
| * | | | Improved error reporting and removed commented code | obscuren | 2015-03-11 | 2 | -43/+7 |
| | | | | |||||
| * | | | Reverted global | obscuren | 2015-03-11 | 2 | -8/+3 |
| | | | | |||||
| * | | | Use the state to up the balance of the coinbase | obscuren | 2015-03-11 | 1 | -2/+6 |
| |/ / | |||||
| * | | Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier | Taylor Gerring | 2015-03-11 | 45 | -1566/+848 |
| |\ \ | |||||
| | * | | Merge branch 'develop' into rpcfrontier | obscuren | 2015-03-11 | 1 | -6/+3 |
| | |\| | |||||
| | * | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into ↵ | obscuren | 2015-03-11 | 4 | -34/+64 |
| | |\ \ | | | | | | | | | | | | | | | | rpcfrontier | ||||
| | * \ \ | Merge branch 'develop' into rpcfrontier | obscuren | 2015-03-11 | 42 | -1558/+841 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: rpc/api.go rpc/args.go | ||||
| | * | | | | fallback | obscuren | 2015-03-11 | 3 | -2/+4 |
| | | | | | | |||||
| * | | | | | Get transaction via block & index | Taylor Gerring | 2015-03-11 | 2 | -0/+37 |
| | | | | | | |||||
| * | | | | | Nil check block | Taylor Gerring | 2015-03-11 | 1 | -0/+4 |
| | |_|/ / | |/| | | | |||||
| * | | | | Output hex should be prepended with 0x | Taylor Gerring | 2015-03-11 | 3 | -34/+36 |
| | | | | | |||||
| * | | | | Left-pad odd length hex inputs and tests | Taylor Gerring | 2015-03-11 | 2 | -0/+28 |
| |/ / / | |||||
| * | | | id to hex | obscuren | 2015-03-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into ↵ | obscuren | 2015-03-11 | 5 | -11/+318 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rpcfrontier Conflicts: rpc/args.go | ||||
| | * | | | Update response types | Taylor Gerring | 2015-03-11 | 4 | -6/+312 |
| | | | | | |||||
| | * | | | Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier | Taylor Gerring | 2015-03-11 | 22 | -2039/+2095 |
| | |\ \ \ | |||||
| | * | | | | Allow integers for BlockNumber | Taylor Gerring | 2015-03-10 | 1 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | If parsing fails, fall back to hex decoding | ||||
| * | | | | | Updated RPC | obscuren | 2015-03-11 | 5 | -135/+151 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | * Added a generic RawMessage deserialiser * Updated ethereum.js * Updated coin test app | ||||
| * | | | | Added unmarshalState | obscuren | 2015-03-10 | 3 | -1017/+1510 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into rpcfrontier | obscuren | 2015-03-10 | 19 | -1022/+585 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | merge | obscuren | 2015-03-10 | 2 | -18/+15 |
| | | | | | |||||
| * | | | | wip | obscuren | 2015-03-10 | 413 | -2191255/+57399 |
| |\ \ \ \ | |||||
| * | | | | | Undo client_version changes | Taylor Gerring | 2015-03-10 | 7 | -19/+14 |
| | | | | | | |||||
| * | | | | | Remove support for compiling serpent | Taylor Gerring | 2015-03-09 | 1 | -16/+2 |
| | | | | | | |||||
| * | | | | | Increased args test coverage | Taylor Gerring | 2015-03-06 | 4 | -56/+393 |
| | | | | | | |||||
| * | | | | | Initial args tests | Taylor Gerring | 2015-03-06 | 2 | -13/+138 |
| | | | | | | |||||
| * | | | | | Add web3_sha3 test | Taylor Gerring | 2015-03-06 | 1 | -0/+18 |
| | | | | | | |||||
| * | | | | | Tidy | Taylor Gerring | 2015-03-06 | 3 | -62/+58 |
| | | | | | | |||||
| * | | | | | Refactor & cleanup | Taylor Gerring | 2015-03-06 | 5 | -657/+543 |
| | | | | | | |||||
| * | | | | | Resolve storage/storageat | Taylor Gerring | 2015-03-06 | 3 | -16/+24 |
| | | | | | | |||||
| * | | | | | Revert to hex response | Taylor Gerring | 2015-03-06 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Final name changes | Taylor Gerring | 2015-03-06 | 1 | -8/+9 |
| | | | | | | |||||
| * | | | | | Update RPC methods | Taylor Gerring | 2015-03-05 | 1 | -84/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | Re-order to match spec and explicitly list unimplemented methods | ||||
| * | | | | | Output 0x0 instead of 0x | Taylor Gerring | 2015-03-05 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | Output net_peerCount as hex | Taylor Gerring | 2015-03-04 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Return block number as hex | Taylor Gerring | 2015-03-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update NewTXArgs to accept hex | Taylor Gerring | 2015-03-04 | 2 | -21/+28 |
| | | | | | | |||||
| * | | | | | Add client_version RPC message | Taylor Gerring | 2015-03-04 | 3 | -1/+11 |
| | | | | | | |||||
| * | | | | | Move p2p.MakeName to ethutil.MakeVersion | Taylor Gerring | 2015-03-03 | 4 | -13/+8 |
| | | | | | | |||||
| * | | | | | Remove defunct calls | Taylor Gerring | 2015-03-02 | 1 | -62/+30 |
| | | | | | | |||||
| * | | | | | Rename "net" methods | Taylor Gerring | 2015-03-02 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | Check length of timestring before taking slice | Taylor Gerring | 2015-03-11 | 1 | -1/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Use ECDSA instead of elliptic | obscuren | 2015-03-11 | 1 | -6/+3 |
| |_|_|/ |/| | | | |||||
* | | | | don't log whisper start ups | obscuren | 2015-03-11 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-03-11 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #447 from fjl/accounts-integration | Jeffrey Wilcke | 2015-03-11 | 42 | -1569/+803 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Accounts integration | ||||
* | | | | | Merge branch 'fjl-accounts-integration' into develop | obscuren | 2015-03-11 | 0 | -0/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge branch 'accounts-integration' of https://github.com/fjl/go-ethereum ↵ | obscuren | 2015-03-10 | 38 | -1545/+701 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into fjl-accounts-integration | ||||
* | \ \ \ \ | Merge branch origin/develop into accounts-integration | Felix Lange | 2015-03-11 | 19 | -1021/+577 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/blocktest/main.go cmd/mist/debugger.go cmd/utils/cmd.go | ||||
| * | | | | | Merge pull request #449 from Gustav-Simonsson/add_blockchain_tests2 | Jeffrey Wilcke | 2015-03-10 | 3 | -3/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add empty total difficulty to test blocks and clean up stopping the node | ||||
| | * | | | | | Add empty total difficulty to test blocks and clean up stopping the node | Gustav Simonsson | 2015-03-10 | 3 | -3/+31 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | removed debugger | obscuren | 2015-03-10 | 5 | -436/+1 |
| | | | | | | |||||
| * | | | | | Fixed error message. Closes #448 | obscuren | 2015-03-10 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'poc-9' into develop | obscuren | 2015-03-10 | 5 | -138/+199 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge pull request #438 from ethersphere/poc9/cli | Jeffrey Wilcke | 2015-03-10 | 2 | -35/+49 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Poc9/cli (exportchain) | ||||
| | | * | | | | version output | zelig | 2015-03-08 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make version output more verbose - include NetworkId - go version and os not displayed like env vars (confusing) | ||||
| | | * | | | | add export blockchain subcommand, remove BlockDo | zelig | 2015-03-08 | 2 | -30/+42 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #437 from ethersphere/poc9/natspec | Jeffrey Wilcke | 2015-03-10 | 3 | -103/+150 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | [WIP] Poc9/natspec | ||||
| | | * | | | | | rename constructor New | zelig | 2015-03-08 | 2 | -2/+3 |
| | | | | | | | | |||||
| | | * | | | | | natspec for poc-9 | zelig | 2015-03-08 | 3 | -103/+149 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - put natspec.js in a heredoc string (to help binary) - constructor takes no args, just sets up js vm - API: only exports Notice(transaction, abi, method, expression string) (string, error) - effort to turn natspec.js error strings to proper go errors - test errors | ||||
| * | | | | | | Merge branch 'poc-9' into develop | obscuren | 2015-03-10 | 383 | -2191073/+56919 |
| |\| | | | | | |||||
| | * | | | | | Right pad zeros. Closes #446 | obscuren | 2015-03-10 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | reworked stack | obscuren | 2015-03-10 | 6 | -442/+352 |
| | | | | | | | |||||
| | * | | | | | wip | obscuren | 2015-03-10 | 1 | -7/+6 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | cmd/utils: improve CLI help templates | Felix Lange | 2015-03-10 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | Help for a specific command now shows available subcommands. | ||||
* | | | | | | cmd/ethereum: show some help before prompting for encryption passphrase | Felix Lange | 2015-03-10 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Godeps: bump github.com/codegangsta/cli | Felix Lange | 2015-03-10 | 5 | -11/+42 |
| | | | | | | |||||
* | | | | | | cmd/ethereum: show more helpful message if no accounts exist | Felix Lange | 2015-03-10 | 3 | -9/+23 |
| | | | | | | |||||
* | | | | | | eth: return account errors directly | Felix Lange | 2015-03-10 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | cmd/utils: remove extra space in fatal error message | Felix Lange | 2015-03-10 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | accounts: return ErrNoKeys if key directory does not exist | Felix Lange | 2015-03-10 | 1 | -2/+7 |
| | | | | | | |||||
* | | | | | | xeth: fix signing transaction after unlock | Felix Lange | 2015-03-10 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | cmd/ethereum: fix line editing setup and history | Felix Lange | 2015-03-10 | 1 | -6/+11 |
| |_|_|/ / |/| | | | | |||||
* | | | | | cmd/evm, core, ethdb, state, tests/helper: remove ReadConfig calls | Felix Lange | 2015-03-10 | 6 | -12/+0 |
| | | | | | |||||
* | | | | | state: fix tests | Felix Lange | 2015-03-10 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | eth: fix tests | Felix Lange | 2015-03-10 | 1 | -7/+7 |
| | | | | | |||||
* | | | | | cmd/ethereum: remove "prompter" in identifiers | Felix Lange | 2015-03-10 | 1 | -9/+10 |
| | | | | | |||||
* | | | | | crypto: delete old key management stuff | Felix Lange | 2015-03-10 | 4 | -492/+0 |
| | | | | | |||||
* | | | | | cmd/ethereum: unlock accounts on JS REPL | Felix Lange | 2015-03-10 | 2 | -104/+111 |
| | | | | | |||||
* | | | | | xeth: use Frontend interface to unlock accounts | Felix Lange | 2015-03-10 | 2 | -31/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The interface has moved to package xeth because that's where it is actually used. | ||||
* | | | | | cmd/ethereum: allow multiple js files | Felix Lange | 2015-03-10 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | accounts: add {Timed,}Unlock, remove SignLocked | Felix Lange | 2015-03-10 | 3 | -57/+56 |
| | | | | | |||||
* | | | | | Merge ethereum/poc-9 into accounts-integration | Felix Lange | 2015-03-10 | 84 | -6213/+25464 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/utils/cmd.go cmd/utils/flags.go core/manager.go eth/backend.go rpc/http/server.go xeth/xeth.go | ||||
| * | | | | Max size JSON data. Closes #418 | obscuren | 2015-03-10 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Updated xeth instances to take extra param for ui.Interface | obscuren | 2015-03-09 | 6 | -153/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please be aware that if any of the instances on xeth.frontend are called the program will crash due to the default, temporarily, frontend interface. | ||||
| * | | | | Added ui.Interface to xeth | obscuren | 2015-03-09 | 2 | -15/+18 |
| | | | | | |||||
| * | | | | Merge commit '3deb470b2d07d28040a381722022cdf8867a829a' into poc-9 | obscuren | 2015-03-09 | 6 | -1080/+1890 |
| |\ \ \ \ | |||||
| | * | | | | Squashed 'tests/files/' changes from b9e4e74..e390be4 | obscuren | 2015-03-09 | 6 | -1080/+1890 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e390be4 remove deprecated tests e9e8e7b update blockchain tests - correct genesis hash a70dd35 fix genesis hash 35964c9 update uncle tests 82c108f update blocktests - fix LLL in pre state 66f0003 update transactionTests git-subtree-dir: tests/files git-subtree-split: e390be4fb8421fdabea041b7bdaea3b582224f7d | ||||
| * | | | | | Updated tests and fixed suicide | obscuren | 2015-03-09 | 4 | -1/+23 |
| | | | | | | |||||
| * | | | | | Merge commit 'c1cafb56d5da57a44f1d766c5299f11664b93921' into poc-9 | obscuren | 2015-03-09 | 11 | -1893/+1150 |
| |\| | | | | |||||
| | * | | | | Squashed 'tests/files/' changes from 05fe945..b9e4e74 | obscuren | 2015-03-09 | 11 | -1893/+1150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9e4e74 adjust gas prices 6a41300 add dajavi memory tests - OOG because of quadratic memory costs 71d80bd update genesis 72b1b52 add randomTest 4b2a090 Merge branch 'PoC9' into develop fdf7ce0 updated basic blochain test 25c065a Merge pull request #70 from faizkhan00/patch-1 c7e1dac Rename 201501150842LARGE_DATA_IN_CALLCREATE_GOjson to 201501150842LARGE_DATA_IN_CALLCREATE_GO.json REVERT: 05fe945 Added another pow test git-subtree-dir: tests/files git-subtree-split: b9e4e747f01a7b91863ffaa45fd377c251de45aa | ||||
| * | | | | | Merge commit 'e2c75b0fa17394553b93fe7ddd62c0f6a6441119' into poc-9 | obscuren | 2015-03-08 | 3 | -4/+723 |
| |\| | | | | |||||
| | * | | | | Squashed 'tests/files/' changes from 15ce2ab..05fe945 | obscuren | 2015-03-08 | 3 | -4/+723 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05fe945 Added another pow test 7cf2f6b uncle header with block number = 1 d65c7a3 Merge remote-tracking branch 'origin/PoC9' into PoC9 8e05ce5 uncle tests 7c8f2b4 Merge branch 'PoC9' of github.com:ethereum/tests into PoC9 83d1f4d fixed git-subtree-dir: tests/files git-subtree-split: 05fe94507b92dbfbfe8c198df33160eaaf9e87fc | ||||
| * | | | | | ignore | obscuren | 2015-03-08 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | ignore | obscuren | 2015-03-08 | 1 | -0/+3 |
| | |_|/ / | |/| | | | |||||
| * | | | | merge | obscuren | 2015-03-08 | 1 | -8/+6 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge pull request #431 from tgerring/jsonlogs | Taylor Gerring | 2015-03-06 | 3 | -11/+26 |
| | |\ \ \ | | | | | | | | | | | | | Structured logging updates | ||||
| | | * | | | Added eth.chain.received.new_block | Taylor Gerring | 2015-03-06 | 2 | -5/+13 |
| | | | | | | |||||
| | | * | | | Added eth.chain.new_head | Taylor Gerring | 2015-03-06 | 2 | -6/+13 |
| | | | | | | |||||
| * | | | | | removed | obscuren | 2015-03-08 | 16 | -610/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9 | obscuren | 2015-03-08 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix logger import path | Taylor Gerring | 2015-03-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | updated ethash | obscuren | 2015-03-08 | 2 | -4/+2 |
| | | | | | | | |||||
| * | | | | | | Bump v | obscuren | 2015-03-08 | 3 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Updated ethereum.js | obscuren | 2015-03-08 | 1 | -180/+663 |
| | | | | | | | |||||
| * | | | | | | Added deploy scripts from go-build | obscuren | 2015-03-07 | 16 | -0/+506 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #435 from zsfelfoldi/poc-9 | Jeffrey Wilcke | 2015-03-07 | 3 | -0/+3633 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Natspec + test | ||||
| | * | | | | | Now using github.com/obscuren/otto, no need for an Ethereum object | Fefe | 2015-03-07 | 3 | -198/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (got rid of some messy code in test) | ||||
| | * | | | | | Natspec + test | Fefe | 2015-03-06 | 3 | -0/+3778 |
| | | | | | | | |||||
| * | | | | | | Fixed tests | obscuren | 2015-03-07 | 3 | -9/+11 |
| | | | | | | | |||||
| * | | | | | | Separated block db from state db. Partial fix for #416 | obscuren | 2015-03-07 | 13 | -40/+56 |
| | | | | | | | |||||
| * | | | | | | Debug option for VM & command line flag | obscuren | 2015-03-06 | 5 | -6/+21 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9 | obscuren | 2015-03-06 | 126 | -5679/+9954 |
| |\| | | | | | |||||
| * | | | | | | Queued approach to delivering chain events | obscuren | 2015-03-06 | 4 | -36/+86 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'ethersphere-blockpool3' into poc-9 | obscuren | 2015-03-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'blockpool3' of https://github.com/ethersphere/go-ethereum into ↵ | obscuren | 2015-03-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ethersphere-blockpool3 | ||||
| | | * | | | | | | fix wonky head section loop; correct status counts | zelig | 2015-03-05 | 2 | -24/+33 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge remote-tracking branch 'upstream/poc-9' into blockpool3 | zelig | 2015-03-05 | 9 | -30/+44 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | use ethash.Verify in blockpool | zelig | 2015-03-05 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | debug comments & pow handling | obscuren | 2015-03-06 | 3 | -8/+6 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'ethersphere-blockpool2' into poc-9 | obscuren | 2015-03-06 | 2 | -24/+33 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'blockpool2' of https://github.com/ethersphere/go-ethereum into ↵ | obscuren | 2015-03-06 | 2 | -24/+33 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ethersphere-blockpool2 | ||||
| | | * | | | | | | | | fix wonky head section loop; correct status counts | zelig | 2015-03-06 | 2 | -24/+33 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Spec changes. | obscuren | 2015-03-06 | 4 | -7/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * All errors during state transition result in an invalid tx | ||||
| * | | | | | | | | | | Merge commit '4e8a9a1cd4a10370fc4a888af0fb2def6f1b961b' into poc-9 | obscuren | 2015-03-06 | 35 | -3914/+18363 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Squashed 'tests/files/' changes from 9e3fe72..15ce2ab | obscuren | 2015-03-06 | 35 | -3914/+18363 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15ce2ab Merge remote-tracking branch 'origin/PoC9' into PoC9 5970b09 add quadratic complexity and performance test 163fa03 more info 560b844 more info a885549 more change 5fed708 one more tiny change 213a2b8 changed test format c20e88b Merge branch 'PoC9' of github.com:ethereum/tests into PoC9 715ed17 Added first ethash test e26a39f update blockchain tests to latest protocol changes 34baee5 poc9 vm tests 20550d9 update block chain test due to difficulty change 597b2b3 increase gasLimit on stateTests 8f573d3 update blockchain tests - 2048 bit logs bloom 06c90e6 typo ef935fc extra data is hex now, for real 81ab5ad extra data is hex now b0aeba8 update blockchain tests f862faf add tx tests 618d724 update state tests 4a989f0 update blockchainII tests ed56e82 add more vm tests 0417655 Merge remote-tracking branch 'origin/PoC9' into PoC9 1f1cf5d update block tests 76b5a8b Fix trie formats. 325dd6d Merge branch 'PoC9' of git://github.com/ethereum/tests into PoC9 a261c5b test3 1d3ab36 again git-subtree-dir: tests/files git-subtree-split: 15ce2ab8e22275e7aa93742cb5f8bc63e4e50db5 | ||||
| * | | | | | | | | | | merge | obscuren | 2015-03-06 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #429 from chfast/pr/fix_vm_tests | Jeffrey Wilcke | 2015-03-06 | 1 | -4/+0 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix VM tests | ||||
| | | * | | | | | | | | | Fix VM tests not checked | Paweł Bylica | 2015-03-05 | 1 | -4/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | cmd/utils: delete InitConfig, KeyTasks | Felix Lange | 2015-03-10 | 1 | -40/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | cmd/mist: use cli library and package accounts | Felix Lange | 2015-03-10 | 6 | -304/+58 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | accounts: add Manager.HasAccount, delete Manager.Default | Felix Lange | 2015-03-10 | 1 | -9/+11 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | eth: delete unused RpcServer field | Felix Lange | 2015-03-10 | 1 | -7/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | rpc/http: delete package | Felix Lange | 2015-03-10 | 1 | -116/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | rpc: add dataDir parameter and JSON-RPC handler | Felix Lange | 2015-03-10 | 5 | -17/+64 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | cmd/utils: add NewApp | Felix Lange | 2015-03-10 | 2 | -5/+12 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | xeth: don't sign transactions for tx call | Felix Lange | 2015-03-10 | 2 | -27/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make calls faster and removes interaction with account manager. | ||||
* | | | | | | | | | | | | core: remove Hash method from Message interface | Felix Lange | 2015-03-10 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will simplify the next commmit. Hash was only used for logging. | ||||
* | | | | | | | | | | | | cmd/blocktest: simplify to fix build | Felix Lange | 2015-03-10 | 2 | -189/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block tests only need the chain, not all of ethereum. | ||||
* | | | | | | | | | | | | accounts: don't store address in unlocked and add commentary | Felix Lange | 2015-03-08 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was suggested during review. | ||||
* | | | | | | | | | | | | accounts: AccountManager -> Manager | Felix Lange | 2015-03-08 | 6 | -36/+37 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | accounts: prevent early drops and zero keys in memory when dropping | Felix Lange | 2015-03-08 | 1 | -19/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private keys would be locked early if SignLocked was called more than once because the unlockLater was still running. Terminate it properly. | ||||
* | | | | | | | | | | | | accounts: fix uses of sync.RWMutex | Felix Lange | 2015-03-08 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RWMutexes must be write-locked when writing in order to actually protect the writes. | ||||
* | | | | | | | | | | | | accounts: use time.Duration correctly | Felix Lange | 2015-03-08 | 2 | -13/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no point to using time.Duration if the value is interpreted as milliseconds. Callers should use the standard multiplication idiom to choose the unit. In fact, the only caller outside of the tests already does so. | ||||
* | | | | | | | | | | | | accounts: use pointers consistently | Felix Lange | 2015-03-08 | 3 | -17/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account is now always a non-pointer. This will be important once the manager starts remembering accounts. AccountManager is now always a pointer because it contains locks and locks cannot be copied. | ||||
* | | | | | | | | | | | | cmd/ethereum: add account commands | Felix Lange | 2015-03-07 | 2 | -34/+93 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | accounts, core, eth, xeth: use account manager for everything | Felix Lange | 2015-03-07 | 4 | -48/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The account manager is now responsible for picking the default account and the coinbase. | ||||
* | | | | | | | | | | | | Integrate eth_accounts and eth_transact to use new account manager | Gustav Simonsson | 2015-03-06 | 10 | -58/+83 |
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add from to eth_transact / xeth.Transact and add static pass in lieu of integrating with native Mist window for user passphrase entry * Make eth_accounts return AccountManager.Accounts() * Add a Generate Key menu item in Mist | ||||
* | | | | | | | | | | | Merge pull request #433 from fjl/newcli | Felix Lange | 2015-03-06 | 64 | -3145/+6683 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improved CLI | ||||
| * | | | | | | | | | | | cmd/ethereum: fix JS REPL exit and add support for dumb terminals | Felix Lange | 2015-03-06 | 2 | -31/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to exit the REPL using Ctrl-C, Ctrl-D or by typing "exit". | ||||
| * | | | | | | | | | | | Godeps: add github.com/peterh/liner | Felix Lange | 2015-03-06 | 22 | -0/+2579 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | cmd/ethereum: new JS repl with cross-platform line editing | Felix Lange | 2015-03-06 | 7 | -538/+209 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | cmd/ethereum: improve command line interface | Felix Lange | 2015-03-06 | 23 | -272/+3805 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ethereum command line interface is now structured using subcommands. These separate the different tasks it can perform. Almost all flag names are backwards compatible. The key tasks have not been ported to subcommands since they will be replaced by the new accounts infrastructure very soon. | ||||
| * | | | | | | | | | | | Godeps: delete golang.org/x/net/websocket | Felix Lange | 2015-03-06 | 9 | -2266/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is no longer imported by any package in our tree. | ||||
| * | | | | | | | | | | | ethutil: remove Config variable | Felix Lange | 2015-03-06 | 7 | -37/+29 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various functions throughout the codebase used it to grab settings. This has to stop because I want to use them without reading the config file. These functions can now be used without reading the config first: * ethdb.NewLDBDatabase * ethrepl.NewJSRepl * vm.New | ||||
* | | | | | | | | | | | Merge pull request #434 from fjl/poc-9 | Felix Lange | 2015-03-06 | 63 | -2534/+3271 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Godeps: bump github.com/ethereum/ethash | ||||
| * | | | | | | | | | | Godeps: bump github.com/ethereum/ethash | Felix Lange | 2015-03-06 | 63 | -2534/+3271 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the build. | ||||
* | | | | | | | | | | Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9 | obscuren | 2015-03-06 | 4 | -1/+377 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #426 from Gustav-Simonsson/add_blockchain_tests | Jeffrey Wilcke | 2015-03-06 | 4 | -1/+377 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add initial implementation of block tests | ||||
| | * | | | | | | | | | | Add initial implementation of block tests | Gustav Simonsson | 2015-03-05 | 4 | -1/+377 |
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add blocktest cmd and support for block tests files in tests/BlockTests , the launched node does not connect to network, resets state with a genesis block from the test file and starts the RPC API | ||||
* | | | | | | | | | | | Merge branch 'develop' into poc-9 | obscuren | 2015-03-06 | 2 | -8/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'tendermint-develop_pull_request' into develop | obscuren | 2015-03-06 | 2 | -9/+22 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Start at 0 | obscuren | 2015-03-06 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop_pull_request' of ↵ | obscuren | 2015-03-06 | 1 | -7/+21 |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tendermint/ethermint into tendermint-develop_pull_request | ||||
| | * | | | | | | | | | Fixed iterator bug which skips the 0x000...000 key | = | 2015-03-05 | 1 | -7/+21 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'develop' into poc-9 | obscuren | 2015-03-06 | 27 | -36/+544 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'alexvandesande-ui' into develop | obscuren | 2015-03-06 | 27 | -36/+544 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Removed unused variables | obscuren | 2015-03-06 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | network back to local files | Alexandre Van de Sande | 2015-03-05 | 1 | -5/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed Average Return calculation | Alexandre Van de Sande | 2015-03-05 | 2 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | updated network app to latest build | Alexandre Van de Sande | 2015-03-04 | 3 | -4/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' into ui | Alexandre Van de Sande | 2015-03-04 | 65 | -1325/+1402 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | network dashboard is now a local file | Alexandre Van de Sande | 2015-03-04 | 23 | -1/+346 |
| | | | | | | | | | | |||||
| | * | | | | | | | | updating to new network health page | Alexandre Van de Sande | 2015-03-04 | 2 | -4/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Network Health Panel with mining | Alexandre Van de Sande | 2015-03-03 | 5 | -27/+178 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' into ui | Alexandre Van de Sande | 2015-02-23 | 111 | -2977/+1988 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | changes to sidebar sizes | Alexandre Van de Sande | 2015-02-23 | 1 | -17/+32 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fjl-p2p-handshake-2' into poc-9 | obscuren | 2015-03-06 | 15 | -747/+763 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Merge branch 'p2p-handshake-2' of https://github.com/fjl/go-ethereum into ↵ | obscuren | 2015-03-06 | 15 | -747/+763 |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fjl-p2p-handshake-2 | ||||
| * | | | | | | | | | | | eth, p2p: delete p2p.Blacklist | Felix Lange | 2015-03-04 | 2 | -67/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is unused and untested right now. We can bring it back later if required. | ||||
| * | | | | | | | | | | | p2p: reject messages that cannot be written as simple RLPx frames | Felix Lange | 2015-03-04 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until chunked frames are implemented we cannot send messages with a size overflowing uint24. | ||||
| * | | | | | | | | | | | p2p: restore read/write timeouts | Felix Lange | 2015-03-04 | 5 | -37/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They got lost in the transition to rlpxFrameRW. | ||||
| * | | | | | | | | | | | eth, whisper: fix msg.Payload reads | Felix Lange | 2015-03-04 | 2 | -32/+31 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | p2p: msg.Payload contains list data | Felix Lange | 2015-03-04 | 7 | -75/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With RLPx frames, the message code is contained in the frame and is no longer part of the encoded data. EncodeMsg, Msg.Decode have been updated to match. Code that decodes RLP directly from Msg.Payload will need to change. | ||||
| * | | | | | | | | | | | p2p: verify protocol handshake node ID | Felix Lange | 2015-03-04 | 1 | -0/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | p2p: make encryption handshake code easier to follow | Felix Lange | 2015-03-04 | 2 | -302/+272 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mostly changes how information is passed around. Instead of using many function parameters and return values, put the entire state in a struct and pass that. This also adds back derivation of ecdhe-shared-secret. I deleted it by accident in a previous refactoring. | ||||
| * | | | | | | | | | | | p2p/discover: add NodeID.Pubkey | Felix Lange | 2015-03-04 | 2 | -0/+33 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | p2p: make RLPx frame MAC 16 bytes as defined in the spec | Felix Lange | 2015-03-04 | 2 | -13/+19 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | p2p: delete frameRW | Felix Lange | 2015-03-04 | 2 | -184/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | p2p: use RLPx frames for messaging | Felix Lange | 2015-03-04 | 6 | -50/+73 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | p2p: encrypted and authenticated RLPx frame I/O | Felix Lange | 2015-03-04 | 4 | -172/+197 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | p2p: add basic RLPx frame I/O | Felix Lange | 2015-03-04 | 2 | -0/+252 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | wip math | obscuren | 2015-03-06 | 3 | -0/+152 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Miner fixes and updates (including miner) | obscuren | 2015-03-05 | 10 | -32/+45 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Clean up REPL | obscuren | 2015-03-04 | 7 | -166/+141 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'develop' into poc-9 | obscuren | 2015-03-04 | 2 | -14/+12 |
|\| | | | | | | | | |||||
| * | | | | | | | | removed double flag. Closes #421 | obscuren | 2015-03-04 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #413 from chfast/pr/jit_build_fixes | Jeffrey Wilcke | 2015-03-04 | 1 | -13/+12 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | JIT build fixes | ||||
| | * | | | | | | | | Fix JitVm build | Paweł Bylica | 2015-03-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into evmjit | Paweł Bylica | 2015-03-03 | 47 | -833/+1204 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | * | | | | | | | | Add required block number | Paweł Bylica | 2015-03-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into evmjit | Paweł Bylica | 2015-02-24 | 8 | -26/+60 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into evmjit | Paweł Bylica | 2015-02-24 | 803 | -3573/+442114 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Update JIT interface to ABI 0.2: code hash added to input data, gas counter ↵ | Paweł Bylica | 2015-02-16 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passed as int64 | ||||
* | | | | | | | | | | | uncle validation | obscuren | 2015-03-04 | 4 | -30/+46 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed genesis | obscuren | 2015-03-04 | 3 | -20/+31 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | updated genesis | obscuren | 2015-03-04 | 2 | -1/+4 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Changed nonce to a uint64 | obscuren | 2015-03-04 | 10 | -25/+30 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'develop' into poc-9 | obscuren | 2015-03-04 | 2 | -34/+0 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | removed all old filters | obscuren | 2015-03-04 | 2 | -34/+0 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'develop' into poc-9 | obscuren | 2015-03-04 | 9 | -285/+49 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/utils/cmd.go | ||||
| * | | | | | | | | | | Merge pull request #411 from ethersphere/readme | Jeffrey Wilcke | 2015-03-04 | 5 | -132/+48 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [WIP] Update Readme | ||||
| | * | | | | | | | | | | db name database -> blockchain in backend error message | zelig | 2015-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | remove threatening coding standards section from README | zelig | 2015-03-03 | 1 | -31/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | remove obsolete install script | zelig | 2015-03-03 | 1 | -53/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | minor cleanup | zelig | 2015-03-03 | 2 | -6/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | update README | zelig | 2015-03-03 | 1 | -42/+41 |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - TLDR for godep install - update executable section - cleanup - add several links to wiki | ||||
| * | | | | | | | | | | Merge pull request #409 from tgerring/jsonlogs | Jeffrey Wilcke | 2015-03-04 | 7 | -24/+40 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | Updated JSON log events | ||||
| * | | | | | | | | | | Merge pull request #408 from tgerring/removews | Jeffrey Wilcke | 2015-03-04 | 7 | -153/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove Websockets RPC transport | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:ethereum/go-ethereum into removews | Taylor Gerring | 2015-03-02 | 15 | -150/+153 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/ethereum/flags.go cmd/mist/flags.go | ||||
| | * | | | | | | | | | | Remove Websockets RPC transport | Taylor Gerring | 2015-03-01 | 7 | -152/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'ethersphere-jsonlogs' into poc-9 | obscuren | 2015-03-04 | 6 | -29/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ↵ | obscuren | 2015-03-04 | 6 | -29/+64 |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ethersphere-jsonlogs Conflicts: eth/block_pool.go eth/block_pool_test.go eth/protocol_test.go miner/worker.go | ||||
| * | | | | | | | | | | | | add eth.chain.new_head log to core/chain_manager | zelig | 2015-03-03 | 1 | -3/+12 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | add eth.chain.received.new_block log to eth protocol | zelig | 2015-03-03 | 1 | -1/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | block number is *big.Int, remoteID is string | zelig | 2015-03-03 | 1 | -9/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'tgerring/jsonlogs' into jsonlogs | zelig | 2015-03-03 | 7 | -24/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | / / / / / / / / | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Fix logger import in tests | Taylor Gerring | 2015-03-02 | 2 | -5/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add event eth.tx.received | Taylor Gerring | 2015-03-02 | 1 | -0/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Don't import logger as ethlogger | Taylor Gerring | 2015-03-02 | 2 | -14/+14 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Implement eth.miner.new_block event | Taylor Gerring | 2015-03-01 | 2 | -5/+14 |
| | | |/ / / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ethersphere-blockpool2' into poc-9 | obscuren | 2015-03-04 | 5 | -51/+89 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'blockpool2' of https://github.com/ethersphere/go-ethereum into ↵ | obscuren | 2015-03-04 | 5 | -51/+89 |
|/| | | | | | | | | | | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | ethersphere-blockpool2 | ||||
| * | | | | | | | | | partial fix to idle best peer issue | zelig | 2015-03-04 | 3 | -13/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - best peer cannot be idle for more than idleBestPeerTimeout - introduce ErrIdleTooLong fatal error - modify default values | ||||
| * | | | | | | | | | log when added peer is behind (hash found in blockchain) | zelig | 2015-03-03 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into blockpool2 | zelig | 2015-03-03 | 41 | -624/+1032 |
| |\| | | | | | | | |