chore: types and lint fixes (#6819)

ChainSafe · Jul 1, 2024 · d971d31 · d971d31
1 parent c321062
commit d971d31
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/packages/beacon-node/src/chain/validation/aggregateAndProof.ts b/packages/beacon-node/src/chain/validation/aggregateAndProof.ts
@@ -9,9 +9,7 @@ import {
 import {IBeaconChain} from "..";
 import {AttestationError, AttestationErrorCode, GossipAction} from "../errors/index.js";
 import {RegenCaller} from "../regen/index.js";
-import {
-  getSeenAttDataKeyFromSignedAggregateAndProof,
-} from "../../util/sszBytes.js";
+import {getSeenAttDataKeyFromSignedAggregateAndProof} from "../../util/sszBytes.js";
 import {getSelectionProofSignatureSet, getAggregateAndProofSignatureSet} from "./signatureSets/index.js";
 import {
   getAttestationDataSigningRoot,

diff --git a/packages/beacon-node/test/perf/chain/validation/attestation.test.ts b/packages/beacon-node/test/perf/chain/validation/attestation.test.ts
@@ -42,7 +42,7 @@ describe("validate gossip attestation", () => {
           attestation: null,
           serializedData,
           attSlot,
-          seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+          seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
         },
         subnet0
       );

diff --git a/packages/beacon-node/test/unit/chain/validation/attestation/validateAttestation.test.ts b/packages/beacon-node/test/unit/chain/validation/attestation/validateAttestation.test.ts
@@ -52,7 +52,7 @@ describe("validateAttestation", () => {
     const {chain, subnet} = getValidData();
     await expectGossipError(
       chain,
-      {attestation: null, serializedData: Buffer.alloc(0), attSlot: 0, seenAttestationDataKey: "invalid"},
+      {attestation: null, serializedData: Buffer.alloc(0), attSlot: 0, seenAttestationKey: "invalid"},
       subnet,
       GossipErrorCode.INVALID_SERIALIZED_BYTES_ERROR_CODE
     );
@@ -72,7 +72,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.BAD_TARGET_EPOCH
@@ -91,7 +91,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.PAST_SLOT
@@ -110,7 +110,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.FUTURE_SLOT
@@ -135,7 +135,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.NOT_EXACTLY_ONE_AGGREGATION_BIT_SET
@@ -155,7 +155,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.NOT_EXACTLY_ONE_AGGREGATION_BIT_SET
@@ -179,7 +179,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.UNKNOWN_OR_PREFINALIZED_BEACON_BLOCK_ROOT
@@ -199,7 +199,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.INVALID_TARGET_ROOT
@@ -226,7 +226,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.WRONG_NUMBER_OF_AGGREGATION_BITS
@@ -245,7 +245,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       invalidSubnet,
       AttestationErrorCode.INVALID_SUBNET_ID
@@ -265,7 +265,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.ATTESTATION_ALREADY_KNOWN
@@ -287,7 +287,7 @@ describe("validateAttestation", () => {
         attestation: null,
         serializedData,
         attSlot: attestation.data.slot,
-        seenAttestationDataKey: getSeenAttDataKeyPhase0(serializedData),
+        seenAttestationKey: getSeenAttDataKeyPhase0(serializedData),
       },
       subnet,
       AttestationErrorCode.INVALID_SIGNATURE

diff --git a/packages/validator/src/services/attestation.ts b/packages/validator/src/services/attestation.ts
@@ -1,5 +1,5 @@
 import {toHexString} from "@chainsafe/ssz";
-import {allForks, BLSSignature, electra, isElectraAttestation, phase0, Slot, ssz} from "@lodestar/types";
+import {allForks, BLSSignature, phase0, Slot, ssz} from "@lodestar/types";
 import {computeEpochAtSlot, isAggregatorFromCommitteeLength} from "@lodestar/state-transition";
 import {sleep} from "@lodestar/utils";
 import {ApiClient, routes} from "@lodestar/api";

diff --git a/packages/validator/src/services/validatorStore.ts b/packages/validator/src/services/validatorStore.ts
@@ -29,7 +29,6 @@ import {
   BlindedBeaconBlock,
   BLSPubkey,
   BLSSignature,
-  electra,
   Epoch,
   phase0,
   Root,
@@ -806,9 +805,7 @@ export class ValidatorStore {
       );
     }
     if (isAfterElectra && data.index !== 0) {
-      throw Error(
-        `Non-zero committee index post-electra during signing: att.committeeIndex ${data.index}`
-      );
+      throw Error(`Non-zero committee index post-electra during signing: att.committeeIndex ${data.index}`);
     }
     if (this.config.getForkSeq(duty.slot) >= ForkSeq.electra && data.index !== 0) {
       throw Error(`Attestataion data index must be 0 post electra: index ${data.index}`);