Skip to content

Build the Ethereum chain config once per fee check #3165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amir-deris merged 3 commits into from
Apr 2, 2026
Merged

Build the Ethereum chain config once per fee check #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fa25d8
plt-233 reused config in evm_checktx.go and fee.go
amir-deris Apr 1, 2026
96cfa89
Merge branch 'main' into amir/plt-233-build-ethereum-chain-config-onc…
masih Apr 2, 2026
7bba778
Merge branch 'main' into amir/plt-233-build-ethereum-chain-config-onc…
amir-deris Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/ante/evm_checktx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,11 @@ func EvmCheckAndChargeFees(ctx sdk.Context, sender common.Address, ek *evmkeeper
if txData.GetGasFeeCap().Cmp(GetMinimumFee(ctx, ek)) < 0 {
return nil, sdkerrors.ErrInsufficientFee
}
ethCfg := evmtypes.DefaultChainConfig().EthereumConfig(ek.ChainID(ctx))
if version >= derived.Cancun && len(txData.GetBlobHashes()) > 0 {
// For now we are simply assuming excessive blob gas is 0. In the future we might change it to be
// dynamic based on prior block usage.
chainConfig := evmtypes.DefaultChainConfig().EthereumConfig(ek.ChainID(ctx))
if txData.GetBlobFeeCap().Cmp(eip4844.CalcBlobFee(chainConfig, &ethtypes.Header{Time: uint64(ctx.BlockTime().Unix())})) < 0 { // nolint:gosec
if txData.GetBlobFeeCap().Cmp(eip4844.CalcBlobFee(ethCfg, &ethtypes.Header{Time: uint64(ctx.BlockTime().Unix())})) < 0 { // nolint:gosec
return nil, sdkerrors.ErrInsufficientFee
}
}
Expand All @@ -268,9 +268,8 @@ func EvmCheckAndChargeFees(ctx sdk.Context, sender common.Address, ek *evmkeeper
if err != nil {
return nil, err
}
cfg := evmtypes.DefaultChainConfig().EthereumConfig(ek.ChainID(ctx))
txCtx := core.NewEVMTxContext(emsg)
evmInstance := vm.NewEVM(*blockCtx, stateDB, cfg, vm.Config{}, ek.CustomPrecompiles(ctx))
evmInstance := vm.NewEVM(*blockCtx, stateDB, ethCfg, vm.Config{}, ek.CustomPrecompiles(ctx))
evmInstance.SetTxContext(txCtx)
st := core.NewStateTransition(evmInstance, emsg, &gp, true, false)
if statelessChecks {
Expand Down
7 changes: 3 additions & 4 deletions x/evm/ante/fee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ func (fc EVMFeeCheckDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate b
if txData.GetGasTipCap().Sign() < 0 {
return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "gas fee cap cannot be negative")
}
ethCfg := evmtypes.DefaultChainConfig().EthereumConfig(fc.evmKeeper.ChainID(ctx))

// if EVM version is Cancun or later, and the transaction contains at least one blob, we need to
// make sure the transaction carries a non-zero blob fee cap.
if ver >= derived.Cancun && len(txData.GetBlobHashes()) > 0 {
// For now we are simply assuming excessive blob gas is 0. In the future we might change it to be
// dynamic based on prior block usage.
chainConfig := evmtypes.DefaultChainConfig().EthereumConfig(fc.evmKeeper.ChainID(ctx))
if txData.GetBlobFeeCap().Cmp(eip4844.CalcBlobFee(chainConfig, &ethtypes.Header{Time: uint64(ctx.BlockTime().Unix())})) < 0 { // nolint:gosec
if txData.GetBlobFeeCap().Cmp(eip4844.CalcBlobFee(ethCfg, &ethtypes.Header{Time: uint64(ctx.BlockTime().Unix())})) < 0 { // nolint:gosec
return ctx, sdkerrors.ErrInsufficientFee
}
}
Expand All @@ -75,9 +75,8 @@ func (fc EVMFeeCheckDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate b
if err != nil {
return ctx, err
}
cfg := evmtypes.DefaultChainConfig().EthereumConfig(fc.evmKeeper.ChainID(ctx))
txCtx := core.NewEVMTxContext(emsg)
evmInstance := vm.NewEVM(*blockCtx, stateDB, cfg, vm.Config{}, fc.evmKeeper.CustomPrecompiles(ctx))
evmInstance := vm.NewEVM(*blockCtx, stateDB, ethCfg, vm.Config{}, fc.evmKeeper.CustomPrecompiles(ctx))
evmInstance.SetTxContext(txCtx)
st := core.NewStateTransition(evmInstance, emsg, &gp, true, false)
// run stateless checks before charging gas (mimicking Geth behavior)
Expand Down
Loading