From ec0e07b100594a9ad274bcb7d1c9908496ca32b8 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Wed, 5 Feb 2025 10:49:34 +0800 Subject: [PATCH] params: add Cancun blocks (#25305) --- common/constants.go | 1 + common/constants/constants.go.devnet | 1 + common/constants/constants.go.local | 1 + common/constants/constants.go.testnet | 1 + params/config.go | 36 ++++++++++++++++++++++++++- 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/common/constants.go b/common/constants.go index e3e2d8c04d..c21e9ed420 100644 --- a/common/constants.go +++ b/common/constants.go @@ -48,6 +48,7 @@ var TIPXDCXCancellationFeeTestnet = big.NewInt(38383838) var TIPXDCXMinerDisable = big.NewInt(80370000) // Target 2nd Oct 2024 var TIPXDCXReceiverDisable = big.NewInt(80370900) // Target 2nd Oct 2024, safer to release after disable miner var Eip1559Block = big.NewInt(9999999999) +var CancunBlock = big.NewInt(9999999999) var BerlinBlock = big.NewInt(76321000) // Target 19th June 2024 var LondonBlock = big.NewInt(76321000) // Target 19th June 2024 var MergeBlock = big.NewInt(76321000) // Target 19th June 2024 diff --git a/common/constants/constants.go.devnet b/common/constants/constants.go.devnet index a71257ae6f..d4619de09a 100644 --- a/common/constants/constants.go.devnet +++ b/common/constants/constants.go.devnet @@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(0) var MergeBlock = big.NewInt(0) var ShanghaiBlock = big.NewInt(0) var Eip1559Block = big.NewInt(0) +var CancunBlock = big.NewInt(9999999999) var TIPXDCXTestnet = big.NewInt(0) var IsTestnet bool = false diff --git a/common/constants/constants.go.local b/common/constants/constants.go.local index 6c51143137..8c9da8ea26 100644 --- a/common/constants/constants.go.local +++ b/common/constants/constants.go.local @@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(0) var MergeBlock = big.NewInt(0) var ShanghaiBlock = big.NewInt(0) var Eip1559Block = big.NewInt(9999999999) +var CancunBlock = big.NewInt(9999999999) var TIPXDCXTestnet = big.NewInt(0) var IsTestnet bool = false diff --git a/common/constants/constants.go.testnet b/common/constants/constants.go.testnet index a7e9fb64ba..7567bc6daa 100644 --- a/common/constants/constants.go.testnet +++ b/common/constants/constants.go.testnet @@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(61290000) var MergeBlock = big.NewInt(61290000) var ShanghaiBlock = big.NewInt(61290000) // Target 31st March 2024 var Eip1559Block = big.NewInt(9999999999) +var CancunBlock = big.NewInt(9999999999) var TIPXDCXTestnet = big.NewInt(23779191) var IsTestnet bool = true diff --git a/params/config.go b/params/config.go index 01904c794b..86c01af318 100644 --- a/params/config.go +++ b/params/config.go @@ -402,6 +402,7 @@ type ChainConfig struct { MergeBlock *big.Int `json:"mergeBlock,omitempty"` ShanghaiBlock *big.Int `json:"shanghaiBlock,omitempty"` Eip1559Block *big.Int `json:"eip1559Block,omitempty"` + CancunBlock *big.Int `json:"cancunBlock,omitempty"` // Various consensus engines Ethash *EthashConfig `json:"ethash,omitempty"` @@ -566,7 +567,11 @@ func (c *ChainConfig) String() string { if c.Eip1559Block != nil { eip1559Block = c.Eip1559Block } - return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Istanbul: %v BerlinBlock: %v LondonBlock: %v MergeBlock: %v ShanghaiBlock: %v Eip1559Block: %v Engine: %v}", + cancunBlock := common.CancunBlock + if c.CancunBlock != nil { + cancunBlock = c.CancunBlock + } + return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Istanbul: %v BerlinBlock: %v LondonBlock: %v MergeBlock: %v ShanghaiBlock: %v Eip1559Block: %v CancunBlock: %v Engine: %v}", c.ChainId, c.HomesteadBlock, c.DAOForkBlock, @@ -582,6 +587,7 @@ func (c *ChainConfig) String() string { mergeBlock, shanghaiBlock, eip1559Block, + cancunBlock, engine, ) } @@ -653,6 +659,10 @@ func (c *ChainConfig) IsEIP1559(num *big.Int) bool { return isForked(common.Eip1559Block, num) || isForked(c.Eip1559Block, num) } +func (c *ChainConfig) IsCancun(num *big.Int) bool { + return isForked(common.CancunBlock, num) || isForked(c.CancunBlock, num) +} + func (c *ChainConfig) IsTIP2019(num *big.Int) bool { return isForked(common.TIP2019Block, num) } @@ -761,6 +771,28 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, head *big.Int) *Confi if isForkIncompatible(c.ConstantinopleBlock, newcfg.ConstantinopleBlock, head) { return newCompatError("Constantinople fork block", c.ConstantinopleBlock, newcfg.ConstantinopleBlock) } + if isForkIncompatible(c.PetersburgBlock, newcfg.PetersburgBlock, head) { + // the only case where we allow Petersburg to be set in the past is if it is equal to Constantinople + // mainly to satisfy fork ordering requirements which state that Petersburg fork be set if Constantinople fork is set + if isForkIncompatible(c.ConstantinopleBlock, newcfg.PetersburgBlock, head) { + return newCompatError("Petersburg fork block", c.PetersburgBlock, newcfg.PetersburgBlock) + } + } + if isForkIncompatible(c.IstanbulBlock, newcfg.IstanbulBlock, head) { + return newCompatError("Istanbul fork block", c.IstanbulBlock, newcfg.IstanbulBlock) + } + if isForkIncompatible(c.BerlinBlock, newcfg.BerlinBlock, head) { + return newCompatError("Berlin fork block", c.BerlinBlock, newcfg.BerlinBlock) + } + if isForkIncompatible(c.LondonBlock, newcfg.LondonBlock, head) { + return newCompatError("London fork block", c.LondonBlock, newcfg.LondonBlock) + } + if isForkIncompatible(c.ShanghaiBlock, newcfg.ShanghaiBlock, head) { + return newCompatError("Shanghai fork timestamp", c.ShanghaiBlock, newcfg.ShanghaiBlock) + } + if isForkIncompatible(c.CancunBlock, newcfg.CancunBlock, head) { + return newCompatError("Cancun fork block", c.CancunBlock, newcfg.CancunBlock) + } return nil } @@ -832,6 +864,7 @@ type Rules struct { IsMerge, IsShanghai bool IsXDCxDisable bool IsEIP1559 bool + IsCancun bool } func (c *ChainConfig) Rules(num *big.Int) Rules { @@ -855,5 +888,6 @@ func (c *ChainConfig) Rules(num *big.Int) Rules { IsShanghai: c.IsShanghai(num), IsXDCxDisable: c.IsXDCxDisable(num), IsEIP1559: c.IsEIP1559(num), + IsCancun: c.IsCancun(num), } }