From 3e020f09fdc52310e34e41eafd84d25510e6c026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 18 Oct 2018 18:42:52 +0200 Subject: [PATCH] core/vm: Upgrade EVMC to version 6.0.0 --- core/vm/evmc.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/core/vm/evmc.go b/core/vm/evmc.go index 72239afe99..2b78e576ee 100644 --- a/core/vm/evmc.go +++ b/core/vm/evmc.go @@ -26,7 +26,6 @@ import ( "github.com/ethereum/evmc/bindings/go/evmc" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" ) @@ -285,16 +284,16 @@ func (evm *EVMC) Run(contract *Contract, input []byte, readOnly bool) (ret []byt output, gasLeft, err := evm.instance.Execute( &HostContext{evm.env, contract}, getRevision(evm.env), - contract.Address(), - contract.Caller(), - common.BigToHash(contract.value), - input, - crypto.Keccak256Hash(contract.Code), - int64(contract.Gas), - evm.env.depth-1, kind, evm.readOnly, - contract.Code) + evm.env.depth-1, + int64(contract.Gas), + contract.Address(), + contract.Caller(), + input, + common.BigToHash(contract.value), + contract.Code, + common.Hash{}) contract.Gas = uint64(gasLeft)