diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-15 00:59:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 00:59:00 +0800 |
| commit | a973d1d5233bbd36cbaed0b7235311d4cd529580 (patch) | |
| tree | 61ed1bd31a9c2a2e6a052a122a737deaee70c6cb /eth/api_backend.go | |
| parent | 15a609d5d6613e37e819975ceba01cb5ba735242 (diff) | |
| parent | c12f4df910e2da1cc5dd28c5c4bbe2d8721e1057 (diff) | |
| download | dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.gz dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.bz2 dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.lz dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.xz dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.zst dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.zip | |
Merge pull request #3674 from obscuren/gaz64
params: core, core/vm, miner: 64bit gas instructions
Diffstat (limited to 'eth/api_backend.go')
| -rw-r--r-- | eth/api_backend.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/api_backend.go b/eth/api_backend.go index 1174588ea..72ed76cc4 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -106,14 +106,14 @@ func (b *EthApiBackend) GetTd(blockHash common.Hash) *big.Int { return b.eth.blockchain.GetTdByHash(blockHash) } -func (b *EthApiBackend) GetVMEnv(ctx context.Context, msg core.Message, state ethapi.State, header *types.Header) (*vm.EVM, func() error, error) { +func (b *EthApiBackend) GetEVM(ctx context.Context, msg core.Message, state ethapi.State, header *types.Header, vmCfg vm.Config) (*vm.EVM, func() error, error) { statedb := state.(EthApiState).state from := statedb.GetOrNewStateObject(msg.From()) from.SetBalance(common.MaxBig) vmError := func() error { return nil } context := core.NewEVMContext(msg, header, b.eth.BlockChain()) - return vm.NewEVM(context, statedb, b.eth.chainConfig, vm.Config{}), vmError, nil + return vm.NewEVM(context, statedb, b.eth.chainConfig, vmCfg), vmError, nil } func (b *EthApiBackend) SendTx(ctx context.Context, signedTx *types.Transaction) error { |