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

Merge pull request #25878 from MariusVanDerWijden/shanghai-by-time

Browse Source 
params: core: enable shanghai based on timestamps
This commit is contained in:
Péter Szilágyi
2023-01-06 16:10:12 +02:00
committed by GitHub
parent f426805fdd b56c796220
commit 2189773093
32 changed files with 886 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/devp2p/internal/ethtest/chain.go
+1 -1
View File
@@ -76,7 +76,7 @@ func (c *Chain) RootAt(height int) common.Hash {
// ForkID gets the fork id of the chain.
func (c *Chain) ForkID() forkid.ID {
return forkid.NewID(c.chainConfig, c.blocks[0].Hash(), uint64(c.Len()))
return forkid.NewID(c.chainConfig, c.blocks[0].Hash(), uint64(c.Len()), c.blocks[0].Time())
}
// Shorten returns a copy chain of a desired height from the imported