diff --git a/params/types/chain_config_configurator.go b/params/types/chain_config_configurator.go index d48bf3bbca..39a3e85e07 100644 --- a/params/types/chain_config_configurator.go +++ b/params/types/chain_config_configurator.go @@ -3,8 +3,8 @@ package paramtypes import ( "math/big" - "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/math" common2 "github.com/ethereum/go-ethereum/params/types/common" "github.com/ethereum/go-ethereum/params/types/goethereum" "github.com/ethereum/go-ethereum/params/vars" @@ -35,14 +35,20 @@ func setBig(i *big.Int, u *uint64) *big.Int { var upstream = goethereum.ChainConfig{} func (c *MultiGethChainConfig) GetAccountStartNonce() *uint64 { return upstream.GetAccountStartNonce() } -func (c *MultiGethChainConfig) SetAccountStartNonce(n *uint64) error { return upstream.SetAccountStartNonce(n) } -func (c *MultiGethChainConfig) GetMaximumExtraDataSize() *uint64 { return upstream.GetMaximumExtraDataSize() } +func (c *MultiGethChainConfig) SetAccountStartNonce(n *uint64) error { + return upstream.SetAccountStartNonce(n) +} +func (c *MultiGethChainConfig) GetMaximumExtraDataSize() *uint64 { + return upstream.GetMaximumExtraDataSize() +} func (c *MultiGethChainConfig) SetMaximumExtraDataSize(n *uint64) error { return upstream.SetMaximumExtraDataSize(n) } func (c *MultiGethChainConfig) GetMinGasLimit() *uint64 { return upstream.GetMinGasLimit() } func (c *MultiGethChainConfig) SetMinGasLimit(n *uint64) error { return upstream.SetMinGasLimit(n) } -func (c *MultiGethChainConfig) GetGasLimitBoundDivisor() *uint64 { return upstream.GetGasLimitBoundDivisor() } +func (c *MultiGethChainConfig) GetGasLimitBoundDivisor() *uint64 { + return upstream.GetGasLimitBoundDivisor() +} func (c *MultiGethChainConfig) SetGasLimitBoundDivisor(n *uint64) error { return upstream.SetGasLimitBoundDivisor(n) } @@ -80,9 +86,6 @@ func (c *MultiGethChainConfig) SetEIP7Transition(n *uint64) error { return nil } -func (c *MultiGethChainConfig) GetEIP98Transition() *uint64 { return upstream.GetEIP98Transition() } -func (c *MultiGethChainConfig) SetEIP98Transition(n *uint64) error { return upstream.SetEIP98Transition(n) } - func (c *MultiGethChainConfig) GetEIP150Transition() *uint64 { return bigNewU64(c.EIP150Block) } diff --git a/params/types/common/configurator_iface.go b/params/types/common/configurator_iface.go index 803b10dc09..25eaed65fc 100644 --- a/params/types/common/configurator_iface.go +++ b/params/types/common/configurator_iface.go @@ -50,8 +50,6 @@ type CatHerder interface { SetMaxCodeSize(n *uint64) error GetEIP7Transition() *uint64 SetEIP7Transition(n *uint64) error - GetEIP98Transition() *uint64 - SetEIP98Transition(n *uint64) error GetEIP150Transition() *uint64 SetEIP150Transition(n *uint64) error GetEIP152Transition() *uint64 diff --git a/params/types/goethereum/goethereum_configurator.go b/params/types/goethereum/goethereum_configurator.go index e526e7b7e3..5b556a0145 100644 --- a/params/types/goethereum/goethereum_configurator.go +++ b/params/types/goethereum/goethereum_configurator.go @@ -4,7 +4,6 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" common2 "github.com/ethereum/go-ethereum/params/types/common" "github.com/ethereum/go-ethereum/params/vars" ) @@ -126,14 +125,6 @@ func (c *ChainConfig) SetEIP7Transition(n *uint64) error { return nil } -func (c *ChainConfig) GetEIP98Transition() *uint64 { - return newU64(math.MaxUint64) -} - -func (c *ChainConfig) SetEIP98Transition(n *uint64) error { - return common2.ErrUnsupportedConfigNoop -} - func (c *ChainConfig) GetEIP150Transition() *uint64 { return bigNewU64(c.EIP150Block) } diff --git a/params/types/parity/parity_configurator.go b/params/types/parity/parity_configurator.go index 8b68c68d28..a344ce2e7f 100644 --- a/params/types/parity/parity_configurator.go +++ b/params/types/parity/parity_configurator.go @@ -3,7 +3,6 @@ package parity import ( "encoding/json" "log" - math2 "math" "math/big" "reflect" @@ -91,16 +90,6 @@ func (spec *ParityChainSpec) SetEIP7Transition(i *uint64) error { return nil } -func (spec *ParityChainSpec) GetEIP98Transition() *uint64 { - return spec.Params.EIP98Transition.Uint64P() -} - -func (spec *ParityChainSpec) SetEIP98Transition(i *uint64) error { - max := uint64(math2.MaxInt64) - spec.Params.EIP98Transition = new(ParityU64).SetUint64(&max) - return nil -} - func (spec *ParityChainSpec) GetEIP150Transition() *uint64 { return spec.Params.EIP150Transition.Uint64P() }