@aztec/prover-node 0.0.1-commit.21caa21 → 0.0.1-commit.21ecf947b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.0.1-commit.21caa21",
+  "version": "0.0.1-commit.21ecf947b",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -11,8 +11,8 @@
     "../package.common.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsgo -b",
-    "build:dev": "tsgo -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "bb": "node --no-warnings ./dest/bb/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
@@ -56,27 +56,27 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.21caa21",
-    "@aztec/bb-prover": "0.0.1-commit.21caa21",
-    "@aztec/blob-lib": "0.0.1-commit.21caa21",
-    "@aztec/blob-sink": "0.0.1-commit.21caa21",
-    "@aztec/constants": "0.0.1-commit.21caa21",
-    "@aztec/epoch-cache": "0.0.1-commit.21caa21",
-    "@aztec/ethereum": "0.0.1-commit.21caa21",
-    "@aztec/foundation": "0.0.1-commit.21caa21",
-    "@aztec/kv-store": "0.0.1-commit.21caa21",
-    "@aztec/l1-artifacts": "0.0.1-commit.21caa21",
-    "@aztec/node-keystore": "0.0.1-commit.21caa21",
-    "@aztec/node-lib": "0.0.1-commit.21caa21",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.21caa21",
-    "@aztec/p2p": "0.0.1-commit.21caa21",
-    "@aztec/protocol-contracts": "0.0.1-commit.21caa21",
-    "@aztec/prover-client": "0.0.1-commit.21caa21",
-    "@aztec/sequencer-client": "0.0.1-commit.21caa21",
-    "@aztec/simulator": "0.0.1-commit.21caa21",
-    "@aztec/stdlib": "0.0.1-commit.21caa21",
-    "@aztec/telemetry-client": "0.0.1-commit.21caa21",
-    "@aztec/world-state": "0.0.1-commit.21caa21",
+    "@aztec/archiver": "0.0.1-commit.21ecf947b",
+    "@aztec/bb-prover": "0.0.1-commit.21ecf947b",
+    "@aztec/blob-client": "0.0.1-commit.21ecf947b",
+    "@aztec/blob-lib": "0.0.1-commit.21ecf947b",
+    "@aztec/constants": "0.0.1-commit.21ecf947b",
+    "@aztec/epoch-cache": "0.0.1-commit.21ecf947b",
+    "@aztec/ethereum": "0.0.1-commit.21ecf947b",
+    "@aztec/foundation": "0.0.1-commit.21ecf947b",
+    "@aztec/kv-store": "0.0.1-commit.21ecf947b",
+    "@aztec/l1-artifacts": "0.0.1-commit.21ecf947b",
+    "@aztec/node-keystore": "0.0.1-commit.21ecf947b",
+    "@aztec/node-lib": "0.0.1-commit.21ecf947b",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.21ecf947b",
+    "@aztec/p2p": "0.0.1-commit.21ecf947b",
+    "@aztec/protocol-contracts": "0.0.1-commit.21ecf947b",
+    "@aztec/prover-client": "0.0.1-commit.21ecf947b",
+    "@aztec/sequencer-client": "0.0.1-commit.21ecf947b",
+    "@aztec/simulator": "0.0.1-commit.21ecf947b",
+    "@aztec/stdlib": "0.0.1-commit.21ecf947b",
+    "@aztec/telemetry-client": "0.0.1-commit.21ecf947b",
+    "@aztec/world-state": "0.0.1-commit.21ecf947b",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2"
@@ -86,7 +86,7 @@
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
     "@types/source-map-support": "^0.5.10",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",

package/src/actions/rerun-epoch-proving-job.ts

@@ -1,4 +1,5 @@
 import { createArchiverStore } from '@aztec/archiver';
+import type { L1ContractsConfig } from '@aztec/ethereum/config';
 import type { Logger } from '@aztec/foundation/log';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
