Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-26 | 21 | -119/+277 |
|\ | | | | | | | | | Conflicts: accounts/account_manager.go | ||||
| * | Merge pull request #392 from tgerring/rpcdefaultblock | Jeffrey Wilcke | 2015-02-26 | 2 | -0/+34 |
| |\ | | | | | | | Stub defaultBlock RPC methods | ||||
| | * | Stub defaultBlock methods | Taylor Gerring | 2015-02-25 | 2 | -0/+34 |
| | | | |||||
| * | | Merge pull request #391 from tgerring/osext | Jeffrey Wilcke | 2015-02-26 | 13 | -101/+90 |
| |\ \ | | | | | | | | | Cleanup DefaultAssetPath | ||||
| | * | | Update godeps | Taylor Gerring | 2015-02-26 | 10 | -42/+60 |
| | | | | |||||
| | * | | Cleanup imports | Taylor Gerring | 2015-02-26 | 3 | -6/+4 |
| | | | | |||||
| | * | | DRY DefaultAssetPath() | Taylor Gerring | 2015-02-26 | 3 | -54/+27 |
| | | | | |||||
| | * | | Update osext import path | Taylor Gerring | 2015-02-26 | 2 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #385 from Gustav-Simonsson/account_manager_key_locking | Jeffrey Wilcke | 2015-02-26 | 2 | -11/+91 |
| |\ \ | | | | | | | | | Add automatic locking / unlocking of accounts | ||||
| | * | | Remove unneeded initialisation of mutex | Gustav Simonsson | 2015-02-26 | 1 | -1/+0 |
| | | | | |||||
| | * | | Address pull request comments | Gustav Simonsson | 2015-02-26 | 2 | -17/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Use RWMutex instead of Mutex * Use time.Duration instead of int for unlock time * Use time.After with select instead of time.Sleep | ||||
| | * | | Add automatic locking / unlocking of accounts | Gustav Simonsson | 2015-02-26 | 2 | -11/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Change account signing API to two sign functions; Sign without passphrase - works if account is unlocked Sign with passphrase - always works and unlocks the account * Account stays unlocked for X ms and is then automatically locked | ||||
| * | | | Merge pull request #388 from Gustav-Simonsson/validate_block_header_gas_limit | Jeffrey Wilcke | 2015-02-26 | 1 | -1/+6 |
| |\ \ \ | | |/ / | |/| | | Validate block header gas limit | ||||
| | * | | Validate block header gas limit | Gustav Simonsson | 2015-02-26 | 1 | -1/+6 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | * Add block header gas limit validation in ValidateBlock function, see eq 39 and 45 in yellow paper. Before it was calculated _for_ the block instead of validated. * Use the block header gas limit when setting the gas pool instead of calculating the value for the block. | ||||
| * | | Merge pull request #382 from ethereum/travis | Taylor Gerring | 2015-02-25 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | Update Go and Qt versions in Travis | ||||
| | * | Update Go and Qt versions | Taylor Gerring | 2015-02-25 | 1 | -2/+2 |
| |/ | |||||
* / | wip | obscuren | 2015-02-26 | 4 | -69/+132 |
|/ | |||||
* | Merge pull request #379 from tgerring/rpcupdates | Jeffrey Wilcke | 2015-02-25 | 6 | -170/+127 |
|\ | | | | | RPC cleanup | ||||
| * | Consolidate related items | Taylor Gerring | 2015-02-25 | 1 | -37/+36 |
| | | |||||
| * | Remove errParseRequest | Taylor Gerring | 2015-02-25 | 3 | -3/+2 |
| | | |||||
| * | Rename files | Taylor Gerring | 2015-02-25 | 3 | -0/+0 |
| | | |||||
| * | Cleanup RPC packcage | Taylor Gerring | 2015-02-25 | 3 | -131/+90 |
| | | |||||
* | | Merge pull request #378 from Gustav-Simonsson/fix_account_manager_tests | Jeffrey Wilcke | 2015-02-25 | 3 | -3/+22 |
|\ \ | |/ |/| | Fix key store address hex decoding and accounts test | ||||
| * | Fix key store address hex decoding and accounts test | Gustav Simonsson | 2015-02-25 | 3 | -3/+22 |
| | | | | | | | | Thanks to https://github.com/jaekwon for original fix! | ||||
* | | Merge pull request #373 from tgerring/issue370 | Taylor Gerring | 2015-02-25 | 1 | -6/+6 |
|\ \ | |/ |/| | Convert gas values to integers | ||||
| * | Move amounts to global vars | Taylor Gerring | 2015-02-25 | 1 | -14/+14 |
| | | |||||
| * | Fix duplicate leading 0x | Taylor Gerring | 2015-02-24 | 1 | -1/+1 |
| | | |||||
| * | Convert gas values to integers | Taylor Gerring | 2015-02-24 | 1 | -14/+14 |
| | | | | | | | | Fixes #370 | ||||
* | | Merge pull request #368 from maran/feature/changeDataDir | Jeffrey Wilcke | 2015-02-25 | 6 | -27/+25 |
|\ \ | | | | | | | Implement OS sensitive dataDirs | ||||
| * | | Implement OS sensitive dataDirs | Maran | 2015-02-23 | 6 | -27/+25 |
| |/ | |||||
* | | Merge pull request #369 from tgerring/issue367 | Jeffrey Wilcke | 2015-02-25 | 2 | -15/+4 |
|\ \ | | | | | | | Allow zero and negative block numbers | ||||
| * | | Allow zero and negative block numbers | Taylor Gerring | 2015-02-23 | 2 | -15/+4 |
| |/ | | | | | | | 0 is genesis block. Xeth recognises -1 as current | ||||
* | | Merge pull request #376 from frozeman/topicsFix | Jeffrey Wilcke | 2015-02-25 | 1 | -1/+1 |
|\ \ | | | | | | | topics fix | ||||
| * | | topics fix | Fabian Vogelsteller | 2015-02-24 | 1 | -1/+1 |
|/ / | |||||
* | | skipping test | obscuren | 2015-02-24 | 2 | -3/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-24 | 1 | -3/+3 |
|\| | |||||
| * | Merge pull request #360 from Gustav-Simonsson/add_stack_size_checks | Jeffrey Wilcke | 2015-02-22 | 1 | -3/+3 |
| |\ | | | | | | | Correct stack size validation for MUL, CALLDATACOPY, EXTCODESIZE, BLOCKH... | ||||
| | * | Correct stack size validation for MUL, CALLDATACOPY, EXTCODESIZE, BLOCKHASH | Gustav Simonsson | 2015-02-21 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into develop | obscuren | 2015-02-24 | 6 | -22/+59 |
|\ \ \ | |||||
| * | | | Properly uninstall filters. Mining issue fixed #closes #365 | obscuren | 2015-02-23 | 6 | -22/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Added an additional tx state which is used to get the current nonce * Refresh transient state each time a new canonical block is found * Properly uninstall filters. Fixes a possible crash in RPC | ||||
| * | | | Merge branch 'develop' | obscuren | 2015-02-22 | 3 | -9/+35 |
| |\| | | |||||
| * | | | Merge branch 'release/0.8.5'v0.8.5 | obscuren | 2015-02-22 | 13 | -39/+60 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'hotfix/0.8.4-1'v0.8.4-1 | obscuren | 2015-02-21 | 1 | -0/+2 |
| |\ \ \ \ | |||||
* | | | | | | removed log | obscuren | 2015-02-24 | 1 | -1/+0 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-22 | 1 | -6/+30 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #359 from fjl/p2p-identity | Jeffrey Wilcke | 2015-02-22 | 1 | -6/+30 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Persistent Node Key | ||||
| | * | | | | | eth: persist node key between sessions (#304) | Felix Lange | 2015-02-20 | 1 | -6/+27 |
| | | | | | | | |||||
| | * | | | | | eth: add poc-8.ethdev.com as second default bootstrap node | Felix Lange | 2015-02-20 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-22 | 2 | -3/+5 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #364 from ethereum/travis | Taylor Gerring | 2015-02-21 | 2 | -3/+5 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Don't print per-function testing results | ||||
| | * | | | | | Don't print per-function testing results | Taylor Gerring | 2015-02-21 | 2 | -3/+5 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'release/0.8.5' into develop | obscuren | 2015-02-22 | 13 | -39/+60 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Bump | obscuren | 2015-02-22 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Added Number to logs | obscuren | 2015-02-22 | 4 | -3/+17 |
| | | | | | |||||
| * | | | | Added eth_logs & fixed issue with manual log filtering | obscuren | 2015-02-22 | 6 | -33/+40 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | * Implemented `eth_logs` * Fixed issue with `filter.Find()` where logs were appended to an incorrect, non-returned slice resulting in no logs found | ||||
* | | | | Merge branch 'hotfix/0.8.4-1' into developv0.8.4 | obscuren | 2015-02-21 | 1 | -0/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | unlock mutex | obscuren | 2015-02-21 | 1 | -0/+2 |
| | |/ | |/| | |||||
| * | | Merge branch 'release/0.8.4' | obscuren | 2015-02-21 | 5 | -6/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'release/0.9.0' | obscuren | 2015-02-21 | 1246 | -21067/+2655510 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'hotfix/0.7.11'v0.7.11 | obscuren | 2014-12-24 | 3 | -2/+8 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'release/0.8.4' into develop | obscuren | 2015-02-21 | 3 | -3/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | reverted back to proper version number | obscuren | 2015-02-21 | 3 | -3/+3 |
|/ / / / / | |||||
* | | | | | Fix test for Finney | Taylor Gerring | 2015-02-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Update build status links to https | Taylor Gerring | 2015-02-21 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'release/0.9.0' into develop | obscuren | 2015-02-21 | 10 | -26/+43 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Updated readme | obscuren | 2015-02-21 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Turbo off | obscuren | 2015-02-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Minor updates for release | obscuren | 2015-02-21 | 8 | -21/+38 |
|/ / / / | |||||
* | | | | Fixed chain event issue | obscuren | 2015-02-20 | 2 | -7/+3 |
| | | | | |||||
* | | | | Merge branch 'tgerring-rpcupdates' into develop | obscuren | 2015-02-20 | 6 | -9/+130 |
|\ \ \ \ | |||||
| * | | | | fixed merge | obscuren | 2015-02-20 | 6 | -9/+130 |
|/| | | | | |||||
| * | | | | Add setMining RPC method | Taylor Gerring | 2015-02-20 | 3 | -0/+37 |
| | | | | | |||||
| * | | | | Add serpent compilation to RPC | Taylor Gerring | 2015-02-20 | 2 | -0/+38 |
| | | | | | |||||
| * | | | | Added uninstall filter methods | Taylor Gerring | 2015-02-19 | 2 | -0/+28 |
| | | | | | |||||
* | | | | | Removed exported fields from state object and added proper set/getters | obscuren | 2015-02-20 | 9 | -47/+64 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-20 | 6 | -19/+55 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #355 from fjl/test-fixes | Jeffrey Wilcke | 2015-02-20 | 6 | -19/+55 |
| |\ \ \ \ | | | | | | | | | | | | | Fix failing tests and speed up Travis builds | ||||
| | * | | | | .travis.yml: don't run gofmt, goimports, golint | Felix Lange | 2015-02-20 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should yield another 30-second speed up. Nobody looks at the output of those anyway. We might want bring back gofmt later and actually fail the build if source is not formatted. | ||||
| | * | | | | .travis.yml: speed up tests on Travis | Felix Lange | 2015-02-20 | 2 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | This should decrease test runtime to about 30 seconds. | ||||
| | * | | | | gocoverage.sh: skip . | Felix Lange | 2015-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is an attempt to get Travis working again. | ||||
| | * | | | | tests/vm: add non-test Go file | Felix Lange | 2015-02-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | This removes the annoying warning printed by "go install ./...". | ||||
| | * | | | | state: improve TestDump | Felix Lange | 2015-02-20 | 1 | -5/+38 |
| | | | | | | |||||
| | * | | | | accounts: use crypto/randentropy in test | Felix Lange | 2015-02-20 | 1 | -2/+4 |
| | | | | | | |||||
| | * | | | | update-license.go: add blank line after build tag | Felix Lange | 2015-02-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This silences "go install ./...". For some reason it started complaining with go 1.4.2. | ||||
* | | | | | | dirty tracking for state objects fixed | obscuren | 2015-02-20 | 4 | -8/+13 |
|/ / / / / | |||||
* | | | | | Added timeout for filter & removed clipboard. Closes #350 | obscuren | 2015-02-20 | 7 | -82/+129 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-20 | 19 | -662/+658 |
|\| | | | | |||||
| * | | | | Merge pull request #352 from fjl/no-enc-handshake | Jeffrey Wilcke | 2015-02-20 | 10 | -342/+333 |
| |\ \ \ \ | | | | | | | | | | | | | p2p: disable encryption handshake, enable log events | ||||
| | * | | | | p2p: emit JSON connect/disconnect events | Felix Lange | 2015-02-20 | 1 | -0/+13 |
| | | | | | | |||||
| | * | | | | logger: add P2P disconnected event | Felix Lange | 2015-02-20 | 1 | -10/+10 |
| | | | | | | |||||
| | * | | | | p2p: initialize Server.ourHandshake before accepting connections | Felix Lange | 2015-02-20 | 1 | -8/+9 |
| | | | | | | |||||
| | * | | | | p2p: enable devp2p ping | Felix Lange | 2015-02-19 | 1 | -11/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | This should prevent connection drops. | ||||
| | * | | | | cmd/mist: show peer names in peers window | Felix Lange | 2015-02-19 | 2 | -2/+4 |
| | | | | | | |||||
| | * | | | | p2p: disable encryption handshake | Felix Lange | 2015-02-19 | 7 | -313/+273 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The diff is a bit bigger than expected because the protocol handshake logic has moved out of Peer. This is necessary because the protocol handshake will have custom framing in the final protocol. | ||||
| * | | | | | Merge pull request #345 from maran/feature/minerthreads | Jeffrey Wilcke | 2015-02-20 | 5 | -17/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Implement command line argument to set the amount miner threads | ||||
| | * | | | | | Implement command line argument to set the amount of agents created by the miner | Maran | 2015-02-19 | 5 | -17/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defaults to the amount of cores available on the CPU | ||||
| * | | | | | | Merge pull request #335 from alexvandesande/ui | Jeffrey Wilcke | 2015-02-20 | 4 | -23/+26 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Cut, Copy, Undo and Redo working in webview | ||||
| | * | | | | | Removed console logs from mist.js | Alexandre Van de Sande | 2015-02-18 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed an issue where it would force reloads unnecessarily | ||||
| | * | | | | | Cut, Copy, Undo and Redo working in webview | Alexandre Van de Sande | 2015-02-18 | 3 | -18/+20 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #339 from tgerring/jsonlog | Taylor Gerring | 2015-02-19 | 3 | -300/+296 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | JSON log updates | ||||
| | * | | | | | Re-add LogFormat to Config | Taylor Gerring | 2015-02-18 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Update JSON Log types | Taylor Gerring | 2015-02-18 | 2 | -300/+295 |
| | | | | | | | |||||
* | | | | | | | Optimisations and fixed a couple of DDOS issues in the miner | obscuren | 2015-02-20 | 15 | -103/+155 |
| | | | | | | | |||||
* | | | | | | | Reset storage cache after sync | obscuren | 2015-02-19 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | WIP QT Clipboard | obscuren | 2015-02-19 | 8 | -4/+75 |
| | | | | | | | |||||
* | | | | | | | Topics => Topic. Closes #343 | obscuren | 2015-02-19 | 3 | -22/+7 |
|/ / / / / / | |||||
* | | | | | | Temp fix for #342 | obscuren | 2015-02-19 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Added WIP number package | obscuren | 2015-02-19 | 2 | -0/+273 |
| |_|/ / / |/| | | | | |||||
* | | | | | Added errors | obscuren | 2015-02-18 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Added GetBlock GetUncle with OOB guard | obscuren | 2015-02-18 | 4 | -9/+59 |
| | | | | | |||||
* | | | | | Disable turbo | obscuren | 2015-02-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Disabled ability to disable whisper. Closes #334 | obscuren | 2015-02-18 | 4 | -3/+8 |
|/ / / / | |||||
* | | | | removed old wallet | obscuren | 2015-02-18 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge pull request #325 from fjl/deps-cleanup | Jeffrey Wilcke | 2015-02-18 | 49 | -2007/+145 |
|\ \ \ \ | | | | | | | | | | | Cleanup imports | ||||
| * | | | | p2p/nat: switch to github.com/huin/goupnp | Felix Lange | 2015-02-17 | 23 | -33/+32 |
| | | | | | | | | | | | | | | | | | | | | My temporary fix was merged upstream. | ||||
| * | | | | crypto: switch to golang.org/x/crypto | Felix Lange | 2015-02-17 | 10 | -254/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | code.google.com/p/go.crypto is deprecated and will cause problems in future versions of Go. | ||||
| * | | | | rpc/ws: switch to golang.org/x/net | Felix Lange | 2015-02-17 | 10 | -10/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | code.google.com/p/go.net is deprecated and will cause problems in future versions of Go. | ||||
| * | | | | p2p: fix ecies dependency in tests | Felix Lange | 2015-02-17 | 9 | -1710/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We forgot to update this reference when moving ecies into the go-ethereum repo. | ||||
* | | | | | added bootnode back in | obscuren | 2015-02-18 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Removed mined transactions from pending view. Closes #321 | obscuren | 2015-02-18 | 3 | -27/+12 |
| | | | | | |||||
* | | | | | Forgot to add the case for logs. Closes #336 | obscuren | 2015-02-18 | 1 | -18/+9 |
| | | | | | |||||
* | | | | | Changed to ChainEvent and fixed a nil pointer in transact | obscuren | 2015-02-18 | 8 | -14/+47 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-17 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #327 from fjl/udp-out-of-range | Jeffrey Wilcke | 2015-02-17 | 1 | -1/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | p2p/discover: fix pending replies iteration | ||||
| | * | | | | | p2p/discover: fix pending replies iteration | Felix Lange | 2015-02-17 | 1 | -1/+2 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Range expressions capture the length of the slice once before the first iteration. A range expression cannot be used here since the loop modifies the slice variable (including length changes). | ||||
* | / / / / | Implement register and watchTx | obscuren | 2015-02-17 | 3 | -2/+88 |
|/ / / / / | |||||
* | | | | | Merge branch 'alexvandesande-ui' into develop | obscuren | 2015-02-17 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | commented peer count out | obscuren | 2015-02-17 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ui' of https://github.com/alexvandesande/go-ethereum into develop | obscuren | 2015-02-17 | 15 | -187/+255 |
|\| | | | | |||||
| * | | | | Merge branch 'develop' into ui | Alexandre Van de Sande | 2015-02-17 | 15 | -102/+62 |
| |\ \ \ \ | |||||
| * | | | | | Updated icons | Alexandre Van de Sande | 2015-02-17 | 6 | -4/+3 |
| | | | | | | |||||
| * | | | | | removed status bar code | Alexandre Van de Sande | 2015-02-17 | 1 | -73/+0 |
| | | | | | | |||||
| * | | | | | badge support | Alexandre Van de Sande | 2015-02-17 | 2 | -9/+9 |
| | | | | | | |||||
| * | | | | | side icons | Alexandre Van de Sande | 2015-02-17 | 4 | -19/+103 |
| | | | | | | |||||
| * | | | | | SideIcons work. Copy paste still doesn't. | Alexandre Van de Sande | 2015-02-17 | 3 | -13/+55 |
| | | | | | | |||||
| * | | | | | merge conflicts | Alexandre Van de Sande | 2015-02-16 | 769 | -2864/+442336 |
| |\ \ \ \ \ | |||||
| * | | | | | | Solved Issue #318 and added states to back button | Alexandre Van de Sande | 2015-02-16 | 6 | -20/+21 |
| | | | | | | | |||||
| * | | | | | | Add http when not present on browser | Alexandre Van de Sande | 2015-02-16 | 1 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | changed url bar behaviour. Failed attempt at icon | Alexandre Van de Sande | 2015-02-14 | 3 | -75/+77 |
| | | | | | | | |||||
* | | | | | | | Filter and mutex locks added | obscuren | 2015-02-17 | 7 | -17/+33 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-17 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Updated P2PConnected log fields | Taylor Gerring | 2015-02-17 | 1 | -2/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Added optional address slice. Closes #326 | obscuren | 2015-02-17 | 1 | -2/+16 |
| | | | | | | | |||||
* | | | | | | | Use new rlp (TODO requires some refactoring) | obscuren | 2015-02-17 | 1 | -2/+23 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-17 | 671 | -17/+435443 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Update obscuren/qml revision | Taylor Gerring | 2015-02-17 | 2 | -1/+3 |
| | | | | | | |||||
| * | | | | | Add godep usage information | Taylor Gerring | 2015-02-17 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Add Docker Hub link to automated builds | Taylor Gerring | 2015-02-17 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Use explicit branch and godep | Taylor Gerring | 2015-02-17 | 1 | -5/+9 |
| | |/ / / | |/| | | | |||||
| * | | | | Update Travis to use godep | Taylor Gerring | 2015-02-16 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Add versioned dependencies from godep | Taylor Gerring | 2015-02-16 | 667 | -0/+435414 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into develop | Taylor Gerring | 2015-02-16 | 5 | -25/+20 |
| |\ \ \ \ | |||||
| * | | | | | Use Go binary instead of building from source | Taylor Gerring | 2015-02-16 | 1 | -6/+5 |
| | | | | | | |||||
| * | | | | | Use latest Trusty version | Taylor Gerring | 2015-02-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Group Qt dependencies together | Taylor Gerring | 2015-02-16 | 1 | -6/+6 |
| | | | | | | |||||
| * | | | | | Ignore locally built binaries | Taylor Gerring | 2015-02-16 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | "centralised" mining to backend. Closes #323 | obscuren | 2015-02-17 | 11 | -96/+47 |
| |/ / / / |/| | | | | |||||
* | | | | | Changed default denominators | obscuren | 2015-02-16 | 3 | -3/+5 |
| | | | | | |||||
* | | | | | Added invalid sec key test | obscuren | 2015-02-16 | 1 | -1/+10 |
| | | | | | |||||
* | | | | | Removed reference to lastBlockNumber & LastBlockNumber | obscuren | 2015-02-16 | 1 | -21/+5 |
|/ / / / | |||||
* | | | | Resolved some bugs in the miner | obscuren | 2015-02-15 | 3 | -13/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | * TODO nonce error sometimes persists * Fixed mining on wrong blocks * Fixed state error & receipt fail | ||||
* | | | | Merge branch 'develop' into bounty | obscuren | 2015-02-15 | 6 | -14/+19 |
|\ \ \ \ | |||||
| * | | | | HTTP RPC only listen on localhost | obscuren | 2015-02-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Validate seckey when generating pub key | obscuren | 2015-02-15 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Use a mutex write-lock for a write operation | obscuren | 2015-02-15 | 2 | -8/+8 |
| | | | | | |||||
| * | | | | Reference pointer to block instead of pointer to function | obscuren | 2015-02-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Unmarshal in to pointer to string | obscuren | 2015-02-15 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | removed some old menu items | obscuren | 2015-02-15 | 2 | -32/+0 |
| | | | | |||||
* | | | | Reset URL bar | obscuren | 2015-02-15 | 1 | -1/+9 |
| | | | | |||||
* | | | | Fixed a few errors in the browser special meta tags objects | obscuren | 2015-02-15 | 1 | -30/+28 |
| | | | | |||||
* | | | | Fixed mining & limited hash power | obscuren | 2015-02-14 | 5 | -22/+44 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop | obscuren | 2015-02-14 | 4 | -25/+43 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #309 from fjl/peer-window | Jeffrey Wilcke | 2015-02-14 | 4 | -25/+43 |
| |\ \ \ \ | | | | | | | | | | | | | Fix Mist Peers Window | ||||
| | * | | | | cmd/mist: fix peer window | Felix Lange | 2015-02-14 | 3 | -25/+37 |
| | | | | | | |||||
| | * | | | | p2p: print Cap as name/version | Felix Lange | 2015-02-14 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | Moved ECIES to repo & added secondary title for webview | obscuren | 2015-02-14 | 6 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * ECIES moved from obscuren to ethereum * Added html META[name=badge] to reflect menuItem.secondaryTitle | ||||
* | | | | | Add 'crypto/ecies/' from commit '7c0f4a9b18d992166452d8cd32caaefd92b26386' | obscuren | 2015-02-14 | 7 | -0/+1703 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | git-subtree-dir: crypto/ecies git-subtree-mainline: 49a739c8d647739b3d815966f8854a4e9978df56 git-subtree-split: 7c0f4a9b18d992166452d8cd32caaefd92b26386 | ||||
| * | | | | Merge pull request #3 from Gustav-Simonsson/fix_ecies_params_init_bug | Jeffrey Wilcke | 2015-02-14 | 1 | -8/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Fix ECIES params nil bug | ||||
| | * | | | | Fix ECIES params nil bug | Gustav Simonsson | 2015-02-12 | 1 | -8/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | * Change ECIES params init function to static var as it does not have state; fixes TestMarshalencryption. | ||||
| * | | | | Merge pull request #2 from Gustav-Simonsson/correct_ecies_shared_key_generation | Jeffrey Wilcke | 2015-02-12 | 1 | -12/+17 |
| |\ \ \ \ | | | | | | | | | | | | | Correct ECIES shared key length check | ||||
| | * | | | | Correct ECIES shared key length check | Gustav Simonsson | 2015-02-12 | 1 | -12/+17 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure the ECIES shared key is padded with zero bytes if it's smaller than the requested key length. * Split the ECIES shared key error into two; one for when the generated key is too big for the params and one for when it's nil (point of infinity returned by the curve scalar multiplication). | ||||
| * | | | | Merge pull request #1 from Gustav-Simonsson/fix_reference_links | Jeffrey Wilcke | 2014-12-12 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Update reference pdf links | ||||
| | * | | | | Update reference pdf links | Gustav Simonsson | 2014-12-11 | 1 | -2/+2 |
| |/ / / / | |||||
| * / / / | init | obscuren | 2014-12-10 | 7 | -0/+1704 |
| / / / | |||||
* | | | | Merge branch 'Gustav-Simonsson-align_key_and_ecdsa_nonce_entropy' into develop | obscuren | 2015-02-14 | 6 | -125/+105 |
|\ \ \ \ | |||||
| * | | | | Merge branch 'align_key_and_ecdsa_nonce_entropy' of ↵ | obscuren | 2015-02-14 | 6 | -125/+105 |
|/| | | | | | | | | | | | | | | | | | | | https://github.com/Gustav-Simonsson/go-ethereum into Gustav-Simonsson-align_key_and_ecdsa_nonce_entropy | ||||
| * | | | | Remove secp256_rand.go and update tests | Gustav Simonsson | 2015-02-14 | 2 | -107/+11 |
| | | | | | |||||
| * | | | | Unexport randEntropy type and use exported Reader instead | Gustav Simonsson | 2015-02-13 | 2 | -5/+7 |
| | | | | | |||||
| * | | | | Set both key generation and ECDSA nonce to use mixed entropy | Gustav Simonsson | 2015-02-11 | 4 | -18/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move random entropy functions to new package randentropy * Add function to get n bytes entropy where up to first 32 bytes are mixed with OS entropy sources | ||||
* | | | | | disabled test | obscuren | 2015-02-14 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #308 from fjl/default-bootnodes | Jeffrey Wilcke | 2015-02-14 | 1 | -2/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | eth: add default bootnode | ||||
| * | | | | | eth: add default bootnode | Felix Lange | 2015-02-14 | 1 | -2/+11 |
|/ / / / / | |||||
* | | | | | Fixed QML errors | obscuren | 2015-02-14 | 3 | -7/+1 |
| | | | | | |||||
* | | | | | Reset hash rate to 0 when mining is stopped | obscuren | 2015-02-14 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Updated coin.js abi | obscuren | 2015-02-14 | 1 | -56/+57 |
| | | | | | |||||
* | | | | | Update balance label when mining | obscuren | 2015-02-14 | 4 | -2/+18 |
| | | | | | |||||
* | | | | | Propagate blocks | obscuren | 2015-02-14 | 2 | -3/+2 |
| | | | | | |||||
* | | | | | Fixed issue in peer window | obscuren | 2015-02-14 | 3 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed issues where new peer window could cause a crash when entering an empty string | ||||
* | | | | | Updated window | obscuren | 2015-02-14 | 1 | -20/+6 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into poc8 | obscuren | 2015-02-14 | 495 | -13816/+2209830 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'miner' into develop | obscuren | 2015-02-14 | 13 | -265/+236 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed a few issues in the miner and updated hash rate title | obscuren | 2015-02-14 | 5 | -29/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Sometimes old nonces were set by "old" agents * Added the hash rate to the miner | ||||
| | * | | | | | Merge branch 'develop' into miner | obscuren | 2015-02-14 | 63 | -2161/+4618 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'fjl-poc8-net-integration' into develop | obscuren | 2015-02-13 | 52 | -1948/+3984 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | merge | obscuren | 2015-02-13 | 5 | -893/+17 |
| | | | | | | | | |||||
| | * | | | | | | wip | obscuren | 2015-02-13 | 52 | -1943/+4855 |
| |/| | | | | | | |||||
| | * | | | | | | p2p: bump devp2p protcol version to 3 | Felix Lange | 2015-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For compatibility with cpp-ethereum | ||||
| | * | | | | | | p2p: handle disconnect before protocol handshake | Felix Lange | 2015-02-13 | 1 | -0/+7 |
| | | | | | | | | |||||
| | * | | | | | | p2p/discover: fix race in ListenUDP | Felix Lange | 2015-02-13 | 1 | -24/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | udp.Table was assigned after the readLoop started, so packets could arrive and be processed before the Table was there. | ||||
| | * | | | | | | p2p: ensure we don't dial ourself | Felix Lange | 2015-02-13 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addPeer doesn't allow self connects, but we can avoid opening connections in the first place. | ||||
| | * | | | | | | p2p: add I/O timeout for encrytion handshake | Felix Lange | 2015-02-13 | 1 | -1/+3 |
| | | | | | | | | |||||
| | * | | | | | | p2p: fix goroutine leak for invalid peers | Felix Lange | 2015-02-13 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deflect logic called Disconnect on the peer, but the peer never ran and wouldn't process the disconnect request. | ||||
| | * | | | | | | p2p: improve read deadlines | Felix Lange | 2015-02-13 | 2 | -15/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are now two deadlines, frameReadTimeout and payloadReadTimeout. The frame timeout is longer and allows for connections that are idle. The message timeout is still short and ensures that we don't get stuck in the middle of a message. | ||||
| | * | | | | | | p2p/discover: map listening port using configured mechanism | Felix Lange | 2015-02-13 | 4 | -18/+35 |
| | | | | | | | | |||||
| | * | | | | | | p2p/discover: code review fixes | Felix Lange | 2015-02-13 | 3 | -7/+9 |
| | | | | | | | | |||||
| | * | | | | | | cmd/ethereum, cmd/mist, eth, p2p: use package p2p/nat | Felix Lange | 2015-02-13 | 9 | -522/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deletes the old NAT implementation. | ||||
| | * | | | | | | p2p/nat: new package for port mapping stuff | Felix Lange | 2015-02-13 | 3 | -0/+499 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have verified that UPnP and NAT-PMP work against an older version of the MiniUPnP daemon running on pfSense. This code is kind of hard to test automatically. | ||||
| | * | | | | | | cmd/bootnode: new command (replaces cmd/peerserver) | Felix Lange | 2015-02-10 | 1 | -0/+86 |
| | | | | | | | | |||||
| | * | | | | | | eth: remove unused Ethereum sync fields | Felix Lange | 2015-02-10 | 1 | -4/+0 |
| | | | | | | | | |||||
| | * | | | | | | cmd/mist, cmd/ethereum: add CLI arguments for node key | Felix Lange | 2015-02-10 | 5 | -16/+72 |
| | | | | | | | | |||||
| | * | | | | | | crypto: add key loading functions | Felix Lange | 2015-02-10 | 2 | -1/+30 |
| | | | | | | | | |||||
| | * | | | | | | eth: don't warn if no BootNodes are specified | Felix Lange | 2015-02-09 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | p2p/discover: deflake UDP tests | Felix Lange | 2015-02-09 | 4 | -59/+123 |
| | | | | | | | | |||||
| | * | | | | | | cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodes | Felix Lange | 2015-02-07 | 9 | -22/+43 |
| | | | | | | | | |||||
| | * | | | | | | cmd/mist, eth, javascript, p2p: use Node URLs for peer suggestions | Felix Lange | 2015-02-07 | 6 | -62/+21 |
| | | | | | | | | |||||
| | * | | | | | | p2p: fixes for actual connections | Felix Lange | 2015-02-07 | 6 | -29/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unit test hooks were turned on 'in production'. | ||||
| | * | | | | | | p2p/discover: add node URL functions, distinguish TCP/UDP ports | Felix Lange | 2015-02-07 | 8 | -326/+532 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The discovery RPC protocol does not yet distinguish TCP and UDP ports. But it can't hurt to do so in our internal model. | ||||
| | * | | | | | | cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p API | Felix Lange | 2015-02-06 | 16 | -125/+86 |
| | | | | | | | | |||||
| | * | | | | | | cmd/peerserver: is gone | Felix Lange | 2015-02-06 | 1 | -58/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will be back soon. Maybe. | ||||
| | * | | | | | | p2p: integrate p2p/discover | Felix Lange | 2015-02-06 | 15 | -1659/+1056 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overview of changes: - ClientIdentity has been removed, use discover.NodeID - Server now requires a private key to be set (instead of public key) - Server performs the encryption handshake before launching Peer - Dial logic takes peers from discover table - Encryption handshake code has been cleaned up a bit - baseProtocol is gone because we don't exchange peers anymore - Some parts of baseProtocol have moved into Peer instead | ||||
| | * | | | | | | p2p/discover: add some helper functions | Felix Lange | 2015-02-06 | 4 | -20/+41 |
| | | | | | | | | |||||
| | * | | | | | | p2p/discover: new package implementing the Node Discovery Protocol | Felix Lange | 2015-02-06 | 4 | -0/+1428 |
| | | | | | | | | |||||
| | * | | | | | | rlp: fix encoding of arrays with byte element type | Felix Lange | 2015-02-06 | 2 | -1/+27 |
| | | | | | | | | |||||
| | * | | | | | | crypto: make it easier to run Sha3 on multiple inputs | Felix Lange | 2015-02-06 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crypto.Sha3(append(foo, bar)) --> crypto.Sha3(foo, bar) crypto.Sha3([]byte{}) --> crypto.Sha3() | ||||
| | * | | | | | | key generation abstracted out, for testing with deterministic keys | zelig | 2015-02-06 | 2 | -12/+92 |
| | | | | | | | | |||||
| | * | | | | | | fix clientidentity test after privkey removed | zelig | 2015-02-06 | 1 | -6/+2 |
| | | | | | | | | |||||
| | * | | | | | | get rid of Private Key in ClientIdentity | zelig | 2015-02-06 | 1 | -5/+3 |
| | | | | | | | | |||||
| | * | | | | | | make crypto handshake calls package level, store privateKey on peer + tests ok | zelig | 2015-02-06 | 3 | -87/+52 |
| | | | | | | | | |||||
| | * | | | | | | apply handshake related improvements from p2p.crypto branch | zelig | 2015-02-06 | 3 | -29/+31 |
| | | | | | | | | |||||
| | * | | | | | | add temporary forced session token generation | zelig | 2015-02-06 | 2 | -0/+8 |
| | | | | | | | | |||||
| | * | | | | | | peer-level integration test for crypto handshake | zelig | 2015-02-06 | 3 | -15/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add const length params for handshake messages - add length check to fail early - add debug logs to help interop testing (!ABSOLUTELY SHOULD BE DELETED LATER) - wrap connection read/writes in error check - add cryptoReady channel in peer to signal when secure session setup is finished - wait for cryptoReady or timeout in TestPeersHandshake | ||||
| | * | | | | | | chop first byte when cryptoid.PubKeyS is set from identity.Pubkey() since ↵ | zelig | 2015-02-06 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is directly copied in the auth message | ||||
| | * | | | | | | add initial peer level test (failing) | zelig | 2015-02-06 | 1 | -1/+52 |
| | | | | | | | | |||||
| | * | | | | | | add code documentation | zelig | 2015-02-06 | 1 | -15/+47 |
| | | | | | | | | |||||
| | * | | | | | | changes that fix it all: | zelig | 2015-02-06 | 2 | -57/+146 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - set proper public key serialisation length in pubLen = 64 - reset all sizes and offsets - rename from DER to S (we are not using DER encoding) - add remoteInitRandomPubKey as return value to respondToHandshake - add ImportPublicKey with error return to read both EC golang.elliptic style 65 byte encoding and 64 byte one - add ExportPublicKey falling back to go-ethereum/crypto.FromECDSAPub() chopping off the first byte - add Import - Export tests - all tests pass | ||||
| | * | | | | | | important fix for peer pubkey. when taken from identity, chop first format byte! | zelig | 2015-02-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | add equality check for nonce and remote nonce | zelig | 2015-02-06 | 1 | -0/+6 |
| | | | | | | | | |||||
| | * | | | | | | add minor comments to the test | zelig | 2015-02-06 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | first stab at integrating crypto in our p2p | zelig | 2015-02-06 | 3 | -44/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - abstract the entire handshake logic in cryptoId.Run() taking session-relevant parameters - changes in peer to accomodate how the encryption layer would be switched on - modify arguments of handshake components - fixed test getting the wrong pubkey but it till crashes on DH in newSession() | ||||
| | * | | | | | | integrate cryptoId into peer and connection lifecycle | zelig | 2015-02-06 | 2 | -3/+33 |
| | | | | | | | |