@lodestar/beacon-node 1.47.0-dev.0bcaaaebb5 → 1.47.0-dev.101e2c290d

package/src/sync/utils/downloadByRange.ts

@@ -136,6 +136,8 @@ export function cacheByRangeResponses({
   const source = BlockInputSource.byRange;
   const updatedBatchBlocks = new Map<Slot, IBlockInput>(batchBlocks.map((block) => [block.slot, block]));
 
+  const payloadEnvelopes = new Map<Slot, PayloadEnvelopeInput>(existingPayloadEnvelopes);
+
   const blocks = responses.validatedBlocks ?? [];
   for (let i = 0; i < blocks.length; i++) {
     const {block, blockRoot} = blocks[i];
@@ -172,15 +174,17 @@ export function cacheByRangeResponses({
     // later step) can throw and abort the batch — otherwise a gloas block would sit in
     // seenBlockInputCache but unseeded here, and payload-by-root sync would later throw "Missing
     // PayloadEnvelopeInput for known block" (see issue #9306). add() is idempotent.
-    if (isForkPostGloas(blockInput.forkName)) {
-      seenPayloadEnvelopeInputCache.add({
+    if (isForkPostGloas(blockInput.forkName) && !payloadEnvelopes.has(blockInput.slot)) {
+      const payloadInput = seenPayloadEnvelopeInputCache.add({
         blockRootHex: blockInput.blockRootHex,
         block: blockInput.getBlock() as SignedBeaconBlock<ForkPostGloas>,
         forkName: blockInput.forkName,
         sampledColumns: custodyConfig.sampledColumns,
         custodyColumns: custodyConfig.custodyColumns,
-        timeCreatedSec: seenTimestampSec,
+        seenTimestampSec,
+        source: PayloadEnvelopeInputSource.byRange,
       });
+      payloadEnvelopes.set(blockInput.slot, payloadInput);
     }
   }
 
@@ -222,17 +226,22 @@ export function cacheByRangeResponses({
     }
   }
 
-  let payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null =
-    existingPayloadEnvelopes !== null ? new Map(existingPayloadEnvelopes) : null;
   if (downloadedPayloadEnvelopes !== null) {
-    payloadEnvelopes ??= new Map();
     for (const [slot, envelope] of downloadedPayloadEnvelopes) {
-      const envelopeBlockRootHex = toRootHex(envelope.message.beaconBlockRoot);
-      const payloadInput = seenPayloadEnvelopeInputCache.get(envelopeBlockRootHex);
+      // the only PayloadEnvelopeInput miss is the dangling parent, which we can get from the seen cache
+      let payloadInput = payloadEnvelopes.get(slot);
       if (payloadInput === undefined) {
-        // Unreachable given the validatedBlocks loop above seeded an entry for every gloas block in
-        // the batch. for the parent block, it's populated at BeaconChain init
-        throw new Error(`Missing PayloadEnvelopeInput for block ${envelopeBlockRootHex}`);
+        if (updatedBatchBlocks.has(slot)) {
+          throw new Error(
+            `Missing PayloadEnvelopeInput for in-batch slot ${slot} root ${toRootHex(envelope.message.beaconBlockRoot)}`
+          );
+        }
+        payloadInput = seenPayloadEnvelopeInputCache.get(toRootHex(envelope.message.beaconBlockRoot));
+      }
+      if (payloadInput === undefined) {
+        throw new Error(
+          `Missing PayloadEnvelopeInput for slot ${slot} root ${toRootHex(envelope.message.beaconBlockRoot)}`
+        );
       }
 
       if (!payloadInput.hasPayloadEnvelope()) {
@@ -262,7 +271,7 @@ export function cacheByRangeResponses({
       // Gloas columns are attached to the matching PayloadEnvelopeInput, NOT to IBlockInput.
       // Gloas DataColumnSidecar has `slot` directly (no signedBlockHeader).
       const dataSlot = firstColumn.slot;
-      const payloadInput = payloadEnvelopes?.get(dataSlot);
+      const payloadInput = payloadEnvelopes.get(dataSlot);
       if (!payloadInput) {
         // Should not happen: we built payloadInputs for all gloas blocks above
         continue;

package/src/sync/utils/downloadByRoot.ts

@@ -13,6 +13,7 @@ import {BlobIndex, ColumnIndex, SignedBeaconBlock, Slot, deneb, fulu} from "@lod
 import {LodestarError, byteArrayEquals, fromHex, prettyPrintIndices, toHex, toRootHex} from "@lodestar/utils";
 import {isBlockInputBlobs, isBlockInputColumns} from "../../chain/blocks/blockInput/blockInput.js";
 import {BlockInputSource, IBlockInput} from "../../chain/blocks/blockInput/types.js";
+import {PayloadEnvelopeInputSource} from "../../chain/blocks/payloadEnvelopeInput/index.js";
 import {ChainEventEmitter} from "../../chain/emitter.js";
 import {IBeaconChain} from "../../chain/interface.js";
 import {validateBlockBlobSidecars} from "../../chain/validation/blobSidecar.js";
@@ -122,7 +123,8 @@ export async function downloadByRoot({
       forkName: blockInput.forkName,
       sampledColumns: chain.custodyConfig.sampledColumns,
       custodyColumns: chain.custodyConfig.custodyColumns,
-      timeCreatedSec: Date.now() / 1000,
+      seenTimestampSec: Date.now() / 1000,
+      source: PayloadEnvelopeInputSource.byRoot,
     });
   }
 

package/lib/chain/bls/maybeBatch.d.ts

@@ -1,12 +0,0 @@
-import { PublicKey } from "@chainsafe/blst";
-export type SignatureSetDeserialized = {
-    publicKey: PublicKey;
-    message: Uint8Array;
-    signature: Uint8Array;
-};
-/**
- * Verify signatures sets with batch verification or regular core verify depending on the set count.
- * Abstracted in a separate file to be consumed by the threaded pool and the main thread implementation.
- */
-export declare function verifySignatureSetsMaybeBatch(sets: SignatureSetDeserialized[]): boolean;
-//# sourceMappingURL=maybeBatch.d.ts.map

package/lib/chain/bls/maybeBatch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"maybeBatch.d.ts","sourceRoot":"","sources":["../../../src/chain/bls/maybeBatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAuD,MAAM,iBAAiB,CAAC;AAIhG,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,wBAAwB,EAAE,GAAG,OAAO,CA8BvF"}

package/lib/chain/bls/maybeBatch.js

@@ -1,35 +0,0 @@
-import { Signature, verify, verifyMultipleAggregateSignatures } from "@chainsafe/blst";
-const MIN_SET_COUNT_TO_BATCH = 2;
-/**
- * Verify signatures sets with batch verification or regular core verify depending on the set count.
- * Abstracted in a separate file to be consumed by the threaded pool and the main thread implementation.
- */
-export function verifySignatureSetsMaybeBatch(sets) {
-    try {
-        if (sets.length >= MIN_SET_COUNT_TO_BATCH) {
-            return verifyMultipleAggregateSignatures(sets.map((s) => ({
-                pk: s.publicKey,
-                msg: s.message,
-                // true = validate signature
-                sig: Signature.fromBytes(s.signature, true),
-            })));
-        }
-        // .every on an empty array returns true
-        if (sets.length === 0) {
-            throw Error("Empty signature set");
-        }
-        // If too few signature sets verify them without batching
-        return sets.every((set) => {
-            // true = validate signature
-            const sig = Signature.fromBytes(set.signature, true);
-            return verify(set.message, set.publicKey, sig);
-        });
-    }
-    catch (_) {
-        // A signature could be malformed, in that case fromBytes throws error
-        // blst-ts `verifyMultipleSignatures` is also a fallible operation if mul_n_aggregate fails
-        // see https://github.com/ChainSafe/blst-ts/blob/b1ba6333f664b08e5c50b2b0d18c4f079203962b/src/lib.ts#L291
-        return false;
-    }
-}
-//# sourceMappingURL=maybeBatch.js.map

package/lib/chain/bls/maybeBatch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"maybeBatch.js","sourceRoot":"","sources":["../../../src/chain/bls/maybeBatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,EAAE,iCAAiC,EAAC,MAAM,iBAAiB,CAAC;AAEhG,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAQjC;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAAgC;IAC5E,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,IAAI,sBAAsB,EAAE,CAAC;YAC1C,OAAO,iCAAiC,CACtC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACf,EAAE,EAAE,CAAC,CAAC,SAAS;gBACf,GAAG,EAAE,CAAC,CAAC,OAAO;gBACd,4BAA4B;gBAC5B,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC;aAC5C,CAAC,CAAC,CACJ,CAAC;QACJ,CAAC;QAED,wCAAwC;QACxC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACrC,CAAC;QAED,yDAAyD;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,4BAA4B;YAC5B,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACrD,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,sEAAsE;QACtE,2FAA2F;QAC3F,yGAAyG;QACzG,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/src/chain/bls/maybeBatch.ts

@@ -1,45 +0,0 @@
-import {PublicKey, Signature, verify, verifyMultipleAggregateSignatures} from "@chainsafe/blst";
-
-const MIN_SET_COUNT_TO_BATCH = 2;
-
-export type SignatureSetDeserialized = {
-  publicKey: PublicKey;
-  message: Uint8Array;
-  signature: Uint8Array;
-};
-
-/**
- * Verify signatures sets with batch verification or regular core verify depending on the set count.
- * Abstracted in a separate file to be consumed by the threaded pool and the main thread implementation.
- */
-export function verifySignatureSetsMaybeBatch(sets: SignatureSetDeserialized[]): boolean {
-  try {
-    if (sets.length >= MIN_SET_COUNT_TO_BATCH) {
-      return verifyMultipleAggregateSignatures(
-        sets.map((s) => ({
-          pk: s.publicKey,
-          msg: s.message,
-          // true = validate signature
-          sig: Signature.fromBytes(s.signature, true),
-        }))
-      );
-    }
-
-    // .every on an empty array returns true
-    if (sets.length === 0) {
-      throw Error("Empty signature set");
-    }
-
-    // If too few signature sets verify them without batching
-    return sets.every((set) => {
-      // true = validate signature
-      const sig = Signature.fromBytes(set.signature, true);
-      return verify(set.message, set.publicKey, sig);
-    });
-  } catch (_) {
-    // A signature could be malformed, in that case fromBytes throws error
-    // blst-ts `verifyMultipleSignatures` is also a fallible operation if mul_n_aggregate fails
-    // see https://github.com/ChainSafe/blst-ts/blob/b1ba6333f664b08e5c50b2b0d18c4f079203962b/src/lib.ts#L291
-    return false;
-  }
-}