@@ -21,7 +22,7 @@ import { ProverNodeJobMetrics } from '../metrics.js';
 export async function rerunEpochProvingJob(
   localPath: string,
   log: Logger,
-  config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig,
+  config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig & Pick<L1ContractsConfig, 'aztecEpochDuration'>,
 ) {
   const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
   log.info(`Loaded proving job data for epoch ${jobData.epochNumber}`);
@@ -29,8 +30,8 @@ export async function rerunEpochProvingJob(
   const telemetry = getTelemetryClient();
   const metrics = new ProverNodeJobMetrics(telemetry.getMeter('prover-job'), telemetry.getTracer('prover-job'));
   const worldState = await createWorldState(config);
-  const archiver = await createArchiverStore(config);
-  const publicProcessorFactory = new PublicProcessorFactory(archiver);
+  const archiver = await createArchiverStore(config, { epochDuration: config.aztecEpochDuration });
+  const publicProcessorFactory = new PublicProcessorFactory(archiver, undefined, undefined, log.getBindings());
 
   const publisher = { submitEpochProof: () => Promise.resolve(true) };
   const l2BlockSourceForReorgDetection = undefined;
@@ -52,6 +53,7 @@ export async function rerunEpochProvingJob(
     metrics,
     deadline,
     { skipEpochCheck: true },
+    log.getBindings(),
   );
 
   log.info(`Rerunning epoch proving job for epoch ${jobData.epochNumber}`);

package/src/bin/run-failed-epoch.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import type { L1ContractAddresses } from '@aztec/ethereum';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';

package/src/config.ts

@@ -1,6 +1,6 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
-import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum';
+import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
 import {
   type ConfigMappingsType,
   booleanConfigHelper,
@@ -8,7 +8,9 @@ import {
   numberConfigHelper,
 } from '@aztec/foundation/config';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
-import { type KeyStore, type KeyStoreConfig, ethPrivateKeySchema, keyStoreConfigMappings } from '@aztec/node-keystore';
+import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
+import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
+import type { KeyStore } from '@aztec/node-keystore/types';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import {
@@ -16,7 +18,7 @@ import {
   type ProverBrokerConfig,
   proverAgentConfigMappings,
   proverBrokerConfigMappings,
-} from '@aztec/prover-client/broker';
+} from '@aztec/prover-client/broker/config';
 import { type ProverClientUserConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
 import {
   type PublisherConfig,
@@ -163,7 +165,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | unde
 function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
   // Extract the publisher keys from the provided config.
   const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map(k => ethPrivateKeySchema.parse(k.getValue()))
+    ? config.publisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   // There must be at least 1.

package/src/factory.ts

@@ -1,16 +1,22 @@
 import { type Archiver, createArchiver } from '@aztec/archiver';
 import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
-import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
+import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
 import { EpochCache } from '@aztec/epoch-cache';
-import { L1TxUtils, PublisherManager, RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
+import { PublisherManager } from '@aztec/ethereum/publisher-manager';
 import { pick } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { type KeyStoreConfig, KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
 import { trySnapshotSync } from '@aztec/node-lib/actions';
-import { createL1TxUtilsFromEthSignerWithStore } from '@aztec/node-lib/factories';
-import { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
+import {
+  createForwarderL1TxUtilsFromEthSigner,
+  createL1TxUtilsFromEthSignerWithStore,
+} from '@aztec/node-lib/factories';
+import { NodeRpcTxSource, type P2PClientDeps, createP2PClient } from '@aztec/p2p';
 import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
 import type { AztecNode, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
@@ -33,10 +39,10 @@ export type ProverNodeDeps = {
   aztecNodeTxProvider?: Pick<AztecNode, 'getTxsByHash'>;
   archiver?: Archiver;
   publisherFactory?: ProverPublisherFactory;
-  blobSinkClient?: BlobSinkClientInterface;
   broker?: ProvingJobBroker;
   l1TxUtils?: L1TxUtils;
   dateProvider?: DateProvider;
+  p2pClientDeps?: P2PClientDeps<P2PClientType.Prover>;
 };
 
 /** Creates a new prover node given a config. */
@@ -50,8 +56,7 @@ export async function createProverNode(
   const config = { ...userConfig };
   const telemetry = deps.telemetry ?? getTelemetryClient();
   const dateProvider = deps.dateProvider ?? new DateProvider();
-  const blobSinkClient =
-    deps.blobSinkClient ?? createBlobSinkClient(config, { logger: createLogger('prover-node:blob-sink:client') });
+  const blobClient = await createBlobClientWithFileStores(config, createLogger('prover-node:blob-client:client'));
   const log = deps.log ?? createLogger('prover-node');
 
   // Build a key store from file if given or from environment otherwise
@@ -102,12 +107,11 @@ export async function createProverNode(
 
   const archiver =
     deps.archiver ??
-    (await createArchiver(config, { blobSinkClient, epochCache, telemetry, dateProvider }, { blockUntilSync: true }));
+    (await createArchiver(config, { blobClient, epochCache, telemetry, dateProvider }, { blockUntilSync: true }));
   log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
 
-  const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
   const worldStateSynchronizer = await createWorldStateSynchronizer(
-    worldStateConfig,
+    config,
     archiver,
     options.prefilledPublicData,
     telemetry,
@@ -123,7 +127,7 @@ export async function createProverNode(
 
   const publicClient = createPublicClient({
     chain: chain.chainInfo,
-    transport: fallback(config.l1RpcUrls.map((url: string) => http(url))),
+    transport: fallback(config.l1RpcUrls.map((url: string) => http(url, { batch: false }))),
     pollingInterval: config.viemPollingIntervalMS,
   });
 
@@ -131,24 +135,32 @@ export async function createProverNode(
 
   const l1TxUtils = deps.l1TxUtils
     ? [deps.l1TxUtils]
-    : await createL1TxUtilsFromEthSignerWithStore(
-        publicClient,
-        proverSigners.signers,
-        { ...config, scope: 'prover' },
-        { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
-      );
+    : config.publisherForwarderAddress
+      ? await createForwarderL1TxUtilsFromEthSigner(
+          publicClient,
+          proverSigners.signers,
+          config.publisherForwarderAddress,
+          { ...config, scope: 'prover' },
+          { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
+        )
+      : await createL1TxUtilsFromEthSignerWithStore(
+          publicClient,
+          proverSigners.signers,
+          { ...config, scope: 'prover' },
+          { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
+        );
 
   const publisherFactory =
     deps.publisherFactory ??
     new ProverPublisherFactory(config, {
       rollupContract,
-      publisherManager: new PublisherManager(l1TxUtils, config),
+      publisherManager: new PublisherManager(l1TxUtils, config, log.getBindings()),
       telemetry,
     });
 
   const proofVerifier = new QueuedIVCVerifier(
     config,
-    config.realProofs
+    config.realProofs || config.debugForceTxProofVerification
       ? await BBCircuitVerifier.new(config)
       : new TestCircuitVerifier(config.proverTestVerificationDelayMs),
   );
@@ -164,9 +176,11 @@ export async function createProverNode(
     dateProvider,
     telemetry,
     {
-      txCollectionNodeSources: deps.aztecNodeTxProvider
-        ? [new NodeRpcTxSource(deps.aztecNodeTxProvider, 'TestNode')]
-        : [],
+      ...deps.p2pClientDeps,
+      txCollectionNodeSources: [
+        ...(deps.p2pClientDeps?.txCollectionNodeSources ?? []),
+        ...(deps.aztecNodeTxProvider ? [new NodeRpcTxSource(deps.aztecNodeTxProvider, 'TestNode')] : []),
+      ],
     },
   );
 

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from './actions/index.js';
 export * from './config.js';
 export * from './factory.js';
+export * from './monitors/index.js';
 export * from './prover-node-publisher.js';
 export * from './prover-node.js';

package/src/job/epoch-proving-job-data.ts

@@ -1,40 +1,45 @@
-import { EpochNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/fields';
+import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
+import { CommitteeAttestation } from '@aztec/stdlib/block';
+import { Checkpoint } from '@aztec/stdlib/checkpoint';
 import { BlockHeader, Tx } from '@aztec/stdlib/tx';
 
 /** All data from an epoch used in proving. */
 export type EpochProvingJobData = {
   epochNumber: EpochNumber;
-  blocks: L2Block[];
+  checkpoints: Checkpoint[];
   txs: Map<string, Tx>;
-  l1ToL2Messages: Record<number, Fr[]>;
+  l1ToL2Messages: Record<CheckpointNumber, Fr[]>;
   previousBlockHeader: BlockHeader;
   attestations: CommitteeAttestation[];
 };
 
 export function validateEpochProvingJobData(data: EpochProvingJobData) {
-  if (data.blocks.length > 0 && data.previousBlockHeader.getBlockNumber() + 1 !== data.blocks[0].number) {
+  if (data.checkpoints.length === 0) {
+    throw new Error('No checkpoints to prove');
+  }
+
+  const firstBlockNumber = data.checkpoints[0].blocks[0].number;
+  const previousBlockNumber = data.previousBlockHeader.getBlockNumber();
+  if (previousBlockNumber + 1 !== firstBlockNumber) {
     throw new Error(
-      `Initial block number ${
-        data.blocks[0].number
-      } does not match previous block header ${data.previousBlockHeader.getBlockNumber()}`,
+      `Initial block number ${firstBlockNumber} does not match previous block header ${previousBlockNumber}`,
     );
   }
 
-  for (const blockNumber of data.blocks.map(block => block.number)) {
-    if (!(blockNumber in data.l1ToL2Messages)) {
-      throw new Error(`Missing L1 to L2 messages for block number ${blockNumber}`);
+  for (const checkpoint of data.checkpoints) {
+    if (!(checkpoint.number in data.l1ToL2Messages)) {
+      throw new Error(`Missing L1 to L2 messages for checkpoint number ${checkpoint.number}`);
     }
   }
 }
 
 export function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer {
-  const blocks = data.blocks.map(block => block.toBuffer());
+  const checkpoints = data.checkpoints.map(checkpoint => checkpoint.toBuffer());
   const txs = Array.from(data.txs.values()).map(tx => tx.toBuffer());
-  const l1ToL2Messages = Object.entries(data.l1ToL2Messages).map(([blockNumber, messages]) => [
-    Number(blockNumber),
+  const l1ToL2Messages = Object.entries(data.l1ToL2Messages).map(([checkpointNumber, messages]) => [
+    Number(checkpointNumber),
     messages.length,
     ...messages,
   ]);
@@ -43,8 +48,8 @@ export function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer
   return serializeToBuffer(
     data.epochNumber,
     data.previousBlockHeader,
-    blocks.length,
-    ...blocks,
+    checkpoints.length,
+    ...checkpoints,
     txs.length,
     ...txs,
     l1ToL2Messages.length,
@@ -58,20 +63,20 @@ export function deserializeEpochProvingJobData(buf: Buffer): EpochProvingJobData
   const reader = BufferReader.asReader(buf);
   const epochNumber = EpochNumber(reader.readNumber());
   const previousBlockHeader = reader.readObject(BlockHeader);
-  const blocks = reader.readVector(L2Block);
+  const checkpoints = reader.readVector(Checkpoint);
   const txArray = reader.readVector(Tx);
 
-  const l1ToL2MessageBlockCount = reader.readNumber();
+  const l1ToL2MessageCheckpointCount = reader.readNumber();
   const l1ToL2Messages: Record<number, Fr[]> = {};
-  for (let i = 0; i < l1ToL2MessageBlockCount; i++) {
-    const blockNumber = reader.readNumber();
+  for (let i = 0; i < l1ToL2MessageCheckpointCount; i++) {
+    const checkpointNumber = CheckpointNumber(reader.readNumber());
     const messages = reader.readVector(Fr);
-    l1ToL2Messages[blockNumber] = messages;
+    l1ToL2Messages[checkpointNumber] = messages;
   }
 
   const attestations = reader.readVector(CommitteeAttestation);
 
   const txs = new Map<string, Tx>(txArray.map(tx => [tx.getTxHash().toString(), tx]));
 
-  return { epochNumber, previousBlockHeader, blocks, txs, l1ToL2Messages, attestations };
+  return { epochNumber, previousBlockHeader, checkpoints, txs, l1ToL2Messages, attestations };
 }