aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* eth/downloader: Doc fixesNick Johnson2017-07-052-3/+7
* eth/downloader, les, light: Changes in response to reviewNick Johnson2017-07-035-51/+52
* eth, les: Refactor downloader peer to use structsNick Johnson2017-06-297-300/+319
* eth, les, light: Refactor downloader to use blockchain interfaceNick Johnson2017-06-286-146/+134
* Merge pull request #14718 from holiman/gascalc_fixPéter Szilágyi2017-06-282-17/+17
|\
| * core/vm : fix testcase for gas calculationMartin Holst Swende2017-06-281-11/+7
| * core/vm: fix overflow in gas calculation formulaMartin Holst Swende2017-06-281-6/+10
* | core/vm: add benchmarks for some ops and precompiles (#14641)Martin Holst Swende2017-06-281-0/+242
|/
* core/state: access trie through Database interface, track errors (#14589)Felix Lange2017-06-2749-1663/+809
* Merge pull request #14686 from fjl/hexutil-json-type-errorPéter Szilágyi2017-06-275-59/+102
|\
| * common/hexutil: wrap errors in json.UnmarshalTypeErrorFelix Lange2017-06-275-59/+102
* | accounts/abi: reorganizing package with small fixes (#14610)RJ Catalano2017-06-2713-1085/+1487
* | build: fix devel golang detection on debian/ubuntu (#14711)Addy Yeow2017-06-271-1/+1
* | Merge pull request #14690 from karalabe/faucet-key-reusePéter Szilágyi2017-06-261-2/+1
|\ \
| * | cmd/puppeth: fix key reuse during faucet deploysPéter Szilágyi2017-06-231-2/+1
* | | Merge pull request #14540 from bas-vk/whisper-apiPéter Szilágyi2017-06-2631-1217/+1664
|\ \ \
| * | | cmd/geth: fix whisper flag group capitalizationPéter Szilágyi2017-06-261-1/+1
| * | | whisper: renamed Info#Message to Info#MessagesBas van Kervel2017-06-231-2/+2
| * | | whisper: use hexutil.UnmarshalFixedText for topic parsingBas van Kervel2017-06-213-34/+27
| * | | whisper: use syncmap for dynamic configuration optionsBas van Kervel2017-06-215-43/+445
| * | | whisper: move flags from whisper package to utilsBas van Kervel2017-06-215-37/+34
| * | | whisper: renamed errorsBas van Kervel2017-06-213-25/+25
| * | | whisper: fallback to default config if none is specifiedBas van Kervel2017-06-211-0/+4
| * | | whisper: remove obsolete api testsBas van Kervel2017-06-211-672/+0
| * | | whisper: remove gencodec override for configBas van Kervel2017-06-212-34/+0
| * | | whisper: move ShhClient to its own packageBas van Kervel2017-06-211-9/+10
| * | | whisperv5: integrate whisper and add whisper RPC simulatorBas van Kervel2017-06-1527-524/+1280
* | | | Merge pull request #14687 from markya0616/unused_eventsPéter Szilágyi2017-06-261-16/+0
|\ \ \ \
| * | | | core: remove unused eventsmark.lin2017-06-231-16/+0
* | | | | rpc: fix closure problem in batch processing (#14688)bloonfield2017-06-261-2/+2
* | | | | Merge pull request #14697 from homotopycolimit/masterPéter Szilágyi2017-06-261-1/+1
|\ \ \ \ \
| * | | | | swarm/storage: remove panic on invalid chunkaron2017-06-251-1/+1
| | |_|/ / | |/| | |
* | | | | Makefile: add make swarm command (#14698)Aron2017-06-261-1/+6
* | | | | Update README.md (#14701)G. Kay Lee2017-06-261-1/+1
|/ / / /
* | | | params, VERSION: 1.6.7 unstableFelix Lange2017-06-232-5/+5
* | | | params: 1.6.6 stablev1.6.6Felix Lange2017-06-231-4/+4
* | | | Merge pull request #14596 from markya0616/valid_clique_votePéter Szilágyi2017-06-232-10/+23
|\ \ \ \
| * | | | consensus/clique: minor cleanupsPéter Szilágyi2017-06-231-6/+7
| * | | | consensus/clique: choose valid votesmark.lin2017-06-142-11/+23
* | | | | Merge pull request #14685 from karalabe/ethdb-metrics-fail-fixPéter Szilágyi2017-06-232-2/+9
|\ \ \ \ \
| * | | | | node: don't return non-nil database on errorFelix Lange2017-06-231-1/+5
| * | | | | eth: gracefully error if database cannot be openedPéter Szilágyi2017-06-231-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #14681 from fjl/build-fixupPéter Szilágyi2017-06-232-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | travis.yml: add fakeroot to launchpad builderFelix Lange2017-06-231-0/+1
| * | | | cmd/swarm: disable TestCLISwarmUp because it's flakyFelix Lange2017-06-231-0/+2
|/ / / /
* | | | Merge pull request #14673 from holiman/txfixPéter Szilágyi2017-06-233-42/+200
|\ \ \ \
| * | | | core: ensure transactions correctly drop on pool limitingPéter Szilágyi2017-06-233-88/+167
| * | | | core: add testcase for txpoolMartin Holst Swende2017-06-232-0/+79
* | | | | Merge pull request #14677 from karalabe/miner-cli-gaspricePéter Szilágyi2017-06-221-0/+4
|\ \ \ \ \
| * | | | | cmd/geth: corrently init gas price for CLI CPU miningPéter Szilágyi2017-06-221-0/+4
| |/ / / /
* / / / / eth/downloader: separate state sync from queue (#14460)Felix Lange2017-06-229-479/+769
|/ / / /
* | | | Merge pull request #14657 from markya0616/refactor_cliquePéter Szilágyi2017-06-211-8/+7
|\ \ \ \
| * | | | consensus/clique: fix typo and don't add snapshot into recents againmark.lin2017-06-201-8/+7
| | |/ / | |/| |
* | | | swarm/test: add integration test for 'swarm up' (#14353)Lewis Marshall2017-06-2117-293/+1048
* | | | README: document new config file option (#14348)Maximilian Meister2017-06-211-0/+16
* | | | cmd/evm, core/vm: add --nomemory, --nostack to evm (#14617)Martin Holst Swende2017-06-215-47/+68
* | | | Merge pull request #14667 from fjl/swarm-fuse-cleanupPéter Szilágyi2017-06-213-206/+132
|\ \ \ \
| * | | | swarm/fuse: use subtestsFelix Lange2017-06-211-171/+112
| * | | | swarm/fuse: simplify externalUnmountFelix Lange2017-06-212-35/+20
* | | | | les: code refactoring (#14416)Felföldi Zsolt2017-06-2115-441/+699
* | | | | ethclient: fix TransactionByHash pending return value. (#14663)Jim McDonald2017-06-211-2/+2
|/ / / /
* / / / trie: more node iterator improvements (#14615)Felix Lange2017-06-217-172/+288
|/ / /
* | | Merge pull request #14635 from necaremus/patch-1Péter Szilágyi2017-06-161-1/+1
|\ \ \
| * | | cmd/geth: fixed a minor typo in the commentsnecaremus2017-06-161-1/+1
|/ / /
* | | eth: remove les server from protocol manager (#14625)Alan Chen2017-06-152-3/+0
* | | Merge pull request #14581 from holiman/byte_optPéter Szilágyi2017-06-134-8/+174
|\ \ \
| * | | core/vm, common/math: Add doc about Byte, fix formatMartin Holst Swende2017-06-093-16/+20
| * | | common/math, core/vm: Un-expose bigEndianByteAt, use correct terms for endian...Martin Holst Swende2017-06-073-18/+19
| * | | core/vm, common/math: Add fast getByte for bigints, improve opByteMartin Holst Swende2017-06-054-8/+169
| |/ /
* | | Merge pull request #14604 from bas-vk/mobile-getfromPéter Szilágyi2017-06-132-2/+34
|\ \ \
| * | | mobile: add a regression test for signer recoveryPéter Szilágyi2017-06-131-0/+29
| * | | mobile: use EIP155 signer for determining senderBas van Kervel2017-06-131-2/+5
| | |/ | |/|
* | | rlp, trie, contracts, compression, consensus: improve comments (#14580)S. Matthew English2017-06-1223-179/+44
* | | Merge pull request #14598 from konradkonrad/fix_makedagPéter Szilágyi2017-06-121-2/+2
|\ \ \ | |/ / |/| |
| * | consensus: Fix `makedag` epochKonrad Feldmeier2017-06-121-2/+2
|/ /
* | cmd/evm: add --prestate, --sender, --json flags for fuzzing (#14476)Martin Holst Swende2017-06-078-35/+295
* | core/types: use Header.Hash for block hashes (#14587)bailantaotao2017-06-071-1/+1
* | cmd/swarm: fix error handling in 'swarm up' (#14557)Lewis Marshall2017-06-061-13/+22
* | Merge pull request #14583 from ethersphere/core-log-fixesPéter Szilágyi2017-06-061-1/+1
|\ \
| * | core: Fix VM error loggingLewis Marshall2017-06-061-1/+1
| |/
* / accounts: fix spelling error (#14567)FaceHo2017-06-061-1/+1
|/
* VERSION, params: begin Geth 1.6.6 release cyclePéter Szilágyi2017-06-022-5/+5
* params: mark Geth v1.6.5 stable (Hat Trick)v1.6.5Péter Szilágyi2017-06-021-4/+4
* Merge pull request #14570 from Arachnid/jumpdestanalysisPéter Szilágyi2017-06-021-14/+12
|\
| * core/vm: Use a bitmap instead of a map for jumpdest analysisNick Johnson2017-06-021-14/+12
|/
* VERSION, params: begin geth 1.6.5 cyclePéter Szilágyi2017-06-012-5/+5
* params: Geth 1.6.4 stable (hotfix)v1.6.4Péter Szilágyi2017-06-011-4/+4
* internal/ethapi: initialize account mutex in lock properlyMartin Holst Swende2017-06-011-2/+3
* swarm/dev: add development environment (#14332)Lewis Marshall2017-06-0111-0/+726
* VERSION, params: begin Geth 1.6.4 release cyclePéter Szilágyi2017-06-012-5/+5
* params: release Geth 1.6.3 - Covfefev1.6.3Péter Szilágyi2017-06-011-4/+4
* Merge pull request #14565 from karalabe/relax-privkey-checksPéter Szilágyi2017-06-014-17/+25
|\
| * accounts/keystore, crypto: don't enforce key checks on existing keyfilesPéter Szilágyi2017-06-014-17/+25
* | Merge pull request #14561 from karalabe/txpool-perf-fixPéter Szilágyi2017-06-012-32/+35
|\ \
| * | core: only reorg changed account, not allPéter Szilágyi2017-06-012-21/+35
| * | core: don't uselessly recheck transactions on dumpPéter Szilágyi2017-06-011-19/+8
| |/
* | Merge pull request #14563 from karalabe/ethstats-reduce-traffic-2Péter Szilágyi2017-06-011-22/+51
|\ \
| * | ethstats: reduce ethstats traffic by trottling reportsPéter Szilágyi2017-06-011-22/+51
| |/
* | Merge pull request #14564 from karalabe/fix-1.6-dockerPéter Szilágyi2017-06-011-1/+1
|\ \ | |/ |/|
| * cotnainers/docker: fix the legacy alpine image before droppingPéter Szilágyi2017-06-011-1/+1
|/
* params, VERSION: 1.6.3 unstableFelix Lange2017-05-312-5/+5
* params: 1.6.2 stablev1.6.2Felix Lange2017-05-311-4/+4
* Merge pull request #14516 from holiman/noncefixesPéter Szilágyi2017-05-304-37/+93
|\
| * internal/ethapi: add mutex around signing + nonce assignmentMartin Holst Swende2017-05-304-37/+93
* | Merge pull request #14553 from karalabe/puppeth-key-checkPéter Szilágyi2017-05-302-3/+2
|\ \
| * | cmd/puppeth: fix improper key validation for remotesPéter Szilágyi2017-05-302-3/+2
* | | Merge pull request #14547 from karalabe/txpool-gas-decreasePéter Szilágyi2017-05-303-31/+72
|\ \ \ | |/ / |/| |
| * | core: check for gas limit exceeding txs too on new blockPéter Szilágyi2017-05-303-31/+72
* | | Merge pull request #14545 from karalabe/clique-cache-signaturesPéter Szilágyi2017-05-302-23/+34
|\ \ \
| * | | consensus/clique: cache block signatures for fast checksPéter Szilágyi2017-05-302-23/+34
| |/ /
* | | Merge pull request #14548 from karalabe/ethstats-no-txsPéter Szilágyi2017-05-301-12/+10
|\ \ \ | |/ / |/| |
| * | ethstats: don't report transaction content, only hashPéter Szilágyi2017-05-301-12/+10
|/ /
* | Merge pull request #14523 from karalabe/txpool-cli-flagsPéter Szilágyi2017-05-2910-105/+241
|\ \
| * | cmd, core, eth: configurable txpool parametersPéter Szilágyi2017-05-2910-105/+241
* | | Merge pull request #14539 from karalabe/txpool-inspec-noncesPéter Szilágyi2017-05-291-8/+8
|\ \ \
| * | | internal/ethapi: fix tx nonces in pool inspect/contentPéter Szilágyi2017-05-291-8/+8
* | | | Merge pull request #14537 from karalabe/setgasprice-durning-nominePéter Szilágyi2017-05-292-10/+24
|\ \ \ \
| * | | | eth: update default gas price when not mining tooPéter Szilágyi2017-05-292-10/+24
| |/ / /
* | | | Merge pull request #14524 from karalabe/noimport-during-fastsyncPéter Szilágyi2017-05-292-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | eth: don't import propagated blocks during fastsyncPéter Szilágyi2017-05-262-0/+6
|/ / /
* | | Merge pull request #14517 from Ali92hm/masterNick Johnson2017-05-261-2/+3
|\ \ \ | |/ / |/| |
| * | dockerfile: expose 30303/udpAli92hm2017-05-261-0/+1
| * | dockerfile: cp geth to /usr/local/binAli92hm2017-05-261-2/+2
|/ /
* | Merge pull request #14514 from karalabe/go1.8.3Péter Szilágyi2017-05-252-14/+14
|\ \
| * | travis, appveyor: bump to Go 1.8.3, Android NDK 14bPéter Szilágyi2017-05-252-14/+14
| |/
* | Merge pull request #14515 from karalabe/golint-tooooolongPéter Szilágyi2017-05-2512-325/+326
|\ \ | |/ |/|
| * core: fix minor accidental typos and comment errorsPéter Szilágyi2017-05-253-8/+8
| * core: typos and comments improvechanghong2017-05-2511-323/+324
|/
* Merge pull request #14446 from bas-vk/cli-helpPéter Szilágyi2017-05-253-12/+70
|\
| * cmd/geth: reorganise help section for new cli flag handlingBas van Kervel2017-05-253-12/+70
* | Merge pull request #14513 from obscuren/allocate-stackPéter Szilágyi2017-05-251-1/+1
|\ \
| * | core/vm: allocate stack to 1024Jeffrey Wilcke2017-05-251-1/+1
| |/
* / README: corrected attach example (#14512)Or Rikon2017-05-251-1/+1
|/
* Merge pull request #14502 from karalabe/mobile-import-ecdsaFelix Lange2017-05-2511-34/+49
|\
| * mobile: support importing flat ecdsa keyst tooPéter Szilágyi2017-05-231-3/+17
| * accounts/keystore, crypto: enforce 256 bit keys on importPéter Szilágyi2017-05-2310-31/+32
* | Merge pull request #14336 from obscuren/metropolis-preparationFelix Lange2017-05-2535-236/+2983
|\ \
| * | consensus/ethash: fix TestCalcDifficultyFelix Lange2017-05-241-1/+1
| * | crypto/bn256: fix go vet false positiveFelix Lange2017-05-245-22/+25
| * | common: fixed byte padding functionsJeffrey Wilcke2017-05-231-3/+3
| * | core/vm: expose intpool to stack dup methodJeffrey Wilcke2017-05-232-3/+3
| * | core/vm: capped int poolJeffrey Wilcke2017-05-231-0/+6
| * | core/vm: improved push instructionsJeffrey Wilcke2017-05-232-35/+48
| * | cmd/evm: added mem/cpu profilingJeffrey Wilcke2017-05-232-0/+44
| * | core/vm: improve error message for invalid opcodesValentin Wüstholz2017-05-221-1/+1
| * | core/state: fixed (self)destructed objectsJeffrey Wilcke2017-05-182-2/+9
| * | consensus, core, core/vm, parems: review fixesJeffrey Wilcke2017-05-186-42/+34
| * | core/types: corrected abstract signing addressJeffrey Wilcke2017-05-182-2/+2
| * | consensus/ethash: set time to current instead of parent timeJeffrey Wilcke2017-05-181-1/+1
| * | consensus, core/*, params: metropolis preparation refactorJeffrey Wilcke2017-05-1828-183/+2865
* | | Merge pull request #14507 from karalabe/faucet-misspellPéter Szilágyi2017-05-241-1/+1
|\ \ \
| * | | cmd/faucet: fix a few typosPéter Szilágyi2017-05-241-1/+1
|/ / /
* | | Merge pull request #14504 from bas-vk/wallet-importPéter Szilágyi2017-05-241-15/+30
|\ \ \ | |_|/ |/| |
| * | cmd/geth: reintroduce wallet import subcommandBas van Kervel2017-05-231-15/+30
|/ /
* | Merge pull request #14501 from sqli-nantes/masterPéter Szilágyi2017-05-232-0/+65
|\ \
| * | mobile: Add management methods to {Addresses,Topics,Hashes} structuresNicolas Guillaume2017-05-232-0/+60
| * | mobile: Allows mobile clients to create custom FilterQueriesNicolas Guillaume2017-05-221-0/+5
|/ /
* | swarm/api: Fix adding paths which exist as manifests (#14482)Lewis Marshall2017-05-222-2/+35
* | cmd/swarm: Add --httpaddr flag (#14475)Lewis Marshall2017-05-225-19/+30
* | README: fixing typo in documentation (#14493)Dave Conroy2017-05-221-1/+1
* | discover: Changed Logging from Debug to Info (#14485)Ali Hajimirza2017-05-201-1/+1
* | internal/ethapi: lock when auto-filling transaction nonce (#14483)Martin Holst Swende2017-05-191-0/+23
|/
* cmd, core, eth, miner: remove txpool gas price limits (#14442)Péter Szilágyi2017-05-1711-178/+619
* les: fix goroutine leak in execQueue (#14480)Felix Lange2017-05-172-30/+118
* cmd/puppeth: v4/v5 boot separation, signer gas configs (#14453)Péter Szilágyi2017-05-134-8/+73
* swarm/api: fix error reporting in api.Resolve (#14464)Lewis Marshall2017-05-133-21/+148
* mobile: accept nil for chainid as homestead signing (#14463)Péter Szilágyi2017-05-131-0/+6
* containers/vagrant: add support for CentOS (#14380)Koustubh Sinkar2017-05-135-19/+62
* Merge pull request #14454 from karalabe/mobile-surface-txrlpPéter Szilágyi2017-05-111-3/+159
|\
| * mobile: add toString & rlp/json encoding for protocol typesPéter Szilágyi2017-05-111-3/+159
|/
* Merge pull request #14452 from karalabe/dual-bootnodesPéter Szilágyi2017-05-114-8/+32
|\
| * cmd, node: support different bootnodes, fix default light portPéter Szilágyi2017-05-104-8/+32
|/
* README: update attach instructions for testnet users (#14448)bas-vk2017-05-091-6/+8
* Merge pull request #14441 from karalabe/receipt-data-regressionPéter Szilágyi2017-05-082-8/+5
|\
| * core: fix processing regression during receipt importPéter Szilágyi2017-05-082-8/+5
* | Merge pull request #14427 from zsfelfoldi/compressPéter Szilágyi2017-05-083-0/+407
|\ \ | |/ |/|
| * common/compress: internalize encoders, add length wrappersPéter Szilágyi2017-05-083-70/+125
| * common/bitutil: fix decompression corner cases; fuzz, test & benchPéter Szilágyi2017-05-073-43/+302
| * common/bitutil: added data compression algorithmZsolt Felfoldi2017-05-061-0/+93
* | Merge pull request #14440 from karalabe/cocoapods-confirm-fixPéter Szilágyi2017-05-081-1/+1
|\ \ | |/ |/|
| * travis: adapt build script to new travis VM settingsPéter Szilágyi2017-05-081-1/+1
|/
* Merge pull request #14423 from karalabe/bitutilPéter Szilágyi2017-05-054-86/+405
|\
| * common/bitutil, consensus/ethash: reusable bitutil packagePéter Szilágyi2017-05-054-86/+405
|/
* VERSION, params: begin 1.6.2 release cyclePéter Szilágyi2017-05-042-5/+5
* params: release Geth 1.6.1, Deripors of Ohratuuv1.6.1Péter Szilágyi2017-05-041-4/+4
* Merge pull request #14418 from karalabe/rinkeby-flagPéter Szilágyi2017-05-047-16/+80
|\
| * cmd, core, params: add --rinkeby flag for fast connectivityPéter Szilágyi2017-05-047-16/+80
* | Hive-test fixes (#14419)Martin Holst Swende2017-05-042-0/+11
* | Merge pull request #14413 from bas-vk/cli-chain-mngtPéter Szilágyi2017-05-048-94/+129
|\ \
| * | cmd/geth: migrate dumpconfig command/flagsBas van Kervel2017-05-031-1/+2
| * | cmd/geth: migrate bug command/flagsBas van Kervel2017-05-031-1/+2
| * | cmd/geth: migrate metric command/flagsBas van Kervel2017-05-031-1/+1
| * | cmd/geth: reorganise misc commands/flagsBas van Kervel2017-05-031-4/+4
| * | cmd/geth: reorganise console/attach commands/flagsBas van Kervel2017-05-033-67/+79
| * | cmd/geth: reorganise chain commands/flagsBas van Kervel2017-05-031-20/+41
* | | Merge pull request #14402 from karalabe/tiered-faucetPéter Szilágyi2017-05-045-30/+93
|\ \ \ | |_|/ |/| |
| * | cmd/faucet: fix period to days conversionPéter Szilágyi2017-05-041-4/+5
| * | cmd/faucet, cmd/puppeth: support multi-tiered faucetPéter Szilágyi2017-05-045-30/+92
|/ /
* | Merge pull request #14414 from gluk256/77_releasePéter Szilágyi2017-05-031-0/+5
|\ \ | |/ |/|
| * build: wnode added to the build configurationVlad2017-05-031-0/+5
* | Merge pull request #14412 from karalabe/init-both-chainsPéter Szilágyi2017-05-032-42/+45
|\ \
| * | cmd/geth, cmd/utils: init/removedb on light/full dbs simultaneouslyPéter Szilágyi2017-05-032-42/+45
|/ /
* | Merge pull request #14411 from karalabe/clique-double-signPéter Szilágyi2017-05-031-1/+1
|\ \
| * | consensus/clique: fix overflow on recent signer check around genesisPéter Szilágyi2017-05-031-1/+1
| |/
* | Merge pull request #13885 from bas-vk/rpc_generic_pubsubPéter Szilágyi2017-05-036-55/+217
|\ \ | |/ |/|
| * rpc: support subscriptions under custom namespacesBas van Kervel2017-04-256-55/+217
* | README: add config to genesis.json (#14373)nicky g2017-05-031-0/+6
* | cmd/puppeth, vendor: update ssh, manage server keys (#14398)Péter Szilágyi2017-05-0319-285/+701
* | Merge pull request #14407 from karalabe/ethash-generation-racePéter Szilágyi2017-05-031-2/+4
|\ \
| * | consensus/ethash: fix a timestamp update racePéter Szilágyi2017-05-021-2/+4
* | | Merge pull request #14406 from karalabe/downloader-sensitive-codePéter Szilágyi2017-05-021-0/+4
|\ \ \ | |/ / |/| |
| * | eth/downloader: fix a potential issue against future refactorsPéter Szilágyi2017-05-021-0/+4
* | | Merge pull request #14403 from fjl/console-numberPéter Szilágyi2017-05-021-3/+6
|\ \ \
| * | | console: avoid float64 when remarshaling parametersFelix Lange2017-05-021-3/+6
* | | | Merge pull request #14399 from bas-vk/rpc-corsPéter Szilágyi2017-05-021-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | rpc: disable CORS if user has not specified custom configBas van Kervel2017-05-021-0/+5
|/ / /
* | | Merge pull request #14388 from bas-vk/cli-account-mngtPéter Szilágyi2017-05-023-70/+95
|\ \ \ | |/ / |/| |
| * | cmd/geth: reorganise account/wallet command/flagsBas van Kervel2017-04-283-70/+95
|/ /
* | whisper: switching to v5 + minor refactoring (#14387)gluk2562017-04-286-39/+139
* | whisper: message format refactoring (#14335)gluk2562017-04-2714-232/+343
* | Merge pull request #14379 from farazdagi/fix/deadlock-in-node-waitPéter Szilágyi2017-04-251-0/+1
|\ \
| * | node: fixes deadlock on Wait()Victor Farazdagi2017-04-251-0/+1
| |/
* | Merge pull request #14377 from karalabe/unify-network-idsPéter Szilágyi2017-04-2517-38/+38
|\ \ | |/ |/|
| * cmd, eth, les, mobile: make networkid uint64 everywherePéter Szilágyi2017-04-2517-38/+38
|/
* Merge pull request #14350 from fjl/trie-iterator-skip-2Péter Szilágyi2017-04-2520-303/+477
|\
| * eth: add debug_storageRangeAtFelix Lange2017-04-255-39/+201
| * trie: add start key to NodeIterator constructorsFelix Lange2017-04-259-73/+146
| * trie: clean up iterator constructorsFelix Lange2017-04-259-31/+21
| * trie: rework and document key encodingFelix Lange2017-04-257-159/+121
| * trie: remove Key in MissingNodeErrorFelix Lange2017-04-183-17/+4
* | Merge pull request #14372 from bas-vk/bootnodegenkeyPéter Szilágyi2017-04-251-0/+1
|\ \
| * | cmd/bootnode: stop after generating/writing nodekeyBas van Kervel2017-04-241-0/+1
* | | internal/ethapi: return empty arrays instead of null (#14374)bas-vk2017-04-241-3/+3
* | | Merge pull request #14364 from fjl/core-remove-split-stat-tyPéter Szilágyi2017-04-243-15/+3
|\ \ \ | |/ / |/| |
| * | core, light: delete SplitStatTy, ChainSplitEvent (unused)Felix Lange2017-04-223-15/+3
|/ /
* | Merge pull request #14339 from karalabe/faucet-block-banned-usersPéter Szilágyi2017-04-205-29/+109
|\ \
| * | cmd: integrate invisible recaptcha into puppethPéter Szilágyi2017-04-174-19/+52
| * | cmd/faucet: fix websocket double close/reopenPéter Szilágyi2017-04-172-2/+2
| * | cmd/faucet: add optional recaptcha validation supportPéter Szilágyi2017-04-173-13/+49
| * | cmd/faucet: double check user against the GH websitePéter Szilágyi2017-04-161-1/+12
| |/
* | Merge pull request #14357 from karalabe/nousb-flagPéter Szilágyi2017-04-204-4/+18
|\ \
| * | cmd, node: add --nosub and node.Config.NoUSB to disable hw walletsPéter Szilágyi2017-04-204-4/+18
* | | Merge pull request #14358 from karalabe/wrong-genesis-descriptionPéter Szilágyi2017-04-201-1/+1
|\ \ \ | |/ / |/| |
| * | core: make genesis incompatibility error more explicitPéter Szilágyi2017-04-201-1/+1
|/ /
* | Merge pull request #13886 from bas-vk/rpc_blocknum_parsePéter Szilágyi2017-04-182-39/+86
|\ \ | |/ |/|
| * rpc: improve BlockNumber unmarshal parsingBas van Kervel2017-04-132-39/+86
* | VERSION, params: begin 1.6.1 release cyclePéter Szilágyi2017-04-142-5/+5
* | params: release Geth 1.6.0, Puppeth Masterv1.6.0Péter Szilágyi2017-04-141-4/+4
* | Merge remote-tracking branch 'fjl/license-update-1.6'Péter Szilágyi2017-04-1446-79/+270
|\ \
| * | all: update license informationFelix Lange2017-04-1446-79/+270