feat: get attestations for electra block #6732

twoeths · 2024-05-04T07:47:44Z

Motivation

Implement getAttestationsForBlock() for electra

Description

Group attestations by AttData hex first because different committees could have the same AttestationData
Implement on-chain aggregation for electra when producing blocks

part of #6689

cc @ensi321

packages/beacon-node/src/chain/opPools/aggregatedAttestationPool.ts

ensi321

Minor comment. Good to go when they are addressed 🙂
Learned a lot when reviewing thanks

ensi321 · 2024-05-07T16:58:10Z

packages/beacon-node/src/chain/opPools/aggregatedAttestationPool.ts

   */
-  getAttestationsForBlock(
+  getAttestationsForBlockPreElectra(


Return type of getAttestationsForBlockPreElectra() should be phase0.Attestation[]

ensi321 · 2024-05-07T16:58:50Z

packages/beacon-node/src/chain/opPools/aggregatedAttestationPool.ts

+    fork: ForkName,
+    forkChoice: IForkChoice,
+    state: CachedBeaconStateAllForks
+  ): allForks.Attestation[] {


I think we can safely define the return type as electra.Attestation[]

ensi321 · 2024-05-07T17:05:38Z

packages/beacon-node/src/chain/opPools/aggregatedAttestationPool.ts

+          // These properties should not change after being validate in gossip
+          // IF they have to be validated, do it only with one attestation per group since same data
+          // The committeeCountPerSlot can be precomputed once per slot
+          // for (const [i, {attestation, notSeenAttesterCount}] of attestationGroup


Is this line of comment necessary?

let the comment be there for now, later cleanups can alwayss happen

ensi321 · 2024-05-07T17:25:43Z

packages/beacon-node/src/chain/opPools/aggregatedAttestationPool.ts

+    if (attestationNonParticipation !== undefined) {
+      const {attestation} = attestationNonParticipation;
+      committeeBits.set(committeeIndex, true);
+      aggregationBits = [...aggregationBits, ...attestation.aggregationBits.toBoolArray()];


Chain up aggregationBits by using toBoolArray() and later do fromBoolArray() seems like a hack. Looks good for now but this chain up operation should ideally be provided by ssz library

hmm like a concat op

ensi321 · 2024-05-07T17:48:41Z

packages/beacon-node/test/unit/chain/opPools/aggregatedAttestationPool.test.ts

+        );
+        const aggAttestation = {
+          ...attestationSeed,
+          // aggregationBits: BitArray.fromBoolArray(aggregationBitsArr[i]),


Obsolete comment?

* feat: getAttestationsForBlock() for electra * chore: fix lint * fix: MAX_ATTESTATIONS_PER_GROUP_ELECTRA and address PR comments * chore: unit test aggregateConsolidation * Fix rebase mistake * Address my own comment :) --------- Co-authored-by: Navie Chan <naviechan@gmail.com>

* initial commit * lint * Add getAttestingIndices and update getIndexedAttestation * Update gossip validation * Update attestation gossip validation * aggregateAndProof validation * clean up * Validator * Misc * Fix the build erros * feat: get attestations for electra block (#6732) * feat: getAttestationsForBlock() for electra * chore: fix lint * fix: MAX_ATTESTATIONS_PER_GROUP_ELECTRA and address PR comments * chore: unit test aggregateConsolidation * Fix rebase mistake * Address my own comment :) --------- Co-authored-by: Navie Chan <naviechan@gmail.com> * Fix check-types * Address comments --------- Co-authored-by: Nazar Hussain <nazarhussain@gmail.com> Co-authored-by: tuyennhv <tuyen@chainsafe.io>

* feat: getAttestationsForBlock() for electra * chore: fix lint * fix: MAX_ATTESTATIONS_PER_GROUP_ELECTRA and address PR comments * chore: unit test aggregateConsolidation * Fix rebase mistake * Address my own comment :) --------- Co-authored-by: Navie Chan <naviechan@gmail.com>

* initial commit * Update gossip validation * Update attestation gossip validation * aggregateAndProof validation * Extend spec runner to be more flexible * Add missing state attributes for electra * Fix ss data types for electra spec * Make the spec runner more flexible * Fix the bug in process attestation * Update the sepc test version * clean up * Misc * Fix the build erros * feat: get attestations for electra block (#6732) * feat: getAttestationsForBlock() for electra * chore: fix lint * fix: MAX_ATTESTATIONS_PER_GROUP_ELECTRA and address PR comments * chore: unit test aggregateConsolidation * Fix rebase mistake * Address my own comment :) --------- Co-authored-by: Navie Chan <naviechan@gmail.com> * Fix check-types * Address comments * Fix the build erros * Extend spec runner to be more flexible * Add missing state attributes for electra * Fix ss data types for electra spec * Make the spec runner more flexible * Fix the bug in process attestation * Update the sepc test version * Fix rebase issue * Update committee index count check --------- Co-authored-by: NC <adrninistrator1@protonmail.com> Co-authored-by: Navie Chan <naviechan@gmail.com> Co-authored-by: tuyennhv <tuyen@chainsafe.io>

* initial commit * lint * Add getAttestingIndices and update getIndexedAttestation * Update gossip validation * Update attestation gossip validation * aggregateAndProof validation * clean up * Validator * Misc * Fix the build erros * feat: get attestations for electra block (#6732) * feat: getAttestationsForBlock() for electra * chore: fix lint * fix: MAX_ATTESTATIONS_PER_GROUP_ELECTRA and address PR comments * chore: unit test aggregateConsolidation * Fix rebase mistake * Address my own comment :) --------- Co-authored-by: Navie Chan <naviechan@gmail.com> * Fix check-types * Address comments --------- Co-authored-by: Nazar Hussain <nazarhussain@gmail.com> Co-authored-by: tuyennhv <tuyen@chainsafe.io>

* initial commit * Update gossip validation * Update attestation gossip validation * aggregateAndProof validation * Extend spec runner to be more flexible * Add missing state attributes for electra * Fix ss data types for electra spec * Make the spec runner more flexible * Fix the bug in process attestation * Update the sepc test version * clean up * Misc * Fix the build erros * feat: get attestations for electra block (#6732) * feat: getAttestationsForBlock() for electra * chore: fix lint * fix: MAX_ATTESTATIONS_PER_GROUP_ELECTRA and address PR comments * chore: unit test aggregateConsolidation * Fix rebase mistake * Address my own comment :) --------- Co-authored-by: Navie Chan <naviechan@gmail.com> * Fix check-types * Address comments * Fix the build erros * Extend spec runner to be more flexible * Add missing state attributes for electra * Fix ss data types for electra spec * Make the spec runner more flexible * Fix the bug in process attestation * Update the sepc test version * Fix rebase issue * Update committee index count check --------- Co-authored-by: NC <adrninistrator1@protonmail.com> Co-authored-by: Navie Chan <naviechan@gmail.com> Co-authored-by: tuyennhv <tuyen@chainsafe.io>

twoeths marked this pull request as ready for review May 4, 2024 08:49

twoeths requested a review from a team as a code owner May 4, 2024 08:49

ensi321 mentioned this pull request May 4, 2024

Electra tracker #6341

Open

31 tasks

ensi321 reviewed May 5, 2024

View reviewed changes

ensi321 force-pushed the nc/7549 branch from 35e04d1 to f7ae62b Compare May 6, 2024 14:52

twoeths added 3 commits May 6, 2024 17:58

feat: getAttestationsForBlock() for electra

76ce08f

chore: fix lint

1e83f10

fix: MAX_ATTESTATIONS_PER_GROUP_ELECTRA and address PR comments

0df33bf

ensi321 force-pushed the tuyen/eip_7549_getAttestationsForBlock branch from 9ceeac9 to 0df33bf Compare May 6, 2024 14:59

chore: unit test aggregateConsolidation

60645a5

ensi321 approved these changes May 7, 2024

View reviewed changes

ensi321 added 2 commits May 7, 2024 20:54

Fix rebase mistake

6408326

Address my own comment :)

ea89168

ensi321 merged commit 0a58616 into nc/7549 May 7, 2024
13 of 17 checks passed

ensi321 deleted the tuyen/eip_7549_getAttestationsForBlock branch May 7, 2024 18:42

ensi321 mentioned this pull request May 7, 2024

feat: implement EIP-7549 #6689

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: get attestations for electra block #6732

feat: get attestations for electra block #6732

twoeths commented May 4, 2024 •

edited

ensi321 left a comment

ensi321 May 7, 2024

g11tech May 7, 2024

ensi321 May 7, 2024

g11tech May 7, 2024

ensi321 May 7, 2024

g11tech May 7, 2024

ensi321 May 7, 2024

g11tech May 7, 2024

ensi321 May 7, 2024

g11tech May 7, 2024

feat: get attestations for electra block #6732

feat: get attestations for electra block #6732

Conversation

twoeths commented May 4, 2024 • edited

ensi321 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

twoeths commented May 4, 2024 •

edited