@lodestar/beacon-node 1.26.0-dev.3dcd668ca9 → 1.26.0-dev.418e81ef2d

package/lib/chain/seenCache/seenAttestationData.js

@@ -9,6 +9,9 @@ export var RejectReason;
     // attestation data is already known
     RejectReason["already_known"] = "already_known";
 })(RejectReason || (RejectReason = {}));
+// For pre-electra, there is no committeeIndex in SingleAttestation, so we hard code it to 0
+// AttDataBase64 has committeeIndex instead
+export const PRE_ELECTRA_SINGLE_ATTESTATION_COMMITTEE_INDEX = 0;
 /**
  * There are maximum 64 committees per slot, assuming 1 committee may have up to 3 different data due to some nodes
  * are not up to date, we can have up to 192 different attestation data per slot.
@@ -31,31 +34,42 @@ export class SeenAttestationDatas {
         this.metrics = metrics;
         this.cacheSlotDistance = cacheSlotDistance;
         this.maxCacheSizePerSlot = maxCacheSizePerSlot;
-        this.cacheEntryByAttDataBase64BySlot = new MapDef(() => new Map());
+        this.cacheEntryByAttDataByIndexBySlot = new MapDef(() => new MapDef(() => new Map()));
         this.lowestPermissibleSlot = 0;
         metrics?.seenCache.attestationData.totalSlot.addCollect(() => this.onScrapeLodestarMetrics(metrics));
     }
-    // TODO: Move InsertOutcome type definition to a common place
-    add(slot, attDataKey, cacheEntry) {
+    /**
+     * Add an AttestationDataCacheEntry to the cache.
+     * - preElectra: add(slot, PRE_ELECTRA_SINGLE_ATTESTATION_COMMITTEE_INDEX, attDataBase64, cacheEntry)
+     * - electra: add(slot, committeeIndex, attDataBase64, cacheEntry)
+     */
+    add(slot, committeeIndex, attDataBase64, cacheEntry) {
         if (slot < this.lowestPermissibleSlot) {
             this.metrics?.seenCache.attestationData.reject.inc({ reason: RejectReason.too_old });
             return InsertOutcome.Old;
         }
-        const cacheEntryByAttDataBase64 = this.cacheEntryByAttDataBase64BySlot.getOrDefault(slot);
-        if (cacheEntryByAttDataBase64.has(attDataKey)) {
+        const cacheEntryByAttDataByIndex = this.cacheEntryByAttDataByIndexBySlot.getOrDefault(slot);
+        const cacheEntryByAttData = cacheEntryByAttDataByIndex.getOrDefault(committeeIndex);
+        if (cacheEntryByAttData.has(attDataBase64)) {
             this.metrics?.seenCache.attestationData.reject.inc({ reason: RejectReason.already_known });
             return InsertOutcome.AlreadyKnown;
         }
-        if (cacheEntryByAttDataBase64.size >= this.maxCacheSizePerSlot) {
+        if (cacheEntryByAttData.size >= this.maxCacheSizePerSlot) {
             this.metrics?.seenCache.attestationData.reject.inc({ reason: RejectReason.reached_limit });
             return InsertOutcome.ReachLimit;
         }
-        cacheEntryByAttDataBase64.set(attDataKey, cacheEntry);
+        cacheEntryByAttData.set(attDataBase64, cacheEntry);
         return InsertOutcome.NewData;
     }
-    get(slot, attDataBase64) {
-        const cacheEntryByAttDataBase64 = this.cacheEntryByAttDataBase64BySlot.get(slot);
-        const cacheEntry = cacheEntryByAttDataBase64?.get(attDataBase64);
+    /**
+     * Get an AttestationDataCacheEntry from the cache.
+     * - preElectra: get(slot, PRE_ELECTRA_SINGLE_ATTESTATION_COMMITTEE_INDEX, attDataBase64)
+     * - electra: get(slot, committeeIndex, attDataBase64)
+     */
+    get(slot, committeeIndex, attDataBase64) {
+        const cacheEntryByAttDataByIndex = this.cacheEntryByAttDataByIndexBySlot.get(slot);
+        const cacheEntryByAttData = cacheEntryByAttDataByIndex?.get(committeeIndex);
+        const cacheEntry = cacheEntryByAttData?.get(attDataBase64);
         if (cacheEntry) {
             this.metrics?.seenCache.attestationData.hit.inc();
         }
@@ -66,18 +80,23 @@ export class SeenAttestationDatas {
     }
     onSlot(clockSlot) {
         this.lowestPermissibleSlot = Math.max(clockSlot - this.cacheSlotDistance, 0);
-        for (const slot of this.cacheEntryByAttDataBase64BySlot.keys()) {
+        for (const slot of this.cacheEntryByAttDataByIndexBySlot.keys()) {
             if (slot < this.lowestPermissibleSlot) {
-                this.cacheEntryByAttDataBase64BySlot.delete(slot);
+                this.cacheEntryByAttDataByIndexBySlot.delete(slot);
             }
         }
     }
     onScrapeLodestarMetrics(metrics) {
-        metrics?.seenCache.attestationData.totalSlot.set(this.cacheEntryByAttDataBase64BySlot.size);
+        metrics?.seenCache.attestationData.totalSlot.set(this.cacheEntryByAttDataByIndexBySlot.size);
         // tracking number of attestation data at current slot may not be correct if scrape time is not at the end of slot
         // so we track it at the previous slot
         const previousSlot = this.lowestPermissibleSlot + this.cacheSlotDistance - 1;
-        metrics?.seenCache.attestationData.countPerSlot.set(this.cacheEntryByAttDataBase64BySlot.get(previousSlot)?.size ?? 0);
+        const cacheEntryByAttDataByIndex = this.cacheEntryByAttDataByIndexBySlot.get(previousSlot);
+        let count = 0;
+        for (const cacheEntryByAttDataBase64 of cacheEntryByAttDataByIndex?.values() ?? []) {
+            count += cacheEntryByAttDataBase64.size;
+        }
+        metrics?.seenCache.attestationData.countPerSlot.set(count);
     }
 }
 //# sourceMappingURL=seenAttestationData.js.map

package/lib/chain/seenCache/seenAttestationData.js.map

@@ -1 +1 @@
-{"version":3,"file":"seenAttestationData.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenAttestationData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"seenAttestationData.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenAttestationData.ts"],"names":[],"mappings":"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"}

package/lib/chain/validation/aggregateAndProof.js

@@ -33,8 +33,6 @@ async function validateAggregateAndProof(fork, chain, signedAggregateAndProof, s
     const { aggregationBits } = aggregate;
     const attData = aggregate.data;
     const attSlot = attData.slot;
-    const seenAttDataKey = serializedData ? getSeenAttDataKeyFromSignedAggregateAndProof(fork, serializedData) : null;
-    const cachedAttData = seenAttDataKey ? chain.seenAttestationDatas.get(attSlot, seenAttDataKey) : null;
     let attIndex;
     if (ForkSeq[fork] >= ForkSeq.electra) {
         attIndex = aggregate.committeeBits.getSingleTrueBit();
@@ -50,6 +48,8 @@ async function validateAggregateAndProof(fork, chain, signedAggregateAndProof, s
     else {
         attIndex = attData.index;
     }
+    const seenAttDataKey = serializedData ? getSeenAttDataKeyFromSignedAggregateAndProof(fork, serializedData) : null;
+    const cachedAttData = seenAttDataKey ? chain.seenAttestationDatas.get(attSlot, attIndex, seenAttDataKey) : null;
     const attEpoch = computeEpochAtSlot(attSlot);
     const attTarget = attData.target;
     const targetEpoch = attTarget.epoch;
@@ -109,14 +109,11 @@ async function validateAggregateAndProof(fork, chain, signedAggregateAndProof, s
         throw new AttestationError(GossipAction.REJECT, { code: AttestationErrorCode.WRONG_NUMBER_OF_AGGREGATION_BITS });
     }
     const attestingIndices = aggregate.aggregationBits.intersectValues(committeeIndices);
-    const indexedAttestationContent = {
+    const indexedAttestation = {
         attestingIndices,
         data: attData,
         signature: aggregate.signature,
     };
-    const indexedAttestation = ForkSeq[fork] >= ForkSeq.electra
-        ? indexedAttestationContent
-        : indexedAttestationContent;
     // TODO: Check this before regen
     // [REJECT] The attestation has participants -- that is,
     // len(get_attesting_indices(state, aggregate.data, aggregate.aggregation_bits)) >= 1.

package/lib/chain/validation/aggregateAndProof.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregateAndProof.js","sourceRoot":"","sources":["../../../src/chain/validation/aggregateAndProof.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aggregateAndProof.js","sourceRoot":"","sources":["../../../src/chain/validation/aggregateAndProof.ts"],"names":[],"mappings":"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"}

package/lib/chain/validation/attestation.d.ts

@@ -1,8 +1,8 @@
 import { BeaconConfig } from "@lodestar/config";
 import { ProtoBlock } from "@lodestar/fork-choice";
-import { ForkName } from "@lodestar/params";
+import { ForkName, ForkPostElectra, ForkPreElectra } from "@lodestar/params";
 import { EpochShuffling, SingleSignatureSet } from "@lodestar/state-transition";
-import { Attestation, CommitteeIndex, Epoch, IndexedAttestation, Root, RootHex, Slot, SubnetID, phase0 } from "@lodestar/types";
+import { CommitteeIndex, Epoch, IndexedAttestation, Root, RootHex, SingleAttestation, Slot, SubnetID, ValidatorIndex, phase0 } from "@lodestar/types";
 import { Result } from "../../util/wrapError.js";
 import { IBeaconChain } from "../interface.js";
 import { RegenCaller } from "../regen/index.js";
@@ -12,16 +12,18 @@ export type BatchResult = {
     batchableBls: boolean;
 };
 export type AttestationValidationResult = {
-    attestation: Attestation;
+    attestation: SingleAttestation;
     indexedAttestation: IndexedAttestation;
     subnet: SubnetID;
     attDataRootHex: RootHex;
     committeeIndex: CommitteeIndex;
+    committeeValidatorIndex: number;
+    committeeSize: number;
 };
 export type AttestationOrBytes = ApiAttestation | GossipAttestation;
 /** attestation from api */
 export type ApiAttestation = {
-    attestation: Attestation;
+    attestation: SingleAttestation;
     serializedData: null;
 };
 /** attestation from gossip */
@@ -50,7 +52,7 @@ export declare function validateGossipAttestationsSameAttData(fork: ForkName, ch
  */
 export declare function validateApiAttestation(fork: ForkName, chain: IBeaconChain, attestationOrBytes: ApiAttestation): Promise<AttestationValidationResult>;
 /**
- * Only deserialize the attestation if needed, use the cached AttestationData instead
+ * Only deserialize the single attestation if needed, use the cached AttestationData instead
  * This is to avoid deserializing similar attestation multiple times which could help the gc
  */
 declare function validateAttestationNoSignatureCheck(fork: ForkName, chain: IBeaconChain, attestationOrBytes: AttestationOrBytes, 
@@ -98,15 +100,21 @@ export declare function getCommitteeIndices(shuffling: EpochShuffling, attestati
 export declare function computeSubnetForSlot(shuffling: EpochShuffling, slot: number, committeeIndex: number): SubnetID;
 /**
  * Return fork-dependent seen attestation key
- *   - for pre-electra, it's the AttestationData base64
- *   - for electra and later, it's the AttestationData base64 + committeeBits base64
+ *   - for pre-electra, it's the AttestationData base64 from Attestation
+ *   - for electra and later, it's the AttestationData base64 from SingleAttestation
+ *   - consumers need to also pass slot + committeeIndex to get the correct SeenAttestationData
  */
-export declare function getSeenAttDataKeyFromGossipAttestation(fork: ForkName, attestation: GossipAttestation): SeenAttDataKey | null;
+export declare function getSeenAttDataKeyFromGossipAttestation(attestation: GossipAttestation): SeenAttDataKey | null;
 /**
  * Extract attestation data key from SignedAggregateAndProof Uint8Array to use cached data from SeenAttestationDatas
- *   - for pre-electra, it's the AttestationData base64
- *   - for electra and later, it's the AttestationData base64 + committeeBits base64
+ *   - for both electra + pre-electra, it's the AttestationData base64
+ *   - consumers need to also pass slot + committeeIndex to get the correct SeenAttestationData
  */
 export declare function getSeenAttDataKeyFromSignedAggregateAndProof(fork: ForkName, aggregateAndProof: Uint8Array): SeenAttDataKey | null;
+export declare function getCommitteeIndexFromAttestationOrBytes(fork: ForkName, attestationOrBytes: AttestationOrBytes): CommitteeIndex | null;
+/**
+ * Convert pre-electra single attestation (`phase0.Attestation`) to post-electra `SingleAttestation`
+ */
+export declare function toElectraSingleAttestation(attestation: SingleAttestation<ForkPreElectra>, attesterIndex: ValidatorIndex): SingleAttestation<ForkPostElectra>;
 export {};
 //# sourceMappingURL=attestation.d.ts.map

package/lib/chain/validation/attestation.js

@@ -1,14 +1,15 @@
-import { ATTESTATION_SUBNET_COUNT, DOMAIN_BEACON_ATTESTER, ForkSeq, SLOTS_PER_EPOCH, isForkPostElectra, } from "@lodestar/params";
+import { ATTESTATION_SUBNET_COUNT, DOMAIN_BEACON_ATTESTER, ForkName, ForkSeq, SLOTS_PER_EPOCH, isForkPostElectra, } from "@lodestar/params";
 import { EpochCacheError, EpochCacheErrorCode, computeEpochAtSlot, computeSigningRoot, computeStartSlotAtEpoch, createSingleSignatureSetFromComponents, } from "@lodestar/state-transition";
-import { isElectraAttestation, ssz, } from "@lodestar/types";
-import { toRootHex } from "@lodestar/utils";
+import { isElectraSingleAttestation, ssz, } from "@lodestar/types";
+import { assert, toRootHex } from "@lodestar/utils";
 import { MAXIMUM_GOSSIP_CLOCK_DISPARITY_SEC } from "../../constants/index.js";
-import { sszDeserializeAttestation } from "../../network/gossip/topic.js";
+import { sszDeserializeSingleAttestation } from "../../network/gossip/topic.js";
 import { getShufflingDependentRoot } from "../../util/dependentRoot.js";
-import { getAggregationBitsFromAttestationSerialized, getAttDataFromSignedAggregateAndProofElectra, getAttDataFromSignedAggregateAndProofPhase0, getCommitteeBitsFromAttestationSerialized, getCommitteeBitsFromSignedAggregateAndProofElectra, getSignatureFromAttestationSerialized, } from "../../util/sszBytes.js";
+import { getAggregationBitsFromAttestationSerialized, getAttDataFromSignedAggregateAndProofElectra, getAttDataFromSignedAggregateAndProofPhase0, getAttesterIndexFromSingleAttestationSerialized, getCommitteeIndexFromSingleAttestationSerialized, getSignatureFromAttestationSerialized, getSignatureFromSingleAttestationSerialized, } from "../../util/sszBytes.js";
 import { wrapError } from "../../util/wrapError.js";
 import { AttestationError, AttestationErrorCode, GossipAction } from "../errors/index.js";
 import { RegenCaller } from "../regen/index.js";
+import { PRE_ELECTRA_SINGLE_ATTESTATION_COMMITTEE_INDEX, } from "../seenCache/seenAttestationData.js";
 /**
  * Verify gossip attestations of the same attestation data. The main advantage is we can batch verify bls signatures
  * through verifySignatureSetsSameMessage bls api to improve performance.
@@ -127,7 +128,7 @@ export async function validateApiAttestation(fork, chain, attestationOrBytes) {
     }
 }
 /**
- * Only deserialize the attestation if needed, use the cached AttestationData instead
+ * Only deserialize the single attestation if needed, use the cached AttestationData instead
  * This is to avoid deserializing similar attestation multiple times which could help the gc
  */
 async function validateAttestationNoSignatureCheck(fork, chain, attestationOrBytes, 
@@ -146,10 +147,13 @@ subnet) {
     if (attestationOrBytes.serializedData) {
         // gossip
         const attSlot = attestationOrBytes.attSlot;
-        attDataKey = getSeenAttDataKeyFromGossipAttestation(fork, attestationOrBytes);
-        const cachedAttData = attDataKey !== null ? chain.seenAttestationDatas.get(attSlot, attDataKey) : null;
+        attDataKey = getSeenAttDataKeyFromGossipAttestation(attestationOrBytes);
+        const committeeIndexForLookup = isForkPostElectra(fork)
+            ? (getCommitteeIndexFromAttestationOrBytes(fork, attestationOrBytes) ?? 0)
+            : PRE_ELECTRA_SINGLE_ATTESTATION_COMMITTEE_INDEX;
+        const cachedAttData = attDataKey !== null ? chain.seenAttestationDatas.get(attSlot, committeeIndexForLookup, attDataKey) : null;
         if (cachedAttData === null) {
-            const attestation = sszDeserializeAttestation(fork, attestationOrBytes.serializedData);
+            const attestation = sszDeserializeSingleAttestation(fork, attestationOrBytes.serializedData);
             // only deserialize on the first AttestationData that's not cached
             attestationOrCache = { attestation, cache: null };
         }
@@ -171,19 +175,10 @@ subnet) {
     const targetEpoch = attTarget.epoch;
     let committeeIndex;
     if (attestationOrCache.attestation) {
-        if (isElectraAttestation(attestationOrCache.attestation)) {
+        if (isElectraSingleAttestation(attestationOrCache.attestation)) {
             // api or first time validation of a gossip attestation
-            const { committeeBits } = attestationOrCache.attestation;
-            // throw in both in case of undefined and null
-            if (committeeBits == null) {
-                throw new AttestationError(GossipAction.REJECT, { code: AttestationErrorCode.INVALID_SERIALIZED_BYTES });
-            }
-            committeeIndex = committeeBits.getSingleTrueBit();
-            // [REJECT] len(committee_indices) == 1, where committee_indices = get_committee_indices(aggregate)
-            if (committeeIndex === null) {
-                throw new AttestationError(GossipAction.REJECT, { code: AttestationErrorCode.NOT_EXACTLY_ONE_COMMITTEE_BIT_SET });
-            }
-            // [REJECT] aggregate.data.index == 0
+            committeeIndex = attestationOrCache.attestation.committeeIndex;
+            // [REJECT] attestation.data.index == 0
             if (attData.index !== 0) {
                 throw new AttestationError(GossipAction.REJECT, { code: AttestationErrorCode.NON_ZERO_ATTESTATION_DATA_INDEX });
             }
@@ -210,22 +205,27 @@ subnet) {
         // (a client MAY queue future attestations for processing at the appropriate slot).
         verifyPropagationSlotRange(fork, chain, attestationOrCache.attestation.data.slot);
     }
-    // [REJECT] The attestation is unaggregated -- that is, it has exactly one participating validator
-    // (len([bit for bit in attestation.aggregation_bits if bit]) == 1, i.e. exactly 1 bit is set).
-    // > TODO: Do this check **before** getting the target state but don't recompute zipIndexes
-    const aggregationBits = attestationOrCache.attestation
-        ? attestationOrCache.attestation.aggregationBits
-        : getAggregationBitsFromAttestationSerialized(fork, attestationOrCache.serializedData);
-    if (aggregationBits === null) {
-        throw new AttestationError(GossipAction.REJECT, {
-            code: AttestationErrorCode.INVALID_SERIALIZED_BYTES,
-        });
-    }
-    const bitIndex = aggregationBits.getSingleTrueBit();
-    if (bitIndex === null) {
-        throw new AttestationError(GossipAction.REJECT, {
-            code: AttestationErrorCode.NOT_EXACTLY_ONE_AGGREGATION_BIT_SET,
-        });
+    let aggregationBits = null;
+    let committeeValidatorIndex = null;
+    if (!isForkPostElectra(fork)) {
+        // [REJECT] The attestation is unaggregated -- that is, it has exactly one participating validator
+        // (len([bit for bit in attestation.aggregation_bits if bit]) == 1, i.e. exactly 1 bit is set).
+        // > TODO: Do this check **before** getting the target state but don't recompute zipIndexes
+        aggregationBits = attestationOrCache.attestation
+            ? attestationOrCache.attestation.aggregationBits
+            : getAggregationBitsFromAttestationSerialized(attestationOrCache.serializedData);
+        if (aggregationBits === null) {
+            throw new AttestationError(GossipAction.REJECT, {
+                code: AttestationErrorCode.INVALID_SERIALIZED_BYTES,
+            });
+        }
+        const bitIndex = aggregationBits.getSingleTrueBit();
+        if (bitIndex === null) {
+            throw new AttestationError(GossipAction.REJECT, {
+                code: AttestationErrorCode.NOT_EXACTLY_ONE_AGGREGATION_BIT_SET,
+            });
+        }
+        committeeValidatorIndex = bitIndex;
     }
     let committeeValidatorIndices;
     let getSigningRoot;
@@ -259,14 +259,43 @@ subnet) {
         getSigningRoot = () => getAttestationDataSigningRoot(chain.config, attData);
         expectedSubnet = computeSubnetForSlot(shuffling, attSlot, committeeIndex);
     }
-    const validatorIndex = committeeValidatorIndices[bitIndex];
-    // [REJECT] The number of aggregation bits matches the committee size
-    // -- i.e. len(attestation.aggregation_bits) == len(get_beacon_committee(state, data.slot, data.index)).
-    // > TODO: Is this necessary? Lighthouse does not do this check.
-    if (aggregationBits.bitLen !== committeeValidatorIndices.length) {
-        throw new AttestationError(GossipAction.REJECT, {
-            code: AttestationErrorCode.WRONG_NUMBER_OF_AGGREGATION_BITS,
-        });
+    let validatorIndex;
+    if (!isForkPostElectra(fork)) {
+        // The validity of aggregation bits are already checked above
+        assert.notNull(aggregationBits);
+        assert.notNull(committeeValidatorIndex);
+        validatorIndex = committeeValidatorIndices[committeeValidatorIndex];
+        // [REJECT] The number of aggregation bits matches the committee size
+        // -- i.e. len(attestation.aggregation_bits) == len(get_beacon_committee(state, data.slot, data.index)).
+        // > TODO: Is this necessary? Lighthouse does not do this check.
+        if (aggregationBits.bitLen !== committeeValidatorIndices.length) {
+            throw new AttestationError(GossipAction.REJECT, {
+                code: AttestationErrorCode.WRONG_NUMBER_OF_AGGREGATION_BITS,
+            });
+        }
+    }
+    else {
+        if (attestationOrCache.attestation) {
+            validatorIndex = attestationOrCache.attestation.attesterIndex;
+        }
+        else {
+            const attesterIndex = getAttesterIndexFromSingleAttestationSerialized(attestationOrCache.serializedData);
+            if (attesterIndex === null) {
+                throw new AttestationError(GossipAction.REJECT, {
+                    code: AttestationErrorCode.INVALID_SERIALIZED_BYTES,
+                });
+            }
+            validatorIndex = attesterIndex;
+        }
+        // [REJECT] The attester is a member of the committee -- i.e.
+        // `attestation.attester_index in get_beacon_committee(state, attestation.data.slot, index)`.
+        // Position of the validator in its committee
+        committeeValidatorIndex = committeeValidatorIndices.indexOf(validatorIndex);
+        if (committeeValidatorIndex === -1) {
+            throw new AttestationError(GossipAction.REJECT, {
+                code: AttestationErrorCode.ATTESTER_NOT_IN_COMMITTEE,
+            });
+        }
     }
     // LH > verify_middle_checks
     // Run the checks that apply to the indexed attestation before the signature is checked.
@@ -298,31 +327,26 @@ subnet) {
     let attDataRootHex;
     const signature = attestationOrCache.attestation
         ? attestationOrCache.attestation.signature
-        : getSignatureFromAttestationSerialized(attestationOrCache.serializedData);
+        : !isForkPostElectra(fork)
+            ? getSignatureFromAttestationSerialized(attestationOrCache.serializedData)
+            : getSignatureFromSingleAttestationSerialized(attestationOrCache.serializedData);
     if (signature === null) {
         throw new AttestationError(GossipAction.REJECT, {
             code: AttestationErrorCode.INVALID_SERIALIZED_BYTES,
         });
     }
-    let committeeBits = undefined;
     if (attestationOrCache.cache) {
         // there could be up to 6% of cpu time to compute signing root if we don't clone the signature set
         signatureSet = createSingleSignatureSetFromComponents(chain.index2pubkey[validatorIndex], attestationOrCache.cache.signingRoot, signature);
         attDataRootHex = attestationOrCache.cache.attDataRootHex;
-        committeeBits = attestationOrCache.cache.committeeBits;
     }
     else {
         signatureSet = createSingleSignatureSetFromComponents(chain.index2pubkey[validatorIndex], getSigningRoot(), signature);
         // add cached attestation data before verifying signature
         attDataRootHex = toRootHex(ssz.phase0.AttestationData.hashTreeRoot(attData));
-        // if attestation is phase0 the committeeBits is undefined anyway
-        committeeBits = isElectraAttestation(attestationOrCache.attestation)
-            ? attestationOrCache.attestation.committeeBits.clone()
-            : undefined;
         if (attDataKey) {
-            chain.seenAttestationDatas.add(attSlot, attDataKey, {
+            chain.seenAttestationDatas.add(attSlot, committeeIndex, attDataKey, {
                 committeeValidatorIndices,
-                committeeBits,
                 committeeIndex,
                 signingRoot: signatureSet.signingRoot,
                 subnet: expectedSubnet,
@@ -334,20 +358,26 @@ subnet) {
         }
     }
     // no signature check, leave that for step1
-    const indexedAttestationContent = {
+    const indexedAttestation = {
         attestingIndices,
         data: attData,
         signature,
     };
-    const indexedAttestation = ForkSeq[fork] >= ForkSeq.electra
-        ? indexedAttestationContent
-        : indexedAttestationContent;
-    const attestation = attestationOrCache.attestation ?? {
-        aggregationBits,
-        data: attData,
-        committeeBits,
-        signature,
-    };
+    const attestation = attestationOrCache.attestation
+        ? attestationOrCache.attestation
+        : !isForkPostElectra(fork)
+            ? {
+                // Aggregation bits are already asserted above to not be null
+                aggregationBits: aggregationBits,
+                data: attData,
+                signature,
+            }
+            : {
+                committeeIndex,
+                attesterIndex: validatorIndex,
+                data: attData,
+                signature,
+            };
     return {
         attestation,
         indexedAttestation,
@@ -356,6 +386,8 @@ subnet) {
         signatureSet,
         validatorIndex,
         committeeIndex,
+        committeeValidatorIndex,
+        committeeSize: committeeValidatorIndices.length,
     };
 }
 /**
@@ -576,30 +608,46 @@ export function computeSubnetForSlot(shuffling, slot, committeeIndex) {
 }
 /**
  * Return fork-dependent seen attestation key
- *   - for pre-electra, it's the AttestationData base64
- *   - for electra and later, it's the AttestationData base64 + committeeBits base64
+ *   - for pre-electra, it's the AttestationData base64 from Attestation
+ *   - for electra and later, it's the AttestationData base64 from SingleAttestation
+ *   - consumers need to also pass slot + committeeIndex to get the correct SeenAttestationData
  */
-export function getSeenAttDataKeyFromGossipAttestation(fork, attestation) {
-    const { attDataBase64, serializedData } = attestation;
-    if (isForkPostElectra(fork)) {
-        const committeeBits = getCommitteeBitsFromAttestationSerialized(serializedData);
-        return attDataBase64 && committeeBits ? attDataBase64 + committeeBits : null;
-    }
-    // pre-electra
-    return attDataBase64;
+export function getSeenAttDataKeyFromGossipAttestation(attestation) {
+    // SeenAttDataKey is the same as gossip index
+    return attestation.attDataBase64;
 }
 /**
  * Extract attestation data key from SignedAggregateAndProof Uint8Array to use cached data from SeenAttestationDatas
- *   - for pre-electra, it's the AttestationData base64
- *   - for electra and later, it's the AttestationData base64 + committeeBits base64
+ *   - for both electra + pre-electra, it's the AttestationData base64
+ *   - consumers need to also pass slot + committeeIndex to get the correct SeenAttestationData
  */
 export function getSeenAttDataKeyFromSignedAggregateAndProof(fork, aggregateAndProof) {
+    return isForkPostElectra(fork)
+        ? getAttDataFromSignedAggregateAndProofElectra(aggregateAndProof)
+        : getAttDataFromSignedAggregateAndProofPhase0(aggregateAndProof);
+}
+export function getCommitteeIndexFromAttestationOrBytes(fork, attestationOrBytes) {
+    const isGossipAttestation = attestationOrBytes.serializedData !== null;
     if (isForkPostElectra(fork)) {
-        const attData = getAttDataFromSignedAggregateAndProofElectra(aggregateAndProof);
-        const committeeBits = getCommitteeBitsFromSignedAggregateAndProofElectra(aggregateAndProof);
-        return attData && committeeBits ? attData + committeeBits : null;
+        if (isGossipAttestation) {
+            return getCommitteeIndexFromSingleAttestationSerialized(ForkName.electra, attestationOrBytes.serializedData);
+        }
+        return attestationOrBytes.attestation.committeeIndex;
+    }
+    if (isGossipAttestation) {
+        return getCommitteeIndexFromSingleAttestationSerialized(ForkName.phase0, attestationOrBytes.serializedData);
     }
-    // pre-electra
-    return getAttDataFromSignedAggregateAndProofPhase0(aggregateAndProof);
+    return attestationOrBytes.attestation.data.index;
+}
+/**
+ * Convert pre-electra single attestation (`phase0.Attestation`) to post-electra `SingleAttestation`
+ */
+export function toElectraSingleAttestation(attestation, attesterIndex) {
+    return {
+        committeeIndex: attestation.data.index,
+        attesterIndex,
+        data: attestation.data,
+        signature: attestation.signature,
+    };
 }
 //# sourceMappingURL=attestation.js.map