roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge remote-tracking branch 'origin/feature/etc-plugin-miner' into feature/network-etc-miner

Browse Source
This commit is contained in:
philip-morlier
2024-02-28 14:39:02 -08:00
parent e7eb23251f 3c9d3b52b0
commit 2a41f9d36f
6 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
params/config.go
+7 -3
View File
@@ -558,10 +558,14 @@ func (c *ChainConfig) IsTerminalPoWBlock(parentTotalDiff *big.Int, totalDiff *bi
return parentTotalDiff.Cmp(c.TerminalTotalDifficulty) < 0 && totalDiff.Cmp(c.TerminalTotalDifficulty) >= 0
}
// begin Plugeth injection -- the following code is being commented to enable network plugins to initiate the shanghai fork
// IsShanghai returns whether time is either equal to the Shanghai fork time or greater.
func (c *ChainConfig) IsShanghai(num *big.Int, time uint64) bool {
return c.IsLondon(num) && isTimestampForked(c.ShanghaiTime, time)
}
// func (c *ChainConfig) IsShanghai(num *big.Int, time uint64) bool {
// return c.IsLondon(num) && isTimestampForked(c.ShanghaiTime, time)
// }
// end PluGeth injection
// IsCancun returns whether num is either equal to the Cancun fork time or greater.
func (c *ChainConfig) IsCancun(num *big.Int, time uint64) bool {