@lodestar/beacon-node 1.41.0 → 1.42.0-dev.4118b5b440

package/src/util/sszBytes.ts

@@ -8,6 +8,7 @@ import {
   ForkSeq,
   MAX_COMMITTEES_PER_SLOT,
   isForkPostElectra,
+  isForkPostGloas,
 } from "@lodestar/params";
 import {BLSSignature, CommitteeIndex, RootHex, Slot, ValidatorIndex, ssz} from "@lodestar/types";
 
@@ -398,23 +399,102 @@ export function getSlotFromBlobSidecarSerialized(data: Uint8Array): Slot | null
 }
 
 /**
+ * Pre-Gloas DataColumnSidecar:
  * {
-    index: ColumnIndex [ fixed - 8 bytes],
-    column: DataColumn BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_CELL * <some non fixed length>,
-    kzgCommitments: denebSsz.BlobKzgCommitments,
-    kzgProofs: denebSsz.KZGProofs,
-    signedBlockHeader: phase0Ssz.SignedBeaconBlockHeader,
-    kzgCommitmentsInclusionProof: KzgCommitmentsInclusionProof,
+ *   index: ColumnIndex [fixed - 8 bytes],
+ *   column: DataColumn (offset - 4 bytes),
+ *   kzgCommitments: (offset - 4 bytes),
+ *   kzgProofs: (offset - 4 bytes),
+ *   signedBlockHeader: (offset - 4 bytes) -> slot at variable offset after fixed header
+ *   kzgCommitmentsInclusionProof: (offset - 4 bytes),
+ * }
+ * Post-Gloas DataColumnSidecar:
+ * {
+ *   index: ColumnIndex [8 bytes],
+ *   column: DataColumn (offset - 4 bytes),
+ *   kzgProofs: (offset - 4 bytes),
+ *   slot: Slot [8 bytes] - at offset 16,
+ *   beaconBlockRoot: Root [32 bytes] - at offset 24,
+ * }
+ */
+const SLOT_BYTES_POSITION_IN_SIGNED_DATA_COLUMN_SIDECAR_PRE_GLOAS = 20;
+const SLOT_BYTES_POSITION_IN_SIGNED_DATA_COLUMN_SIDECAR_POST_GLOAS = 16;
+const BEACON_BLOCK_ROOT_POSITION_IN_GLOAS_DATA_COLUMN_SIDECAR = 24;
+
+export function getSlotFromDataColumnSidecarSerialized(data: Uint8Array, fork: ForkName): Slot | null {
+  const offset = isForkPostGloas(fork)
+    ? SLOT_BYTES_POSITION_IN_SIGNED_DATA_COLUMN_SIDECAR_POST_GLOAS
+    : SLOT_BYTES_POSITION_IN_SIGNED_DATA_COLUMN_SIDECAR_PRE_GLOAS;
+
+  if (data.length < offset + SLOT_SIZE) {
+    return null;
   }
+
+  return getSlotFromOffset(data, offset);
+}
+
+export function getBeaconBlockRootFromDataColumnSidecarSerialized(data: Uint8Array): RootHex | null {
+  if (data.length < BEACON_BLOCK_ROOT_POSITION_IN_GLOAS_DATA_COLUMN_SIDECAR + ROOT_SIZE) {
+    return null;
+  }
+
+  blockRootBuf.set(
+    data.subarray(
+      BEACON_BLOCK_ROOT_POSITION_IN_GLOAS_DATA_COLUMN_SIDECAR,
+      BEACON_BLOCK_ROOT_POSITION_IN_GLOAS_DATA_COLUMN_SIDECAR + ROOT_SIZE
+    )
+  );
+  return "0x" + blockRootBuf.toString("hex");
+}
+
+/**
+ * SignedExecutionPayloadEnvelope SSZ Layout:
+ * ├─ 4 bytes: message offset (points to byte 100)
+ * ├─ 96 bytes: signature
+ * └─ ExecutionPayloadEnvelope (starts at byte 100):
+ *    ├─ 4 bytes: payload offset
+ *    ├─ 4 bytes: executionRequests offset
+ *    ├─ 8 bytes: builderIndex        (offset 108-115)
+ *    ├─ 32 bytes: beaconBlockRoot    (offset 116-147)
+ *    ├─ 8 bytes: slot                (offset 148-155)
+ *    └─ 32 bytes: stateRoot          (offset 156-187)
  */
