aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * p2p: bump global write timeout to 20sFelix Lange2015-06-091-1/+1
| * eth: add protocol testsFelix Lange2015-06-091-336/+190
| * eth: limit number of sent transactions based on message sizeFelix Lange2015-06-092-9/+109
| * eth: limit number of sent blocks based on message sizeFelix Lange2015-06-091-2/+11
| * core/types: add Transaction.SizeFelix Lange2015-06-091-0/+7
|/
* Merge pull request #1213 from karalabe/polish-console-prettyprinterJeffrey Wilcke2015-06-091-11/+28
|\
| * jsre: print function arguments tooPéter Szilágyi2015-06-091-1/+1
| * jsre: sort pretty print output, fields before funcsPéter Szilágyi2015-06-091-3/+20
| * jsre: fix wrong separator comma placing due to non consistent field ordersPéter Szilágyi2015-06-091-7/+7
* | Merge pull request #1219 from Gustav-Simonsson/precompiled_ec_recover_paddingJeffrey Wilcke2015-06-0938-357/+20683
|\ \
| * | Remove unneeded if check on EC recover paddingGustav Simonsson2015-06-091-3/+1
| * | Skip BlockTests/bcValidBlockTests SimpleTx3Gustav Simonsson2015-06-091-1/+3
| * | Pad precompiled EC recover input and add validationsGustav Simonsson2015-06-091-8/+14
| * | Skip VMTests RandomTests temporarily until they are fixedGustav Simonsson2015-06-091-0/+1
| * | Update Ethereum JSON test filesGustav Simonsson2015-06-0935-348/+20667
* | | Merge pull request #1216 from karalabe/fix-eth-dataracesJeffrey Wilcke2015-06-095-38/+85
|\ \ \ | |/ / |/| |
| * | core: fix up a deadlock caused by double lockingPéter Szilágyi2015-06-091-8/+5
| * | p2p: fix close data racePéter Szilágyi2015-06-091-0/+1
| * | core: fix data race accessing ChainManager.currentBlockPéter Szilágyi2015-06-091-1/+4
| * | core: fix data race in accessing ChainManager.tdPéter Szilágyi2015-06-091-9/+8
| * | eth: fix a data race in the hash announcement processingPéter Szilágyi2015-06-091-10/+18
| * | eth: fix data race accessing peer.tdPéter Szilágyi2015-06-093-14/+33
| * | eth: fix data race accessing peer.recentHashPéter Szilágyi2015-06-093-12/+32
* | | Merge pull request #1217 from tgerring/rpcsignJeffrey Wilcke2015-06-092-13/+74
|\ \ \
| * | | Fixed signing + testsTaylor Gerring2015-06-092-13/+74
* | | | skip sol on new compilerobscuren2015-06-091-2/+2
* | | | Merge pull request #1156 from tgerring/issue1145Jeffrey Wilcke2015-06-094-36/+73
|\ \ \ \ | |/ / / |/| | |
| * | | gas -> gaspriceTaylor Gerring2015-06-091-2/+2
| * | | gas -> gaspriceTaylor Gerring2015-06-091-2/+2
| * | | Differentiate between 0 and unspecified gas/gaspriceTaylor Gerring2015-06-094-36/+73
* | | | Merge pull request #1215 from obscuren/issue1202Jeffrey Wilcke2015-06-091-5/+10
|\ \ \ \
| * | | | core: skip genesis block for reprocess. Closes #1202obscuren2015-06-091-5/+10
| | |_|/ | |/| |
* | | | Fixed readme links and descriptionobscuren2015-06-091-2/+4
| |_|/ |/| |
* | | Merge pull request #1188 from karalabe/newblockhashes-proposalJeffrey Wilcke2015-06-094-81/+262
|\ \ \
| * | | eth: clean up pending announce download map, polish logsPéter Szilágyi2015-06-092-14/+26
| * | | eth: split and handle explicitly vs. download requested blocksPéter Szilágyi2015-06-092-23/+81
| * | | eth: fetch announced hashes from origin, periodicallyPéter Szilágyi2015-06-092-32/+80
| * | | eth: mark blocks as known when broadcasting hashes tooPéter Szilágyi2015-06-081-0/+3
| * | | eth: implement the NewBlockHashes protocol proposalPéter Szilágyi2015-06-083-63/+123
* | | | Merge pull request #1153 from karalabe/downloader-banned-starvation-attackJeffrey Wilcke2015-06-096-177/+315
|\ \ \ \ | |_|/ / |/| | |
| * | | eth/downloader: test registration rejection on head banPéter Szilágyi2015-06-081-2/+10
| * | | eth/downloader: reject peer registration if head is bannedPéter Szilágyi2015-06-081-4/+15
| * | | eth/downloader: cap the hash ban set, add test for itPéter Szilágyi2015-06-086-12/+64
| * | | eth/downloader: fix throttling test to be less timing dependentPéter Szilágyi2015-06-081-3/+7
| * | | eth/downloader: fix another rebase errorPéter Szilágyi2015-06-081-2/+1
| * | | eth/downloader: preallocate the block cachePéter Szilágyi2015-06-083-21/+14
| * | | eth/downloader: fix merge compile errorPéter Szilágyi2015-06-081-1/+1
| * | | eth/downloader: don't block hash deliveries while pulling blocksPéter Szilágyi2015-06-081-17/+14
| * | | eth/downloader: update test for shitty travisPéter Szilágyi2015-06-081-1/+1
| * | | eth/downloader: clean up and simplify the code a bitPéter Szilágyi2015-06-081-13/+3
| * | | eth/downloader: short circuit sync if head hash is bannedPéter Szilágyi2015-06-081-0/+4
| * | | eth/downloader: accumulating hash bans for reconnecting attackersPéter Szilágyi2015-06-082-5/+126
| * | | eth/downloader: clean up tests and unused variablesPéter Szilágyi2015-06-082-120/+79
| |/ /
* | | Merge pull request #1211 from obscuren/genesis_writout_fixJeffrey Wilcke2015-06-092-7/+8
|\ \ \ | |_|/ |/| |
| * | core: write accounts to statedb. Closes #1210obscuren2015-06-092-7/+8
|/ /
* | Merge pull request #1193 from tgerring/hotbackupJeffrey Wilcke2015-06-093-5/+55
|\ \
| * | Export should start with block 0Taylor Gerring2015-06-061-1/+1
| * | Improved error checkingTaylor Gerring2015-06-061-3/+7
| * | CleanupTaylor Gerring2015-06-062-3/+2
| * | Allow export command to take first and last argsTaylor Gerring2015-06-062-1/+36
| * | Allow exporting subset of chainTaylor Gerring2015-06-061-2/+14
* | | Merge pull request #1209 from obscuren/txpool_test_and_pending_fixJeffrey Wilcke2015-06-092-1/+24
|\ \ \
| * | | core: added a test for missing noncesobscuren2015-06-092-1/+24
|/ / /
* | | Merge pull request #1199 from obscuren/settable_genesis_nonceJeffrey Wilcke2015-06-099-28/+84
|\ \ \
| * | | core: settable genesis nonceobscuren2015-06-099-28/+84
| | |/ | |/|
* | | Merge pull request #1204 from carver/deep-log-crashfixJeffrey Wilcke2015-06-091-1/+1
|\ \ \
| * | | crash fix: skip deep log if self.chain is not caught upJason Carver2015-06-091-1/+1
|/ / /
* / / Fix blocktestTaylor Gerring2015-06-091-3/+3
|/ /
* | Merge pull request #1198 from fjl/core-fix-nonce-checkJeffrey Wilcke2015-06-084-3/+74
|\ \
| * | core: add bad block for the 'missing nonce check' forkFelix Lange2015-06-081-0/+1
| * | core: fix the nonce check one more timeFelix Lange2015-06-083-3/+73
| |/
* / added ARM buildsJeffrey Wilcke2015-06-061-4/+4
|/
* cmd/geth: version bump 0.9.27obscuren2015-06-051-1/+1
* wipobscuren2015-06-051-2/+10
* Merge pull request #1189 from karalabe/downloader-polishesJeffrey Wilcke2015-06-053-19/+50
|\
| * eth/downloader: differentiate stale and nonexistent deliveriesPéter Szilágyi2015-06-052-19/+46
| * eth/downloader: log hard timeouts and reset capacityPéter Szilágyi2015-06-052-0/+4
* | Merge pull request #1100 from karalabe/drop-sync-peer-on-empty-hashJeffrey Wilcke2015-06-052-3/+3
|\ \ | |/ |/|
| * eth, eth/downloader: fix #1098, elevate empty hash errors to peer dropsPéter Szilágyi2015-06-052-3/+3
|/
* Merge pull request #1185 from fjl/p2p-nat-timeoutsJeffrey Wilcke2015-06-053-4/+10
|\
| * p2p/nat: add timeout for UPnP SOAP requestsFelix Lange2015-06-051-0/+3
| * Godeps: update github.com/huin/goupnp to 5cff77a69fb22f5Felix Lange2015-06-052-4/+7
|/
* Merge pull request #1186 from obscuren/log_fixesJeffrey Wilcke2015-06-051-3/+3
|\
| * tests: use state logs instead own kept logsobscuren2015-06-051-3/+3
|/
* Merge pull request #1181 from obscuren/txpool_fixesJeffrey Wilcke2015-06-0525-347/+390
|\
| * core: added fork test & double nonce testobscuren2015-06-052-20/+75
| * crypto: return common.Address rather than raw bytesobscuren2015-06-053-8/+8
| * core: documented changes in tx poolobscuren2015-06-041-3/+30
| * core: only change the nonce if the account nonce is lowerobscuren2015-06-041-1/+3
| * skipped failing natspec testsobscuren2015-06-042-2/+2
| * core: renamed txs to pendingobscuren2015-06-042-24/+24
| * cmd/geth, common/natspec: updating tests (still failing?)obscuren2015-06-042-2/+2
| * xeth: use the correct nonce for creating transactionsobscuren2015-06-041-3/+2
| * core: test updatesobscuren2015-06-042-2/+1
| * core, eth, miner: moved nonce management to tx pool.obscuren2015-06-046-104/+66
| * cmd/utils, eth: core.NewBlockProcessor no longer needs TxPoolFelix Lange2015-06-042-3/+2
| * core: don't remove transactions after block processingFelix Lange2015-06-044-11/+5
| * core: update documentation comments for TxPoolFelix Lange2015-06-041-22/+25
| * core: remove unused code from TxPoolFelix Lange2015-06-041-41/+13
| * core: compute less transaction hashes in TxPoolFelix Lange2015-06-042-82/+82
| * wipobscuren2015-06-043-10/+69
| * types: block json unmarshal method addedobscuren2015-06-043-6/+30
| * core/vm: cleanup and renamesobscuren2015-06-045-52/+0
* | Merge pull request #1184 from karalabe/nonstop-block-fetchesJeffrey Wilcke2015-06-053-20/+33
|\ \ | |/ |/|
| * eth/downloader: drop log entry from peer, it's covered alreadyPéter Szilágyi2015-06-041-5/+0
| * eth/downloader: log after state updates, easier to debugPéter Szilágyi2015-06-041-5/+3
| * eth/downloader: fix #1178, don't request blocks beyond the cache boundsPéter Szilágyi2015-06-043-15/+35
|/
* Merge pull request #1167 from Gustav-Simonsson/check_ec_recover_errJeffrey Wilcke2015-06-044-18/+25
|\
| * Add missing err checks on From() (skip RPC for now)Gustav Simonsson2015-06-024-18/+25
* | Merge pull request #1151 from fjl/parallel-nonce-2Jeffrey Wilcke2015-06-041-67/+49
|\ \
| * | core: insert less length zero chainsFelix Lange2015-06-011-4/+5
| * | core: re-add parallel nonce checksFelix Lange2015-06-011-63/+44
| |/
* | Merge pull request #1150 from fjl/fix-jumpdestJeffrey Wilcke2015-06-044-30/+173
|\ \
| * | tests/files: update tests to d309b4679a58d2Felix Lange2015-06-033-912/+1386
| * | core/vm: check for 'no code' before doing any workFelix Lange2015-06-031-5/+5
| * | core/vm: improve JUMPDEST analysisFelix Lange2015-06-033-25/+44
| * | Update Ethereum JSON test filesGustav Simonsson2015-05-297-3664/+4028
* | | Merge pull request #1176 from karalabe/congestion-controlJeffrey Wilcke2015-06-035-55/+72
|\ \ \
| * | | eth/downloader: demote peers if they exceed the soft limits at 1 blocks alreadyPéter Szilágyi2015-06-031-3/+8
| * | | eth/downloader: add a basic block download congestion controlPéter Szilágyi2015-06-035-55/+67
* | | | Merge pull request #1166 from Gustav-Simonsson/add_ec_sig_validationsJeffrey Wilcke2015-06-033-22/+31
|\ \ \ \
| * | | | Initialise curve N value in package initGustav Simonsson2015-06-031-1/+3
| * | | | Add EC signature validations before call to libsecp256k1Gustav Simonsson2015-06-023-22/+29
| | |_|/ | |/| |
* | | | Merge pull request #1175 from karalabe/keccak-updateJeffrey Wilcke2015-06-032-173/+409
|\ \ \ \ | |_|/ / |/| | |
| * | | crypto/sha3: pull in latest keccak from go crypto (45% speed increase)Péter Szilágyi2015-06-032-173/+409
|/ / /
* | | Merge pull request #1169 from Gustav-Simonsson/unsupport_brunclesJeffrey Wilcke2015-06-0311-4578/+5558
|\ \ \ | |/ / |/| |
| * | Add new 0th gen uncle testGustav Simonsson2015-06-021-0/+1
| * | Use older version of stSpecialTest until JUMPDEST fix is mergedGustav Simonsson2015-06-021-124/+0
| * | Update Ethereum JSON test filesGustav Simonsson2015-06-022-985/+1250
| * | Unsupport brunclesGustav Simonsson2015-06-021-2/+2
| * | Update Ethereum JSON test filesGustav Simonsson2015-06-029-4574/+5412
|/ /
* | Merge pull request #1161 from tgerring/bootnodeFelix Lange2015-06-011-1/+1
|\ \
| * | Update bootnodeTaylor Gerring2015-06-011-1/+1
|/ /
* | Merge pull request #1155 from karalabe/fix-chainmanager-dataraceFelix Lange2015-05-301-2/+2
|\ \ | |/ |/|
| * core: fix #1154, sort out data race accessing the future blocksPéter Szilágyi2015-05-301-2/+2
* | Merge branch 'release/0.9.26'v0.9.26obscuren2015-05-291-9/+8
|\ \
| * | core: moved guardsobscuren2015-05-291-9/+8
| * | Merge branch 'release/0.9.26' into developobscuren2015-05-291-1/+1
| |\ \
* | \ \ Merge branch 'release/0.9.26'obscuren2015-05-2924-1986/+779
|\ \ \ \ | | |/ / | |/| |
| * | | cmd/geth: bump version v0.9.26obscuren2015-05-281-1/+1
| |/ /
| * | build server fixobscuren2015-05-281-0/+4
| * | Merge pull request #1142 from obscuren/100-pct-block-propJeffrey Wilcke2015-05-281-2/+1
| |\ \
| | * | eth: 100% block propogationobscuren2015-05-281-2/+1
| |/ /
| * | Merge pull request #1140 from Gustav-Simonsson/fix_account_unlock_loggingJeffrey Wilcke2015-05-281-2/+2
| |\ \
| | * | Validate account length and avoid slicing in loggingGustav Simonsson2015-05-281-2/+2
| * | | Merge pull request #1141 from obscuren/parallelisation-issueJeffrey Wilcke2015-05-282-25/+58
| |\ \ \
| | * | | core: added bad blockobscuren2015-05-281-0/+1
| | * | | core: log block hash during nonce errorobscuren2015-05-281-2/+2
| | * | | core: partially removed nonce parallelisation and added merge error chkobscuren2015-05-281-24/+56
| | |/ /
| * | | Merge pull request #1132 from obscuren/log_optimisationsJeffrey Wilcke2015-05-285-33/+124
| |\ \ \ | | |/ / | |/| |
| | * | core: fixed an issue with storing receiptsobscuren2015-05-285-33/+124
| * | | Merge pull request #1137 from obscuren/web3_updateJeffrey Wilcke2015-05-281-1546/+146
| |\ \ \ | | |_|/ | |/| |
| | * | cmd/geth: updated web3obscuren2015-05-281-1546/+146
| * | | Merge pull request #1123 from fjl/lean-blockchain-commandsJeffrey Wilcke2015-05-287-267/+285
| |\ \ \ | | |/ / | |/| |
| | * | cmd/geth: don't flush databases after importFelix Lange2015-05-281-5/+4
| | * | cmd/utils: use constant for import batch sizeFelix Lange2015-05-281-3/+6
| | * | cmd/utils: skip batches with known blocks during importFelix Lange2015-05-281-3/+16
| | * | cmd/geth, cmd/utils: make chain importing interruptibleFelix Lange2015-05-282-10/+39
| | * | cmd/utils: print errors only once if stdout and stderr are the same fileFelix Lange2015-05-281-3/+10
| | * | cmd/geth, cmd/utils: rename utils.Get* -> utils.Make*Felix Lange2015-05-283-16/+21
| | * | p2p/nat: bump timeout in TestAutoDiscRaceFelix Lange2015-05-281-1/+1
| | * | cmd/geth: move blockchain commands to chaincmd.goFelix Lange2015-05-283-147/+167
| | * | cmd/mist: use utils.SetupLoggerFelix Lange2015-05-281-0/+4
| | * | cmd/geth, cmd/utils: don't use Ethereum for import, export and upgradedbFelix Lange2015-05-283-134/+72
| | |/
| * | Merge pull request #1135 from karalabe/tempban-invalid-hashesJeffrey Wilcke2015-05-285-12/+22
| |\ \ | | |/ | |/|
| | * core, eth/downloader: expose the bad hashes, check in downloaderPéter Szilágyi2015-05-285-12/+22
| |/
| * Merge pull request #1128 from karalabe/hard-disconnect-trialJeffrey Wilcke2015-05-281-4/+12
| |\
| | * eth: hard disconnect if a peer is flakyPéter Szilágyi2015-05-271-4/+12
| * | Merge pull request #1129 from obscuren/database_cache_removalJeffrey Wilcke2015-05-283-59/+7
| |\ \
| | * | common, ethdb: removed caching and LastTDobscuren2015-05-282-59/+6
| | * | core: adjust gas calculationobscuren2015-05-271-0/+1
| | |/
| * | Merge pull request #1124 from karalabe/detaied-download-progressJeffrey Wilcke2015-05-281-2/+2
| |\ \ | | |/ | |/|
| | * cmd/geth: expand admin.progress() to something meaningfulPéter Szilágyi2015-05-271-2/+2
| |/
| * Merge pull request #1121 from obscuren/miner_time_fixJeffrey Wilcke2015-05-272-9/+10
| |\
| | * miner: Added 5 blocks wait in prep for #1067obscuren2015-05-271-4/+5
| | * core, miner: fixed miner time issue and removed future blocksobscuren2015-05-272-5/+5
| * | Merge pull request #1112 from fjl/fix-console-exitJeffrey Wilcke2015-05-271-20/+44
| |\ \
| | * | cmd/geth: exit the console cleanly when interruptedFelix Lange2015-05-271-20/+44
| * | | Merge pull request #1122 from Gustav-Simonsson/improve_validate_header_commentsJeffrey Wilcke2015-05-271-4/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Update ValidateHeader commentsGustav Simonsson2015-05-271-4/+2
| * | | 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
| |\ \ \
* | \ \ \ Merge branch 'release/0.9.25'v0.9.25obscuren2015-05-2720-242/+361
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | | Merge branch 'develop'obscuren2015-05-261-6/+16
|\| | | |
| * | | | core: prevent crash when last block failsobscuren2015-05-261-6/+16
| |/ / /
* | | | Merge branch 'develop'v0.9.24obscuren2015-05-2630-1468/+7980
|\| | |
| * | | 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 branch 'develop'obscuren2015-05-260-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'release/0.9.24' into developobscuren2015-05-261-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'release/0.9.24'obscuren2015-05-2624-4606/+6703
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | cmd/geth: bumped version to 0.9.24obscuren2015-05-261-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
| | | |/ | | |/|