aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix wonky head section loop; correct status countszelig2015-03-062-24/+33
* partial fix to idle best peer issuezelig2015-03-043-13/+33
* log when added peer is behind (hash found in blockchain)zelig2015-03-031-0/+1
* Merge remote-tracking branch 'upstream/develop' into blockpool2zelig2015-03-0341-624/+1032
|\
| * Report debug hash rateobscuren2015-03-012-6/+15
| * Fixed miner threads for ethereum CLIobscuren2015-03-012-18/+22
| * Merge pull request #402 from tgerring/rpcupdatesJeffrey Wilcke2015-03-016-66/+72
| |\
| | * Report RPC listening address in logsTaylor Gerring2015-02-281-1/+3
| | * Add flag to set RPC portTaylor Gerring2015-02-286-65/+69
| * | Merge pull request #398 from tgerring/assetpathJeffrey Wilcke2015-03-011-2/+11
| |\ \
| | * | bump last resort check out of ifelseTaylor Gerring2015-02-271-5/+6
| | * | Check source directroy for assets as last resortTaylor Gerring2015-02-271-2/+10
| * | | Unused variableobscuren2015-03-011-1/+0
| * | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-011-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | Bump to latest versions for DockerTaylor Gerring2015-02-271-6/+6
| * | | Simple effective VM optimisationobscuren2015-03-011-6/+12
| * | | Removed some methods from the JS REPLobscuren2015-03-017-54/+25
| |/ /
| * | Report proper database directory. Closes #397obscuren2015-02-271-1/+2
| * | Merge branch 'hotfix/0.8.5-2' into developobscuren2015-02-274-7/+4
| |\ \ | | |/ | |/|
| | * Bumpobscuren2015-02-274-7/+4
| | * Merge branch 'master' into hotfix/0.8.5-2obscuren2015-02-2739-681/+1047
| | |\
| | | * Merge branch 'develop'obscuren2015-02-2739-681/+1047
| | |/| | | |/ | |/|
| * | Fixed consensus issue for refundingobscuren2015-02-276-18/+31
| * | Defautl blockobscuren2015-02-263-316/+488
| * | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-2621-119/+277
| |\ \
| | * \ Merge pull request #392 from tgerring/rpcdefaultblockJeffrey Wilcke2015-02-262-0/+34
| | |\ \
| | | * | Stub defaultBlock methodsTaylor Gerring2015-02-252-0/+34
| | * | | Merge pull request #391 from tgerring/osextJeffrey Wilcke2015-02-2613-101/+90
| | |\ \ \
| | | * | | Update godepsTaylor Gerring2015-02-2610-42/+60
| | | * | | Cleanup importsTaylor Gerring2015-02-263-6/+4
| | | * | | DRY DefaultAssetPath()Taylor Gerring2015-02-263-54/+27
| | | * | | Update osext import pathTaylor Gerring2015-02-262-2/+2
| | |/ / /
| | * | | Merge pull request #385 from Gustav-Simonsson/account_manager_key_lockingJeffrey Wilcke2015-02-262-11/+91
| | |\ \ \
| | | * | | Remove unneeded initialisation of mutexGustav Simonsson2015-02-261-1/+0
| | | * | | Address pull request commentsGustav Simonsson2015-02-262-17/+19
| | | * | | Add automatic locking / unlocking of accountsGustav Simonsson2015-02-262-11/+90
| | * | | | Merge pull request #388 from Gustav-Simonsson/validate_block_header_gas_limitJeffrey Wilcke2015-02-261-1/+6
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Validate block header gas limitGustav Simonsson2015-02-261-1/+6
| | |/ / /
| | * | | Merge pull request #382 from ethereum/travisTaylor Gerring2015-02-251-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update Go and Qt versionsTaylor Gerring2015-02-251-2/+2
| | |/ /
| * / / wipobscuren2015-02-264-69/+132
| |/ /
* | | - fix peer disconnect by adding severity function to errszelig2015-03-034-38/+55
* | | integrate blockpool into ethzelig2015-02-2527-2570/+61
* | | export Sendln/Sendf in loggerzelig2015-02-251-14/+14
* | | major rewrite, reorg of blockpool + new featureszelig2015-02-2513-0/+3583
* | | errs pkg for error code based errorszelig2015-02-252-0/+137
|/ /
* | Merge pull request #379 from tgerring/rpcupdatesJeffrey Wilcke2015-02-256-170/+127
|\ \
| * | Consolidate related itemsTaylor Gerring2015-02-251-37/+36
| * | Remove errParseRequestTaylor Gerring2015-02-253-3/+2
| * | Rename filesTaylor Gerring2015-02-253-0/+0
| * | Cleanup RPC packcageTaylor Gerring2015-02-253-131/+90
* | | Merge pull request #378 from Gustav-Simonsson/fix_account_manager_testsJeffrey Wilcke2015-02-253-3/+22
|\ \ \ | |/ / |/| |
| * | Fix key store address hex decoding and accounts testGustav Simonsson2015-02-253-3/+22
* | | Merge pull request #373 from tgerring/issue370Taylor Gerring2015-02-251-6/+6
|\ \ \ | |/ / |/| |
| * | Move amounts to global varsTaylor Gerring2015-02-251-14/+14
| * | Fix duplicate leading 0xTaylor Gerring2015-02-241-1/+1
| * | Convert gas values to integersTaylor Gerring2015-02-241-14/+14
* | | Merge pull request #368 from maran/feature/changeDataDirJeffrey Wilcke2015-02-256-27/+25
|\ \ \
| * | | Implement OS sensitive dataDirsMaran2015-02-236-27/+25
| |/ /
* | | Merge pull request #369 from tgerring/issue367Jeffrey Wilcke2015-02-252-15/+4
|\ \ \
| * | | Allow zero and negative block numbersTaylor Gerring2015-02-232-15/+4
| |/ /
* | | Merge pull request #376 from frozeman/topicsFixJeffrey Wilcke2015-02-251-1/+1
|\ \ \
| * | | topics fixFabian Vogelsteller2015-02-241-1/+1
|/ / /
* | | skipping testobscuren2015-02-242-3/+1
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-241-3/+3
|\| |
| * | Merge pull request #360 from Gustav-Simonsson/add_stack_size_checksJeffrey Wilcke2015-02-221-3/+3
| |\ \
| | * | Correct stack size validation for MUL, CALLDATACOPY, EXTCODESIZE, BLOCKHASHGustav Simonsson2015-02-211-3/+3
* | | | Merge branch 'master' into developobscuren2015-02-246-22/+59
|\ \ \ \ | | |_|/ | |/| |
| * | | Properly uninstall filters. Mining issue fixed #closes #365obscuren2015-02-236-22/+59
| * | | Merge branch 'develop'obscuren2015-02-223-9/+35
| |\| |
| * | | Merge branch 'release/0.8.5'v0.8.5obscuren2015-02-2213-39/+60
| |\ \ \
| * \ \ \ Merge branch 'hotfix/0.8.4-1'v0.8.4-1obscuren2015-02-211-0/+2
| |\ \ \ \
* | | | | | removed logobscuren2015-02-241-1/+0
| |_|_|/ / |/| | | |
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-221-6/+30
|\ \ \ \ \
| * \ \ \ \ Merge pull request #359 from fjl/p2p-identityJeffrey Wilcke2015-02-221-6/+30
| |\ \ \ \ \
| | * | | | | eth: persist node key between sessions (#304)Felix Lange2015-02-201-6/+27
| | * | | | | eth: add poc-8.ethdev.com as second default bootstrap nodeFelix Lange2015-02-201-0/+3
* | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-222-3/+5
|\| | | | | |
| * | | | | | Merge pull request #364 from ethereum/travisTaylor Gerring2015-02-212-3/+5
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Don't print per-function testing resultsTaylor Gerring2015-02-212-3/+5
| |/ / / / /
* | | | | | Merge branch 'release/0.8.5' into developobscuren2015-02-2213-39/+60
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Bumpobscuren2015-02-223-3/+3
| * | | | Added Number to logsobscuren2015-02-224-3/+17
| * | | | Added eth_logs & fixed issue with manual log filteringobscuren2015-02-226-33/+40
|/ / / /
* | | | Merge branch 'hotfix/0.8.4-1' into developv0.8.4obscuren2015-02-211-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | unlock mutexobscuren2015-02-211-0/+2
| | |/ | |/|
| * | Merge branch 'release/0.8.4'obscuren2015-02-215-6/+6
| |\ \
| * \ \ Merge branch 'release/0.9.0'obscuren2015-02-211246-21067/+2655510
| |\ \ \
| * \ \ \ Merge branch 'hotfix/0.7.11'v0.7.11obscuren2014-12-243-2/+8
| |\ \ \ \
* | \ \ \ \ Merge branch 'release/0.8.4' into developobscuren2015-02-213-3/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | reverted back to proper version numberobscuren2015-02-213-3/+3
|/ / / / /
* | | | | Fix test for FinneyTaylor Gerring2015-02-211-1/+1
* | | | | Update build status links to httpsTaylor Gerring2015-02-211-2/+2
* | | | | Merge branch 'release/0.9.0' into developobscuren2015-02-2110-26/+43
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Updated readmeobscuren2015-02-211-4/+4
| * | | | Turbo offobscuren2015-02-211-1/+1
| * | | | Minor updates for releaseobscuren2015-02-218-21/+38
|/ / / /
* | | | Fixed chain event issueobscuren2015-02-202-7/+3
* | | | Merge branch 'tgerring-rpcupdates' into developobscuren2015-02-206-9/+130
|\ \ \ \
| * | | | fixed mergeobscuren2015-02-206-9/+130
|/| | | |
| * | | | Add setMining RPC methodTaylor Gerring2015-02-203-0/+37
| * | | | Add serpent compilation to RPCTaylor Gerring2015-02-202-0/+38
| * | | | Added uninstall filter methodsTaylor Gerring2015-02-192-0/+28
* | | | | Removed exported fields from state object and added proper set/gettersobscuren2015-02-209-47/+64
| |_|_|/ |/| | |
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-206-19/+55
|\ \ \ \
| * \ \ \ Merge pull request #355 from fjl/test-fixesJeffrey Wilcke2015-02-206-19/+55
| |\ \ \ \
| | * | | | .travis.yml: don't run gofmt, goimports, golintFelix Lange2015-02-201-5/+0
| | * | | | .travis.yml: speed up tests on TravisFelix Lange2015-02-202-6/+8
| | * | | | gocoverage.sh: skip .Felix Lange2015-02-201-1/+1
| | * | | | tests/vm: add non-test Go fileFelix Lange2015-02-201-0/+3
| | * | | | state: improve TestDumpFelix Lange2015-02-201-5/+38
| | * | | | accounts: use crypto/randentropy in testFelix Lange2015-02-201-2/+4
| | * | | | update-license.go: add blank line after build tagFelix Lange2015-02-201-0/+1
* | | | | | dirty tracking for state objects fixedobscuren2015-02-204-8/+13
|/ / / / /
* | | | | Added timeout for filter & removed clipboard. Closes #350obscuren2015-02-207-82/+129
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-2019-662/+658
|\| | | |
| * | | | Merge pull request #352 from fjl/no-enc-handshakeJeffrey Wilcke2015-02-2010-342/+333
| |\ \ \ \
| | * | | | p2p: emit JSON connect/disconnect eventsFelix Lange2015-02-201-0/+13
| | * | | | logger: add P2P disconnected eventFelix Lange2015-02-201-10/+10
| | * | | | p2p: initialize Server.ourHandshake before accepting connectionsFelix Lange2015-02-201-8/+9
| | * | | | p2p: enable devp2p pingFelix Lange2015-02-191-11/+26
| | * | | | cmd/mist: show peer names in peers windowFelix Lange2015-02-192-2/+4
| | * | | | p2p: disable encryption handshakeFelix Lange2015-02-197-313/+273
| * | | | | Merge pull request #345 from maran/feature/minerthreadsJeffrey Wilcke2015-02-205-17/+23
| |\ \ \ \ \
| | * | | | | Implement command line argument to set the amount of agents created by the minerMaran2015-02-195-17/+23
| * | | | | | Merge pull request #335 from alexvandesande/uiJeffrey Wilcke2015-02-204-23/+26
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Removed console logs from mist.jsAlexandre Van de Sande2015-02-182-7/+8
| | * | | | | Cut, Copy, Undo and Redo working in webviewAlexandre Van de Sande2015-02-183-18/+20
| * | | | | | Merge pull request #339 from tgerring/jsonlogTaylor Gerring2015-02-193-300/+296
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Re-add LogFormat to ConfigTaylor Gerring2015-02-181-0/+1
| | * | | | | Update JSON Log typesTaylor Gerring2015-02-182-300/+295
* | | | | | | Optimisations and fixed a couple of DDOS issues in the minerobscuren2015-02-2015-103/+155
* | | | | | | Reset storage cache after syncobscuren2015-02-191-0/+1
* | | | | | | WIP QT Clipboardobscuren2015-02-198-4/+75
* | | | | | | Topics => Topic. Closes #343obscuren2015-02-193-22/+7
|/ / / / / /
* | | | | | Temp fix for #342obscuren2015-02-191-2/+3
* | | | | | Added WIP number packageobscuren2015-02-192-0/+273
| |_|/ / / |/| | | |
* | | | | Added errorsobscuren2015-02-181-0/+6
* | | | | Added GetBlock GetUncle with OOB guardobscuren2015-02-184-9/+59
* | | | | Disable turboobscuren2015-02-181-1/+1
* | | | | Disabled ability to disable whisper. Closes #334obscuren2015-02-184-3/+8
|/ / / /
* | | | removed old walletobscuren2015-02-181-1/+0
* | | | Merge pull request #325 from fjl/deps-cleanupJeffrey Wilcke2015-02-1849-2007/+145
|\ \ \ \
| * | | | p2p/nat: switch to github.com/huin/goupnpFelix Lange2015-02-1723-33/+32
| * | | | crypto: switch to golang.org/x/cryptoFelix Lange2015-02-1710-254/+15
| * | | | rpc/ws: switch to golang.org/x/netFelix Lange2015-02-1710-10/+96
| * | | | p2p: fix ecies dependency in testsFelix Lange2015-02-179-1710/+2
* | | | | added bootnode back inobscuren2015-02-181-2/+1
* | | | | Removed mined transactions from pending view. Closes #321obscuren2015-02-183-27/+12
* | | | | Forgot to add the case for logs. Closes #336obscuren2015-02-181-18/+9
* | | | | Changed to ChainEvent and fixed a nil pointer in transactobscuren2015-02-188-14/+47
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-171-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #327 from fjl/udp-out-of-rangeJeffrey Wilcke2015-02-171-1/+2
| |\ \ \ \ \
| | * | | | | p2p/discover: fix pending replies iterationFelix Lange2015-02-171-1/+2
| | |/ / / /
* | / / / / Implement register and watchTxobscuren2015-02-173-2/+88
|/ / / / /
* | | | | Merge branch 'alexvandesande-ui' into developobscuren2015-02-171-1/+1
|\ \ \ \ \
| * | | | | commented peer count outobscuren2015-02-171-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ui' of https://github.com/alexvandesande/go-ethereum into developobscuren2015-02-1715-187/+255
|\| | | |
| * | | | Merge branch 'develop' into uiAlexandre Van de Sande2015-02-1715-102/+62
| |\ \ \ \
| * | | | | Updated iconsAlexandre Van de Sande2015-02-176-4/+3
| * | | | | removed status bar codeAlexandre Van de Sande2015-02-171-73/+0
| * | | | | badge supportAlexandre Van de Sande2015-02-172-9/+9
| * | | | | side iconsAlexandre Van de Sande2015-02-174-19/+103
| * | | | | SideIcons work. Copy paste still doesn't.Alexandre Van de Sande2015-02-173-13/+55
| * | | | | merge conflictsAlexandre Van de Sande2015-02-16769-2864/+442336
| |\ \ \ \ \
| * | | | | | Solved Issue #318 and added states to back buttonAlexandre Van de Sande2015-02-166-20/+21
| * | | | | | Add http when not present on browserAlexandre Van de Sande2015-02-161-1/+6
| * | | | | | changed url bar behaviour. Failed attempt at iconAlexandre Van de Sande2015-02-143-75/+77
* | | | | | | Filter and mutex locks addedobscuren2015-02-177-17/+33
* | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-171-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Updated P2PConnected log fieldsTaylor Gerring2015-02-171-2/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Added optional address slice. Closes #326obscuren2015-02-171-2/+16
* | | | | | | Use new rlp (TODO requires some refactoring)obscuren2015-02-171-2/+23
|/ / / / / /
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-17671-17/+435443
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Update obscuren/qml revisionTaylor Gerring2015-02-172-1/+3
| * | | | | Add godep usage informationTaylor Gerring2015-02-171-0/+2
| * | | | | Add Docker Hub link to automated buildsTaylor Gerring2015-02-171-0/+1
| * | | | | Use explicit branch and godepTaylor Gerring2015-02-171-5/+9
| | |/ / / | |/| | |
| * | | | Update Travis to use godepTaylor Gerring2015-02-161-1/+2
| * | | | Add versioned dependencies from godepTaylor Gerring2015-02-16667-0/+435414
| * | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developTaylor Gerring2015-02-165-25/+20
| |\ \ \ \
| * | | | | Use Go binary instead of building from sourceTaylor Gerring2015-02-161-6/+5
| * | | | | Use latest Trusty versionTaylor Gerring2015-02-161-1/+1
| * | | | | Group Qt dependencies togetherTaylor Gerring2015-02-161-6/+6
| * | | | | Ignore locally built binariesTaylor Gerring2015-02-161-0/+3
* | | | | | "centralised" mining to backend. Closes #323obscuren2015-02-1711-96/+47
| |/ / / / |/| | | |
* | | | | Changed default denominatorsobscuren2015-02-163-3/+5
* | | | | Added invalid sec key testobscuren2015-02-161-1/+10
* | | | | Removed reference to lastBlockNumber & LastBlockNumberobscuren2015-02-161-21/+5
|/ / / /
* | | | Resolved some bugs in the minerobscuren2015-02-153-13/+12
* | | | Merge branch 'develop' into bountyobscuren2015-02-156-14/+19
|\ \ \ \
| * | | | HTTP RPC only listen on localhostobscuren2015-02-151-1/+1
| * | | | Validate seckey when generating pub keyobscuren2015-02-151-1/+6
| * | | | Use a mutex write-lock for a write operationobscuren2015-02-152-8/+8
| * | | | Reference pointer to block instead of pointer to functionobscuren2015-02-151-1/+1
| * | | | Unmarshal in to pointer to stringobscuren2015-02-151-3/+3
|/ / / /
* | | | removed some old menu itemsobscuren2015-02-152-32/+0
* | | | Reset URL barobscuren2015-02-151-1/+9
* | | | Fixed a few errors in the browser special meta tags objectsobscuren2015-02-151-30/+28
* | | | Fixed mining & limited hash powerobscuren2015-02-145-22/+44
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-144-25/+43
|\ \ \ \
| * \ \ \ Merge pull request #309 from fjl/peer-windowJeffrey Wilcke2015-02-144-25/+43
| |\ \ \ \
| | * | | | cmd/mist: fix peer windowFelix Lange2015-02-143-25/+37
| | * | | | p2p: print Cap as name/versionFelix Lange2015-02-141-0/+6
| |/ / / /
* | | | | Moved ECIES to repo & added secondary title for webviewobscuren2015-02-146-6/+18
* | | | | Add 'crypto/ecies/' from commit '7c0f4a9b18d992166452d8cd32caaefd92b26386'obscuren2015-02-147-0/+1703
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #3 from Gustav-Simonsson/fix_ecies_params_init_bugJeffrey Wilcke2015-02-141-8/+2
| |\ \ \ \
| | * | | | Fix ECIES params nil bugGustav Simonsson2015-02-121-8/+2
| |/ / / /
| * | | | Merge pull request #2 from Gustav-Simonsson/correct_ecies_shared_key_generationJeffrey Wilcke2015-02-121-12/+17
| |\ \ \ \
| | * | | | Correct ECIES shared key length checkGustav Simonsson2015-02-121-12/+17
| |/ / / /
| * | | | Merge pull request #1 from Gustav-Simonsson/fix_reference_linksJeffrey Wilcke2014-12-121-2/+2
| |\ \ \ \
| | * | | | Update reference pdf linksGustav Simonsson2014-12-111-2/+2
| |/ / / /
| * / / / initobscuren2014-12-107-0/+1704
| / / /
* | | | Merge branch 'Gustav-Simonsson-align_key_and_ecdsa_nonce_entropy' into developobscuren2015-02-146-125/+105
|\ \ \ \
| * | | | Merge branch 'align_key_and_ecdsa_nonce_entropy' of https://github.com/Gustav...obscuren2015-02-146-125/+105
|/| | | |
| * | | | Remove secp256_rand.go and update testsGustav Simonsson2015-02-142-107/+11
| * | | | Unexport randEntropy type and use exported Reader insteadGustav Simonsson2015-02-132-5/+7
| * | | | Set both key generation and ECDSA nonce to use mixed entropyGustav Simonsson2015-02-114-18/+92
* | | | | disabled testobscuren2015-02-141-0/+1
* | | | | Merge pull request #308 from fjl/default-bootnodesJeffrey Wilcke2015-02-141-2/+11
|\ \ \ \ \
| * | | | | eth: add default bootnodeFelix Lange2015-02-141-2/+11
|/ / / / /
* | | | | Fixed QML errorsobscuren2015-02-143-7/+1
* | | | | Reset hash rate to 0 when mining is stoppedobscuren2015-02-141-1/+2
* | | | | Updated coin.js abiobscuren2015-02-141-56/+57
* | | | | Update balance label when miningobscuren2015-02-144-2/+18
* | | | | Propagate blocksobscuren2015-02-142-3/+2
* | | | | Fixed issue in peer windowobscuren2015-02-143-10/+14
* | | | | Updated windowobscuren2015-02-141-20/+6
* | | | | Merge branch 'develop' into poc8obscuren2015-02-14495-13816/+2209830
|\ \ \ \ \
| * \ \ \ \ Merge branch 'miner' into developobscuren2015-02-1413-265/+236
| |\ \ \ \ \
| | * | | | | Fixed a few issues in the miner and updated hash rate titleobscuren2015-02-145-29/+66
| | * | | | | Merge branch 'develop' into minerobscuren2015-02-1463-2161/+4618
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'fjl-poc8-net-integration' into developobscuren2015-02-1352-1948/+3984
| |\ \ \ \ \ \
| | * | | | | | mergeobscuren2015-02-135-893/+17
| | * | | | | | wipobscuren2015-02-1352-1943/+4855
| |/| | | | | |
| | * | | | | | p2p: bump devp2p protcol version to 3Felix Lange2015-02-131-1/+1
| | * | | | | | p2p: handle disconnect before protocol handshakeFelix Lange2015-02-131-0/+7
| | * | | | | | p2p/discover: fix race in ListenUDPFelix Lange2015-02-131-24/+17
| | * | | | | | p2p: ensure we don't dial ourselfFelix Lange2015-02-131-1/+4
| | * | | | | | p2p: add I/O timeout for encrytion handshakeFelix Lange2015-02-131-1/+3
| | * | | | | | p2p: fix goroutine leak for invalid peersFelix Lange2015-02-131-6/+5
| | * | | | | | p2p: improve read deadlinesFelix Lange2015-02-132-15/+27
| | * | | | | | p2p/discover: map listening port using configured mechanismFelix Lange2015-02-134-18/+35
| | * | | | | | p2p/discover: code review fixesFelix Lange2015-02-133-7/+9
| | * | | | | | cmd/ethereum, cmd/mist, eth, p2p: use package p2p/natFelix Lange2015-02-139-522/+54
| | * | | | | | p2p/nat: new package for port mapping stuffFelix Lange2015-02-133-0/+499
| | * | | | | | cmd/bootnode: new command (replaces cmd/peerserver)Felix Lange2015-02-101-0/+86
| | * | | | | | eth: remove unused Ethereum sync fieldsFelix Lange2015-02-101-4/+0
| | * | | | | | cmd/mist, cmd/ethereum: add CLI arguments for node keyFelix Lange2015-02-105-16/+72
| | * | | | | | crypto: add key loading functionsFelix Lange2015-02-102-1/+30