rebase fixes

chore: fix bls and blst versioning fix: add ForkName.electra to ForkBlobsInfo some api header lookup fixes more api fixes make the api data safe Co-authored-by: matthewkeil <me@matthewkeil.com>
ChainSafe · Aug 9, 2024 · 7ade322 · 7ade322
1 parent 2aea1c6
commit 7ade322
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 12 deletions.
diff --git a/packages/api/src/beacon/routes/beacon/pool.ts b/packages/api/src/beacon/routes/beacon/pool.ts
@@ -17,6 +17,7 @@ import {
 } from "../../../utils/codecs.js";
 import {MetaHeader, VersionCodec, VersionMeta} from "../../../utils/metadata.js";
 import {toForkName} from "../../../utils/fork.js";
+import {fromHeaders} from "../../../utils/headers.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
 
@@ -247,7 +248,12 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
           };
         },
         parseReqJson: ({body, headers}) => {
-          const fork = toForkName(headers[MetaHeader.Version]);
+          const versionHeader = fromHeaders(headers, MetaHeader.Version, false);
+          const fork =
+            versionHeader !== undefined
+              ? toForkName(versionHeader)
+              : config.getForkName(Number((body as {data: {slot: string}}[])[0]?.data.slot ?? 0));
+
           return {
             signedAttestations:
               ForkSeq[fork] >= ForkSeq.electra
@@ -266,7 +272,8 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
           };
         },
         parseReqSsz: ({body, headers}) => {
-          const fork = toForkName(headers[MetaHeader.Version]);
+          const versionHeader = fromHeaders(headers, MetaHeader.Version, true);
+          const fork = toForkName(versionHeader);
           return {
             signedAttestations:
               ForkSeq[fork] >= ForkSeq.electra

diff --git a/packages/api/src/beacon/routes/validator.ts b/packages/api/src/beacon/routes/validator.ts
@@ -41,6 +41,7 @@ import {
   VersionMeta,
   VersionType,
 } from "../../utils/metadata.js";
+import {fromHeaders} from "../../utils/headers.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
 
@@ -811,7 +812,7 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
         parseReq: ({query}) => ({
           attestationDataRoot: fromHexString(query.attestation_data_root),
           slot: query.slot,
-          committeeIndex: query.slot,
+          committeeIndex: query.committeeIndex,
         }),
         schema: {
           query: {
@@ -833,7 +834,7 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
       method: "POST",
       req: {
         writeReqJson: ({signedAggregateAndProofs}) => {
-          const fork = config.getForkName(signedAggregateAndProofs[0].message.aggregate.data.slot);
+          const fork = config.getForkName(signedAggregateAndProofs[0]?.message.aggregate.data.slot ?? 0);
           return {
             body:
               ForkSeq[fork] >= ForkSeq.electra
@@ -847,7 +848,16 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
           };
         },
         parseReqJson: ({body, headers}) => {
-          const fork = toForkName(headers[MetaHeader.Version]);
+          const versionHeader = fromHeaders(headers, MetaHeader.Version, false);
+          const fork =
+            versionHeader !== undefined
+              ? toForkName(versionHeader)
+              : config.getForkName(
+                  Number(
+                    (body as {message: {aggregate: {data: {slot: string}}}}[])[0]?.message.aggregate.data.slot ?? 0
+                  )
+                );
+
           return {
             signedAggregateAndProofs:
               ForkSeq[fork] >= ForkSeq.electra
@@ -856,7 +866,7 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
           };
         },
         writeReqSsz: ({signedAggregateAndProofs}) => {
-          const fork = config.getForkName(signedAggregateAndProofs[0].message.aggregate.data.slot);
+          const fork = config.getForkName(signedAggregateAndProofs[0]?.message.aggregate.data.slot ?? 0);
           return {
             body:
               ForkSeq[fork] >= ForkSeq.electra
@@ -870,7 +880,8 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
           };
         },
         parseReqSsz: ({body, headers}) => {
-          const fork = toForkName(headers[MetaHeader.Version]);
+          const versionHeader = fromHeaders(headers, MetaHeader.Version, true);
+          const fork = toForkName(versionHeader);
           return {
             signedAggregateAndProofs:
               ForkSeq[fork] >= ForkSeq.electra

diff --git a/packages/api/test/unit/beacon/testData/beacon.ts b/packages/api/test/unit/beacon/testData/beacon.ts
@@ -92,7 +92,7 @@ export const testData: GenericServerTestCases<Endpoints> = {
 
   getPoolAttestations: {
     args: {slot: 1, committeeIndex: 2},
-    res: {data: [ssz.phase0.Attestation.defaultValue()]},
+    res: {data: [ssz.phase0.Attestation.defaultValue()], meta: {version: ForkName.deneb}},
   },
   getPoolAttesterSlashings: {
     args: undefined,

diff --git a/packages/api/test/unit/beacon/testData/validator.ts b/packages/api/test/unit/beacon/testData/validator.ts
@@ -99,7 +99,7 @@ export const testData: GenericServerTestCases<Endpoints> = {
     res: {data: ssz.altair.SyncCommitteeContribution.defaultValue()},
   },
   getAggregatedAttestation: {
-    args: {attestationDataRoot: ZERO_HASH, slot: 32000, index: 2},
+    args: {attestationDataRoot: ZERO_HASH, slot: 32000, committeeIndex: 2},
     res: {data: ssz.phase0.Attestation.defaultValue(), meta: {version: ForkName.phase0}},
   },
   publishAggregateAndProofs: {

diff --git a/packages/light-client/test/unit/webEsmBundle.browser.test.ts b/packages/light-client/test/unit/webEsmBundle.browser.test.ts
@@ -1,7 +1,7 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access */
 import {expect, describe, it, vi, beforeAll} from "vitest";
 import {sleep} from "@lodestar/utils";
-import {Lightclient, LightclientEvent, utils, transport} from "../../dist/lightclient.min.mjs";
+import {Lightclient, LightclientEvent, utils, transport} from "../../src/index.js";
 
 describe("web bundle for lightclient", () => {
   vi.setConfig({testTimeout: 20_000});

diff --git a/packages/state-transition/package.json b/packages/state-transition/package.json
@@ -59,6 +59,7 @@
   "types": "lib/index.d.ts",
   "dependencies": {
     "@chainsafe/as-sha256": "^0.5.0",
+    "@chainsafe/bls": "7.1.3",
     "@chainsafe/blst": "^2.0.3",
     "@chainsafe/persistent-merkle-tree": "^0.8.0",
     "@chainsafe/persistent-ts": "^0.19.1",

diff --git a/packages/validator/test/unit/services/attestation.test.ts b/packages/validator/test/unit/services/attestation.test.ts
@@ -5,6 +5,7 @@ import {ssz} from "@lodestar/types";
 import {routes} from "@lodestar/api";
 import {createChainForkConfig} from "@lodestar/config";
 import {config} from "@lodestar/config/default";
+import {ForkName} from "@lodestar/params";
 import {AttestationService, AttestationServiceOpts} from "../../../src/services/attestation.js";
 import {AttDutyAndProof} from "../../../src/services/attestationDuties.js";
 import {ValidatorStore} from "../../../src/services/validatorStore.js";
@@ -105,7 +106,9 @@ describe("AttestationService", function () {
 
         // Mock beacon's attestation and aggregates endpoints
         api.validator.produceAttestationData.mockResolvedValue(mockApiResponse({data: attestation.data}));
-        api.validator.getAggregatedAttestation.mockResolvedValue(mockApiResponse({data: attestation}));
+        api.validator.getAggregatedAttestation.mockResolvedValue(
+          mockApiResponse({data: attestation, meta: {version: ForkName.phase0}})
+        );
 
         api.beacon.submitPoolAttestations.mockResolvedValue(mockApiResponse({}));
         api.validator.publishAggregateAndProofs.mockResolvedValue(mockApiResponse({}));