@lodestar/state-transition 1.45.0-dev.c6b2b7f1ba → 1.45.0-dev.d16fa2b13a

package/src/util/execution.ts

@@ -9,6 +9,7 @@ import {
   bellatrix,
   capella,
   deneb,
+  gloas,
   isBlindedBeaconBlockBody,
   isExecutionPayload,
   ssz,
@@ -127,7 +128,10 @@ export function isCapellaPayloadHeader(
 }
 
 export function executionPayloadToPayloadHeader(fork: ForkSeq, payload: ExecutionPayload): ExecutionPayloadHeader {
-  const transactionsRoot = ssz.bellatrix.Transactions.hashTreeRoot(payload.transactions);
+  const transactionsRoot =
+    fork >= ForkSeq.gloas
+      ? ssz.gloas.Transactions.hashTreeRoot((payload as gloas.ExecutionPayload).transactions)
+      : ssz.bellatrix.Transactions.hashTreeRoot(payload.transactions);
 
   const bellatrixPayloadFields: ExecutionPayloadHeader = {
     parentHash: payload.parentHash,
@@ -147,9 +151,10 @@ export function executionPayloadToPayloadHeader(fork: ForkSeq, payload: Executio
   };
 
   if (fork >= ForkSeq.capella) {
-    (bellatrixPayloadFields as capella.ExecutionPayloadHeader).withdrawalsRoot = ssz.capella.Withdrawals.hashTreeRoot(
-      (payload as capella.ExecutionPayload).withdrawals
-    );
+    (bellatrixPayloadFields as capella.ExecutionPayloadHeader).withdrawalsRoot =
+      fork >= ForkSeq.gloas
+        ? ssz.gloas.Withdrawals.hashTreeRoot((payload as gloas.ExecutionPayload).withdrawals)
+        : ssz.capella.Withdrawals.hashTreeRoot((payload as capella.ExecutionPayload).withdrawals);
   }
 
   if (fork >= ForkSeq.deneb) {

package/src/util/gloas.ts

@@ -18,7 +18,6 @@ import {AttestationData} from "@lodestar/types/phase0";
 import {byteArrayEquals} from "@lodestar/utils";
 import {ZERO_HASH} from "../constants/index.js";
 import {CachedBeaconStateFulu, CachedBeaconStateGloas} from "../types.js";
-import {getBlockRootAtSlot} from "./blockRoot.js";
 import {computeDomain} from "./domain.js";
 import {computeEpochAtSlot} from "./epoch.js";
 import {computeEpochShuffling} from "./epochShuffling.js";
@@ -188,15 +187,9 @@ export function findBuilderIndexByPubkey(state: CachedBeaconStateGloas, pubkey:
   return null;
 }
 
-export function isAttestationSameSlot(state: CachedBeaconStateGloas, data: AttestationData): boolean {
-  if (data.slot === 0) return true;
-
-  const isMatchingBlockRoot = byteArrayEquals(data.beaconBlockRoot, getBlockRootAtSlot(state, data.slot));
-  const isCurrentBlockRoot = !byteArrayEquals(data.beaconBlockRoot, getBlockRootAtSlot(state, data.slot - 1));
-
-  return isMatchingBlockRoot && isCurrentBlockRoot;
-}
-
+/**
+ * Use cached block roots to avoid repeated state root lookups while matching the spec's is_attestation_same_slot behavior.
+ */
 export function isAttestationSameSlotRootCache(rootCache: RootCache, data: AttestationData): boolean {
   if (data.slot === 0) return true;
 

package/src/util/index.ts

@@ -25,6 +25,7 @@ export * from "./shuffling.js";
 export * from "./signatureSets.js";
 export * from "./signingRoot.js";
 export * from "./slot.js";
+export * from "./ssz.js";
 export * from "./syncCommittee.js";
 export * from "./validator.js";
 export * from "./weakSubjectivity.js";

package/src/util/ssz.ts

@@ -0,0 +1,42 @@
+import {BranchNode, LeafNode, Node, zeroNode} from "@chainsafe/persistent-merkle-tree";
+import {progressiveSubtreeFillToContents} from "@chainsafe/ssz";
+
+// TODO: move these utils to @chainsafe/ssz (progressive.ts, next to progressiveSubtreeFillToContents)
+
+/** Root node (chunks + length mix-in) of a zero-filled ProgressiveListBasicType of `length` items */
+export function zeroProgressiveListBasicRootNode(itemsPerChunk: number, length: number): Node {
+  const chunkCount = Math.ceil(length / itemsPerChunk);
+  // mirrors ssz's progressiveSubtreeCount (subtree capacities 1, 4, 16, ...)
+  let numSubtrees = 0;
+  for (let remaining = chunkCount, subtreeLength = 1; remaining > 0; subtreeLength *= 4) {
+    remaining -= Math.min(remaining, subtreeLength);
+    numSubtrees++;
+  }
+  return new BranchNode(zeroProgressiveNode(numSubtrees), LeafNode.fromUint32(length));
+}
+
+/**
+ * Root node of a progressive list from its chunk/element nodes + length mix-in.
+ * `nodes` are packed 32-byte chunk leaves for basic lists, or element root nodes for composite lists.
+ */
+export function progressiveListRootNode(nodes: Node[], length: number): Node {
+  return new BranchNode(progressiveSubtreeFillToContents(nodes), LeafNode.fromUint32(length));
+}
+
+/**
+ * Return the chunks node of a zero-filled progressive merkle list spanning `numSubtrees`
+ * balanced subtrees (chunk capacities 1, 4, 16, ... = 4^i; depths 0, 2, 4, ... = 2i).
+ *
+ * Not memoized: the zero data is already fully shared via the cached zeroNode(2i) subtrees;
+ * only the O(numSubtrees) spine BranchNodes (~10 at 2M validators) are allocated per call.
+ */
+function zeroProgressiveNode(numSubtrees: number): Node {
+  // chain(k) = B(zeroNode(0), B(zeroNode(2), ... B(zeroNode(2(k-1)), zeroNode(0))))
+  let node: Node = zeroNode(0); // terminator
+  for (let i = numSubtrees - 1; i >= 0; i--) {
+    // BranchNode(left: balanced subtree i, right: rest of chain) — chain grows to the right,
+    // same as ssz progressiveSubtreeFillToContents: `root = new BranchNode(subtreeRoots[i], root)`
+    node = new BranchNode(zeroNode(2 * i), node);
+  }
+  return node;
+}