status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-28 07:15:57 +00:00
Code Issues Projects Releases Wiki Activity

use fixed max depth for BlockRef (#6070)

Browse Source 
In `block_dag` there is a max depth of 100 years configured to detect
internal inconsistencies, e.g., circular references. As `BlockRef` was
changed long ago to only reflect the non-finalized chain segment, the
theoretically supported max depth can be reduced and simplified.
This commit is contained in:
Etan Kissling 2024-03-13 13:01:51 +01:00 committed by GitHub
parent efb1971d7e
commit 4e2ffca44a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_chain/consensus_object_pools/block_dag.nim
View File

@ -102,17 +102,20 @@ func parentOrSlot*(bs: BlockSlot): BlockSlot =
else: else:
BlockSlot(blck: bs.blck, slot: bs.slot - 1) BlockSlot(blck: bs.blck, slot: bs.slot - 1)
# This is used to detect internal inconsistencies, e.g., circular references.
# Note that `BlockRef` is only used for the non-finalized chain segment.
const defaultMaxDepth = 1'i64 shl 24 # More than enough for years
func getDepth*(a, b: BlockRef): tuple[ancestor: bool, depth: int] = func getDepth*(a, b: BlockRef): tuple[ancestor: bool, depth: int] =
var b = b var b = b
var depth = 0 var depth = 0
const maxDepth = (100'i64 * 365 * 24 * 60 * 60 div SECONDS_PER_SLOT.int)
while true: while true:
if a == b: if a == b:
return (true, depth) return (true, depth)
# for now, use an assert for block chain length since a chain this long # for now, use an assert for block chain length since a chain this long
# indicates a circular reference here.. # indicates a circular reference here..
doAssert depth < maxDepth doAssert depth < defaultMaxDepth
depth += 1 depth += 1
if a.slot >= b.slot or b.parent.isNil: if a.slot >= b.slot or b.parent.isNil:
@ -132,9 +135,8 @@ func link*(parent, child: BlockRef) =
child.parent = parent child.parent = parent
func get_ancestor*(blck: BlockRef, slot: Slot, func get_ancestor*(
maxDepth = 100'i64 * 365 * 24 * 60 * 60 div SECONDS_PER_SLOT.int): blck: BlockRef, slot: Slot, maxDepth = defaultMaxDepth): BlockRef =
BlockRef =
## https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.5/specs/phase0/fork-choice.md#get_ancestor ## https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.5/specs/phase0/fork-choice.md#get_ancestor
## Return the most recent block as of the time at `slot` that not more recent ## Return the most recent block as of the time at `slot` that not more recent
## than `blck` itself ## than `blck` itself