@aztec/prover-node 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/src/config.ts

@@ -1,16 +1,14 @@
 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 ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
+import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
 import {
-  type EthAccount,
-  type EthAddressHex,
-  type EthRemoteSignerAccount,
-  type KeyStore,
-  type KeyStoreConfig,
-  keyStoreConfigMappings,
-} from '@aztec/node-keystore';
+  type ConfigMappingsType,
+  booleanConfigHelper,
+  getConfigFromMappings,
+  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 SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import {
@@ -45,6 +43,8 @@ export type SpecificProverNodeConfig = {
   proverNodePollingIntervalMs: number;
   proverNodeMaxParallelBlocksPerEpoch: number;
   proverNodeFailedEpochStore: string | undefined;
+  proverNodeEpochProvingDelayMs: number | undefined;
+  proverNodeDisableProofPublish?: boolean;
   txGatheringTimeoutMs: number;
   txGatheringIntervalMs: number;
   txGatheringBatchSize: number;
@@ -72,6 +72,10 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'File store where to upload node state when an epoch fails to be proven',
     defaultValue: undefined,
   },
+  proverNodeEpochProvingDelayMs: {
+    description: 'Optional delay in milliseconds to wait before proving a new epoch',
+    defaultValue: undefined,
+  },
   txGatheringIntervalMs: {
     env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
     description: 'How often to check that tx data is available',
@@ -92,6 +96,11 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'How long to wait for tx data to be available before giving up',
     ...numberConfigHelper(120_000),
   },
+  proverNodeDisableProofPublish: {
+    env: 'PROVER_NODE_DISABLE_PROOF_PUBLISH',
+    description: 'Whether the prover node skips publishing proofs to L1',
+    ...booleanConfigHelper(false),
+  },
 };
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
@@ -125,19 +134,14 @@ export function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig
   };
 }
 
-function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
-  // See what we have been given for proverId.
-  const proverId = config.proverId ? (config.proverId.toString() as EthAddressHex) : undefined;
-
+function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | undefined {
   // If we don't have a valid prover Id then we can't build a valid key store with remote signers
-  if (proverId === undefined) {
+  if (config.proverId === undefined) {
     return undefined;
   }
 
   // Also, we need at least one publisher address.
-  const publishers = config.publisherAddresses
-    ? config.publisherAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount)
-    : [];
+  const publishers = config.publisherAddresses ?? [];
 
   if (publishers.length === 0) {
     return undefined;
@@ -147,7 +151,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
     schemaVersion: 1,
     slasher: undefined,
     prover: {
-      id: proverId,
+      id: config.proverId,
       publisher: publishers,
     },
     remoteSigner: config.web3SignerUrl,
@@ -156,10 +160,10 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
   return keyStore;
 }
 
-function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
+function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
   // Extract the publisher keys from the provided config.
   const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map(k => k.getValue() as EthAddressHex)
+    ? config.publisherPrivateKeys.map(k => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   // There must be at least 1.
@@ -167,9 +171,6 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
     return undefined;
   }
 
-  // Now see what we have been given for proverId.
-  const proverId = config.proverId ? (config.proverId.toString() as EthAddressHex) : undefined;
-
   // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
   // Otherwise create one of the form ("0x12345678....." as EthAccount).
 
@@ -177,11 +178,11 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
     schemaVersion: 1,
     slasher: undefined,
     prover:
-      proverId === undefined
-        ? (publisherKeys[0] as EthAccount)
+      config.proverId === undefined
+        ? publisherKeys[0]
         : {
-            id: proverId,
-            publisher: publisherKeys.map(key => key as EthAccount),
+            id: config.proverId,
+            publisher: publisherKeys,
           },
     remoteSigner: undefined,
     validators: undefined,
@@ -189,7 +190,7 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
   return keyStore;
 }
 
-export function createKeyStoreForProver(config: ProverNodeConfig) {
+export function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
     return createKeyStoreFromWeb3Signer(config);
   }

package/src/factory.ts

@@ -2,20 +2,17 @@ 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 { EpochCache } from '@aztec/epoch-cache';
-import {
-  type EthSigner,
-  L1TxUtils,
-  PublisherManager,
-  RollupContract,
-  createEthereumChain,
-  createL1TxUtilsFromEthSigner,
-} 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 { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
@@ -73,6 +70,8 @@ export async function createProverNode(
     }
   }
 
+  await keyStoreManager?.validateSigners();
+
   // Extract the prover signers from the key store and verify that we have one.
   const proverSigners = keyStoreManager?.createProverSigners();
 
@@ -86,6 +85,8 @@ export async function createProverNode(
     );
   }
 
+  log.info(`Creating prover with publishers ${proverSigners.signers.map(signer => signer.address.toString()).join()}`);
+
   // Only consider user provided config if it is valid
   const proverIdInUserConfig = config.proverId === undefined || config.proverId.isZero() ? undefined : config.proverId;
 
@@ -133,21 +134,26 @@ export async function createProverNode(
 
   const l1TxUtils = deps.l1TxUtils
     ? [deps.l1TxUtils]
-    : proverSigners.signers.map((signer: EthSigner) => {
-        return createL1TxUtilsFromEthSigner(publicClient, signer, log, dateProvider, config);
-      });
+    : 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),
+      publisherManager: new PublisherManager(l1TxUtils, config),
       telemetry,
     });
 
   const proofVerifier = new QueuedIVCVerifier(
     config,
-    config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(),
+    config.realProofs || config.debugForceTxProofVerification
+      ? await BBCircuitVerifier.new(config)
+      : new TestCircuitVerifier(config.proverTestVerificationDelayMs),
   );
 
   const p2pClient = await createP2PClient(
@@ -175,10 +181,12 @@ export async function createProverNode(
       'proverNodeMaxPendingJobs',
       'proverNodeMaxParallelBlocksPerEpoch',
       'proverNodePollingIntervalMs',
+      'proverNodeEpochProvingDelayMs',
       'txGatheringMaxParallelRequests',
       'txGatheringIntervalMs',
       'txGatheringTimeoutMs',
       'proverNodeFailedEpochStore',
+      'proverNodeDisableProofPublish',
       'dataDirectory',
       'l1ChainId',
       'rollupVersion',
@@ -187,7 +195,7 @@ export async function createProverNode(
 
   const epochMonitor = await EpochMonitor.create(
     archiver,
-    { pollingIntervalMs: config.proverNodePollingIntervalMs },
+    { pollingIntervalMs: config.proverNodePollingIntervalMs, provingDelayMs: config.proverNodeEpochProvingDelayMs },
     telemetry,
   );
 

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

@@ -1,49 +1,55 @@
-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: bigint;
-  blocks: L2Block[];
+  epochNumber: EpochNumber;
+  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,
   ]);
   const attestations = data.attestations.map(attestation => attestation.toBuffer());
 
   return serializeToBuffer(
-    Number(data.epochNumber),
+    data.epochNumber,
     data.previousBlockHeader,
-    blocks.length,
-    ...blocks,
+    checkpoints.length,
+    ...checkpoints,
     txs.length,
     ...txs,
     l1ToL2Messages.length,
@@ -55,22 +61,22 @@ export function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer
 
 export function deserializeEpochProvingJobData(buf: Buffer): EpochProvingJobData {
   const reader = BufferReader.asReader(buf);
-  const epochNumber = BigInt(reader.readNumber());
+  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 };
 }