mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-10 13:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "little additions to chain/chain_config to support eip-4844" (#872)

Browse Source 
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.
This commit is contained in:
Andrew Ashikhmin 2023-01-30 18:21:41 +01:00 committed by GitHub
parent a7cbc100e1
commit b594e6cdbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chain/chain_config.go
View File

@ -62,9 +62,8 @@ type Config struct {
TerminalTotalDifficultyPassed bool `json:"terminalTotalDifficultyPassed,omitempty"` // Disable PoW sync for networks that have already passed through the Merge 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 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) 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) 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)
// Parlia fork blocks // Parlia fork blocks
RamanujanBlock *big.Int `json:"ramanujanBlock,omitempty" toml:",omitempty"` // ramanujanBlock switch block (nil = no fork, 0 = already activated) 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) 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. // IsCancun returns whether time is either equal to the Cancun fork time or greater.
func (c *Config) IsCancun(time uint64) bool { func (c *Config) IsCancun(time uint64) bool {
return isForked(c.CancunTime, time) return isForked(c.CancunTime, time)
@ -353,8 +347,6 @@ func (c *Config) forkPoints() []forkPoint {
{name: "arrowGlacierBlock", block: c.ArrowGlacierBlock, canSkip: true}, {name: "arrowGlacierBlock", block: c.ArrowGlacierBlock, canSkip: true},
{name: "grayGlacierBlock", block: c.GrayGlacierBlock, canSkip: true}, {name: "grayGlacierBlock", block: c.GrayGlacierBlock, canSkip: true},
{name: "mergeNetsplitBlock", block: c.MergeNetsplitBlock, 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 IsHomestead, IsTangerineWhistle, IsSpuriousDragon bool
IsByzantium, IsConstantinople, IsPetersburg, IsIstanbul bool IsByzantium, IsConstantinople, IsPetersburg, IsIstanbul bool
IsBerlin, IsLondon, IsShanghai, IsCancun bool IsBerlin, IsLondon, IsShanghai, IsCancun bool
IsSharding bool
IsNano, IsMoran, IsGibbs bool IsNano, IsMoran, IsGibbs bool
IsEip1559FeeCollector bool IsEip1559FeeCollector bool
IsParlia, IsAura bool IsParlia, IsAura bool