diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1abf081e7e..95b0b34442 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,4 +35,4 @@ jobs: version: v1.42.1 only-new-issues: true skip-pkg-cache: true - skip-build-cache: true:w \ No newline at end of file + skip-build-cache: true \ No newline at end of file diff --git a/core/state_processor.go b/core/state_processor.go index 2ea61eafa7..71ecaa6a2a 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -154,6 +154,7 @@ 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) + blockContext.BaseFee = big.NewInt(0) vmenv := vm.NewEVM(blockContext, vm.TxContext{}, statedb, config, cfg) 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..ab63e1ff16 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 @@ -188,6 +188,7 @@ func (api *PreExecAPI) TraceTransaction(ctx context.Context, origin *PreExecTx, } // Run the transaction with tracing enabled. vmenv := vm.NewEVM(core.NewEVMBlockContext(d.header, bc, nil), txContext, d.stateDb, bc.Config(), vm.Config{Debug: true, Tracer: tracer}) + vmenv.Context.BaseFee = big.NewInt(0) // Call Prepare to clear out the statedb access list d.stateDb.Prepare(d.tx.Hash(), txIndex) diff --git a/internal/build/env.go b/internal/build/env.go index d70c0d50a4..1be30e7e81 100644 --- a/internal/build/env.go +++ b/internal/build/env.go @@ -109,6 +109,7 @@ func LocalEnv() Environment { commitRe, _ := regexp.Compile("^([0-9a-f]{40})$") if commit := commitRe.FindString(head); commit != "" && env.Commit == "" { env.Commit = commit + env.Date = getDate(commit) } return env }