From ac690f0d4c09cbd00f4a6a017bc9a656dfbb4da5 Mon Sep 17 00:00:00 2001 From: Sina Mahmoodi Date: Wed, 12 Jun 2024 13:11:26 +0200 Subject: [PATCH] fix chainId default --- internal/ethapi/simulate.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/internal/ethapi/simulate.go b/internal/ethapi/simulate.go index a47cdec0ce..00245fc24a 100644 --- a/internal/ethapi/simulate.go +++ b/internal/ethapi/simulate.go @@ -189,12 +189,11 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header, if err := sim.sanitizeCall(&call, sim.state, &gasUsed, blockContext); err != nil { return nil, err } - tx := call.ToTransaction(call.GasPrice == nil) - txes[i] = tx - if err := call.CallDefaults(gp.Gas(), header.BaseFee, config.ChainID); err != nil { return nil, err } + tx := call.ToTransaction(call.GasPrice == nil) + txes[i] = tx msg := call.ToMessage(header.BaseFee, !sim.validate) tracer.reset(tx.Hash(), uint(i)) evm.Reset(core.NewEVMTxContext(msg), sim.state) @@ -276,11 +275,6 @@ func (sim *simulator) sanitizeCall(call *TransactionArgs, state *state.StateDB, remaining := blockContext.GasLimit - *gasUsed call.Gas = (*hexutil.Uint64)(&remaining) } - // TODO: check chainID and against current header for london fees - if call.GasPrice == nil && call.MaxFeePerGas == nil && call.MaxPriorityFeePerGas == nil { - call.MaxFeePerGas = (*hexutil.Big)(big.NewInt(0)) - call.MaxPriorityFeePerGas = (*hexutil.Big)(big.NewInt(0)) - } return nil }