forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into mardizzone/upstream-merge

Browse source
This commit is contained in:
marcello33 2023-06-21 07:48:19 +02:00
commit c57ef82236
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
params/config.go
View file

@ -725,8 +725,10 @@ func (c *BorConfig) CalculateStateSyncDelay(number uint64) uint64 {
// TODO: modify this function once the block number is finalized // TODO: modify this function once the block number is finalized
func (c *BorConfig) IsParallelUniverse(number *big.Int) bool { func (c *BorConfig) IsParallelUniverse(number *big.Int) bool {
if c.ParallelUniverseBlock == big.NewInt(0) { if c.ParallelUniverseBlock != nil {
return false if c.ParallelUniverseBlock.Cmp(big.NewInt(0)) == 0 {
return false
}
} }
return isBlockForked(c.ParallelUniverseBlock, number) return isBlockForked(c.ParallelUniverseBlock, number)