amalraj.manigmail.com 4dbd95947d Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18 ... # Conflicts: # .github/CONTRIBUTING.md # .travis.yml # core/blockchain.go # core/vm/evm.go # core/vm/logger_test.go # eth/handler_test.go # eth/tracers/tracer_test.go # internal/ethapi/api.go # internal/web3ext/web3ext.go # p2p/discover/node.go # p2p/server.go # swarm/network/simulations/discovery/discovery_test.go		2019-01-29 19:08:50 +08:00
..
algorithm.go	consensus: move test use only var/func to test(#17004)	2018-07-24 02:14:15 +02:00
algorithm_test.go	consensus, miner: stale block mining support (#17506)	2018-08-28 16:59:05 +03:00
api.go	consensus: extend getWork API with block number (#18038)	2018-11-08 17:08:57 +02:00
consensus.go	Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18	2019-01-25 22:29:22 +08:00
consensus_test.go	debug merge attempt	2018-05-31 14:21:16 +08:00
ethash.go	Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18	2019-01-29 19:08:50 +08:00
ethash_test.go	consensus: extend getWork API with block number (#18038)	2018-11-08 17:08:57 +02:00
sealer.go	consensus: extend getWork API with block number (#18038)	2018-11-08 17:08:57 +02:00
sealer_test.go	consensus/ethash: increase timeout in test (#17526)	2018-09-03 16:59:23 +02:00