mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 13:46:43 +00:00
consensus/beacon: update
This commit is contained in:
parent
3e675b18f0
commit
c1954d280b
1 changed files with 1 additions and 1 deletions
|
|
@ -76,7 +76,7 @@ func New(ethone consensus.Engine) *Beacon {
|
||||||
// Here we check the MergeNetsplitBlock to allow configuring networks with a PoW or
|
// Here we check the MergeNetsplitBlock to allow configuring networks with a PoW or
|
||||||
// PoA chain for unit testing purposes.
|
// PoA chain for unit testing purposes.
|
||||||
func isPostMerge(config *params.Config2, blockNum uint64, timestamp uint64) bool {
|
func isPostMerge(config *params.Config2, blockNum uint64, timestamp uint64) bool {
|
||||||
ttd := params.Get[*params.TerminalTotalDifficulty](config).BigInt()
|
ttd := params.TerminalTotalDifficulty.Get(config)
|
||||||
mergedAtGenesis := ttd != nil && ttd.Sign() == 0
|
mergedAtGenesis := ttd != nil && ttd.Sign() == 0
|
||||||
return mergedAtGenesis ||
|
return mergedAtGenesis ||
|
||||||
config.Active(forks.Paris, blockNum, timestamp) ||
|
config.Active(forks.Paris, blockNum, timestamp) ||
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue