mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-19 02:12:23 +00:00
internal/ethapi: simplify
This commit is contained in:
parent
24151101bb
commit
62058060cb
1 changed files with 4 additions and 4 deletions
|
|
@ -169,7 +169,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
|
||||||
if block.BlockOverrides.BlobBaseFee != nil {
|
if block.BlockOverrides.BlobBaseFee != nil {
|
||||||
blockContext.BlobBaseFee = block.BlockOverrides.BlobBaseFee.ToInt()
|
blockContext.BlobBaseFee = block.BlockOverrides.BlobBaseFee.ToInt()
|
||||||
}
|
}
|
||||||
precompiles := sim.activePrecompiles(ctx, sim.base)
|
precompiles := sim.activePrecompiles(sim.base)
|
||||||
// State overrides are applied prior to execution of a block
|
// State overrides are applied prior to execution of a block
|
||||||
if err := block.StateOverrides.Apply(sim.state, precompiles); err != nil {
|
if err := block.StateOverrides.Apply(sim.state, precompiles); err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
|
|
@ -278,10 +278,10 @@ func (sim *simulator) sanitizeCall(call *TransactionArgs, state *state.StateDB,
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (sim *simulator) activePrecompiles(ctx context.Context, base *types.Header) vm.PrecompiledContracts {
|
func (sim *simulator) activePrecompiles(base *types.Header) vm.PrecompiledContracts {
|
||||||
var (
|
var (
|
||||||
blockContext = core.NewEVMBlockContext(base, NewChainContext(ctx, sim.b), nil)
|
isMerge = (base.Difficulty.Sign() == 0)
|
||||||
rules = sim.chainConfig.Rules(blockContext.BlockNumber, blockContext.Random != nil, blockContext.Time)
|
rules = sim.chainConfig.Rules(base.Number, isMerge, base.Time)
|
||||||
)
|
)
|
||||||
return maps.Clone(vm.ActivePrecompiledContracts(rules))
|
return maps.Clone(vm.ActivePrecompiledContracts(rules))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue