From b594e6cdbf76ba8fb035037c3f2b515fc88a5599 Mon Sep 17 00:00:00 2001 From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com> Date: Mon, 30 Jan 2023 18:21:41 +0100 Subject: [PATCH] Revert "little additions to chain/chain_config to support eip-4844" (#872) Because [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) is the main feature of the [Cancun](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/cancun.md) upgrade, it makes sense to use Cancun as the fork for it instead of some artificial one. This reverts PR #848. --- chain/chain_config.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/chain/chain_config.go b/chain/chain_config.go index 0e973926e..d44eefdbe 100644 --- a/chain/chain_config.go +++ b/chain/chain_config.go @@ -62,9 +62,8 @@ type Config struct { TerminalTotalDifficultyPassed bool `json:"terminalTotalDifficultyPassed,omitempty"` // Disable PoW sync for networks that have already passed through the Merge MergeNetsplitBlock *big.Int `json:"mergeNetsplitBlock,omitempty"` // Virtual fork after The Merge to use as a network splitter; see FORK_NEXT_VALUE in EIP-3675 - ShanghaiTime *big.Int `json:"shanghaiTime,omitempty"` // Shanghai switch time (nil = no fork, 0 = already activated) - CancunTime *big.Int `json:"cancunTime,omitempty"` // Cancun switch time (nil = no fork, 0 = already activated) - ShardingForkTime *big.Int `json:"shardingForkTime,omitempty"` // Mini-Danksharding switch block (nil = no fork, 0 = already activated) + ShanghaiTime *big.Int `json:"shanghaiTime,omitempty"` // Shanghai switch time (nil = no fork, 0 = already activated) + CancunTime *big.Int `json:"cancunTime,omitempty"` // Cancun switch time (nil = no fork, 0 = already activated) // Parlia fork blocks RamanujanBlock *big.Int `json:"ramanujanBlock,omitempty" toml:",omitempty"` // ramanujanBlock switch block (nil = no fork, 0 = already activated) @@ -297,11 +296,6 @@ func (c *Config) IsShanghai(time uint64) bool { return isForked(c.ShanghaiTime, time) } -// IsSharding returns whether time is either equal to the Mini-Danksharding fork time or greater. -func (c *Config) IsSharding(time uint64) bool { - return isForked(c.ShardingForkTime, time) -} - // IsCancun returns whether time is either equal to the Cancun fork time or greater. func (c *Config) IsCancun(time uint64) bool { return isForked(c.CancunTime, time) @@ -353,8 +347,6 @@ func (c *Config) forkPoints() []forkPoint { {name: "arrowGlacierBlock", block: c.ArrowGlacierBlock, canSkip: true}, {name: "grayGlacierBlock", block: c.GrayGlacierBlock, canSkip: true}, {name: "mergeNetsplitBlock", block: c.MergeNetsplitBlock, canSkip: true}, - // {name: "shanghaiTime", timestamp: c.ShanghaiTime}, - // {name: "shardingForkTime", timestamp: c.ShardingForkTime}, } } @@ -651,7 +643,6 @@ type Rules struct { IsHomestead, IsTangerineWhistle, IsSpuriousDragon bool IsByzantium, IsConstantinople, IsPetersburg, IsIstanbul bool IsBerlin, IsLondon, IsShanghai, IsCancun bool - IsSharding bool IsNano, IsMoran, IsGibbs bool IsEip1559FeeCollector bool IsParlia, IsAura bool