+const SIGNED_EXECUTION_PAYLOAD_ENVELOPE_MESSAGE_OFFSET = 4;
+const SIGNED_EXECUTION_PAYLOAD_ENVELOPE_SIGNATURE_SIZE = 96;
+const EXECUTION_PAYLOAD_ENVELOPE_PAYLOAD_OFFSET = 4;
+const EXECUTION_PAYLOAD_ENVELOPE_REQUESTS_OFFSET = 4;
+const EXECUTION_PAYLOAD_ENVELOPE_BUILDER_INDEX_SIZE = 8;
+
+const BEACON_BLOCK_ROOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE =
+  SIGNED_EXECUTION_PAYLOAD_ENVELOPE_MESSAGE_OFFSET +
+  SIGNED_EXECUTION_PAYLOAD_ENVELOPE_SIGNATURE_SIZE +
+  EXECUTION_PAYLOAD_ENVELOPE_PAYLOAD_OFFSET +
+  EXECUTION_PAYLOAD_ENVELOPE_REQUESTS_OFFSET +
+  EXECUTION_PAYLOAD_ENVELOPE_BUILDER_INDEX_SIZE; // 116
+
+const SLOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE =
+  BEACON_BLOCK_ROOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE + ROOT_SIZE; // 148
+
+export function getSlotFromExecutionPayloadEnvelopeSerialized(data: Uint8Array): Slot | null {
+  if (data.length < SLOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE + SLOT_SIZE) {
+    return null;
+  }
 
-const SLOT_BYTES_POSITION_IN_SIGNED_DATA_COLUMN_SIDECAR = 20;
-export function getSlotFromDataColumnSidecarSerialized(data: Uint8Array): Slot | null {
-  if (data.length < SLOT_BYTES_POSITION_IN_SIGNED_DATA_COLUMN_SIDECAR + SLOT_SIZE) {
+  return getSlotFromOffset(data, SLOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE);
+}
+
+export function getBeaconBlockRootFromExecutionPayloadEnvelopeSerialized(data: Uint8Array): RootHex | null {
+  if (data.length < BEACON_BLOCK_ROOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE + ROOT_SIZE) {
     return null;
   }
 
-  return getSlotFromOffset(data, SLOT_BYTES_POSITION_IN_SIGNED_DATA_COLUMN_SIDECAR);
+  blockRootBuf.set(
+    data.subarray(
+      BEACON_BLOCK_ROOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE,
+      BEACON_BLOCK_ROOT_OFFSET_IN_SIGNED_EXECUTION_PAYLOAD_ENVELOPE + ROOT_SIZE
+    )
+  );
+  return "0x" + blockRootBuf.toString("hex");
 }
 
 /**

package/lib/chain/archiveStore/utils/archivePayloads.d.ts

@@ -1,7 +0,0 @@
-import { CheckpointWithHex } from "@lodestar/fork-choice";
-import { IBeaconChain } from "../../interface.js";
-/**
- * Archives execution payload envelopes from hot DB to archive DB after finalization.
- */
-export declare function archiveExecutionPayloadEnvelopes(chain: IBeaconChain, _finalized: CheckpointWithHex): Promise<void>;
-//# sourceMappingURL=archivePayloads.d.ts.map

package/lib/chain/archiveStore/utils/archivePayloads.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"archivePayloads.d.ts","sourceRoot":"","sources":["../../../../src/chain/archiveStore/utils/archivePayloads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD;;GAEG;AACH,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAKf"}

package/lib/chain/archiveStore/utils/archivePayloads.js

@@ -1,10 +0,0 @@
-/**
- * Archives execution payload envelopes from hot DB to archive DB after finalization.
- */
-export async function archiveExecutionPayloadEnvelopes(chain, _finalized) {
-    const finalizedBlock = chain.forkChoice.getFinalizedBlock();
-    if (!finalizedBlock)
-        return;
-    // TODO GLOAS: Implement payload envelope archival after epbs fork choice changes are merged
-}
-//# sourceMappingURL=archivePayloads.js.map

package/lib/chain/archiveStore/utils/archivePayloads.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"archivePayloads.js","sourceRoot":"","sources":["../../../../src/chain/archiveStore/utils/archivePayloads.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,KAAmB,EACnB,UAA6B,EACd;IACf,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;IAC5D,IAAI,CAAC,cAAc;QAAE,OAAO;IAE5B,4FAA4F;AAFhE,CAG7B"}

package/lib/chain/seenCache/seenExecutionPayloadEnvelope.d.ts

@@ -1,15 +0,0 @@
-import { RootHex, Slot } from "@lodestar/types";
-/**
- * Cache to prevent processing multiple execution payload envelopes for the same block root.
- * Only one builder qualifies to submit an execution payload for a given slot.
- * We only keep track of envelopes of unfinalized slots.
- * [IGNORE] The node has not seen another valid `SignedExecutionPayloadEnvelope` for this block root.
- */
-export declare class SeenExecutionPayloadEnvelopes {
-    private readonly slotByBlockRoot;
-    private finalizedSlot;
-    isKnown(blockRoot: RootHex): boolean;
-    add(blockRoot: RootHex, slot: Slot): void;
-    prune(finalizedSlot: Slot): void;
-}
-//# sourceMappingURL=seenExecutionPayloadEnvelope.d.ts.map

package/lib/chain/seenCache/seenExecutionPayloadEnvelope.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"seenExecutionPayloadEnvelope.d.ts","sourceRoot":"","sources":["../../../src/chain/seenCache/seenExecutionPayloadEnvelope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAE9C;;;;;GAKG;AACH,qBAAa,6BAA6B;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4B;IAC5D,OAAO,CAAC,aAAa,CAAW;IAEhC,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAEnC;IAED,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAMxC;IAED,KAAK,CAAC,aAAa,EAAE,IAAI,GAAG,IAAI,CAQ/B;CACF"}

package/lib/chain/seenCache/seenExecutionPayloadEnvelope.js

@@ -1,28 +0,0 @@
-/**
- * Cache to prevent processing multiple execution payload envelopes for the same block root.
- * Only one builder qualifies to submit an execution payload for a given slot.
- * We only keep track of envelopes of unfinalized slots.
- * [IGNORE] The node has not seen another valid `SignedExecutionPayloadEnvelope` for this block root.
- */
-export class SeenExecutionPayloadEnvelopes {
-    slotByBlockRoot = new Map();
-    finalizedSlot = 0;
-    isKnown(blockRoot) {
-        return this.slotByBlockRoot.has(blockRoot);
-    }
-    add(blockRoot, slot) {
-        if (slot < this.finalizedSlot) {
-            throw Error(`slot ${slot} < finalizedSlot ${this.finalizedSlot}`);
-        }
-        this.slotByBlockRoot.set(blockRoot, slot);
-    }
-    prune(finalizedSlot) {
-        this.finalizedSlot = finalizedSlot;
-        for (const [blockRoot, slot] of this.slotByBlockRoot.entries()) {
-            if (slot < finalizedSlot) {
-                this.slotByBlockRoot.delete(blockRoot);
-            }
-        }
-    }
-}
-//# sourceMappingURL=seenExecutionPayloadEnvelope.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"seenExecutionPayloadEnvelope.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenExecutionPayloadEnvelope.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,OAAO,6BAA6B;IACvB,eAAe,GAAG,IAAI,GAAG,EAAiB,CAAC;IACpD,aAAa,GAAS,CAAC,CAAC;IAEhC,OAAO,CAAC,SAAkB,EAAW;QACnC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAAA,CAC5C;IAED,GAAG,CAAC,SAAkB,EAAE,IAAU,EAAQ;QACxC,IAAI,IAAI,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAC,QAAQ,IAAI,oBAAoB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAAA,CAC3C;IAED,KAAK,CAAC,aAAmB,EAAQ;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,KAAK,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/D,IAAI,IAAI,GAAG,aAAa,EAAE,CAAC;gBACzB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IAAA,CACF;CACF"}

package/src/chain/archiveStore/utils/archivePayloads.ts

@@ -1,15 +0,0 @@
-import {CheckpointWithHex} from "@lodestar/fork-choice";
-import {IBeaconChain} from "../../interface.js";
-
-/**
- * Archives execution payload envelopes from hot DB to archive DB after finalization.
- */
-export async function archiveExecutionPayloadEnvelopes(
-  chain: IBeaconChain,
-  _finalized: CheckpointWithHex
-): Promise<void> {
-  const finalizedBlock = chain.forkChoice.getFinalizedBlock();
-  if (!finalizedBlock) return;
-
-  // TODO GLOAS: Implement payload envelope archival after epbs fork choice changes are merged
-}

package/src/chain/seenCache/seenExecutionPayloadEnvelope.ts

@@ -1,34 +0,0 @@
-import {RootHex, Slot} from "@lodestar/types";
-
-/**
- * Cache to prevent processing multiple execution payload envelopes for the same block root.
- * Only one builder qualifies to submit an execution payload for a given slot.
- * We only keep track of envelopes of unfinalized slots.
- * [IGNORE] The node has not seen another valid `SignedExecutionPayloadEnvelope` for this block root.
- */
-export class SeenExecutionPayloadEnvelopes {
-  private readonly slotByBlockRoot = new Map<RootHex, Slot>();
-  private finalizedSlot: Slot = 0;
-
-  isKnown(blockRoot: RootHex): boolean {
-    return this.slotByBlockRoot.has(blockRoot);
-  }
-
-  add(blockRoot: RootHex, slot: Slot): void {
-    if (slot < this.finalizedSlot) {
-      throw Error(`slot ${slot} < finalizedSlot ${this.finalizedSlot}`);
-    }
-
-    this.slotByBlockRoot.set(blockRoot, slot);
-  }
-
-  prune(finalizedSlot: Slot): void {
-    this.finalizedSlot = finalizedSlot;
-
-    for (const [blockRoot, slot] of this.slotByBlockRoot.entries()) {
-      if (slot < finalizedSlot) {
-        this.slotByBlockRoot.delete(blockRoot);
-      }
-    }
-  }
-}