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

Merge branch 'unstable' into dev/etan/lc-electra

Browse Source
This commit is contained in:
Etan Kissling 2024-06-23 15:54:46 +02:00
commit 4e8e316012
No known key found for this signature in database
GPG Key ID: B21DA824C5A3D03D
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/testblockutil.nim
View File

@ -611,11 +611,17 @@ iterator makeTestBlocks*(
let let
parent_root = withState(state[]): forkyState.latest_block_root parent_root = withState(state[]): forkyState.latest_block_root
attestations = attestations =
if attested: if attested and state.kind < ConsensusFork.Electra:
makeFullAttestations( makeFullAttestations(
state[], parent_root, getStateField(state[], slot), cache) state[], parent_root, getStateField(state[], slot), cache)
else: else:
@[] @[]
electraAttestations =
if attested and state.kind >= ConsensusFork.Electra:
makeFullElectraAttestations(
state[], parent_root, getStateField(state[], slot), cache)
else:
@[]
stateEth1 = getStateField(state[], eth1_data) stateEth1 = getStateField(state[], eth1_data)
stateDepositIndex = getStateField(state[], eth1_deposit_index) stateDepositIndex = getStateField(state[], eth1_deposit_index)
deposits = deposits =
@ -633,7 +639,8 @@ iterator makeTestBlocks*(
state[], cache, state[], cache,
eth1_data = eth1_data, eth1_data = eth1_data,
attestations = attestations, attestations = attestations,
electraAttestations = electraAttestations,
deposits = deposits, deposits = deposits,
sync_aggregate = sync_aggregate, sync_aggregate = sync_aggregate,
graffiti = graffiti, graffiti = graffiti,
cfg = cfg) cfg = cfg)