aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cmd/geth, trie: report on trie cache unloads, also add debug logPéter Szilágyi2016-10-193-1/+11
* trie: add metric to track cache unloading (#3175)Felix Lange2016-10-192-1/+5
* Merge pull request #3173 from karalabe/parametrized-trie-cache-getPéter Szilágyi2016-10-195-12/+29
|\
| * cmd, core/state: allow configurable trie cache generationsPéter Szilágyi2016-10-195-12/+29
* | trie: make the cache miss counter a real metricFelix Lange2016-10-191-7/+5
|/
* Merge pull request #3168 from benjaminbrent/developJeffrey Wilcke2016-10-191-1/+1
|\
| * core/vm: fix GASPRICE string (resolves #2553)Benjamin Brent2016-10-191-1/+1
* | Merge pull request #3153 from fjl/trie-unload-fixJeffrey Wilcke2016-10-197-70/+130
|\ \
| * | trie: ensure dirty flag is unset for embedded child nodesFelix Lange2016-10-182-32/+42
| * | core/state: bump trie cache values slightlyFelix Lange2016-10-181-4/+4
| * | trie: ensure resolved nodes stay loadedFelix Lange2016-10-186-43/+95
| * | trie: avoid loading the root node twiceFelix Lange2016-10-181-6/+4
* | | Merge pull request #3161 from karalabe/trie-cache-countersPéter Szilágyi2016-10-192-4/+28
|\ \ \ | |_|/ |/| |
| * | cmd/geth, trie: track and report trie cache missesPéter Szilágyi2016-10-192-4/+28
|/ /
* | miner: copy pending state before handing it to callers (#3162)Nick Johnson2016-10-191-1/+1
* | Merge pull request #3156 from holiman/metrics-blocksJeffrey Wilcke2016-10-181-0/+2
|\ \
| * | core: Add block processing time metric collectionMartin Holst Swende2016-10-181-0/+2
* | | Merge pull request #3160 from karalabe/import-database-statsPéter Szilágyi2016-10-181-4/+21
|\ \ \
| * | | cmd/geth: compact and print database stats after an importPéter Szilágyi2016-10-181-4/+21
|/ / /
* | | Merge pull request #3158 from karalabe/pretty-print-importsPéter Szilágyi2016-10-184-19/+71
|\ \ \ | |/ / |/| |
| * | common, core, eth/downloader: adjust import log formattingPéter Szilágyi2016-10-184-19/+71
|/ /
* | Merge pull request #3100 from kobigurk/developFelix Lange2016-10-172-1/+55
|\ \ | |/ |/|
| * internal/ethapi, internal/web3ext: adds raw tx retrieval methodsKobi Gurkan2016-10-102-1/+55
* | Merge pull request #3142 from fjl/trie-sync-fixPéter Szilágyi2016-10-151-0/+2
|\ \
| * | trie: fix regression that linked all downloaded nodes togetherFelix Lange2016-10-151-0/+2
* | | Merge pull request #3141 from obscuren/reprice-block-numberJeffrey Wilcke2016-10-151-1/+1
|\ \ \ | |/ / |/| |
| * | params: set reprice block number to 2463000Jeffrey Wilcke2016-10-151-1/+1
|/ /
* | Merge pull request #3111 from obscuren/gas-price-forkPéter Szilágyi2016-10-1543-67/+77186
|\ \
| * | core, core/vm: added gas price variance tableJeffrey Wilcke2016-10-1543-67/+77186
* | | Merge pull request #3138 from karalabe/txpool-pending-limitsPéter Szilágyi2016-10-152-5/+150
|\ \ \
| * | | core: add global (soft) limits on the pending transactionsPéter Szilágyi2016-10-142-5/+150
* | | | trie, core/state: improve memory usage and performance (#3135)Felix Lange2016-10-1515-142/+249
* | | | Merge pull request #3136 from Arachnid/expvarPéter Szilágyi2016-10-142-2/+9
|\ \ \ \ | |/ / / |/| | |
| * | | metrics, internal/debug: Add --pprofaddr flag, expose metrics via gexpNick Johnson2016-10-142-2/+9
* | | | Merge pull request #3133 from ethersphere/http-fixViktor Trón2016-10-141-5/+8
|\ \ \ \
| * | | | swarm/storage: Allow EOF at the end of the reader in the chunker. Handle the ...Daniel A. Nagy2016-10-141-5/+8
* | | | | Merge pull request #3108 from homotopycolimit/FixChunkerWithBrokenReaderFelix Lange2016-10-144-101/+89
|\| | | | | |/ / / |/| | |
| * | | swarm/storage: fix chunker when reader is brokenaron2016-10-114-101/+89
* | | | Merge pull request #3120 from obscuren/reporter-fixFelix Lange2016-10-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | core: fixed import reporterJeffrey Wilcke2016-10-111-1/+1
|/ / /
* | | Merge pull request #3104 from fjl/core-import-logFelix Lange2016-10-112-12/+43
|\ \ \
| * | | eth: move "timed out DAO fork check, dropping" to debug levelFelix Lange2016-10-081-1/+1
| * | | core: print import stats more oftenFelix Lange2016-10-081-11/+42
| | |/ | |/|
* | | Merge pull request #3117 from fjl/txpool-low-limitFelix Lange2016-10-101-1/+1
|\ \ \ | |/ / |/| |
| * | core: lower transaction pool max queue limitFelix Lange2016-10-101-1/+1
|/ /
* | Merge pull request #3088 from bas-vk/rpc-block-outputFelix Lange2016-10-073-6/+6
|\ \ | |/ |/|
| * core/types: renamed receiptRoot to receiptsRootBas van Kervel2016-10-053-6/+6
* | Merge pull request #3094 from fjl/tests-updateFelix Lange2016-10-06746-65642/+188445
|\ \
| * | tests: update test files from github.com/ethereum/tests @ 45bc1d21d3c1Felix Lange2016-10-06746-65642/+188445
* | | Merge pull request #3092 from fjl/state-journalJeffrey Wilcke2016-10-0627-275/+697
|\ \ \
| * | | core/state: optimize GetStateFelix Lange2016-10-061-5/+7
| * | | core/state: rename Delete/IsDeleted to Suicide/HasSuicidedFelix Lange2016-10-069-32/+35
| * | | core/state: implement reverts by journaling all changesFelix Lange2016-10-0624-250/+667
* | | | Merge pull request #3090 from karalabe/fix-eth-header-indexingJeffrey Wilcke2016-10-062-5/+31
|\ \ \ \
| * | | | eth: monitor malicious header retrieval requestsPéter Szilágyi2016-10-052-5/+31
| | |_|/ | |/| |
* | | | Merge pull request #3089 from bas-vk/resendFelix Lange2016-10-061-4/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | internal/ethapi: bugfix gas price and limit swapped in eth_resendBas van Kervel2016-10-051-4/+3
| |/ /
* | | Merge pull request #3081 from ethernomad/cors-max-agePéter Szilágyi2016-10-051-0/+1
|\ \ \ | |/ / |/| |
| * | rpc: set CORS Max-Age to reduce preflight OPTIONS requestsJonathan Brown2016-10-031-0/+1
| |/
* | Merge pull request #3082 from fjl/build-fix-tag-appveyorFelix Lange2016-10-041-1/+1
|\ \ | |/ |/|
| * internal/build: fix git tag env variable for AppVeyorFelix Lange2016-10-031-1/+1
|/
* Merge pull request #3073 from fjl/build-git17Péter Szilágyi2016-10-031-1/+3
|\
| * internal/build: use less edgy command to get the branch nameFelix Lange2016-10-031-1/+3
|/
* Merge pull request #3072 from karalabe/state-storage-dirtyPéter Szilágyi2016-10-032-18/+24
|\
| * core/state: track dirty state entries for each objectPéter Szilágyi2016-10-032-18/+24
|/
* Merge pull request #3066 from fjl/build-envPéter Szilágyi2016-10-029-132/+250
|\
| * build: improve debian packagingFelix Lange2016-10-029-132/+250
* | Merge pull request #3068 from fjl/update-sha3Felix Lange2016-10-026-3/+410
|\ \
| * | crypto/sha3: update from golang.org/x/crypto/sha3 a 80b25ed4Felix Lange2016-10-026-3/+410
|/ /
* | Merge pull request #3067 from karalabe/vm-avoid-hashingPéter Szilágyi2016-10-0117-37/+59
|\ \ | |/ |/|
| * cmd, core, internal, light, tests: avoid hashing the code in the VMPéter Szilágyi2016-10-0117-37/+59
|/
* Merge pull request #3062 from fjl/trie-delete-bugPéter Szilágyi2016-09-302-38/+133
|\
| * trie: fix delete bug for values contained in fullNodeFelix Lange2016-09-302-35/+127
| * trie: remove dependency on package cryptoFelix Lange2016-09-301-3/+6
* | Merge pull request #3032 from Gustav-Simonsson/keystore_paddingFelix Lange2016-09-303-1/+62
|\ \
| * | accounts: left pad keybytes-to-encrypt, add 30/31 byte keys testsGustav Simonsson2016-09-283-1/+62
* | | Merge pull request #2914 from fjl/node-coinhabitFelix Lange2016-09-2919-239/+470
|\ \ \ | |_|/ |/| |
| * | common, node: move datadir defaults into package nodeFelix Lange2016-09-167-49/+43
| * | node: ensure datadir can be co-inhabited by different instancesFelix Lange2016-09-1614-186/+422
| * | ethdb: add accessor for database directoryFelix Lange2016-09-161-0/+5
| * | p2p/nat: delay auto discovery until first useFelix Lange2016-09-161-5/+1
* | | Merge pull request #3048 from sandakersmann/patch-2Péter Szilágyi2016-09-291-5/+5
|\ \ \
| * | | README: Changed http:// to https:// on some linkssandakersmann2016-09-271-5/+5
| | |/ | |/|
* | | p2p/nat: fix parameter order for AddMappingken101001472016-09-281-2/+2
* | | Merge pull request #3053 from karalabe/fjl-state-trie-journalPéter Szilágyi2016-09-2822-671/+562
|\ \ \ | |/ / |/| |
| * | core, eth, trie: reuse trie journals in all our codePéter Szilágyi2016-09-289-25/+151
| * | core, trie: replace state caches with trie journalFelix Lange2016-09-2815-654/+419
|/ /
* | Merge pull request #3043 from fjl/windows-fix-fatalfFelix Lange2016-09-271-4/+11
|\ \
| * | cmd/utils: don't check for stderr redirect on windowsFelix Lange2016-09-261-4/+11
|/ /
* | Merge pull request #3041 from fjl/build-less-parallelPéter Szilágyi2016-09-262-3/+3
|\ \
| * | travis.yml: remove go 1.4 builderFelix Lange2016-09-261-3/+0
| * | build: limit test concurrencyFelix Lange2016-09-261-0/+3
* | | Merge pull request #3040 from karalabe/dummyPéter Szilágyi2016-09-261-1/+1
|\ \ \ | |/ / |/| |
| * | accounts/abi: fix typo in the comment (dummy commit)Péter Szilágyi2016-09-261-1/+1
|/ /
* | Merge pull request #3037 from karalabe/state-cachingPéter Szilágyi2016-09-2617-336/+414
|\ \
| * | core/state: track all accounts in canon stateFelix Lange2016-09-2617-336/+414
|/ /
* | Merge pull request #3035 from Gustav-Simonsson/zero_value_transfer_noopPéter Szilágyi2016-09-261-0/+6
|\ \
| * | core/state: short-circuit balance change if zero valueGustav Simonsson2016-09-261-0/+6
|/ /
* | Merge pull request #3009 from Gustav-Simonsson/fix_oom_in_lightFelix Lange2016-09-222-2/+4
|\ \
| * | light: fix memory expansion bug (same as fix for core/state)Gustav Simonsson2016-09-202-2/+4
* | | Merge pull request #3021 from bas-vk/ethclient-logsFelix Lange2016-09-211-2/+2
|\ \ \ | |/ / |/| |
| * | ethclient: bugfix retrieving logsBas van Kervel2016-09-211-2/+2
|/ /
* | Merge pull request #3010 from Gustav-Simonsson/remove_unused_initcode_fieldFelix Lange2016-09-193-9/+0
|\ \
| * | core/state, light: remove unused StateObject.initCodeGustav Simonsson2016-09-193-9/+0
|/ /
* | Merge pull request #3006 from Arachnid/patchPéter Szilágyi2016-09-193-5/+8
|\ \ | |/ |/|
| * core/state: Fix memory expansion bug by not copying clean objectsNick Johnson2016-09-193-5/+8
* | Merge pull request #2999 from karalabe/bury-blockchain-versionPéter Szilágyi2016-09-154-12/+3
|\ \
| * | cmd, eth: drop the blockchain version from cli/eth configsPéter Szilágyi2016-09-154-12/+3
|/ /
* | Merge pull request #2983 from bas-vk/txindexFelix Lange2016-09-151-1/+2
|\ \
| * | miner: set tx index logsBas van Kervel2016-09-121-1/+2
* | | Merge pull request #2973 from bas-vk/filteridPéter Szilágyi2016-09-122-1/+53
|\ \ \
| * | | rpc: format filter ID according to spec for quantitiesBas van Kervel2016-09-012-1/+53
* | | | Merge pull request #2984 from karalabe/fix-head-subbas-vk2016-09-095-1/+132
|\ \ \ \ | |_|/ / |/| | |
| * | | core/types: add core type marshal methods tooPéter Szilágyi2016-09-084-0/+131
| * | | ethclient: fix new block->header subscription endpointPéter Szilágyi2016-09-081-1/+1
|/ / /
* | | Merge pull request #2979 from karalabe/ethclient-sync-apiPéter Szilágyi2016-09-067-55/+105
|\ \ \
| * | | ethereum, ethclient: add SyncProgress API endpointPéter Szilágyi2016-09-067-55/+105
|/ / /
* | | Merge pull request #2976 from fjl/utils-versionFelix Lange2016-09-057-76/+124
|\ \ \
| * | | cmd/geth: fix port clash in genesis testFelix Lange2016-09-051-1/+4
| * | | cmd/evm, cmd/geth, cmd/utils: move version handling to cmd/utilsFelix Lange2016-09-056-75/+120
|/ / /
* | | Merge pull request #2949 from elliots/fix/#2948Péter Szilágyi2016-09-021-12/+4
|\ \ \
| * | | miner: Move CpuAgent channel creation from Start() to initialization (fixes #...☃ Elliot Shepherd2016-08-251-12/+4
* | | | Merge pull request #2742 from karalabe/tx-spam-protectionJeffrey Wilcke2016-09-0215-553/+1146
|\ \ \ \
| * | | | core: abstract out a sorted transaction hash mapPéter Szilágyi2016-09-024-222/+229
| * | | | core: add upper bound on the queued transctionsPéter Szilágyi2016-09-023-33/+203
| * | | | core/types, miner: switch over to the grouped tx setsPéter Szilágyi2016-09-023-119/+98
| * | | | core, eth, internal, miner: optimize txpool for quick opsPéter Szilágyi2016-09-0214-426/+788
| * | | | core, eth, miner: only retain 1 tx/nonce, remove bad onesPéter Szilágyi2016-09-026-207/+282
|/ / / /
* | | | Merge pull request #2972 from Arachnid/ensFelix Lange2016-09-012-5/+26
|\ \ \ \
| * | | | contracts/ens: Replace setOwner with setSubnodeOwner in accordance with EIP137Nick Johnson2016-09-012-5/+26
* | | | | Merge pull request #2965 from fjl/swarm-mergeFelix Lange2016-09-0151-13/+10805
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | swarm: plan bee for content storage and distribution on web3ΞTHΞЯSPHΞЯΞ2016-08-3151-13/+10805
| |/ / /
* | | | Merge pull request #2918 from hypergig/patch-2Felix Lange2016-09-011-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | README: docker run exampleJordan Cohen2016-08-191-0/+12
* | | | Merge pull request #2962 from fjl/release-moveFelix Lange2016-08-318-24/+8
|\ \ \ \
| * | | | contracts/release: move package release to contracts/Felix Lange2016-08-308-24/+8
* | | | | Merge pull request #2963 from fjl/ens-solc-0.3.6Felix Lange2016-08-313-12/+12
|\ \ \ \ \
| * | | | | contracts/ens: regenerate binding with solc v0.3.6Felix Lange2016-08-303-12/+12
| |/ / / /
* | | | | Merge pull request #2964 from nagydani/developFelix Lange2016-08-315-39/+11
|\ \ \ \ \
| * | | | | contracts/chequebook/contract: fix possible reentrancy bug in chequebook.solDaniel A. Nagy2016-08-315-39/+11
|/ / / / /
* | | | | Merge pull request #2967 from fjl/godeps-updateFelix Lange2016-08-30118-52135/+18832
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Godeps: update golang.org/x/...Felix Lange2016-08-30118-52135/+18832
|/ / / /
* | | | Merge pull request #2952 from Arachnid/ensFelix Lange2016-08-306-0/+1393
|\ \ \ \
| * | | | contracts/ens: Add ENS contract bindingNick Johnson2016-08-306-0/+1393
* | | | | Merge pull request #2956 from fjl/chequebookFelix Lange2016-08-297-0/+1930
|\ \ \ \ \
| * | | | | contracts/chequebook: add chequebook contract wrapperViktor Trón2016-08-297-0/+1930
| |/ / / /
* / / / / common,internal: typo/misspelling fixes (#2953)gregg dourgarian2016-08-272-9/+9
|/ / / /
* | | | Merge pull request #2930 from fjl/ethclientPéter Szilágyi2016-08-2525-558/+1716
|\ \ \ \ | |_|/ / |/| | |
| * | | accounts/abi/bind: add utilities for waiting on transactionsFelix Lange2016-08-234-15/+267
| * | | accounts/abi/bind: use ethereum interfacesFelix Lange2016-08-224-220/+204
| * | | accounts/abi/bind/backends: remove nil and remote backendsFelix Lange2016-08-214-203/+10
| * | | ethclient: add initial implementation of the typed RPC clientFelix Lange2016-08-102-0/+399
| * | | ethereum: add new Go API interfacesFelix Lange2016-08-051-0/+168
| * | | internal/ethapi: add missing output fieldsFelix Lange2016-08-043-24/+85
| * | | core/types, core/vm: improve docs, add JSON marshaling methodsFelix Lange2016-08-048-99/+589
| * | | eth: don't call ValidateFieldsFelix Lange2016-08-041-3/+0
|/ / /
* | | Merge pull request #2943 from Arachnid/tracingFelix Lange2016-08-252-6/+23
|\ \ \
| * | | internal/ethapi: Fix bug in opCodeWrapper usageNick Johnson2016-08-242-6/+23
|/ / /
* | | Merge pull request #2941 from Arachnid/tracingFelix Lange2016-08-242-11/+26
|\ \ \
| * | | internal/ethapi: Improve tracer error reporting and serializationNick Johnson2016-08-242-11/+26
|/ / /
* | | eth/fetcher: small typo fix (#2932)Stein Dekker2016-08-231-1/+1
* | | Merge pull request #2929 from Arachnid/tracingPéter Szilágyi2016-08-236-18/+551
|\ \ \
| * | | core/vm, eth: Add support for javascript trace functionsNick Johnson2016-08-236-18/+551
* | | | cmd/geth: set correct initial nonce on testnet for import/init subcommands (#...Hellsegga2016-08-232-0/+8
* | | | Merge pull request #2928 from obscuren/remove-dao-messageFelix Lange2016-08-221-17/+0
|\ \ \ \ | |/ / / |/| | |
| * | | cmd/utils: removed DAO oppose / support messageJeffrey Wilcke2016-08-221-17/+0
| |/ /
* | | Merge pull request #2927 from obscuren/licensePéter Szilágyi2016-08-222-0/+25
|\ \ \
| * | | cmd/geth: added copyright and license informationJeffrey Wilcke2016-08-222-0/+25
| |/ /
* | | Merge pull request #2923 from Arachnid/tracingPéter Szilágyi2016-08-2216-282/+162
|\ \ \
| * | | core/vm: Refactor tracing to make Tracer the main interfaceNick Johnson2016-08-2216-282/+162
| |/ /
* | | Merge pull request #2921 from karalabe/fix-fetcher-logPéter Szilágyi2016-08-191-1/+1
|\ \ \ | |/ / |/| |
| * | eth/fetcher: fix a log message formatting issuePéter Szilágyi2016-08-191-1/+1
|/ /
* | Merge pull request #2909 from fjl/account-manager-cleanupFelix Lange2016-08-1822-496/+462
|\ \
| * | core, miner: move Backend to minerFelix Lange2016-08-173-22/+24
| * | common/compiler: simplify solc wrapperFelix Lange2016-08-178-254/+225
| * | eth: remove dapp database remainsFelix Lange2016-08-173-25/+6
| * | cmd/utils, node: create account manager in package nodeFelix Lange2016-08-1711-195/+207
* | | Merge pull request #2885 from bas-vk/subscriptionsFelix Lange2016-08-1715-1216/+1265
|\ \ \
| * | | rpc: refactor subscriptions and filtersBas van Kervel2016-08-1715-1216/+1265
|/ / /
* | | Merge pull request #2913 from karalabe/travis-go-1.7Nick Johnson2016-08-171-2/+5
|\ \ \
| * | | TravisCI: add Go 1.7 targets, bump PPA to 1.7 tooPéter Szilágyi2016-08-171-2/+5
|/ / /
* | | Merge pull request #2873 from bas-vk/canonicalblockFelix Lange2016-08-175-20/+69
|\ \ \
| * | | core: ensure the canonical block is written before the canonical hash is setBas van Kervel2016-08-165-20/+69
|/ / /
* | | Makefile: support building for the MIPS64 platforms (#2682)Péter Szilágyi2016-08-161-2/+12
* | | Merge pull request #2866 from karalabe/downloader-future-ancestorsPéter Szilágyi2016-08-161-9/+17
|\ \ \
| * | | eth/downloader: fewer headers and futures too un ancestor lookupPéter Szilágyi2016-07-261-9/+17
* | | | console: fix return via callbacks (#2910)cdetrio2016-08-161-2/+2
| |/ / |/| |
* | | Merge pull request #2891 from fjl/rpc-client-fixesPéter Szilágyi2016-08-094-62/+158
|\ \ \
| * | | rpc: add context argument to EthSubscribeFelix Lange2016-08-063-33/+38
| * | | rpc: ensure client doesn't block for slow subscribersFelix Lange2016-08-063-30/+117
| * | | rpc: don't exceed context deadline while waiting for send lockFelix Lange2016-08-051-0/+4
* | | | Merge pull request #2868 from karalabe/downloader-abort-master-dropPéter Szilágyi2016-08-091-2/+15
|\ \ \ \
| * | | | eth/downloader: abort sync if master drops (timeout prev)Péter Szilágyi2016-07-261-2/+15
| | |/ / | |/| |
* | | | Merge pull request #2867 from karalabe/dao-challenge-finishPéter Szilágyi2016-08-092-1/+2
|\ \ \ \
| * | | | eth, eth/downloader: don't forward the DAO challenge headerPéter Szilágyi2016-07-262-1/+2
| |/ / /
* | | | Merge pull request #2861 from karalabe/track-peer-heads-properlyPéter Szilágyi2016-08-096-50/+59
|\ \ \ \
| * | | | eth, eth/downloader: better remote head trackingPéter Szilágyi2016-07-256-50/+59
* | | | | Merge pull request #2896 from karalabe/fix-xgo-crossbuildsFelix Lange2016-08-093-50/+57
|\ \ \ \ \
| * | | | | Makefile, build: move cross compilation into ci.goPéter Szilágyi2016-08-083-50/+57
|/ / / / /
* | | | | Merge pull request #2892 from fjl/vm-hide-ecrecover-messageFelix Lange2016-08-061-2/+2
|\ \ \ \ \
| * | | | | core/vm: hide ecrecover error messageFelix Lange2016-08-061-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #2889 from fjl/godeps-update-notifyFelix Lange2016-08-064-5/+3
|\ \ \ \ \
| * | | | | Godeps: update github.com/rjeczalik/notify to f627deca7a51Felix Lange2016-08-054-5/+3
| |/ / / /
* | | | | Merge pull request #2740 from Firescar96/removepeerFelix Lange2016-07-295-0/+48
|\ \ \ \ \
| * | | | | node, p2p, internal: Add ability to remove peers via admin interfaceFirescar962016-07-155-0/+48
* | | | | | Merge pull request #2870 from lukeyeager/patch-1Péter Szilágyi2016-07-271-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | README: Fix typoLuke Yeager2016-07-271-1/+1
|/ / / / /
* | | | | Merge pull request #2862 from yep/faster-git-clonePéter Szilágyi2016-07-262-11/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | containers/docker: whitespace changes only, make future diffs more readableyep2016-07-252-8/+8
| * | | | containers/docker: use shallow clone of single branchyep2016-07-252-3/+2
|/ / / /
* | | | Merge pull request #2855 from karalabe/downloader-fix-stall-dropFelix Lange2016-07-251-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | eth/downloader: fix the stall checks/drops during syncPéter Szilágyi2016-07-221-1/+8
* | | | Merge pull request #2808 from fjl/rpc-client-3bas-vk2016-07-2530-769/+2021
|\ \ \ \
| * | | | rpc: add new client, use it everywhereFelix Lange2016-07-2330-751/+2002
| * | | | rpc: fix bad method error for batch requestsFelix Lange2016-07-233-9/+15
| * | | | rpc: remove grace period when shutting down the serverFelix Lange2016-07-231-10/+5
| |/ / /
* | | | Merge pull request #2842 from fjl/downloader-remove-eth61Felix Lange2016-07-2315-1524/+119
|\ \ \ \ | |/ / / |/| | |
| * | | eth, eth/downloader, eth/fetcher: delete eth/61 codeFelix Lange2016-07-2215-1524/+119
* | | | Merge pull request #2712 from bas-vk/sendtxPéter Szilágyi2016-07-222-4/+10
|\ \ \ \
| * | | | eth/api: rename signAndSendTransaction to sendTransactionBas van Kervel2016-07-222-4/+10
|/ / / /
* | | | Merge pull request #2851 from yep/alpine-3-4Péter Szilágyi2016-07-222-2/+2
|\ \ \ \
| * | | | containers/docker: update to alpine 3.4yep2016-07-222-2/+2
* | | | | Merge pull request #2833 from karalabe/fix-dao-challenge-annoyancePéter Szilágyi2016-07-221-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | eth: cancel DAO challenge on peer drop (annoying log)Péter Szilágyi2016-07-191-0/+7
| |/ / /
* | | | Merge pull request #2836 from fjl/godeps-update-leveldbPéter Szilágyi2016-07-205-28/+63
|\ \ \ \
| * | | | Godeps: bump github.com/syndtr/goleveldb/... to ab8b5dcf104Felix Lange2016-07-205-28/+63
| |/ / /
* | | | Merge pull request #2711 from hdiedrich/1.4.7-filter-races-cleanupFelix Lange2016-07-202-28/+54
|\ \ \ \
| * | | | eth: fix #2710 filter racesHenning Diedrich2016-07-042-28/+54
* | | | | Merge pull request #2821 from Arachnid/discover-enodeFelix Lange2016-07-201-12/+16
|\ \ \ \ \
| * | | | | cmd/bootnode: Add support for outputting a node's ID on the command lineNick Johnson2016-07-151-12/+16
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2834 from zsfelfoldi/chaindb-upgrade-fixPéter Szilágyi2016-07-191-0/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | eth: fixed chaindb upgradezsfelfoldi2016-07-191-0/+13
|/ / / /
* | | | Merge pull request #2814 from karalabe/dao-hard-finalcomboJeffrey Wilcke2016-07-1635-124/+9888
|\ \ \ \
| * | | | cmd/utils, eth: display the user's current fork, minor text tweakPéter Szilágyi2016-07-162-1/+20
| * | | | cmd, core, eth, miner, params, tests: finalize the DAO forkPéter Szilágyi2016-07-1512-414/+7519
| * | | | accounts, core, eth: pass chain config for chain maker to test DAOPéter Szilágyi2016-07-1516-132/+181
| * | | | core, params, tests: add DAO hard-fork balance movesPéter Szilágyi2016-07-1510-42/+2011
| * | | | core, eth: enforce network split post DAO hard-forkPéter Szilágyi2016-07-154-7/+141
| * | | | cmd, core, miner: add extradata validation to consensus rulesPéter Szilágyi2016-07-157-216/+275
| * | | | cmd/geth, miner, params: special extradata for DAO fork startPéter Szilágyi2016-07-153-6/+22
| * | | | core: gracefully handle missing homestead block configPéter Szilágyi2016-07-152-1/+106
| * | | | cmd, core, eth, params: implement flags to control dao fork blocksPéter Szilágyi2016-07-157-46/+354
|/ / / /
* | | | Merge pull request #2823 from karalabe/circleci-hivePéter Szilágyi2016-07-151-0/+32
|\ \ \ \
| * | | | circleci: enable docker based hive testingPéter Szilágyi2016-07-151-0/+32
* | | | | Merge pull request #2724 from pirapira/fix_reset_feesPéter Szilágyi2016-07-152-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | vm: Replace some SstoreClearGas with SstoreResetGasYoichi Hirai2016-06-222-2/+2
| | |/ / | |/| |
* | | | Merge pull request #2819 from fjl/rpc-back-to-npipeFelix Lange2016-07-1528-2333/+1555
|\ \ \ \
| * | | | Godeps: update golang.org/x/net/...Felix Lange2016-07-159-486/+381
| * | | | Godeps, rpc: switch back to package npipeFelix Lange2016-07-1520-1847/+1174
|/ / / /
* | / / appveyor.yml: don't install Go and MinGW, they're already there (#2813)Felix Lange2016-07-141-11/+13
| |/ / |/| |