@aztec/prover-node 0.76.2 → 0.76.4-devnet-test

package/dest/prover-node.js

@@ -1,5 +1,5 @@
 import { __esDecorate, __runInitializers } from "tslib";
-import { EpochProofQuotePayload, getTimestampRangeForEpoch, tryStop, } from '@aztec/circuit-types';
+import { EpochProvingJobTerminalState, getTimestampRangeForEpoch, tryStop, } from '@aztec/circuit-types';
 import { compact } from '@aztec/foundation/collection';
 import { memoize } from '@aztec/foundation/decorators';
 import { createLogger } from '@aztec/foundation/log';
@@ -23,7 +23,7 @@ let ProverNode = (() => {
     let _checkForTxs_decorators;
     let _gatherEpochData_decorators;
     return _a = class ProverNode {
-            constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, quoteProvider, quoteSigner, claimsMonitor, epochsMonitor, bondManager, options = {}, telemetryClient = getTelemetryClient()) {
+            constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()) {
                 this.prover = (__runInitializers(this, _instanceExtraInitializers), prover);
                 this.publisher = publisher;
                 this.l2BlockSource = l2BlockSource;
@@ -31,11 +31,7 @@ let ProverNode = (() => {
                 this.contractDataSource = contractDataSource;
                 this.worldState = worldState;
                 this.coordination = coordination;
-                this.quoteProvider = quoteProvider;
-                this.quoteSigner = quoteSigner;
-                this.claimsMonitor = claimsMonitor;
                 this.epochsMonitor = epochsMonitor;
-                this.bondManager = bondManager;
                 this.telemetryClient = telemetryClient;
                 this.log = createLogger('prover-node');
                 this.dateProvider = new DateProvider();
@@ -61,81 +57,24 @@ let ProverNode = (() => {
                 }
                 return undefined;
             }
-            async handleClaim(proofClaim) {
-                if (proofClaim.epochToProve === this.latestEpochWeAreProving) {
-                    this.log.verbose(`Already proving claim for epoch ${proofClaim.epochToProve}`);
-                    return;
-                }
-                const provenEpoch = await this.l2BlockSource.getProvenL2EpochNumber();
-                if (provenEpoch !== undefined && proofClaim.epochToProve <= provenEpoch) {
-                    this.log.verbose(`Claim for epoch ${proofClaim.epochToProve} is already proven`);
-                    return;
-                }
-                try {
-                    await this.startProof(proofClaim.epochToProve);
-                    this.latestEpochWeAreProving = proofClaim.epochToProve;
-                }
-                catch (err) {
-                    this.log.error(`Error handling claim for epoch ${proofClaim.epochToProve}`, err);
-                }
-                try {
-                    // Staked amounts are lowered after a claim, so this is a good time for doing a top-up if needed
-                    await this.bondManager.ensureBond();
-                }
-                catch (err) {
-                    this.log.error(`Error ensuring prover bond after handling claim for epoch ${proofClaim.epochToProve}`, err);
-                }
-            }
             /**
-             * Handles the epoch number to prove when the prover node starts by checking if there
-             * is an existing claim for it. If not, it creates and sends a quote for it.
-             * @param epochNumber - The epoch immediately before the current one when the prover node starts.
-             */
-            async handleInitialEpochSync(epochNumber) {
-                try {
-                    const claim = await this.publisher.getProofClaim();
-                    if (!claim || claim.epochToProve < epochNumber) {
-                        this.log.verbose(`Handling epoch ${epochNumber} completed as initial sync`);
-                        await this.handleEpochCompleted(epochNumber);
-                    }
-                }
-                catch (err) {
-                    this.log.error(`Error handling initial epoch sync`, err);
-                }
-            }
-            /**
-             * Handles an epoch being completed by sending a quote for proving it.
+             * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
              * @param epochNumber - The epoch number that was just completed.
              */
             async handleEpochCompleted(epochNumber) {
                 try {
-                    // Gather data for the epoch
-                    const epochData = await this.gatherEpochData(epochNumber);
-                    const { blocks } = epochData;
-                    this.cachedEpochData = { epochNumber, ...epochData };
-                    // Construct a quote for the epoch
-                    const partialQuote = await this.quoteProvider.getQuote(Number(epochNumber), blocks);
-                    if (!partialQuote) {
-                        this.log.info(`No quote produced for epoch ${epochNumber}`);
+                    this.log.debug('jobs', JSON.stringify(this.jobs, null, 2));
+                    const activeJobs = await this.getActiveJobsForEpoch(epochNumber);
+                    if (activeJobs.length > 0) {
+                        this.log.info(`Not starting proof for ${epochNumber} since there are active jobs`);
                         return;
                     }
-                    // Ensure we have deposited enough funds for sending this quote
-                    await this.bondManager.ensureBond(partialQuote.bondAmount);
-                    // Assemble and sign full quote
-                    const quote = EpochProofQuotePayload.from({
-                        ...partialQuote,
-                        epochToProve: BigInt(epochNumber),
-                        prover: this.publisher.getSenderAddress(),
-                        validUntilSlot: partialQuote.validUntilSlot ?? BigInt(Number.MAX_SAFE_INTEGER), // Should we constrain this?
-                    });
-                    const signed = await this.quoteSigner.sign(quote);
-                    // Send it to the coordinator
-                    this.log.info(`Sending quote for epoch ${epochNumber} with blocks ${blocks[0].number} to ${blocks.at(-1).number}`, quote.toViemArgs());
-                    await this.doSendEpochProofQuote(signed);
+                    // TODO: we probably want to skip starting a proof if we are too far into the current epoch
+                    await this.startProof(epochNumber);
                 }
                 catch (err) {
                     if (err instanceof EmptyEpochError) {
-                        this.log.info(`Not producing quote for ${epochNumber} since no blocks were found`);
+                        this.log.info(`Not starting proof for ${epochNumber} since no blocks were found`);
                     }
                     else {
                         this.log.error(`Error handling epoch completed`, err);
@@ -143,15 +82,12 @@ let ProverNode = (() => {
                 }
             }
             /**
-             * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and sends
-             * quotes for them, as well as monitors the claims for the epochs it has sent quotes for and starts proving jobs.
-             * This method returns once the prover node has deposited an initial bond into the escrow contract.
+             * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
+             * starts proving jobs for them.
              */
-            async start() {
+            start() {
                 this.txFetcher.start();
-                await this.bondManager.ensureBond();
                 this.epochsMonitor.start(this);
-                this.claimsMonitor.start(this);
                 this.log.info('Started ProverNode', this.options);
             }
             /**
@@ -161,7 +97,6 @@ let ProverNode = (() => {
                 this.log.info('Stopping ProverNode');
                 await this.txFetcher.stop();
                 await this.epochsMonitor.stop();
-                await this.claimsMonitor.stop();
                 await this.prover.stop();
                 await tryStop(this.l2BlockSource);
                 this.publisher.interrupt();
@@ -171,14 +106,6 @@ let ProverNode = (() => {
                 await this.telemetryClient.stop();
                 this.log.info('Stopped ProverNode');
             }
-            /** Sends an epoch proof quote to the coordinator. */
-            sendEpochProofQuote(quote) {
-                this.log.info(`Sending quote for epoch`, quote.toViemArgs().quote);
-                return this.doSendEpochProofQuote(quote);
-            }
-            doSendEpochProofQuote(quote) {
-                return this.coordination.addEpochProofQuote(quote);
-            }
             /**
              * Creates a proof for a block range. Returns once the proof has been submitted to L1.
              */
@@ -203,7 +130,16 @@ let ProverNode = (() => {
              * Returns an array of jobs being processed.
              */
             getJobs() {
-                return Promise.resolve(Array.from(this.jobs.entries()).map(([uuid, job]) => ({ uuid, status: job.getState() })));
+                return Promise.resolve(Array.from(this.jobs.entries()).map(([uuid, job]) => ({
+                    uuid,
+                    status: job.getState(),
+                    epochNumber: Number(job.getEpochNumber()),
+                })));
+            }
+            async getActiveJobsForEpoch(epochBigInt) {
+                const jobs = await this.getJobs();
+                const epochNumber = Number(epochBigInt);
+                return jobs.filter(job => job.epochNumber === epochNumber && !EpochProvingJobTerminalState.includes(job.status));
             }
             checkMaximumPendingJobs() {
                 const { maxPendingJobs } = this.options;
@@ -283,7 +219,6 @@ let ProverNode = (() => {
             /** Extracted for testing purposes. */
             async triggerMonitors() {
                 await this.epochsMonitor.work();
-                await this.claimsMonitor.work();
             }
         },
         (() => {
@@ -307,4 +242,4 @@ class EmptyEpochError extends Error {
         this.name = 'EmptyEpochError';
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.76.2",
+  "version": "0.76.4-devnet-test",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -53,25 +53,25 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.76.2",
-    "@aztec/bb-prover": "0.76.2",
-    "@aztec/blob-sink": "0.76.2",
-    "@aztec/circuit-types": "0.76.2",
-    "@aztec/circuits.js": "0.76.2",
-    "@aztec/epoch-cache": "0.76.2",
-    "@aztec/ethereum": "0.76.2",
-    "@aztec/foundation": "0.76.2",
-    "@aztec/kv-store": "0.76.2",
-    "@aztec/l1-artifacts": "0.76.2",
-    "@aztec/noir-protocol-circuits-types": "0.76.2",
-    "@aztec/p2p": "0.76.2",
-    "@aztec/protocol-contracts": "0.76.2",
-    "@aztec/prover-client": "0.76.2",
-    "@aztec/sequencer-client": "0.76.2",
-    "@aztec/simulator": "0.76.2",
-    "@aztec/telemetry-client": "0.76.2",
-    "@aztec/types": "0.76.2",
-    "@aztec/world-state": "0.76.2",
+    "@aztec/archiver": "0.76.4-devnet-test",
+    "@aztec/bb-prover": "0.76.4-devnet-test",
+    "@aztec/blob-sink": "0.76.4-devnet-test",
+    "@aztec/circuit-types": "0.76.4-devnet-test",
+    "@aztec/circuits.js": "0.76.4-devnet-test",
+    "@aztec/epoch-cache": "0.76.4-devnet-test",
+    "@aztec/ethereum": "0.76.4-devnet-test",
+    "@aztec/foundation": "0.76.4-devnet-test",
+    "@aztec/kv-store": "0.76.4-devnet-test",
+    "@aztec/l1-artifacts": "0.76.4-devnet-test",
+    "@aztec/noir-protocol-circuits-types": "0.76.4-devnet-test",
+    "@aztec/p2p": "0.76.4-devnet-test",
+    "@aztec/protocol-contracts": "0.76.4-devnet-test",
+    "@aztec/prover-client": "0.76.4-devnet-test",
+    "@aztec/sequencer-client": "0.76.4-devnet-test",
+    "@aztec/simulator": "0.76.4-devnet-test",
+    "@aztec/telemetry-client": "0.76.4-devnet-test",
+    "@aztec/types": "0.76.4-devnet-test",
+    "@aztec/world-state": "0.76.4-devnet-test",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.22.8"

package/src/config.ts

@@ -1,11 +1,6 @@
 import { type ArchiverConfig, archiverConfigMappings, getArchiverConfigFromEnv } from '@aztec/archiver/config';
 import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover/config';
-import {
-  type ConfigMappingsType,
-  bigintConfigHelper,
-  getConfigFromMappings,
-  numberConfigHelper,
-} from '@aztec/foundation/config';
+import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
 import { type DataStoreConfig, dataConfigMappings, getDataConfigFromEnv } from '@aztec/kv-store/config';
 import { type P2PConfig, getP2PConfigFromEnv, p2pConfigMappings } from '@aztec/p2p/config';
 import {
@@ -30,7 +25,6 @@ import {
 } from '@aztec/sequencer-client/config';
 import { type WorldStateConfig, getWorldStateConfigFromEnv, worldStateConfigMappings } from '@aztec/world-state/config';
 
-import { type ProverBondManagerConfig, proverBondManagerConfigMappings } from './bond/config.js';
 import {
   type ProverCoordinationConfig,
   getTxProviderConfigFromEnv,
@@ -45,8 +39,6 @@ export type ProverNodeConfig = ArchiverConfig &
   TxSenderConfig &
   DataStoreConfig &
   ProverCoordinationConfig &
-  ProverBondManagerConfig &
-  QuoteProviderConfig &
   SpecificProverNodeConfig;
 
 type SpecificProverNodeConfig = {
@@ -58,12 +50,6 @@ type SpecificProverNodeConfig = {
   txGatheringMaxParallelRequests: number;
 };
 
-export type QuoteProviderConfig = {
-  quoteProviderBasisPointFee: number;
-  quoteProviderBondAmount: bigint;
-  quoteProviderUrl?: string;
-};
-
 const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
   proverNodeMaxPendingJobs: {
     env: 'PROVER_NODE_MAX_PENDING_JOBS',
@@ -97,24 +83,6 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
   },
 };
 
-const quoteProviderConfigMappings: ConfigMappingsType<QuoteProviderConfig> = {
-  quoteProviderBasisPointFee: {
-    env: 'QUOTE_PROVIDER_BASIS_POINT_FEE',
-    description: 'The basis point fee to charge for providing quotes',
-    ...numberConfigHelper(100),
-  },
-  quoteProviderBondAmount: {
-    env: 'QUOTE_PROVIDER_BOND_AMOUNT',
-    description: 'The bond amount to charge for providing quotes',
-    ...bigintConfigHelper(1000n),
-  },
-  quoteProviderUrl: {
-    env: 'QUOTE_PROVIDER_URL',
-    description:
-      'The URL of the remote quote provider. Overrides QUOTE_PROVIDER_BASIS_POINT_FEE and QUOTE_PROVIDER_BOND_AMOUNT.',
-  },
-};
-
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
   ...dataConfigMappings,
   ...archiverConfigMappings,
@@ -124,8 +92,6 @@ export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
   ...getPublisherConfigMappings('PROVER'),
   ...getTxSenderConfigMappings('PROVER'),
   ...proverCoordinationConfigMappings,
-  ...quoteProviderConfigMappings,
-  ...proverBondManagerConfigMappings,
   ...specificProverNodeConfigMappings,
 };
 
@@ -139,9 +105,7 @@ export function getProverNodeConfigFromEnv(): ProverNodeConfig {
     ...getPublisherConfigFromEnv('PROVER'),
     ...getTxSenderConfigFromEnv('PROVER'),
     ...getTxProviderConfigFromEnv(),
-    ...getConfigFromMappings(quoteProviderConfigMappings),
     ...getConfigFromMappings(specificProverNodeConfigMappings),
-    ...getConfigFromMappings(proverBondManagerConfigMappings),
   };
 }
 

package/src/factory.ts

@@ -3,28 +3,18 @@ import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-
 import { type ProverCoordination, type ProvingJobBroker } from '@aztec/circuit-types';
 import { EpochCache } from '@aztec/epoch-cache';
 import { L1TxUtils, RollupContract, createEthereumChain, createL1Clients } from '@aztec/ethereum';
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
-import { RollupAbi } from '@aztec/l1-artifacts';
 import { createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 
-import { createPublicClient, getAddress, getContract, http } from 'viem';
-
-import { createBondManager } from './bond/factory.js';
-import { type ProverNodeConfig, type QuoteProviderConfig } from './config.js';
-import { ClaimsMonitor } from './monitors/claims-monitor.js';
+import { type ProverNodeConfig } from './config.js';
 import { EpochMonitor } from './monitors/epoch-monitor.js';
 import { createProverCoordination } from './prover-coordination/factory.js';
 import { ProverNodePublisher } from './prover-node-publisher.js';
 import { ProverNode, type ProverNodeOptions } from './prover-node.js';
-import { HttpQuoteProvider } from './quote-provider/http.js';
-import { SimpleQuoteProvider } from './quote-provider/simple.js';
-import { QuoteSigner } from './quote-signer.js';
 
 /** Creates a new prover node given a config. */
 export async function createProverNode(
@@ -64,7 +54,7 @@ export async function createProverNode(
 
   const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
 
-  // If config.p2pEnabled is true, createProverCoordination will create a p2p client where quotes will be shared and tx's requested
+  // If config.p2pEnabled is true, createProverCoordination will create a p2p client where txs are requested
   // If config.p2pEnabled is false, createProverCoordination request information from the AztecNode
   const proverCoordination = await createProverCoordination(config, {
     aztecNodeTxProvider: deps.aztecNodeTxProvider,
@@ -74,9 +64,6 @@ export async function createProverNode(
     telemetry,
   });
 
-  const quoteProvider = createQuoteProvider(config);
-  const quoteSigner = createQuoteSigner(config);
-
   const proverNodeConfig: ProverNodeOptions = {
     maxPendingJobs: config.proverNodeMaxPendingJobs,
     pollingIntervalMs: config.proverNodePollingIntervalMs,
@@ -86,12 +73,8 @@ export async function createProverNode(
     txGatheringTimeoutMs: config.txGatheringTimeoutMs,
   };
 
-  const claimsMonitor = new ClaimsMonitor(publisher, proverNodeConfig, telemetry);
   const epochMonitor = new EpochMonitor(archiver, proverNodeConfig, telemetry);
 
-  const escrowContractAddress = await rollupContract.getProofCommitmentEscrow();
-  const bondManager = await createBondManager(EthAddress.fromString(escrowContractAddress), walletClient, config);
-
   return new ProverNode(
     prover,
     publisher,
@@ -100,29 +83,8 @@ export async function createProverNode(
     archiver,
     worldStateSynchronizer,
     proverCoordination,
-    quoteProvider,
-    quoteSigner,
-    claimsMonitor,
     epochMonitor,
-    bondManager,
     proverNodeConfig,
     telemetry,
   );
 }
-
-function createQuoteProvider(config: QuoteProviderConfig) {
-  return config.quoteProviderUrl
-    ? new HttpQuoteProvider(config.quoteProviderUrl)
-    : new SimpleQuoteProvider(config.quoteProviderBasisPointFee, config.quoteProviderBondAmount);
-}
-
-function createQuoteSigner(config: ProverNodeConfig) {
-  // REFACTOR: We need a package that just returns an instance of a rollup contract ready to use
-  const { l1RpcUrl: rpcUrl, l1ChainId: chainId, l1Contracts } = config;
-  const chain = createEthereumChain(rpcUrl, chainId);
-  const client = createPublicClient({ chain: chain.chainInfo, transport: http(chain.rpcUrl) });
-  const address = getAddress(l1Contracts.rollupAddress.toString());
-  const rollupContract = getContract({ address, abi: RollupAbi, client });
-  const privateKey = config.publisherPrivateKey;
-  return QuoteSigner.new(Buffer32.fromString(privateKey), rollupContract);
-}

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

@@ -63,6 +63,10 @@ export class EpochProvingJob implements Traceable {
     return this.state;
   }
 
+  public getEpochNumber(): bigint {
+    return this.epochNumber;
+  }
+
   /**
    * Proves the given epoch and submits the proof to L1.
    */

package/src/monitors/epoch-monitor.ts

@@ -10,7 +10,6 @@ import {
 } from '@aztec/telemetry-client';
 
 export interface EpochMonitorHandler {
-  handleInitialEpochSync(epochNumber: bigint): Promise<void>;
   handleEpochCompleted(epochNumber: bigint): Promise<void>;
 }
 
@@ -48,7 +47,7 @@ export class EpochMonitor implements Traceable {
     if (!this.latestEpochNumber) {
       const epochNumber = await this.l2BlockSource.getL2EpochNumber();
       if (epochNumber > 0n) {
-        await this.handler?.handleInitialEpochSync(epochNumber - 1n);
+        await this.handler?.handleEpochCompleted(epochNumber - 1n);
       }
       this.latestEpochNumber = epochNumber;
       return;

package/src/monitors/index.ts

@@ -1,2 +1 @@
-export * from './claims-monitor.js';
 export * from './epoch-monitor.js';

package/src/prover-node-publisher.ts

@@ -85,10 +85,6 @@ export class ProverNodePublisher {
     return EthAddress.fromString(this.l1TxUtils.getSenderAddress());
   }
 
-  public getProofClaim() {
-    return this.rollupContract.getProofClaim();
-  }
-
   public async submitEpochProof(args: {
     epochNumber: number;
     fromBlock: number;
@@ -205,11 +201,12 @@ export class ProverNodePublisher {
 
     const txArgs = [
       {
-        epochSize: argsArray[0],
-        args: argsArray[1],
-        fees: argsArray[2],
-        blobPublicInputs: argsArray[3],
-        aggregationObject: argsArray[4],
+        start: argsArray[0],
+        end: argsArray[1],
+        args: argsArray[2],
+        fees: argsArray[3],
+        blobPublicInputs: argsArray[4],
+        aggregationObject: argsArray[5],
         proof: proofHex,
       },
     ] as const;
@@ -252,7 +249,8 @@ export class ProverNodePublisher {
     proof: Proof;
   }) {
     return [
-      BigInt(args.toBlock - args.fromBlock + 1),
+      BigInt(args.fromBlock),
+      BigInt(args.toBlock),
       [
         args.publicInputs.previousArchive.root.toString(),
         args.publicInputs.endArchive.root.toString(),