status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev/etan/ex-emptyera' into feat/splitview

This commit is contained in:
Etan Kissling 2024-04-02 17:51:31 +02:00
parent f8f704501b 6cfcd873fd
commit 2ffe49fa10
No known key found for this signature in database
GPG Key ID: B21DA824C5A3D03D
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_chain/consensus_object_pools/blockchain_dag.nim
View File

@ -1287,7 +1287,7 @@ proc init*(T: type ChainDAGRef, cfg: RuntimeConfig, db: BeaconChainDB,
# If we end up in here, we failed the root comparison just below in
# an earlier iteration
fatal "Era summaries don't lead up to backfill, database or era files corrupt?",
bid
bid, backfillSlot
quit 1
# In BeaconState.block_roots, empty slots are filled with the root of
@ -1310,7 +1310,7 @@ proc init*(T: type ChainDAGRef, cfg: RuntimeConfig, db: BeaconChainDB,
blocks += 1
if blocks > 0:
info "Front-filled blocks from era files", blocks
info "Front-filled blocks from era files", blocks, backfillSlot
let frontfillTick = Moment.now()

2
beacon_chain/era_db.nim
View File

@ -257,7 +257,7 @@ proc verify*(f: EraFile, cfg: RuntimeConfig): Result[Eth2Digest, string] =
if blck[].signature != default(type(blck[].signature)):
return err("Genesis slot signature not empty")
if not batchVerify(verifier, sigs):
if sigs.len > 0 and not batchVerify(verifier, sigs):
return err("Invalid block signature")
ok(getStateRoot(state[]))