mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-18 02:40:45 +00:00
params: add Cancun blocks (#25305)
This commit is contained in:
parent
b8f017a732
commit
ec0e07b100
5 changed files with 39 additions and 1 deletions
|
|
@ -48,6 +48,7 @@ var TIPXDCXCancellationFeeTestnet = big.NewInt(38383838)
|
||||||
var TIPXDCXMinerDisable = big.NewInt(80370000) // Target 2nd Oct 2024
|
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 TIPXDCXReceiverDisable = big.NewInt(80370900) // Target 2nd Oct 2024, safer to release after disable miner
|
||||||
var Eip1559Block = big.NewInt(9999999999)
|
var Eip1559Block = big.NewInt(9999999999)
|
||||||
|
var CancunBlock = big.NewInt(9999999999)
|
||||||
var BerlinBlock = big.NewInt(76321000) // Target 19th June 2024
|
var BerlinBlock = big.NewInt(76321000) // Target 19th June 2024
|
||||||
var LondonBlock = 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
|
var MergeBlock = big.NewInt(76321000) // Target 19th June 2024
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(0)
|
||||||
var MergeBlock = big.NewInt(0)
|
var MergeBlock = big.NewInt(0)
|
||||||
var ShanghaiBlock = big.NewInt(0)
|
var ShanghaiBlock = big.NewInt(0)
|
||||||
var Eip1559Block = big.NewInt(0)
|
var Eip1559Block = big.NewInt(0)
|
||||||
|
var CancunBlock = big.NewInt(9999999999)
|
||||||
|
|
||||||
var TIPXDCXTestnet = big.NewInt(0)
|
var TIPXDCXTestnet = big.NewInt(0)
|
||||||
var IsTestnet bool = false
|
var IsTestnet bool = false
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(0)
|
||||||
var MergeBlock = big.NewInt(0)
|
var MergeBlock = big.NewInt(0)
|
||||||
var ShanghaiBlock = big.NewInt(0)
|
var ShanghaiBlock = big.NewInt(0)
|
||||||
var Eip1559Block = big.NewInt(9999999999)
|
var Eip1559Block = big.NewInt(9999999999)
|
||||||
|
var CancunBlock = big.NewInt(9999999999)
|
||||||
|
|
||||||
var TIPXDCXTestnet = big.NewInt(0)
|
var TIPXDCXTestnet = big.NewInt(0)
|
||||||
var IsTestnet bool = false
|
var IsTestnet bool = false
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(61290000)
|
||||||
var MergeBlock = big.NewInt(61290000)
|
var MergeBlock = big.NewInt(61290000)
|
||||||
var ShanghaiBlock = big.NewInt(61290000) // Target 31st March 2024
|
var ShanghaiBlock = big.NewInt(61290000) // Target 31st March 2024
|
||||||
var Eip1559Block = big.NewInt(9999999999)
|
var Eip1559Block = big.NewInt(9999999999)
|
||||||
|
var CancunBlock = big.NewInt(9999999999)
|
||||||
|
|
||||||
var TIPXDCXTestnet = big.NewInt(23779191)
|
var TIPXDCXTestnet = big.NewInt(23779191)
|
||||||
var IsTestnet bool = true
|
var IsTestnet bool = true
|
||||||
|
|
|
||||||
|
|
@ -402,6 +402,7 @@ type ChainConfig struct {
|
||||||
MergeBlock *big.Int `json:"mergeBlock,omitempty"`
|
MergeBlock *big.Int `json:"mergeBlock,omitempty"`
|
||||||
ShanghaiBlock *big.Int `json:"shanghaiBlock,omitempty"`
|
ShanghaiBlock *big.Int `json:"shanghaiBlock,omitempty"`
|
||||||
Eip1559Block *big.Int `json:"eip1559Block,omitempty"`
|
Eip1559Block *big.Int `json:"eip1559Block,omitempty"`
|
||||||
|
CancunBlock *big.Int `json:"cancunBlock,omitempty"`
|
||||||
|
|
||||||
// Various consensus engines
|
// Various consensus engines
|
||||||
Ethash *EthashConfig `json:"ethash,omitempty"`
|
Ethash *EthashConfig `json:"ethash,omitempty"`
|
||||||
|
|
@ -566,7 +567,11 @@ func (c *ChainConfig) String() string {
|
||||||
if c.Eip1559Block != nil {
|
if c.Eip1559Block != nil {
|
||||||
eip1559Block = c.Eip1559Block
|
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.ChainId,
|
||||||
c.HomesteadBlock,
|
c.HomesteadBlock,
|
||||||
c.DAOForkBlock,
|
c.DAOForkBlock,
|
||||||
|
|
@ -582,6 +587,7 @@ func (c *ChainConfig) String() string {
|
||||||
mergeBlock,
|
mergeBlock,
|
||||||
shanghaiBlock,
|
shanghaiBlock,
|
||||||
eip1559Block,
|
eip1559Block,
|
||||||
|
cancunBlock,
|
||||||
engine,
|
engine,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -653,6 +659,10 @@ func (c *ChainConfig) IsEIP1559(num *big.Int) bool {
|
||||||
return isForked(common.Eip1559Block, num) || isForked(c.Eip1559Block, num)
|
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 {
|
func (c *ChainConfig) IsTIP2019(num *big.Int) bool {
|
||||||
return isForked(common.TIP2019Block, num)
|
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) {
|
if isForkIncompatible(c.ConstantinopleBlock, newcfg.ConstantinopleBlock, head) {
|
||||||
return newCompatError("Constantinople fork block", c.ConstantinopleBlock, newcfg.ConstantinopleBlock)
|
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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -832,6 +864,7 @@ type Rules struct {
|
||||||
IsMerge, IsShanghai bool
|
IsMerge, IsShanghai bool
|
||||||
IsXDCxDisable bool
|
IsXDCxDisable bool
|
||||||
IsEIP1559 bool
|
IsEIP1559 bool
|
||||||
|
IsCancun bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ChainConfig) Rules(num *big.Int) Rules {
|
func (c *ChainConfig) Rules(num *big.Int) Rules {
|
||||||
|
|
@ -855,5 +888,6 @@ func (c *ChainConfig) Rules(num *big.Int) Rules {
|
||||||
IsShanghai: c.IsShanghai(num),
|
IsShanghai: c.IsShanghai(num),
|
||||||
IsXDCxDisable: c.IsXDCxDisable(num),
|
IsXDCxDisable: c.IsXDCxDisable(num),
|
||||||
IsEIP1559: c.IsEIP1559(num),
|
IsEIP1559: c.IsEIP1559(num),
|
||||||
|
IsCancun: c.IsCancun(num),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue