diff options
| author | Martin Holst Swende <martin@swende.se> | 2018-04-26 16:30:23 +0800 |
|---|---|---|
| committer | Martin Holst Swende <martin@swende.se> | 2018-05-02 16:17:00 +0800 |
| commit | 8dfa4f46a95c3755396c9be84704cfdf7102ff8e (patch) | |
| tree | b63b140457048a2a4b53b231e2ef6f6741dcabd3 /cmd/evm | |
| parent | 86be91b3e2dff5df28ee53c59df1ecfe9f97e007 (diff) | |
| download | dexon-8dfa4f46a95c3755396c9be84704cfdf7102ff8e.tar.gz dexon-8dfa4f46a95c3755396c9be84704cfdf7102ff8e.tar.zst dexon-8dfa4f46a95c3755396c9be84704cfdf7102ff8e.zip | |
evm/main: use blocknumber from genesis
Diffstat (limited to 'cmd/evm')
| -rw-r--r-- | cmd/evm/runner.go | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 2d9d31fb0..99919304a 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -21,12 +21,12 @@ import ( "encoding/json" "fmt" "io/ioutil" + "math/big" "os" + goruntime "runtime" "runtime/pprof" "time" - goruntime "runtime" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" @@ -86,6 +86,7 @@ func runCmd(ctx *cli.Context) error { chainConfig *params.ChainConfig sender = common.BytesToAddress([]byte("sender")) receiver = common.BytesToAddress([]byte("receiver")) + blockNumber uint64 ) if ctx.GlobalBool(MachineFlag.Name) { tracer = NewJSONLogger(logconfig, os.Stdout) @@ -101,6 +102,7 @@ func runCmd(ctx *cli.Context) error { genesis := gen.ToBlock(db) statedb, _ = state.New(genesis.Root(), state.NewDatabase(db)) chainConfig = gen.Config + blockNumber = gen.Number } else { db, _ := ethdb.NewMemDatabase() statedb, _ = state.New(common.Hash{}, state.NewDatabase(db)) @@ -156,11 +158,12 @@ func runCmd(ctx *cli.Context) error { initialGas := ctx.GlobalUint64(GasFlag.Name) runtimeConfig := runtime.Config{ - Origin: sender, - State: statedb, - GasLimit: initialGas, - GasPrice: utils.GlobalBig(ctx, PriceFlag.Name), - Value: utils.GlobalBig(ctx, ValueFlag.Name), + Origin: sender, + State: statedb, + GasLimit: initialGas, + GasPrice: utils.GlobalBig(ctx, PriceFlag.Name), + Value: utils.GlobalBig(ctx, ValueFlag.Name), + BlockNumber: new(big.Int).SetUint64(blockNumber), EVMConfig: vm.Config{ Tracer: tracer, Debug: ctx.GlobalBool(DebugFlag.Name) || ctx.GlobalBool(MachineFlag.Name), |