aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | eth/fetcher: remove test sleeps (15s -> 2.8s)Péter Szilágyi2015-06-222-59/+167
| * | | | eth/fetcher: handle and (crude) test block memory DOSPéter Szilágyi2015-06-222-23/+105
| * | | | eth/fetcher: handle and test block announce DOS attacksPéter Szilágyi2015-06-222-7/+82
* | | | | Merge pull request #1279 from bas-vk/rpc-httpJeffrey Wilcke2015-06-2353-5319/+1725
|\ \ \ \ \
| * | | | | fixed relative path issue with javascript filesBas van Kervel2015-06-231-3/+3
| * | | | | improved action descriptionBas van Kervel2015-06-231-1/+1
| * | | | | bugfix in startRPC error handlingBas van Kervel2015-06-231-4/+4
| * | | | | added missing change for sign testBas van Kervel2015-06-221-1/+1
| * | | | | fixed eth sign unittestBas van Kervel2015-06-225-9/+27
| * | | | | added RPC start/stop supportBas van Kervel2015-06-2231-130/+224
| * | | | | fixed unittestsBas van Kervel2015-06-222-36/+10
| * | | | | added batch support to console and attach actionsBas van Kervel2015-06-226-30/+62
| * | | | | moved solidity test to new rpc structureBas van Kervel2015-06-221-0/+110
| * | | | | fixed bug where history file was create in cwdBas van Kervel2015-06-221-1/+1
| * | | | | added attach over http/rpc supportBas van Kervel2015-06-223-6/+134
| * | | | | added attach over ipc commandBas van Kervel2015-06-228-35/+238
| * | | | | removed console commandBas van Kervel2015-06-225-577/+0
| * | | | | cleanup comments/codeBas van Kervel2015-06-223-150/+12
| * | | | | removed old rpc structure and added new inproc api clientBas van Kervel2015-06-2222-4427/+393
| * | | | | fixed rpc test failure in eth.blockNumberBas van Kervel2015-06-221-43/+45
| * | | | | fixed rpc test failure in net_peerCountBas van Kervel2015-06-221-1/+1
| * | | | | fixed web3 rpc test failuresBas van Kervel2015-06-221-0/+24
| * | | | | added DB apiBas van Kervel2015-06-226-5/+295
| * | | | | refactored old rpc structure to newBas van Kervel2015-06-223-4/+20
| * | | | | added comms httpBas van Kervel2015-06-225-1/+254
| * | | | | made ipc handler generic and reusableBas van Kervel2015-06-222-28/+39
| |/ / / /
* | | | | Merge pull request #1309 from fjl/p2p-fix-lookup-spinJeffrey Wilcke2015-06-232-15/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | p2p: throttle all discovery lookupsFelix Lange2015-06-222-15/+16
* | | | | Merge pull request #1304 from obscuren/state-renamesJeffrey Wilcke2015-06-227-35/+11
|\ \ \ \ \
| * | | | | tests: SetGasLimitobscuren2015-06-211-1/+1
| * | | | | core, miner, xeth: renamed gas methodsobscuren2015-06-216-34/+10
| |/ / / /
* | | | | Merge pull request #1305 from obscuren/database-error-checkJeffrey Wilcke2015-06-226-10/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | trie: fixed testsobscuren2015-06-211-1/+1
| * | | | core, ethdb, trie: validate database errorsobscuren2015-06-215-9/+25
|/ / / /
* | | | Merge pull request #1302 from obscuren/mist-removalJeffrey Wilcke2015-06-21128-15536/+1
|\ \ \ \
| * | | | travis: removed qt depsobscuren2015-06-211-1/+1
| * | | | mist: R.I.P.obscuren2015-06-20127-15535/+0
* | | | | Merge pull request #1236 from tgerring/ethtestJeffrey Wilcke2015-06-2020-866/+1138
|\ \ \ \ \
| * | | | | Expand --test switchTaylor Gerring2015-06-191-5/+5
| * | | | | Add --skip option to CLITaylor Gerring2015-06-199-79/+94
| * | | | | recover test logicTaylor Gerring2015-06-191-1/+1
| * | | | | Build error fixesTaylor Gerring2015-06-193-7/+6
| * | | | | Rebase cleanupTaylor Gerring2015-06-192-30/+1
| * | | | | Add stdin optionTaylor Gerring2015-06-196-201/+386
| * | | | | Minor cleanupTaylor Gerring2015-06-191-17/+23
| * | | | | Expand CLI options to allow running all testsTaylor Gerring2015-06-191-41/+109
| * | | | | Allow specifying single depth directoryTaylor Gerring2015-06-191-37/+67
| * | | | | Add lost rebase changesTaylor Gerring2015-06-191-1/+9
| * | | | | Cleanup loggingTaylor Gerring2015-06-196-12/+15
| * | | | | Fix geth blocktest commandTaylor Gerring2015-06-192-2/+3
| * | | | | Wire ethtest to new tests structureTaylor Gerring2015-06-191-203/+32
| * | | | | DRY file loadingTaylor Gerring2015-06-195-58/+42
| * | | | | More consistent test interfaces + test skippingTaylor Gerring2015-06-197-78/+108
| * | | | | Cleanup/reorgTaylor Gerring2015-06-198-273/+265
| * | | | | Return error up stack instead of passing testing var downTaylor Gerring2015-06-197-84/+159
| * | | | | DRY log checkTaylor Gerring2015-06-192-61/+46
| * | | | | Separate and identify tests runnersTaylor Gerring2015-06-196-283/+387
| * | | | | Flatten helper directoryTaylor Gerring2015-06-196-70/+22
| * | | | | Fix pathsTaylor Gerring2015-06-194-45/+61
| * | | | | Split tests from helper codeTaylor Gerring2015-06-195-555/+170
| * | | | | Flatten vm directoryTaylor Gerring2015-06-194-3/+387
| * | | | | Require a first argument of test typeTaylor Gerring2015-06-191-4/+24
| |/ / / /
* | | | | Added link to ARM develop buildTaylor Gerring2015-06-201-0/+1
* | | | | Merge pull request #1298 from karalabe/slack-n-boundJeffrey Wilcke2015-06-191-4/+15
|\ \ \ \ \
| * | | | | eth/fetcher: lower max cache size, add timeout slackPéter Szilágyi2015-06-191-4/+15
* | | | | | Merge pull request #1290 from tgerring/dataargsJeffrey Wilcke2015-06-191-0/+54
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | unit test coverage for NewDataArgsTaylor Gerring2015-06-181-0/+54
* | | | | | Merge pull request #1295 from karalabe/fix-broadcast-orderPéter Szilágyi2015-06-191-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | eth: fix the propagation/announce order for mined blocksPéter Szilágyi2015-06-191-4/+4
|/ / / / /
* | | | | Merge pull request #1267 from SilentCicero/developJeffrey Wilcke2015-06-196-0/+89
|\| | | |
| * | | | Added glog messages like TransactionSilentCicero2015-06-171-0/+4
| * | | | Remove Extra LoggersSilentCicero2015-06-171-4/+1
| * | | | New DataArgs and eth_sendRawTransactionSilentCicero2015-06-175-3/+64
| * | | | thanks subtly :)Nick Dodson2015-06-161-1/+1
| * | | | NewSigArgs arg change.Nick Dodson2015-06-161-1/+1
| * | | | Update utils.goNick Dodson2015-06-151-1/+1
| * | | | Update eth.goNick Dodson2015-06-151-1/+1
| * | | | Change eth_pushTx case to eth_sendRawTransactionNick Dodson2015-06-151-1/+1
| * | | | Changed variable namesSilentCicero2015-06-152-8/+2
| * | | | eth_pushTx send raw signed encoded TX data to the chain through RPCSilentCicero2015-06-153-0/+33
* | | | | Merge pull request #1275 from karalabe/optimise-fetcherJeffrey Wilcke2015-06-198-274/+878
|\ \ \ \ \
| * | | | | eth/fetcher: since uncles are allowed, drop phase testPéter Szilágyi2015-06-191-51/+0
| * | | | | eth/fetcher: allow backward uncle imports tooPéter Szilágyi2015-06-191-2/+3
| * | | | | eth: fix test breakage from the previous commitPéter Szilágyi2015-06-182-2/+1
| * | | | | eth, eth/fetcher: propagate after header verify, announce only on insertPéter Szilágyi2015-06-184-43/+81
| * | | | | eth: clean the block request packet handling a bitPéter Szilágyi2015-06-181-17/+17
| * | | | | eth, eth/fetcher: move propagated block import into fetcherPéter Szilágyi2015-06-184-123/+106
| * | | | | eth/fetcher: make tests thread safePéter Szilágyi2015-06-181-22/+34
| * | | | | eth/fetcher: build longest chain until proven otherwisePéter Szilágyi2015-06-183-31/+95
| * | | | | eth/fetcher: fix premature queue cleanup, general polishesPéter Szilágyi2015-06-181-35/+47
| * | | | | eth, eth/fetcher: define and enforce propagation boundariesPéter Szilágyi2015-06-183-24/+60
| * | | | | eth/fetcher: deduplicate future blocksPéter Szilágyi2015-06-182-25/+71
| * | | | | eth, eth/fetcher: cache future propagated blocks tooPéter Szilágyi2015-06-183-0/+51
| * | | | | eth, eth/fetcher: use an import queue to store out of order blocksPéter Szilágyi2015-06-183-33/+91
| * | | | | eth/fetcher: add test to check for duplicate downloadsPéter Szilágyi2015-06-181-0/+38
| * | | | | eth/fetcher: fix timer reset bug, add initial testsPéter Szilágyi2015-06-183-6/+212
| * | | | | eth, eth/fetcher: separate notification sync mechanismPéter Szilágyi2015-06-184-182/+293
|/ / / / /
* | | | | Merge pull request #1282 from obscuren/state-cleanupJeffrey Wilcke2015-06-1814-197/+176
|\ \ \ \ \
| * | | | | core/vm: clarified SSTOREobscuren2015-06-181-7/+5
| * | | | | core: ValidatedHeader (method => function)obscuren2015-06-182-66/+68
| * | | | | core, core/vm: state improvements and tx pool speed upobscuren2015-06-173-32/+25
| * | | | | core: TMP testing codeobscuren2015-06-172-21/+23
| * | | | | core/state: removed trie copyobscuren2015-06-171-1/+1
| * | | | | core/state: removed state from state objectobscuren2015-06-173-31/+20
| * | | | | core/state: fixed state testsobscuren2015-06-171-13/+10
| * | | | | xeth, tests: fixed apiobscuren2015-06-173-6/+6
| * | | | | core/state: remove the need for common.Valueobscuren2015-06-171-2/+4
| * | | | | core/state, core/vm: reworked storage get / set to use common.Hashobscuren2015-06-175-41/+45
| * | | | | core/state, core/vm: cleanup refundsobscuren2015-06-173-21/+13
* | | | | | Merge pull request #1287 from karalabe/fix-downloader-cancel-interruptJeffrey Wilcke2015-06-183-64/+60
|\ \ \ \ \ \
| * | | | | | eth/downloader: extend slow test to fix even slower CI server...Péter Szilágyi2015-06-181-1/+1
| * | | | | | eth/downloader: always reenter processing if not exitingPéter Szilágyi2015-06-182-39/+37
| * | | | | | eth, eth/downloader: fix processing interrupt caused by temp cancelPéter Szilágyi2015-06-183-24/+22
|/ / / / / /
* | | | | | Merge pull request #1269 from bas-vk/console-batchJeffrey Wilcke2015-06-172-5/+31
|\ \ \ \ \ \
| * | | | | | added printing support for objectsBas van Kervel2015-06-151-2/+3
| * | | | | | added batch mode to consoleBas van Kervel2015-06-142-5/+30
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1281 from karalabe/fix-overlapping-delivery-hangJeffrey Wilcke2015-06-172-0/+35
|\ \ \ \ \ \
| * | | | | | eth/downloader: fix #1280, overlapping (good/bad) delivery hangPéter Szilágyi2015-06-172-0/+35
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1274 from Gustav-Simonsson/update_ethash_godepJeffrey Wilcke2015-06-1733-14768/+2634
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update ethash Godep (again)Gustav Simonsson2015-06-173-12/+23
| * | | | | Update ethash GodepGustav Simonsson2015-06-1616-13958/+76
| * | | | | Update Ethereum JSON test filesGustav Simonsson2015-06-1616-802/+2539
|/ / / / /
* | | | | cmd/geth: bump 0.9.31obscuren2015-06-161-1/+1
* | | | | Merge branch 'release/0.9.30' into developobscuren2015-06-161-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | cmd/geth: bump version number 0.9.30obscuren2015-06-161-1/+1
|/ / / /
* | | | Merge pull request #1260 from obscuren/tx-drop-low-txJeffrey Wilcke2015-06-168-24/+60
|\ \ \ \
| * | | | rpc/api: fixed default gas-(price) issue.obscuren2015-06-152-7/+10
| * | | | core: moved check for max queue to checkQueueobscuren2015-06-152-26/+12
| * | | | core: reduce max allowed queued txs per addressobscuren2015-06-152-0/+30
| * | | | core, miner: tx pool drops txs below ask priceobscuren2015-06-154-6/+23
| |/ / /
* | | | Merge pull request #990 from zsfelfoldi/gaspriceJeffrey Wilcke2015-06-158-59/+319
|\ \ \ \
| * | | | Changed miner and gpo min gas price to 1 szabozsfelfoldi2015-06-151-6/+6
| * | | | fixed rpc/api.GasPricezsfelfoldi2015-06-151-1/+1
| * | | | fixed xeth.gpo = nil bugzsfelfoldi2015-06-151-1/+4
| * | | | removed duplicate function after rebasezsfelfoldi2015-06-151-16/+2
| * | | | fixed gas price corr. factorzsfelfoldi2015-06-151-1/+1
| * | | | fallback for uninitialized GPO config valueszsfelfoldi2015-06-151-0/+3
| * | | | fixed initial base price bugzsfelfoldi2015-06-151-0/+4
| * | | | added missing sourcezsfelfoldi2015-06-151-0/+174
| * | | | fixed saving receiptszsfelfoldi2015-06-156-54/+144
| |/ / /
* | | | Merge pull request #1261 from fjl/p2p-no-writes-at-shutdownJeffrey Wilcke2015-06-152-28/+61
|\ \ \ \
| * | | | p2p: improve disconnect loggingFelix Lange2015-06-152-6/+7
| * | | | p2p: track write errors and prevent writes during shutdownFelix Lange2015-06-151-25/+57
| |/ / /
* | | | Merge pull request #1243 from karalabe/instrument-downloader-syncJeffrey Wilcke2015-06-159-468/+646
|\ \ \ \ | |/ / / |/| | |
| * | | eth: don't refetch non fitting blocks to avoid duplicatesPéter Szilágyi2015-06-151-1/+1
| * | | eth/downloader: detailed comment for the race corner casePéter Szilágyi2015-06-151-4/+15
| * | | eth/downloader: fix import statistic reset, fetch hashes asyncPéter Szilágyi2015-06-151-11/+14
| * | | eth, eth/downloader: do async block fetches, add dl testsPéter Szilágyi2015-06-153-5/+47
| * | | eth/downloader: sanity test for multi peer syncsPéter Szilágyi2015-06-151-0/+31
| * | | eth, eth/downloader: move block processing into the downlaoderPéter Szilágyi2015-06-154-231/+253
| * | | eth/downloader: add valid peer during attacks (check interference)Péter Szilágyi2015-06-151-93/+140
| * | | eth/downloader: instreument and test the sync peer dropPéter Szilágyi2015-06-152-9/+66
| * | | eth: fix an accidental test compile errorPéter Szilágyi2015-06-151-3/+1
| * | | eth/downloader: support individual peers in the test suitePéter Szilágyi2015-06-151-112/+113
| * | | eth/downloader: remove uneeded testing functionsPéter Szilágyi2015-06-152-37/+2
| * | | eth, eth/downloader: move peer removal into downloaderPéter Szilágyi2015-06-156-82/+83
|/ / /
* | | Merge pull request #1255 from obscuren/chain-proc-interuptJeffrey Wilcke2015-06-122-2/+11
|\ \ \
| * | | core: changed interrupt strategyobscuren2015-06-121-102/+101
| * | | eth, core: interupt the chain processing on stopobscuren2015-06-122-95/+105
* | | | Merge pull request #1256 from obscuren/fix-printable-charsJeffrey Wilcke2015-06-125-52/+47
|\ \ \ \
| * | | | core/vm: Improved error reporting for trace loggingobscuren2015-06-124-46/+45
| * | | | core/vm: fixed printable characters using unicode insteadobscuren2015-06-122-6/+2
| |/ / /
* | | | Merge pull request #1254 from bas-vk/ipcwindowspathfixJeffrey Wilcke2015-06-124-5/+26
|\ \ \ \
| * | | | removed obsolete console flagBas van Kervel2015-06-122-2/+0
| * | | | fixed windows ipc path issueBas van Kervel2015-06-124-4/+27
* | | | | Merge pull request #1245 from bas-vk/ipcdatadirfixJeffrey Wilcke2015-06-122-2/+2
|\| | | | | |/ / / |/| | |
| * | | ipc socket always used default pathBas van Kervel2015-06-122-2/+2
|/ / /
* | | Merge pull request #1239 from bas-vk/rpc-apisJeffrey Wilcke2015-06-1150-250/+7950
|\ \ \
| * | | fixed incomplete merge actionBas van Kervel2015-06-112-703/+1
| * | | removed obsolete print statementBas van Kervel2015-06-112-89/+1
| * | | removed binary filesBas van Kervel2015-06-112-7/+0
| * | | upgrade web3.js with _extend supportBas van Kervel2015-06-117-6/+51
| * | | added net APIBas van Kervel2015-06-111-0/+8
| * | | added miner APIBas van Kervel2015-06-111-1/+5
| * | | added console binaryBas van Kervel2015-06-111-5/+89
| * | | fixed windows build problemBas van Kervel2015-06-111-0/+702
| * | | changed send methods for backwards compatability in geth consoleBas van Kervel2015-06-112-2/+54
| * | | added console commandBas van Kervel2015-06-115-26/+64
| * | | added API/IPC commandline flagsBas van Kervel2015-06-111-0/+5
| * | | restructured eth rpc APIBas van Kervel2015-06-113-0/+122
| * | | added shh APIBas van Kervel2015-06-116-5/+370
| * | | cleanup of javascript APIBas van Kervel2015-06-1110-89/+91
| * | | added txpool APIBas van Kervel2015-06-114-1/+91
| * | | changed console welcome messageBas van Kervel2015-06-111-12/+9
| * | | upgrade web3.js with _extend supportBas van Kervel2015-06-116-2829/+230
| * | | added admin APIBas van Kervel2015-06-1114-203/+613
| * | | added personal APIBas van Kervel2015-06-115-9/+259
| * | | added debug APIBas van Kervel2015-06-119-712/+980
| * | | only load supported api'sBas van Kervel2015-06-112-9/+81
| * | | added net APIBas van Kervel2015-06-119-11/+141
| * | | added miner APIBas van Kervel2015-06-115-1/+323
| * | | added console binaryBas van Kervel2015-06-116-0/+402
| * | | fixed windows build problemBas van Kervel2015-06-111-1/+1
| * | | fixed unittest build problemBas van Kervel2015-06-111-1/+1
| * | | changed send methods for backwards compatability in geth consoleBas van Kervel2015-06-113-2/+57
| * | | added console commandBas van Kervel2015-06-1112-249/+4819
| * | | added API/IPC commandline flagsBas van Kervel2015-06-114-0/+50
| * | | added RPC/IPC supportBas van Kervel2015-06-116-1/+887
| * | | restructured eth rpc APIBas van Kervel2015-06-1111-0/+2167
|/ / /
* | | Merge pull request #1228 from obscuren/vm-optimisationsJeffrey Wilcke2015-06-1116-159/+200
|\ \ \
| * | | core: retry block now also parellise nonce checksobscuren2015-06-111-2/+8
| * | | core/vm: added a comment regarding the uint64 vs *big.Intobscuren2015-06-111-1/+3
| * | | cmd/geth: Added optional debug flag for reprocess blockobscuren2015-06-111-2/+5
| * | | cmd/evm: print trace when running programsobscuren2015-06-111-0/+3
| * | | core/vm: reverse loop stackobscuren2015-06-111-2/+3
| * | | core/vm: fixed a bug where `Data` ignored the stack ptrobscuren2015-06-111-1/+1
| * | | core, core/vm: moved logger and added gas cost to struct loggingobscuren2015-06-114-10/+10
| * | | core/vm: unexported stack again. No longer requiredobscuren2015-06-103-16/+16
| * | | core/vm: documentation and name changesobscuren2015-06-102-18/+34
| * | | cmd/evm: implements vm.Environmentobscuren2015-06-101-0/+7
| * | | miner: update gas used after tx proc for pending blockobscuren2015-06-101-1/+2
| * | | core: log tx count for each set of blocks we're importingobscuren2015-06-101-1/+4
| * | | core/vm, core/state: added storage to structured vm loggingobscuren2015-06-104-9/+39
| * | | core, core/vm: added structure loggingobscuren2015-06-109-149/+104
| * | | core/vm: added structured loggingobscuren2015-06-102-8/+22
| * | | core/vm: changed program counter to uint64obscuren2015-06-102-13/+13
* | | | Merge pull request #1227 from karalabe/block-fetcher-optimisationsJeffrey Wilcke2015-06-111-18/+37
|\ \ \ \
| * | | | eth: dedup fetches to ensure no blocks are pulled twicePéter Szilágyi2015-06-111-5/+23
| * | | | eth: randomly fetch announced block (don't hammer origin)Péter Szilágyi2015-06-111-4/+5
| * | | | eth: discard fetched blocks that don't fit (no goroutine)Péter Szilágyi2015-06-111-13/+13
* | | | | Merge pull request #1224 from karalabe/report-import-progressJeffrey Wilcke2015-06-112-8/+51
|\ \ \ \ \
| * | | | | eth/downloader: fetch the block hashes on the fly, when neededPéter Szilágyi2015-06-111-9/+5
| * | | | | cmd/geth: round the import ETA before converting to stringPéter Szilágyi2015-06-101-1/+1
| * | | | | cmd/geth, eth/downloader: rough guess at the import etaPéter Szilágyi2015-06-102-4/+20
| * | | | | cmd/geth, eth/downloader: collect and report import progress tooPéter Szilágyi2015-06-102-8/+39
* | | | | | Merge pull request #1218 from tgerring/rpcsignJeffrey Wilcke2015-06-111-0/+8
|\ \ \ \ \ \
| * | | | | | Updated testTaylor Gerring2015-06-111-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1223 from obscuren/tx-pool-vroooooomJeffrey Wilcke2015-06-113-41/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | core: fixed race condition for subscriptionsobscuren2015-06-101-2/+1
| * | | | | core: fixed testobscuren2015-06-101-4/+1
| * | | | | core: fixed race condition in the transaction poolobscuren2015-06-102-35/+30
|/ / / / /
* | | | | Merge pull request #1230 from fjl/p2p-discover-fix-ping-testJeffrey Wilcke2015-06-104-48/+49
|\ \ \ \ \
| * | | | | p2p/discover: use separate rand.Source instances in testsFelix Lange2015-06-102-15/+19
| * | | | | p2p/discover: deflake TestUDP_successfulPingFelix Lange2015-06-102-33/+30
|/ / / / /
* | | | | Merge pull request #1222 from obscuren/state-vm-test-suit-fixJeffrey Wilcke2015-06-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | tests: check gas limit errorobscuren2015-06-101-1/+1
| |/ / /
* | | | Merge pull request #1221 from karalabe/fix-p2p-dial-testFelix Lange2015-06-101-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | p2p: fix a close race in the dial testPéter Szilágyi2015-06-101-1/+2
|/ / /
* | | cmd/geth: develop version bump 0.9.29obscuren2015-06-101-1/+1
* | | Merge branch 'release/0.9.28' into developobscuren2015-06-106-25/+46
|\ \ \ | | |/ | |/|
| * | rpc: skip test if solc version doesn't matchobscuren2015-06-101-1/+1
| * | core, xeth: moved nonce management burden from xeth to txpoolobscuren2015-06-104-23/+44
| * | cmd/geth: bumped version number 0.9.28obscuren2015-06-101-1/+1
|/ /
* | Merge pull request #1220 from karalabe/fix-chain-deadlock2Jeffrey Wilcke2015-06-102-6/+18
|\ \
| * | event/filter: hack around data race in the testPéter Szilágyi2015-06-101-1/+6
| * | core: fix a race condition accessing the gas limitPéter Szilágyi2015-06-101-3/+5
| * | core: fix a lock annoyance and potential deadlockPéter Szilágyi2015-06-101-4/+9
|/ /
* | Merge pull request #1212 from fjl/p2p-eth-block-timeoutJeffrey Wilcke2015-06-108-362/+341
|\ \
| * | core, eth: document that result of GetTransactions is modifiableFelix Lange2015-06-092-2/+5
| * | eth/downloader: fix hash fetch timeout handlingFelix Lange2015-06-091-12/+18