@aztec/aztec-node 0.0.1-commit.0dc957cde → 0.0.1-commit.0ec55a70b

package/dest/sentinel/sentinel.js

@@ -37,6 +37,12 @@ export class Sentinel extends EventEmitter {
         const interval = epochCache.getL1Constants().ethereumSlotDuration * 1000 / 4;
         this.runningPromise = new RunningPromise(this.work.bind(this), logger, interval);
     }
+    getSignatureContext() {
+        return {
+            chainId: this.config.l1ChainId,
+            rollupAddress: this.config.l1Contracts.rollupAddress
+        };
+    }
     updateConfig(config) {
         this.config = {
             ...this.config,
@@ -75,7 +81,7 @@ export class Sentinel extends EventEmitter {
         this.slotNumberToCheckpoint.set(checkpoint.checkpoint.header.slotNumber, {
             checkpointNumber: checkpoint.checkpoint.number,
             archive: checkpoint.checkpoint.archive.root.toString(),
-            attestors: getAttestationInfoFromPublishedCheckpoint(checkpoint).filter((a)=>a.status === 'recovered-from-signature').map((a)=>a.address)
+            attestors: getAttestationInfoFromPublishedCheckpoint(checkpoint, this.getSignatureContext()).filter((a)=>a.status === 'recovered-from-signature').map((a)=>a.address)
         });
         // Prune the archive map to only keep at most N entries
         const historyLength = this.store.getHistoryLength();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.0.1-commit.0dc957cde",
+  "version": "0.0.1-commit.0ec55a70b",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -65,31 +65,31 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.0dc957cde",
-    "@aztec/bb-prover": "0.0.1-commit.0dc957cde",
-    "@aztec/blob-client": "0.0.1-commit.0dc957cde",
-    "@aztec/blob-lib": "0.0.1-commit.0dc957cde",
-    "@aztec/constants": "0.0.1-commit.0dc957cde",
-    "@aztec/epoch-cache": "0.0.1-commit.0dc957cde",
-    "@aztec/ethereum": "0.0.1-commit.0dc957cde",
-    "@aztec/foundation": "0.0.1-commit.0dc957cde",
-    "@aztec/kv-store": "0.0.1-commit.0dc957cde",
-    "@aztec/l1-artifacts": "0.0.1-commit.0dc957cde",
-    "@aztec/node-keystore": "0.0.1-commit.0dc957cde",
-    "@aztec/node-lib": "0.0.1-commit.0dc957cde",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.0dc957cde",
-    "@aztec/p2p": "0.0.1-commit.0dc957cde",
-    "@aztec/protocol-contracts": "0.0.1-commit.0dc957cde",
-    "@aztec/prover-client": "0.0.1-commit.0dc957cde",
-    "@aztec/prover-node": "0.0.1-commit.0dc957cde",
-    "@aztec/sequencer-client": "0.0.1-commit.0dc957cde",
-    "@aztec/simulator": "0.0.1-commit.0dc957cde",
-    "@aztec/slasher": "0.0.1-commit.0dc957cde",
-    "@aztec/stdlib": "0.0.1-commit.0dc957cde",
-    "@aztec/telemetry-client": "0.0.1-commit.0dc957cde",
-    "@aztec/validator-client": "0.0.1-commit.0dc957cde",
-    "@aztec/validator-ha-signer": "0.0.1-commit.0dc957cde",
-    "@aztec/world-state": "0.0.1-commit.0dc957cde",
+    "@aztec/archiver": "0.0.1-commit.0ec55a70b",
+    "@aztec/bb-prover": "0.0.1-commit.0ec55a70b",
+    "@aztec/blob-client": "0.0.1-commit.0ec55a70b",
+    "@aztec/blob-lib": "0.0.1-commit.0ec55a70b",
+    "@aztec/constants": "0.0.1-commit.0ec55a70b",
+    "@aztec/epoch-cache": "0.0.1-commit.0ec55a70b",
+    "@aztec/ethereum": "0.0.1-commit.0ec55a70b",
+    "@aztec/foundation": "0.0.1-commit.0ec55a70b",
+    "@aztec/kv-store": "0.0.1-commit.0ec55a70b",
+    "@aztec/l1-artifacts": "0.0.1-commit.0ec55a70b",
+    "@aztec/node-keystore": "0.0.1-commit.0ec55a70b",
+    "@aztec/node-lib": "0.0.1-commit.0ec55a70b",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.0ec55a70b",
+    "@aztec/p2p": "0.0.1-commit.0ec55a70b",
+    "@aztec/protocol-contracts": "0.0.1-commit.0ec55a70b",
+    "@aztec/prover-client": "0.0.1-commit.0ec55a70b",
+    "@aztec/prover-node": "0.0.1-commit.0ec55a70b",
+    "@aztec/sequencer-client": "0.0.1-commit.0ec55a70b",
+    "@aztec/simulator": "0.0.1-commit.0ec55a70b",
+    "@aztec/slasher": "0.0.1-commit.0ec55a70b",
+    "@aztec/stdlib": "0.0.1-commit.0ec55a70b",
+    "@aztec/telemetry-client": "0.0.1-commit.0ec55a70b",
+    "@aztec/validator-client": "0.0.1-commit.0ec55a70b",
+    "@aztec/validator-ha-signer": "0.0.1-commit.0ec55a70b",
+    "@aztec/world-state": "0.0.1-commit.0ec55a70b",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",

package/src/aztec-node/block_response_helpers.ts

@@ -0,0 +1,131 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import {
+  type BlockData,
+  type BlockDataWithCheckpointContext,
+  type CheckpointedL2Block,
+  type CommitteeAttestation,
+  L2Block,
+} from '@aztec/stdlib/block';
+import type { CheckpointData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import {
+  type BlockIncludeOptions,
+  type BlockResponse,
+  type CheckpointIncludeOptions,
+  type CheckpointResponse,
+  l1PublishInfoFromL1PublishedData,
+} from '@aztec/stdlib/interfaces/client';
+
+/** Projects a full {@link L2Block} into a {@link BlockResponse}, attaching L1 / attestation context when provided. */
+export async function blockResponseFromL2Block(
+  block: L2Block,
+  options: BlockIncludeOptions,
+  context?: { l1?: BlockDataWithCheckpointContext['l1']; attestations?: CommitteeAttestation[] },
+): Promise<BlockResponse> {
+  const response: BlockResponse = {
+    header: block.header,
+    archive: block.archive,
+    hash: await block.hash(),
+    checkpointNumber: block.checkpointNumber,
+    indexWithinCheckpoint: block.indexWithinCheckpoint,
+    number: block.number,
+  };
+  if (options.includeTransactions) {
+    (response as BlockResponse).body = block.body;
+  }
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link BlockData} into a {@link BlockResponse}. */
+export function blockResponseFromBlockData(
+  data: BlockData,
+  blockNumber: BlockNumber,
+  options: BlockIncludeOptions,
+  context?: { l1?: BlockDataWithCheckpointContext['l1']; attestations?: CommitteeAttestation[] },
+): BlockResponse {
+  const response: BlockResponse = {
+    header: data.header,
+    archive: data.archive,
+    hash: data.blockHash,
+    checkpointNumber: data.checkpointNumber,
+    indexWithinCheckpoint: data.indexWithinCheckpoint,
+    number: blockNumber,
+  };
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects a {@link CheckpointedL2Block} into a {@link BlockResponse}. */
+export function blockResponseFromCheckpointedL2Block(
+  cp: CheckpointedL2Block,
+  options: BlockIncludeOptions,
+): Promise<BlockResponse> {
+  return blockResponseFromL2Block(cp.block, options, { l1: cp.l1, attestations: cp.attestations });
+}
+
+/** Projects a {@link PublishedCheckpoint} into a {@link CheckpointResponse}. */
+export async function checkpointResponseFromPublishedCheckpoint(
+  pc: PublishedCheckpoint,
+  options: CheckpointIncludeOptions,
+): Promise<CheckpointResponse> {
+  const response: CheckpointResponse = {
+    number: pc.checkpoint.number,
+    header: pc.checkpoint.header,
+    archive: pc.checkpoint.archive,
+    checkpointOutHash: pc.checkpoint.getCheckpointOutHash(),
+    startBlock: pc.checkpoint.blocks[0]?.number ?? BlockNumber.ZERO,
+    blockCount: pc.checkpoint.blocks.length,
+    feeAssetPriceModifier: pc.checkpoint.feeAssetPriceModifier,
+  };
+  if (options.includeBlocks) {
+    (response as CheckpointResponse).blocks = await Promise.all(
+      pc.checkpoint.blocks.map(block =>
+        blockResponseFromL2Block(block, {
+          includeTransactions: options.includeTransactions,
+          includeL1PublishInfo: false,
+          includeAttestations: false,
+        }),
+      ),
+    );
+  }
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(pc.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = pc.attestations;
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link CheckpointData} into a {@link CheckpointResponse}. `includeBlocks` is ignored (no blocks loaded). */
+export function checkpointResponseFromCheckpointData(
+  cd: CheckpointData,
+  options: CheckpointIncludeOptions,
+): CheckpointResponse {
+  const response: CheckpointResponse = {
+    number: cd.checkpointNumber,
+    header: cd.header,
+    archive: cd.archive,
+    checkpointOutHash: cd.checkpointOutHash,
+    startBlock: cd.startBlock,
+    blockCount: cd.blockCount,
+    feeAssetPriceModifier: cd.feeAssetPriceModifier,
+  };
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(cd.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = cd.attestations;
+  }
+  return response;
+}