Merge branch 'develop' into mardizzone/upstream-merge

This commit is contained in:
marcello33 2023-06-21 07:48:19 +02:00
commit c57ef82236

View file

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