mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 14:46:42 +00:00
Merge branch 'develop' into mardizzone/upstream-merge
This commit is contained in:
commit
c57ef82236
1 changed files with 4 additions and 2 deletions
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue