Merge pull request #14336 from obscuren/metropolis-preparation

consensus, core/*, params: metropolis preparation refactor
2017-05-24 22:28:22 +02:00
parent 344f25fb3e 11cf5b7ead
commit 261b3e2351
35 changed files with 2984 additions and 237 deletions
--- a/internal/ethapi/tracer_test.go
+++ b/internal/ethapi/tracer_test.go
@ -48,7 +48,7 @@ func runTrace(tracer *JavascriptTracer) (interface{}, error) {
 	contract := vm.NewContract(account{}, account{}, big.NewInt(0), 10000)
 	contract.Code = []byte{byte(vm.PUSH1), 0x1, byte(vm.PUSH1), 0x1, 0x0}

-	_, err := env.Interpreter().Run(contract, []byte{})
+	_, err := env.Interpreter().Run(0, contract, []byte{})
 	if err != nil {
 		return nil, err
 	}