aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1033 from tgerring/issue1010Jeffrey Wilcke2015-05-193-33/+70
|\
| * Remove unused confirm() methodTaylor Gerring2015-05-191-14/+0
| * Refactor user prompts into utilsTaylor Gerring2015-05-193-49/+50
| * Add user confirmation for removedbTaylor Gerring2015-05-191-5/+40
| * Add "removedb" command to GethTaylor Gerring2015-05-181-0/+15
* | Merge pull request #1032 from tgerring/issue1025Jeffrey Wilcke2015-05-181-1/+2
|\ \ | |/ |/|
| * Permit multiple CORS domainsTaylor Gerring2015-05-181-1/+2
|/
* Merge pull request #1031 from bas-vk/issue1012Jeffrey Wilcke2015-05-181-12/+13
|\
| * fixed issue when miner is not stopping af stop commandBas van Kervel2015-05-181-0/+6
| * fixed race condition in minerBas van Kervel2015-05-181-12/+7
|/
* core: bugfix test 2. set => hash mapobscuren2015-05-181-14/+23
* retobscuren2015-05-181-0/+1
* core: tmp diagnostic logsobscuren2015-05-181-0/+7
* Merge branch 'hotfix/0.9.22' into developobscuren2015-05-181-1/+1
|\
| * cmd/geth: fixed ver numobscuren2015-05-181-1/+1
| * Merge branch 'hotfix/0.9.21-1'obscuren2015-05-165-27/+36
| |\
* | \ Merge pull request #1021 from obscuren/global_chain_lockJeffrey Wilcke2015-05-171-44/+43
|\ \ \
| * | | core: global chain insert lockobscuren2015-05-171-44/+43
* | | | Merge pull request #1011 from obscuren/upgradedb_fixJeffrey Wilcke2015-05-161-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | cmd/geth: delete state db on upgradedb commandobscuren2015-05-161-0/+1
|/ / /
* | | Merge branch 'hotfix/0.9.21.1' into developobscuren2015-05-164-27/+35
|\ \ \ | | |/ | |/|
| * | cmd/geth: hotfix bumpobscuren2015-05-161-1/+1
| * | core: further improved uncle error messagesobscuren2015-05-161-8/+8
| * | eth/downloader: moved start eventobscuren2015-05-162-2/+3
| * | Adjust miner coinbase and not just miner worker coinbaseVitalik Buterin2015-05-161-0/+1
| * | miner: mutex locks on cpu agent. Closes #1007obscuren2015-05-161-16/+23
| |/
| * Merge branch 'release/0.9.21'obscuren2015-05-16200-3242/+611118
| |\
| * \ Merge branch 'release/0.9.20'obscuren2015-05-1354-617/+4653
| |\ \
| * \ \ Merge branch 'develop' of github.com-obscure:ethereum/go-ethereumobscuren2015-05-100-0/+0
| |\ \ \
* | | | | Adjust miner coinbase and not just miner worker coinbaseVitalik Buterin2015-05-161-0/+1
* | | | | Merge branch 'release/0.9.21' into developobscuren2015-05-166-8/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | core, cmd/geth, cmd/mist: cleanup. bump version 0.9.21obscuren2015-05-164-7/+3
| * | | | xeth: set balance max balance to from in call. Closes #951obscuren2015-05-162-1/+3
|/ / / /
* | | | Merge pull request #989 from obscuren/developJeffrey Wilcke2015-05-164-9/+20
|\ \ \ \
| * | | | eth, cmd/geth: start mining from console respects CLI flagobscuren2015-05-162-1/+3
| * | | | miner: properly check for mining operation on Registerobscuren2015-05-161-1/+1
| * | | | core, miner: fork resolving and restart miner after sync opobscuren2015-05-162-7/+16
|/ / / /
* | | | Merge pull request #996 from karalabe/fix-potential-crosscheck-raceJeffrey Wilcke2015-05-161-5/+7
|\ \ \ \
| * | | | eth/downloader: circumvent download race between crosscheck and hashesPéter Szilágyi2015-05-161-5/+7
* | | | | Merge pull request #997 from karalabe/fix-shitty-test-server-issueJeffrey Wilcke2015-05-161-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | eth/downloader: fix #992, where tests may time out on a slow machinePéter Szilágyi2015-05-161-0/+6
|/ / / /
* | | | Merge pull request #995 from Gustav-Simonsson/update_state_tests_and_vm_creat...Jeffrey Wilcke2015-05-1620-2741/+420841
|\ \ \ \
| * | | | Add StateTests/RandomTests but skip for nowGustav Simonsson2015-05-161-0/+21
| * | | | Update StateTests and nil create return on failed code depositGustav Simonsson2015-05-162-2/+13
| * | | | Update Ethereum JSON testsGustav Simonsson2015-05-1517-2734/+420801
| * | | | unskip StateTests/stTransactionTest and use test tx nonceGustav Simonsson2015-05-152-5/+6
* | | | | Merge pull request #994 from karalabe/fix-cancel-double-closeJeffrey Wilcke2015-05-161-3/+8
|\ \ \ \ \
| * | | | | eth/downloader: fix cancel channel double closePéter Szilágyi2015-05-161-3/+8
|/ / / / /
* | | | | Merge pull request #988 from karalabe/fix-downloader-vulnerabilitiesJeffrey Wilcke2015-05-154-122/+336
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | eth/downloader: circumvent a fake blockchain attackPéter Szilágyi2015-05-152-27/+58
| * | | | eth/downloader: don't penalize for stale cross checksPéter Szilágyi2015-05-151-7/+17
| * | | | eth, eth/downloader: detect and handle madeup hash attacksPéter Szilágyi2015-05-154-43/+110
| * | | | eth: drop a sync peer if it sends an invalid hash chainPéter Szilágyi2015-05-151-1/+1
| * | | | eth/downloader: circumvent hash reordering attacksPéter Szilágyi2015-05-153-49/+88
| * | | | eth/downloader: check sync after failed attacksPéter Szilágyi2015-05-152-7/+23
| * | | | eth/downloader: add a test for detecting missing blocksPéter Szilágyi2015-05-152-8/+24
| * | | | eth, eth/downloader: prevent hash repeater attackPéter Szilágyi2015-05-154-15/+50
|/ / / /
* | | | Merge pull request #987 from obscuren/developJeffrey Wilcke2015-05-1512-35/+110
|\ \ \ \
| * | | | eth/downloader: fixed testobscuren2015-05-152-2/+4
| * | | | core: fixed mining strategyobscuren2015-05-152-10/+16
| * | | | eth, eth/downloader, miner: use download events to check miner startobscuren2015-05-156-18/+83
| * | | | core: changed how head events are checkedobscuren2015-05-152-2/+4
| * | | | core: improved uncle messagesobscuren2015-05-151-3/+3
* | | | | Merge pull request #984 from tgerring/issue924Jeffrey Wilcke2015-05-151-3/+21
|\ \ \ \ \
| * | | | | Unreverse orderingTaylor Gerring2015-05-151-2/+1
| * | | | | Omit replies for notification requestsTaylor Gerring2015-05-151-3/+22
* | | | | | Merge pull request #975 from obscuren/developJeffrey Wilcke2015-05-151-11/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | core: changed log message for forks. closes #952obscuren2015-05-141-11/+13
* | | | | | Merge pull request #983 from tgerring/issue958Jeffrey Wilcke2015-05-151-0/+1
|\ \ \ \ \ \
| * | | | | | Format contract code as hexdataTaylor Gerring2015-05-151-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #982 from tgerring/issue962Jeffrey Wilcke2015-05-151-1/+5
|\ \ \ \ \ \
| * | | | | | Check for error on DB fetch of txTaylor Gerring2015-05-151-1/+5
| |/ / / / /
* | | | | | Merge pull request #980 from fjl/geth-test-no-scryptJeffrey Wilcke2015-05-151-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | cmd/geth: use plain keystore for JS testsFelix Lange2015-05-141-1/+1
|/ / / / /
* | | | | Merge pull request #974 from karalabe/downloader-fix-unknown-parent-attackJeffrey Wilcke2015-05-144-38/+92
|\ \ \ \ \
| * | | | | eth/downloader: add a small additional check to the testPéter Szilágyi2015-05-141-0/+3
| * | | | | eth/downloader: remove a previous leftoverPéter Szilágyi2015-05-141-1/+0
| * | | | | eth, eth/downloader: remove parent verification from the downlaoderPéter Szilágyi2015-05-144-46/+17
| * | | | | eth, eth/downloader: handle a potential unknown parent attackPéter Szilágyi2015-05-143-31/+112
* | | | | | Merge pull request #971 from fjl/p2p-limit-tweaksJeffrey Wilcke2015-05-147-64/+16
|\ \ \ \ \ \
| * | | | | | p2p/discover: limit open files for node databaseFelix Lange2015-05-141-2/+3
| * | | | | | p2p: remove testlogFelix Lange2015-05-143-51/+0
| * | | | | | p2p/discover: bump maxBondingPingPongs to 16Felix Lange2015-05-141-1/+1
| * | | | | | p2p: log remote reason when disconnect is requestedFelix Lange2015-05-142-8/+10
| * | | | | | p2p: bump maxAcceptConns and defaultDialTimoutFelix Lange2015-05-141-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #973 from bas-vk/issue972Jeffrey Wilcke2015-05-142-0/+10
|\ \ \ \ \ \
| * | | | | | Introduced default unlock duration when an account is unlocked from the consoleBas van Kervel2015-05-142-0/+10
* | | | | | | Merge pull request #960 from fjl/nat-fixesJeffrey Wilcke2015-05-14142-25/+189479
|\ \ \ \ \ \ \
| * | | | | | | cmd/utils: print messages from package log through glogFelix Lange2015-05-141-0/+1
| * | | | | | | p2p/nat: tweak port mapping log messages and levelsFelix Lange2015-05-141-7/+6
| * | | | | | | Godeps: bump github.com/huin/goupnp to c57ae84Felix Lange2015-05-14138-1/+189186
| * | | | | | | p2p/nat: add test for UPnP auto discovery via SSDPFelix Lange2015-05-141-0/+223
| * | | | | | | p2p/nat: fix concurrent access to autodisc InterfaceFelix Lange2015-05-142-17/+63
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #969 from Gustav-Simonsson/ethash_improve_hashrate_update2Jeffrey Wilcke2015-05-145-116/+48
|\ \ \ \ \ \ \
| * | | | | | | Make read of ethash hashrate atomic and update ethash godepGustav Simonsson2015-05-145-116/+48
| |/ / / / / /
* | | | | | | Merge pull request #950 from karalabe/downloader-cancel-syncJeffrey Wilcke2015-05-141-32/+37
|\ \ \ \ \ \ \
| * | | | | | | eth/downloader: remove a redundant sync progress checkPéter Szilágyi2015-05-131-4/+0
| * | | | | | | eth/downloader: add a user sync notificatonPéter Szilágyi2015-05-131-0/+5
| * | | | | | | eth/downloader: sync the cancel channel during cancel tooPéter Szilágyi2015-05-131-21/+4
| * | | | | | | eth/downloader: fix deliveries to check for sync cancelsPéter Szilágyi2015-05-131-10/+31
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #949 from bas-vk/issue944Jeffrey Wilcke2015-05-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | removed invalid filename charactersBas van Kervel2015-05-131-1/+1
* | | | | | | | Merge pull request #970 from ethereum/vitalik_quick_testJeffrey Wilcke2015-05-141-2/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Combined two loopsVitalik Buterin2015-05-141-3/+1
| * | | | | | | Created separate family and ancestors environment objectsVitalik Buterin2015-05-141-2/+10
|/ / / / / / /
* | | / / / / Fixed max uncle count error messageVitalik Buterin2015-05-141-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #966 from fjl/fixup-discover-chunked-neighborsFelix Lange2015-05-142-32/+49
|\ \ \ \ \ \
| * | | | | | p2p/discover: fix out-of-bounds slicing for chunked neighbors packetsFelix Lange2015-05-142-32/+49
* | | | | | | Merge pull request #963 from Gustav-Simonsson/fix_keystore_crypto_commentsJeffrey Wilcke2015-05-141-6/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update keystore code commentsGustav Simonsson2015-05-141-6/+7
* | | | | | | Merge pull request #965 from subtly/patch-1Felix Lange2015-05-142-4/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix test.subtly2015-05-141-1/+1
| * | | | | | Manual send of multiple neighbours packets. Test receiving multiple neighbour...subtly2015-05-142-3/+19
| * | | | | | UDP Interop. Limit datagrams to 1280bytes.subtly2015-05-141-1/+1
|/ / / / / /
* | | | | | Merge pull request #954 from karalabe/fix-downloader-nil-panicPéter Szilágyi2015-05-141-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | eth/downloader: fix nil panic caused by wrong variable usePéter Szilágyi2015-05-131-1/+1
|/ / / / /
* | | | | Merge pull request #948 from karalabe/fix-downlaoder-activepeer-shadowJeffrey Wilcke2015-05-133-24/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | eth/downloader: fix active peer shadowing, polish func namesPéter Szilágyi2015-05-133-24/+16
|/ / / /
* | | | Merge pull request #946 from Gustav-Simonsson/fix_geth_unlock_accountJeffrey Wilcke2015-05-131-1/+2
|\ \ \ \
| * | | | Fix hex conversion in --unlock and log when successfulGustav Simonsson2015-05-131-1/+2
|/ / / /
* | | | Merge branch 'release/0.9.20' into developobscuren2015-05-132-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | eth: 100% tx propagationobscuren2015-05-131-1/+1
| * | | cmd/geth: bump version to 0.9.20obscuren2015-05-131-1/+1
|/ / /
* | | Merge pull request #631 from Gustav-Simonsson/improve_key_store_cryptoJeffrey Wilcke2015-05-1322-196/+241
|\ \ \
| * | | Change default keystore dirGustav Simonsson2015-05-135-6/+6
| * | | Fix address type in js testGustav Simonsson2015-05-121-1/+1
| * | | fix hex conversion bug in RPC for byte slicesGustav Simonsson2015-05-121-1/+8
| * | | Fix natspec test (again x2) typesGustav Simonsson2015-05-121-1/+2
| * | | Update key store to new spec but keep address field for nowGustav Simonsson2015-05-127-72/+59
| * | | Fix natspec e2e test accounts type (again)Gustav Simonsson2015-05-121-1/+1
| * | | Fix HEX hack in xeth accounts()Gustav Simonsson2015-05-121-1/+1
| * | | Address pull request comments; key header and hex encodingGustav Simonsson2015-05-123-31/+67
| * | | Revert "Add key header to unencrypted key file"Gustav Simonsson2015-05-122-16/+8
| * | | Fix common.Address / []byte type conversionsGustav Simonsson2015-05-122-2/+2
| * | | Add key header to unencrypted key fileGustav Simonsson2015-05-122-8/+16
| * | | Add key header to encrypted keysGustav Simonsson2015-05-122-7/+57
| * | | Correct accounts hex in XETH APIGustav Simonsson2015-05-121-1/+1
| * | | Use common.Address type for accounts.AddressGustav Simonsson2015-05-1211-64/+69
| * | | Improve key store passphrase cryptoGustav Simonsson2015-05-124-23/+31
| * | | Remove the awesome, ever misunderstood entropy mixingGustav Simonsson2015-05-124-64/+15
|/ / /
* | | Merge pull request #933 from bas-vk/issue928Jeffrey Wilcke2015-05-1218-64/+58
|\ \ \
| * | | fixed identingBas van Kervel2015-05-121-1/+1
| * | | removed redundant newlines in import blockBas van Kervel2015-05-127-11/+5
| * | | replaced several path.* with filepath.* which is platform independentBas van Kervel2015-05-1218-64/+64
* | | | Merge pull request #932 from obscuren/developJeffrey Wilcke2015-05-127-15/+40
|\ \ \ \ | |/ / / |/| | |
| * | | sol: skipped source checking stepobscuren2015-05-123-7/+13
| * | | xeth: use same semantics as block processer for transient callsobscuren2015-05-121-4/+3
| * | | rpc: hexData => hexNumobscuren2015-05-121-2/+2
| * | | xeth, rpc: implement eth_estimateGas. Closes #930obscuren2015-05-123-7/+26
| * | | eth, ethdb: lower the amount of open files & improve err messages for dbobscuren2015-05-121-0/+1
|/ / /
* | | Merge pull request #899 from ethersphere/solc-test-fixJeffrey Wilcke2015-05-124-6/+21
|\ \ \
| * | | compiler, cli/js: fix solidity compiler tests failing when a different versio...zelig2015-05-124-6/+21
* | | | Merge pull request #929 from obscuren/developJeffrey Wilcke2015-05-122-5/+8
|\ \ \ \ | |/ / / |/| | |
| * | | eth, ethdb: lower the amount of open files & improve err messages for dbobscuren2015-05-122-5/+8
|/ / /
* | | Merge pull request #925 from obscuren/worker_owned_accountsJeffrey Wilcke2015-05-122-29/+44
|\ \ \
| * | | miner, cmd/geth: miner will not ignored owned account transactionsobscuren2015-05-122-29/+44
|/ / /
* | | Merge pull request #918 from obscuren/cpu_miner_fixesJeffrey Wilcke2015-05-1211-46/+50
|\ \ \
| * | | eth, eth/downloader: moved pending queue error message to debugobscuren2015-05-112-3/+4
| * | | cmd/geth, miner, backend, xeth: Fixed miner threads to be settableobscuren2015-05-119-43/+46
| * | | eth/downloader: use count instead of peers, clearerPéter Szilágyi2015-05-112-4/+4
| * | | eth/downloader: revert to demotion, use harsher penaltyPéter Szilágyi2015-05-112-8/+19
| * | | eth/downloader: fix #910, thread safe peers & polishesPéter Szilágyi2015-05-114-161/+210
* | | | Merge pull request #915 from karalabe/downloader-threading-fixesJeffrey Wilcke2015-05-114-159/+219
|\ \ \ \ | |/ / / |/| | |
| * | | eth/downloader: use count instead of peers, clearerPéter Szilágyi2015-05-112-4/+4
| * | | eth/downloader: revert to demotion, use harsher penaltyPéter Szilágyi2015-05-112-8/+19
| * | | eth/downloader: fix #910, thread safe peers & polishesPéter Szilágyi2015-05-114-161/+210
* | | | Merge pull request #920 from tgerring/issue917Jeffrey Wilcke2015-05-111-2/+2
|\ \ \ \
| * | | | Return 32-byte hashes from GetWorkTaylor Gerring2015-05-111-2/+2
* | | | | Merge pull request #914 from ethersphere/developJeffrey Wilcke2015-05-116-15/+3801
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only allow doSign to sign hashes, enforced by using the type common.HashDaniel A. Nagy2015-05-111-4/+4
| * | | | Interactive signature creation refactored into separate doSign function.Daniel A. Nagy2015-05-111-20/+20
| * | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developDaniel A. Nagy2015-05-1122-103/+372
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #908 from obscuren/developJeffrey Wilcke2015-05-119-97/+135
|\ \ \ \ \
| * | | | | miner: added log message for mining operation. #912obscuren2015-05-111-0/+4
| * | | | | core: optimise pending transaction processingobscuren2015-05-112-86/+102
| * | | | | rpc: display error message to stdoutobscuren2015-05-111-0/+2
| * | | | | core, eth, miner: improved tx removal & fatal error on db sync errobscuren2015-05-116-31/+47
|/ / / / /
* | | | | Merge pull request #911 from karalabe/whisper-graceful-failJeffrey Wilcke2015-05-114-2/+53
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rpc, xeth: fix #881, gracefully handle offline whisperPéter Szilágyi2015-05-114-2/+53
|/ / / /
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-05-100-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge pull request #894 from obscuren/developJeffrey Wilcke2015-05-101-1/+4
| |\ \
| * \ \ Merge pull request #893 from obscuren/developJeffrey Wilcke2015-05-103-2/+106
| |\ \ \
* | | | | cmd/geth, cmd/mist: version 0.9.19obscuren2015-05-102-2/+2
| |_|/ / |/| | |
* | | | ethdb: set open file limit to 128 for all leveldbsobscuren2015-05-101-1/+4
| |/ / |/| |
* | | eth: added a cancel method for the downloaderobscuren2015-05-103-2/+106
|/ /
* | cmd/mist: version bumpobscuren2015-05-091-1/+1
* | Merge pull request #888 from obscuren/developJeffrey Wilcke2015-05-098-15/+88
|\ \
| * | cmd/geth: bump version 0.9.18obscuren2015-05-091-1/+1
| * | miner, tests: fixed block testobscuren2015-05-092-1/+6
| * | miner: start/stop mutex locked. Closes #887obscuren2015-05-091-0/+9
| * | miner: moved gasprice to non-methodobscuren2015-05-091-9/+12
| * | miner, cmd/geth: settable gas price from flags and consoleobscuren2015-05-093-0/+44
| * | cmd/geth, cmd/mist, eth, flags: renamed loglevel to verbosityobscuren2015-05-094-13/+25
|/ /
| * Signature test.Daniel A. Nagy2015-05-091-0/+28
| * Merge branch 'develop' of github.com:ethereum/go-ethereum into developDaniel A. Nagy2015-05-0823-441/+1203
| |\ | |/ |/|
* | version 0.9.17obscuren2015-05-081-1/+1
* | Merge pull request #863 from karalabe/ordered-block-downloadJeffrey Wilcke2015-05-0813-383/+939
|\ \
| * | eth/downloader: fix leftover state between syncsPéter Szilágyi2015-05-081-1/+4
| * | eth, eth/downloader: handle sync errors a bit more gracefullyPéter Szilágyi2015-05-084-48/+48
| * | eth, eth/downloader: make synchronize thread safePéter Szilágyi2015-05-085-82/+22
| * | eth/downloader: fix priority queue reset, add throttling testPéter Szilágyi2015-05-076-21/+111
| * | eth/downloader: fix expiration not running while fetchingPéter Szilágyi2015-05-072-34/+32
| * | eth/downloader: prioritize block fetch based on chain position, cap memory usePéter Szilágyi2015-05-0711-273/+798
* | | Merge pull request #885 from fjl/p2p-fixesJeffrey Wilcke2015-05-086-39/+69
|\ \ \
| * | | p2p: drop connections with no matching protocolsFelix Lange2015-05-082-4/+21
| * | | cmd/utils: bump default maxpeers to 25Felix Lange2015-05-081-1/+1
| * | | p2p: use maxDialingConns instead of maxAcceptConns as dial limitFelix Lange2015-05-081-1/+1
| * | | p2p: fix disconnect at capacityFelix Lange2015-05-084-33/+46
|/ / /
* | | Merge pull request #840 from karalabe/throttled-dialingJeffrey Wilcke2015-05-086-19/+180
|\ \ \
| * | | p2p: increase the handshake timeout in the testsPéter Szilágyi2015-05-071-2/+2
| * | | cmd, eth, p2p: introduce pending peer cli arg, add testsPéter Szilágyi2015-05-076-19/+170
| * | | p2p: reduce the concurrent handshakes to 10/10 in/outPéter Szilágyi2015-05-071-2/+2
| * | | p2p: fix dial throttling race conditionPéter Szilágyi2015-05-071-1/+1
| * | | p2p: fix a dialing race in the throttlerPéter Szilágyi2015-05-071-1/+1
| * | | p2p: limit the outbound dialing tooPéter Szilágyi2015-05-071-1/+11
| |/ /
* | | Merge pull request #882 from zsfelfoldi/developJeffrey Wilcke2015-05-081-2/+17
|\ \ \
| * | | ToVal serialization fixzsfelfoldi2015-05-081-2/+3
| * | | Otto.ToValue concurrency error fixedzsfelfoldi2015-05-081-2/+16
| | | * Signing (almost) works.Daniel A. Nagy2015-05-083-4/+3725
| | | * eth_sign added to API for signing arbitrary data.Daniel A. Nagy2015-05-082-8/+8
| | | * New API call for signatures.Daniel A. Nagy2015-05-083-0/+37
| |_|/ |/| |
* | | Merge pull request #876 from obscuren/jsre_fixesJeffrey Wilcke2015-05-084-13/+7
|\ \ \
| * | | updated ethereum.jsobscuren2015-05-081-0/+0
| * | | jsre, cmd/geth: updated web3.js and altered settimeoutobscuren2015-05-083-13/+7
|/ / /
* | | Merge pull request #875 from Gustav-Simonsson/test_updatesJeffrey Wilcke2015-05-0852-4920/+9983
|\ \ \
| * | | Add bcTotalDifficultyTest and unskip now working tx testsGustav Simonsson2015-05-073-6/+6
| * | | Update JSON test filesGustav Simonsson2015-05-0749-4914/+9977
| | |/ | |/|
* | | Merge pull request #833 from ethersphere/frontier/solidityJeffrey Wilcke2015-05-0821-503/+1449
|\ \ \
| * | | solidity compiler and contract metadocs integrationzelig2015-05-0721-503/+1449
| |/ /
* | | Merge pull request #864 from obscuren/filter_changesJeffrey Wilcke2015-05-086-83/+221
|\ \ \ | |_|/ |/| |
| * | xeth: getTransactionByHash, try pool if db failsobscuren2015-05-081-0/+2
| * | core: get transaction by hash from transaction poolobscuren2015-05-081-0/+21
| * | xeth: check proper queue for pending transaction filterobscuren2015-05-071-1/+1
| * | rpc: eth_transactionFilter => eth_newPendingTransactionFilterobscuren2015-05-071-1/+1
| * | xeth, core, event/filter, rpc: new block and transaction filtersobscuren2015-05-075-83/+198
| |/
* | Merge pull request #877 from Gustav-Simonsson/update_ethash_godepJeffrey Wilcke2015-05-088-21/+65
|\ \ | |/ |/|
| * Update ethash deps (more build fixes, tests)Gustav Simonsson2015-05-088-21/+65
|/
* updated ignoreobscuren2015-05-071-0/+1
* Merge pull request #867 from Gustav-Simonsson/fix_block_tests_genesis_block_t...Jeffrey Wilcke2015-05-073-4/+1
|\
| * Unskip now working tests, remove debug printGustav Simonsson2015-05-072-4/+0
| * Add genesis block total difficulty in testsGustav Simonsson2015-05-071-0/+1
* | Merge pull request #866 from fjl/p2p-last-minuteJeffrey Wilcke2015-05-076-26/+24
|\ \
| * | p2p: stop dialing at half the maximum peer countFelix Lange2015-05-071-1/+1
| * | p2p, whisper: use glog for peer-level loggingFelix Lange2015-05-073-20/+16
| * | p2p/discover: bump packet timeouts to 500msFelix Lange2015-05-071-2/+2
| * | p2p/nat: less confusing error loggingFelix Lange2015-05-071-3/+5
* | | cmd/geth: gofmt screwup fixobscuren2015-05-071-0/+2
* | | cmd/geth: version bumpobscuren2015-05-071-3/+1
* | | Merge branch 'karalabe-cherry-trusted-peers' into developobscuren2015-05-077-39/+317
|\ \ \ | |/ / |/| |
| * | fixed merge issueobscuren2015-05-077-39/+317
|/| |