mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-19 10:22:23 +00:00
fix chainId default
This commit is contained in:
parent
638d82bdf7
commit
ac690f0d4c
1 changed files with 2 additions and 8 deletions
|
|
@ -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 {
|
if err := sim.sanitizeCall(&call, sim.state, &gasUsed, blockContext); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
tx := call.ToTransaction(call.GasPrice == nil)
|
|
||||||
txes[i] = tx
|
|
||||||
|
|
||||||
if err := call.CallDefaults(gp.Gas(), header.BaseFee, config.ChainID); err != nil {
|
if err := call.CallDefaults(gp.Gas(), header.BaseFee, config.ChainID); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
tx := call.ToTransaction(call.GasPrice == nil)
|
||||||
|
txes[i] = tx
|
||||||
msg := call.ToMessage(header.BaseFee, !sim.validate)
|
msg := call.ToMessage(header.BaseFee, !sim.validate)
|
||||||
tracer.reset(tx.Hash(), uint(i))
|
tracer.reset(tx.Hash(), uint(i))
|
||||||
evm.Reset(core.NewEVMTxContext(msg), sim.state)
|
evm.Reset(core.NewEVMTxContext(msg), sim.state)
|
||||||
|
|
@ -276,11 +275,6 @@ func (sim *simulator) sanitizeCall(call *TransactionArgs, state *state.StateDB,
|
||||||
remaining := blockContext.GasLimit - *gasUsed
|
remaining := blockContext.GasLimit - *gasUsed
|
||||||
call.Gas = (*hexutil.Uint64)(&remaining)
|
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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue