From 0a41d7943b7cad2d699ecce2eefabed6ac1bdd05 Mon Sep 17 00:00:00 2001 From: nethoxa Date: Fri, 26 Sep 2025 14:21:15 +0200 Subject: [PATCH] internal/ethapi: fix some issues in eth_config impl --- core/vm/contracts.go | 8 +------- core/vm/evm.go | 2 +- params/config.go | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/core/vm/contracts.go b/core/vm/contracts.go index cae0be9f2d..7b55e1bf55 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,7 +21,6 @@ import ( "encoding/binary" "errors" "fmt" - "maps" "math" "math/big" "math/bits" @@ -211,7 +210,7 @@ func init() { } } -func activePrecompiledContracts(rules params.Rules) PrecompiledContracts { +func ActivePrecompiledContracts(rules params.Rules) PrecompiledContracts { switch { case rules.IsVerkle: return PrecompiledContractsVerkle @@ -232,11 +231,6 @@ func activePrecompiledContracts(rules params.Rules) PrecompiledContracts { } } -// ActivePrecompiledContracts returns a copy of precompiled contracts enabled with the current configuration. -func ActivePrecompiledContracts(rules params.Rules) PrecompiledContracts { - return maps.Clone(activePrecompiledContracts(rules)) -} - // ActivePrecompiles returns the precompile addresses enabled with the current configuration. func ActivePrecompiles(rules params.Rules) []common.Address { switch { diff --git a/core/vm/evm.go b/core/vm/evm.go index 88ef1cf121..48bc7db310 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -146,7 +146,7 @@ func NewEVM(blockCtx BlockContext, statedb StateDB, chainConfig *params.ChainCon jumpDests: newMapJumpDests(), hasher: crypto.NewKeccakState(), } - evm.precompiles = activePrecompiledContracts(evm.chainRules) + evm.precompiles = ActivePrecompiledContracts(evm.chainRules) switch { case evm.chainRules.IsOsaka: diff --git a/params/config.go b/params/config.go index 42a2c61ab5..9bb267b6f5 100644 --- a/params/config.go +++ b/params/config.go @@ -598,9 +598,9 @@ func (c *ChainConfig) Description() string { // BlobConfig specifies the target and max blobs per block for the associated fork. type BlobConfig struct { + UpdateFraction uint64 `json:"baseFeeUpdateFraction"` Target int `json:"target"` Max int `json:"max"` - UpdateFraction uint64 `json:"baseFeeUpdateFraction"` } // BlobScheduleConfig determines target and max number of blobs allow per fork.