status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-21 20:10:36 +00:00
Code Issues Projects Releases Wiki Activity

use correct slot when producing sync aggregate around forks (#5089)

Browse Source 
`produceSyncAggregate` is called in new slot when block is produced,
while the other functions in `sync_committee_msg_pool` are called in
previous slot. So, need to subtract 1 slot when producing sync aggregate
to accept the signatures using the old digest during fork transition.
This commit is contained in:
Etan Kissling 2023-06-16 23:30:36 +02:00 committed by GitHub
parent aa54760391
commit 8c6c8a0ffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
beacon_chain/consensus_object_pools/sync_committee_msg_pool.nim
View File

@ -333,8 +333,9 @@ proc produceSyncAggregateAux(
proc produceSyncAggregate*(
pool: SyncCommitteeMsgPool,
bid: BlockId,
slot: Slot): SyncAggregate =
let target = pool.cfg.toSyncMsgTarget(bid, slot)
signatureSlot: Slot): SyncAggregate =
# Sync committee signs previous slot, relative to when new block is produced
let target = pool.cfg.toSyncMsgTarget(bid, max(signatureSlot, 1.Slot) - 1)
if target in pool.bestContributions:
try:
produceSyncAggregateAux(pool.bestContributions[target])

2
tests/test_gossip_validation.nim
View File

@ -274,7 +274,7 @@ suite "Gossip validation - Extra": # Not based on preset config
doAssert(signRes.isOk())
contrib[].signature = signRes.get()
contrib
aggregate = syncCommitteePool[].produceSyncAggregate(bid, slot)
aggregate = syncCommitteePool[].produceSyncAggregate(bid, slot + 1)
check:
expectedCount > 1 # Cover edge case

10
tests/test_sync_committee_pool.nim
View File

@ -43,7 +43,7 @@ suite "Sync committee pool":
check(success == false)
let aggregate = pool.produceSyncAggregate(headBid, headBid.slot)
let aggregate = pool.produceSyncAggregate(headBid, headBid.slot + 1)
check:
aggregate.sync_committee_bits.isZeros
@ -326,21 +326,21 @@ suite "Sync committee pool":
#
block:
# Checking for a block that got no votes
let aggregate = pool.produceSyncAggregate(bid3, bid3.slot)
let aggregate = pool.produceSyncAggregate(bid3, bid3.slot + 1)
check:
aggregate.sync_committee_bits.isZeros
aggregate.sync_committee_signature == ValidatorSig.infinity
block:
# Checking for a block that got votes from 1 committee
let aggregate = pool.produceSyncAggregate(bid2, bid2.slot)
let aggregate = pool.produceSyncAggregate(bid2, bid2.slot + 1)
check:
aggregate.sync_committee_bits.countOnes == 1
aggregate.sync_committee_signature == sig4.toValidatorSig
block:
# Checking for a block that got votes from 2 committees
let aggregate = pool.produceSyncAggregate(bid1, bid1.slot)
let aggregate = pool.produceSyncAggregate(bid1, bid1.slot + 1)
let sig = aggregate [sig1, sig2, sig3]
check:
aggregate.sync_committee_bits.countOnes == 3
@ -362,7 +362,7 @@ suite "Sync committee pool":
check:
not success
let aggregate = pool.produceSyncAggregate(bid2, bid2.slot)
let aggregate = pool.produceSyncAggregate(bid2, bid2.slot + 1)
check:
aggregate.sync_committee_bits.isZeros
aggregate.sync_committee_signature == ValidatorSig.infinity

2
tests/testblockutil.nim
View File

@ -514,7 +514,7 @@ proc makeSyncAggregate(
signedContributionAndProof,
latest_block_id, contribution.signature.load.get)
syncCommitteePool[].produceSyncAggregate(latest_block_id, slot)
syncCommitteePool[].produceSyncAggregate(latest_block_id, slot + 1)
iterator makeTestBlocks*(
state: ForkedHashedBeaconState,