5 commits

Author	SHA1	Message	Date
Christopher Franko	0b7c82fc14	Merge remote-tracking branch 'refs/remotes/ethereum/master' into v1.6.x	2017-04-19 14:45:46 -04:00
Felix Lange	0cc492f815	all: update license information	2017-04-14 10:29:00 +02:00
Péter Szilágyi	a7b9e484d0	consensus, core, ethstats: use engine specific block beneficiary (#14318) ... * consensus, core, ethstats: use engine specific block beneficiary * core, eth, les, miner: use explicit beneficiary during mining	2017-04-12 16:38:31 +03:00
Christopher Franko	57638f70e6	Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9	2017-02-15 13:21:31 -05:00
Jeffrey Wilcke	3fc7c97827	core, core/vm: implemented a generic environment (#3348) ... Environment is now a struct (not an interface). This reduces a lot of tech-debt throughout the codebase where a virtual machine environment had to be implemented in order to test or run it. The new environment is suitable to be used en the json tests, core consensus and light client.	2016-12-06 02:16:03 +01:00