From aa3cc051704749189608f5b8cb845b573e0bde72 Mon Sep 17 00:00:00 2001
From: linhaiyang <1183679527@qq.com>
Date: Wed, 27 Oct 2021 13:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E6=89=A7=E8=A1=8C=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E4=B8=8D=E6=89=A7=E8=A1=8C=20pre=20check=20part=20one=20?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=20=E7=BB=95=E8=BF=87=E4=BB=A5=E5=A4=AA?=
 =?UTF-8?q?=E5=9D=8A=E5=9F=BA=E7=A1=80=E8=B4=B9=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/state_processor.go | 1 +
 eth/api_pre_exec.go     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/state_processor.go b/core/state_processor.go
index 2ea61eafa7..d85da2aa02 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -155,5 +155,6 @@ func ApplyTransaction(config *params.ChainConfig, bc ChainContext, author *commo
 func ApplyTransactionForPreExec(config *params.ChainConfig, bc ChainContext, author *common.Address, gp *GasPool, statedb *state.StateDB, header *types.Header, tx *types.Transaction, msg types.Message, usedGas *uint64, cfg vm.Config) (*types.Receipt, error) {
 	blockContext := NewEVMBlockContext(header, bc, author)
 	vmenv := vm.NewEVM(blockContext, vm.TxContext{}, statedb, config, cfg)
+	vmenv.Context.BaseFee = big.NewInt(0)
 	return applyTransaction(msg, config, bc, author, gp, statedb, header.Number, header.Hash(), tx, usedGas, vmenv)
 }
diff --git a/eth/api_pre_exec.go b/eth/api_pre_exec.go
index b28f88b032..365a387805 100644
--- a/eth/api_pre_exec.go
+++ b/eth/api_pre_exec.go
@@ -93,7 +93,7 @@ func (api *PreExecAPI) getBlockAndMsg(origin *PreExecTx, number *big.Int) (*type
 		tx.GasFeeCap(),
 		tx.GasTipCap(),
 		hexutil.MustDecode(origin.Data),
-		nil, false,
+		nil, true,
 	)
 
 	return block, msg