aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* core, miner: fixed miner time issue and removed future blocksobscuren2015-05-272-5/+5
* Merge pull request #1067 from carver/deep-mining-logJeffrey Wilcke2015-05-271-0/+59
|\
| * deep-mining-log: need ring buffer to be one bigger for all-blocks-mined caseJason Carver2015-05-271-1/+1
| * deep-mining-log: only track non-stale blocksJason Carver2015-05-271-2/+2
| * do not export ring buffer structJason Carver2015-05-241-4/+4
| * do not export constant for when to log a deep block you minedJason Carver2015-05-241-4/+4
| * Log locally mined blocks, after they are 5-deep in the chainJason Carver2015-05-231-0/+59
* | Merge pull request #1120 from Gustav-Simonsson/revert_gas_limit_changeJeffrey Wilcke2015-05-271-1/+1
|\ \
| * | Revert "core: block.gasLimit - parent.gasLimit <= parent.gasLimit / GasLimitB...Gustav Simonsson2015-05-271-1/+1
|/ /
* | Merge branch 'release/0.9.25' into developobscuren2015-05-271-1/+1
|\ \
| * | cmd/geth: bump version 0.9.25obscuren2015-05-271-1/+1
|/ /
* | Merge pull request #1114 from obscuren/developJeffrey Wilcke2015-05-271-1/+1
|\ \
| * | core: block.gasLimit - parent.gasLimit <= parent.gasLimit / GasLimitBoundDivisorobscuren2015-05-271-1/+1
|/ /
* | Merge pull request #1113 from obscuren/developJeffrey Wilcke2015-05-273-8/+34
|\ \
| * | cmd/geth: Flush instead of close. This solves a nil ptr errorobscuren2015-05-271-6/+6
| * | cmd/geth, core: Updated DB version & seedhash debug methodobscuren2015-05-272-2/+28
|/ /
* | p2p/discover: bond with seed nodes too (runs only if findnode failed)Péter Szilágyi2015-05-271-7/+4
* | p2p/discovery: fix a cornercase loop if no seeds or bootnodes are knownPéter Szilágyi2015-05-271-5/+9
* | p2p/discover: force refresh if the table is emptyPéter Szilágyi2015-05-271-13/+41
* | p2p/discover: permit temporary bond failures for previously known nodesPéter Szilágyi2015-05-271-12/+15
* | p2p/discover: watch find failures, evacuate on too many, rebond if failedPéter Szilágyi2015-05-271-8/+47
* | p2p/discover: add support for counting findnode failuresPéter Szilágyi2015-05-272-3/+25
* | Merge pull request #1108 from karalabe/fine-seedingFelix Lange2015-05-275-20/+52
|\ \
| * | cmd/geth: fix js console test for p2p server updatePéter Szilágyi2015-05-271-1/+3
| * | p2p: fix Self() panic if listening is disabledPéter Szilágyi2015-05-271-0/+9
| * | cmd/geth, cmd/utils, eth, p2p: pass and honor a no discovery flagPéter Szilágyi2015-05-274-9/+37
| * | eth, p2p: start the p2p server even if maxpeers == 0Péter Szilágyi2015-05-262-10/+3
* | | Merge pull request #1111 from obscuren/neg_tx_checkJeffrey Wilcke2015-05-274-2/+20
|\ \ \
| * | | core: check negative value transactions. Closes #1109obscuren2015-05-274-2/+20
|/ / /
* | | Merge pull request #1090 from fjl/jsre-fixesJeffrey Wilcke2015-05-275-176/+124
|\ \ \
| * | | cmd/geth, jsre, rpc: run all JS code on the event loopFelix Lange2015-05-255-176/+124
* | | | Merge pull request #1086 from debris/solidity_stdJeffrey Wilcke2015-05-271-0/+2
|\ \ \ \
| * | | | compile solidity contracts with std libraryMarek Kotewicz2015-05-251-0/+2
| | |_|/ | |/| |
* | | | Merge pull request #1106 from karalabe/silence-useless-downloader-logJeffrey Wilcke2015-05-271-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | eth/downloader: silence "Added N blocks from..." if N == 0Péter Szilágyi2015-05-261-1/+1
* | | | core: prevent crash when last block failsobscuren2015-05-261-6/+16
|/ / /
* | | cmd/geth: bumped version to 0.9.24obscuren2015-05-261-1/+1
* | | Merge pull request #1014 from fjl/p2p-dialer-3000Jeffrey Wilcke2015-05-2630-1468/+7980
|\ \ \
| * | | p2p: decrease frameReadTimeout to 30sFelix Lange2015-05-251-4/+5
| * | | p2p: new dialer, peer management without locksFelix Lange2015-05-2511-1329/+2118
| * | | p2p/discover: add ReadRandomNodesFelix Lange2015-05-252-1/+83
| * | | p2p: decrease maximum message size for devp2p to 1kBFelix Lange2015-05-251-1/+1
| * | | Godeps: add github.com/davecgh/go-spewFelix Lange2015-05-2516-0/+5776
| * | | p2p: delete Server.BroadcastFelix Lange2015-05-254-136/+0
| * | | eth: stop p2p.Server on shutdownFelix Lange2015-05-251-1/+1
| | |/ | |/|
* | | Merge pull request #1099 from obscuren/fork_fixJeffrey Wilcke2015-05-269-4481/+6478
|\ \ \
| * | | tests: removed missing block testobscuren2015-05-261-4/+0
| * | | core: ban hash 38f5bb...a714bcobscuren2015-05-261-0/+1
| * | | core/vm: Fork fix. Removal of appending 0 bytes in memsetobscuren2015-05-261-6/+2
| * | | tests: updatedobscuren2015-05-266-4471/+6475
|/ / /
* | | Merge pull request #1102 from karalabe/maintain-block-originsJeffrey Wilcke2015-05-265-23/+39
|\ \ \
| * | | eth, eth/downloader: surface downloaded block origin, drop on errorPéter Szilágyi2015-05-265-23/+39
* | | | Merge pull request #1101 from obscuren/issue-1096Jeffrey Wilcke2015-05-261-15/+3
|\ \ \ \ | |/ / / |/| | |
| * | | core/vm: Cleanups & SUB output fix. Closes #1096obscuren2015-05-261-15/+3
* | | | Merge pull request #1078 from carver/patch-1Felix Lange2015-05-251-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | expand acronym in log message from TDJason Carver2015-05-231-1/+1
| | |/ | |/|
* | | Merge pull request #1066 from karalabe/peer-db-polishesFelix Lange2015-05-253-25/+99
|\ \ \ | |/ / |/| |
| * | p2p/discover: fix #838, evacuate self entries from the node dbPéter Szilágyi2015-05-223-25/+99
| * | p2p/discover: fix database presistency test folderPéter Szilágyi2015-05-221-3/+3
* | | Merge pull request #1077 from obscuren/disasmJeffrey Wilcke2015-05-222-1/+29
|\ \ \ | |_|/ |/| |
| * | core/vm, rpc: added disasm to `ext_` RPCobscuren2015-05-222-1/+29
|/ /
* | Merge pull request #1076 from obscuren/rpc_signJeffrey Wilcke2015-05-222-42/+42
|\ \
| * | core: added RPC sign back inobscuren2015-05-222-42/+42
* | | Merge pull request #1072 from Gustav-Simonsson/add_random_testsJeffrey Wilcke2015-05-221-16/+10
|\ \ \
| * | | Add StateTests/RandomTests and VMTests/RandomTestsGustav Simonsson2015-05-221-16/+10
| |/ /
* | | Merge pull request #1074 from bas-vk/issue1068Jeffrey Wilcke2015-05-221-1/+1
|\ \ \ | |/ / |/| |
| * | make registrar available in consoleBas van Kervel2015-05-221-1/+1
|/ /
* | miner: moved break INSIDE the switch ...obscuren2015-05-221-4/+5
* | Merge branch 'release/0.9.23' into developobscuren2015-05-222-1/+3
|\ \ | |/ |/|
| * miner: on downloader.Done/Fail stop immediately. Ignore pending evsobscuren2015-05-221-0/+2
| * cmd/geth: bump version 0.9.23obscuren2015-05-221-1/+1
|/
* Merge pull request #1055 from ethersphere/autodagJeffrey Wilcke2015-05-224-1/+127
|\
| * automatic DAG pregeneration for smooth epoch transitionszelig2015-05-214-1/+127
* | Merge pull request #1064 from karalabe/downloader-attacksJeffrey Wilcke2015-05-226-28/+99
|\ \
| * | eth, eth/downloader: remove duplicate consts, bump hash fetch to 2KPéter Szilágyi2015-05-216-13/+14
| * | eth/downloader: circumvent a forged block chain with known parent attackPéter Szilágyi2015-05-212-13/+56
| * | eth/downloader: prevent a peer from dripping bad hashesPéter Szilágyi2015-05-212-9/+36
* | | Merge pull request #1063 from bas-vk/issue1053Jeffrey Wilcke2015-05-211-2/+5
|\ \ \ | |_|/ |/| |
| * | prefix dapp key/value entries in extradbBas van Kervel2015-05-211-2/+5
|/ /
* | Merge pull request #1062 from Gustav-Simonsson/tests_updatesJeffrey Wilcke2015-05-217-31/+9209
|\ \
| * | Add wrapper for BlockTests/bcWalletTest.jsonGustav Simonsson2015-05-181-0/+4
| * | Handle call depth exception for CREATEGustav Simonsson2015-05-181-0/+6
| * | Update Ethereum JSON test filesGustav Simonsson2015-05-185-31/+9199
* | | Merge pull request #1059 from obscuren/cleanupJeffrey Wilcke2015-05-215-36/+37
|\ \ \ | |/ / |/| |
| * | miner: one-shot update loopobscuren2015-05-211-0/+6
| * | eth: reduced max open files for LevelDBobscuren2015-05-211-1/+1
| * | ethdb: documentation and corruption recoveryobscuren2015-05-211-8/+13
| * | core: switched back to `set.Set` for uncle verificationobscuren2015-05-211-24/+14
| * | xeth: removed `Value`obscuren2015-05-211-3/+3
|/ /
* | Merge pull request #1043 from obscuren/test_fixesJeffrey Wilcke2015-05-203-13/+35
|\ \
| * | tests: added conditional skip on long running VM testsobscuren2015-05-201-0/+7
| * | core/vm: RETURN op code returns pointer to memory rather than copyobscuren2015-05-203-5/+17
| * | tests/vm: updated tests and skipped output for specific testsobscuren2015-05-201-8/+11
* | | Merge pull request #1049 from zsfelfoldi/receiptsJeffrey Wilcke2015-05-202-0/+34
|\ \ \
| * | | Storing tx receipts in extraDbzsfelfoldi2015-05-202-0/+34
| | |/ | |/|
* | | Merge pull request #1048 from ethersphere/cli-fixesJeffrey Wilcke2015-05-2015-645/+2305
|\ \ \
| * | | rpc: NewNotAvailableError instead of NewNotImplementedError if no solczelig2015-05-201-1/+1
| * | | fix eth.sign. now implemented in admin jsre until web3.js has it .zelig2015-05-204-43/+68
| * | | multiple contract source for solidity compiler: returns contract array if mul...zelig2015-05-206-74/+91
| * | | update web3.js to 0.4.2zelig2015-05-201-475/+2061
| * | | add usage doc to wallet importzelig2015-05-201-1/+9
| * | | remove solc flairzelig2015-05-201-1/+2
| * | | solc now in ethereum, fixes solc path setting; setSolc() didnt workzelig2015-05-206-15/+26
| * | | fix solc tests unskipzelig2015-05-206-38/+50
| |/ /
* | | Merge pull request #1050 from karalabe/handle-slow-download-testerJeffrey Wilcke2015-05-201-1/+1
|\ \ \
| * | | eth/downloader: fix test to it doesn't time out on a slow machinePéter Szilágyi2015-05-201-1/+1
* | | | Merge pull request #1051 from karalabe/fix-odd-namingJeffrey Wilcke2015-05-202-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | eth: fix odd method names in peer setPéter Szilágyi2015-05-202-7/+7
|/ / /
* | | Merge pull request #1044 from obscuren/thread_safe_block_cacheJeffrey Wilcke2015-05-201-0/+3
|\ \ \
| * | | core: block cache Has method thread safeobscuren2015-05-201-0/+3
| | |/ | |/|
* | | Merge pull request #1046 from tgerring/issue1045Jeffrey Wilcke2015-05-201-10/+21
|\ \ \ | |/ / |/| |
| * | Support multiple account unlock attemptsTaylor Gerring2015-05-201-3/+10
| * | Allow unlocking multiple accounts #1045Taylor Gerring2015-05-201-9/+13
* | | core: skipped tests while cache disabledobscuren2015-05-201-0/+2
|/ /
* | Merge pull request #1035 from karalabe/eth-threadsafe-peersJeffrey Wilcke2015-05-193-68/+150
|\ \
| * | eth: remote a superfluous peerSet methodPéter Szilágyi2015-05-191-12/+0
| * | eth: make the peer set thread safePéter Szilágyi2015-05-193-68/+162
| |/
* | Merge pull request #1036 from tgerring/issue884Jeffrey Wilcke2015-05-192-8/+21
|\ \
| * | Use bytes.Repeat() instead of 32-byte literalTaylor Gerring2015-05-191-1/+2
| * | XEth comment clarificationTaylor Gerring2015-05-181-2/+5
| * | CleanupTaylor Gerring2015-05-181-3/+1
| * | Return nil for certain fields on eth_getTransactionByHash when not part of a ...Taylor Gerring2015-05-181-3/+7
| * | Return nil for certain fields on eth_getBlockByNumber pendingTaylor Gerring2015-05-181-0/+7
* | | core: disable cash tmpobscuren2015-05-191-3/+5
* | | Merge pull request #1034 from obscuren/tx_pool_fixJeffrey Wilcke2015-05-191-0/+2
|\ \ \
| * | | xeth: remove nonce on error. Fixes #1026obscuren2015-05-191-0/+2
| |/ /
* | | Merge pull request #1022 from obscuren/parallel_nonce_checksJeffrey Wilcke2015-05-199-25/+119
|\ \ \
| * | | core: fixed testsobscuren2015-05-193-8/+15
| * | | core: chain manager no longer exports genesis blockobscuren2015-05-192-2/+4
| * | | miner: stale block notificationobscuren2015-05-191-1/+7
| * | | core: parallelise nonce checking when processing blocksobscuren2015-05-184-15/+94
* | | | 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 bumpv0.9.21.1obscuren2015-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'v0.9.21obscuren2015-05-16200-3242/+611118
| |\
| * \ Merge branch 'release/0.9.20'v0.9.20obscuren2015-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
|\ \ \ \