@aztec/prover-node 0.85.0 → 0.86.0

package/dest/prover-coordination/combined-prover-coordination.js

@@ -0,0 +1,136 @@
+import { asyncPool } from '@aztec/foundation/async-pool';
+import { createLogger } from '@aztec/foundation/log';
+import { TxHash } from '@aztec/stdlib/tx';
+// Wraps the p2p client into a coordination pool
+class P2PCoordinationPool {
+    p2p;
+    constructor(p2p){
+        this.p2p = p2p;
+    }
+    getTxsByHash(txHashes) {
+        return this.p2p.getTxsByHash(txHashes);
+    }
+    hasTxsInPool(txHashes) {
+        return this.p2p.hasTxsInPool(txHashes);
+    }
+    getTxsByHashFromPool(txHashes) {
+        return this.p2p.getTxsByHashFromPool(txHashes);
+    }
+    addTxs(txs) {
+        return this.p2p.addTxs(txs);
+    }
+}
+// Wraps an in memory tx pool into a coordination pool. Used for testing when no p2p/tx pool is available.
+class InMemoryCoordinationPool {
+    txs = new Map();
+    getTxsByHash(txHashes) {
+        return Promise.resolve(txHashes.map((hash)=>this.txs.get(hash.toString())));
+    }
+    hasTxsInPool(txHashes) {
+        return Promise.resolve(txHashes.map((hash)=>this.txs.has(hash.toString())));
+    }
+    getTxsByHashFromPool(txHashes) {
+        return this.getTxsByHash(txHashes);
+    }
+    async addTxs(txs) {
+        const hashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+        txs.forEach((tx, index)=>this.txs.set(hashes[index].toString(), tx));
+    }
+}
+// Class to implement combined transaction retrieval from p2p and any available nodes
+export class CombinedProverCoordination {
+    p2p;
+    aztecNodes;
+    options;
+    log;
+    constructor(p2p, aztecNodes, options = {
+        txGatheringBatchSize: 10,
+        txGatheringMaxParallelRequestsPerNode: 10
+    }, log = createLogger('prover-node:combined-prover-coordination')){
+        this.p2p = p2p;
+        this.aztecNodes = aztecNodes;
+        this.options = options;
+        this.log = log;
+    }
+    getP2PClient() {
+        return this.p2p;
+    }
+    async getTxsByHash(txHashes) {
+        const pool = this.p2p ? new P2PCoordinationPool(this.p2p) : new InMemoryCoordinationPool();
+        await this.#gatherTxs(txHashes, pool);
+        const availability = await pool.hasTxsInPool(txHashes);
+        const notFound = txHashes.filter((_, index)=>!availability[index]);
+        if (notFound.length > 0) {
+            throw new Error(`Could not find txs: ${notFound.map((tx)=>tx.toString())}`);
+        }
+        const txs = await pool.getTxsByHashFromPool(txHashes);
+        return txs.filter((tx)=>tx !== undefined);
+    }
+    async gatherTxs(txHashes) {
+        const pool = this.p2p ? new P2PCoordinationPool(this.p2p) : new InMemoryCoordinationPool();
+        await this.#gatherTxs(txHashes, pool);
+    }
+    async #gatherTxs(txHashes, pool) {
+        const availability = await pool.hasTxsInPool(txHashes);
+        const notFound = txHashes.filter((_, index)=>!availability[index]);
+        const txsToFind = new Set(notFound.map((tx)=>tx.toString()));
+        if (txsToFind.size === 0) {
+            this.log.info(`Check for ${txHashes.length} txs found all in the pool}`);
+            return;
+        }
+        this.log.info(`Check for ${txHashes.length} txs found ${txsToFind.size} missing. Will gather from nodes and p2p`);
+        const originalToFind = txsToFind.size;
+        await this.#gatherTxsFromAllNodes(txsToFind, pool);
+        if (txsToFind.size === 0) {
+            this.log.info(`Found all ${originalToFind} txs directly from nodes`);
+            return;
+        }
+        const toFindFromP2P = txsToFind.size;
+        this.log.verbose(`Gathering ${toFindFromP2P} txs from p2p network`);
+        const foundFromP2P = await pool.getTxsByHash([
+            ...txsToFind
+        ].map((tx)=>TxHash.fromString(tx)));
+        const numFoundFromNodes = originalToFind - toFindFromP2P;
+        const numNotFound = toFindFromP2P - foundFromP2P.length;
+        if (numNotFound === 0) {
+            this.log.info(`Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2P.length} from p2p`);
+            return;
+        }
+        this.log.warn(`Failed to find ${numNotFound} txs from any source. Found ${foundFromP2P.length} from p2p and ${numFoundFromNodes} from nodes`);
+    }
+    async #gatherTxsFromAllNodes(txsToFind, pool) {
+        if (txsToFind.size === 0 || this.aztecNodes.length === 0) {
+            return;
+        }
+        await Promise.all(this.aztecNodes.map((aztecNode)=>this.#gatherTxsFromNode(txsToFind, aztecNode, pool)));
+    }
+    async #gatherTxsFromNode(txsToFind, aztecNode, pool) {
+        const totalTxsRequired = txsToFind.size;
+        // It's possible that the set is empty as we already found the txs
+        if (totalTxsRequired === 0) {
+            return;
+        }
+        let totalTxsGathered = 0;
+        const batches = [];
+        const allTxs = [
+            ...txsToFind
+        ];
+        while(allTxs.length){
+            const batch = allTxs.splice(0, this.options.txGatheringBatchSize);
+            batches.push(batch);
+        }
+        await asyncPool(this.options.txGatheringMaxParallelRequestsPerNode, batches, async (batch)=>{
+            try {
+                const txs = (await aztecNode.getTxsByHash(batch.map((b)=>TxHash.fromString(b)))).filter((tx)=>!!tx);
+                const hashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+                await pool.addTxs(txs);
+                hashes.forEach((hash)=>txsToFind.delete(hash.toString()));
+                totalTxsGathered += txs.length;
+            } catch (err) {
+                this.log.error(`Error gathering txs from aztec node: ${err}`);
+                return;
+            }
+        });
+        this.log.verbose(`Gathered ${totalTxsGathered} of ${totalTxsRequired} txs from a node`);
+    }
+}

package/dest/prover-coordination/config.d.ts

@@ -1,6 +1,6 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 export type ProverCoordinationConfig = {
-    proverCoordinationNodeUrl: string | undefined;
+    proverCoordinationNodeUrls: string[];
 };
 export declare const proverCoordinationConfigMappings: ConfigMappingsType<ProverCoordinationConfig>;
 export declare function getTxProviderConfigFromEnv(): ProverCoordinationConfig;

package/dest/prover-coordination/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAAG;IACrC,yBAAyB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAMzF,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,wBAAwB,CAErE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAAG;IACrC,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAMzF,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,wBAAwB,CAErE"}

package/dest/prover-coordination/config.js

@@ -1,9 +1,9 @@
 import { getConfigFromMappings } from '@aztec/foundation/config';
 export const proverCoordinationConfigMappings = {
-    proverCoordinationNodeUrl: {
-        env: 'PROVER_COORDINATION_NODE_URL',
-        description: 'The URL of the tx provider node',
-        parseEnv: (val)=>val
+    proverCoordinationNodeUrls: {
+        env: 'PROVER_COORDINATION_NODE_URLS',
+        description: 'The URLs of the tx provider nodes',
+        parseEnv: (val)=>val.split(',').map((url)=>url.trim().replace(/\/$/, ''))
     }
 };
 export function getTxProviderConfigFromEnv() {

package/dest/prover-coordination/factory.d.ts

@@ -4,12 +4,13 @@ import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ProverCoordination, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { ProverNodeConfig } from '../config.js';
+import { type TxSource } from './combined-prover-coordination.js';
 type ProverCoordinationDeps = {
-    aztecNodeTxProvider?: ProverCoordination;
-    worldStateSynchronizer?: WorldStateSynchronizer;
-    archiver?: Archiver | ArchiveSource;
+    aztecNodeTxProvider?: TxSource;
+    worldStateSynchronizer: WorldStateSynchronizer;
+    archiver: Archiver | ArchiveSource;
     telemetry?: TelemetryClient;
-    epochCache?: EpochCache;
+    epochCache: EpochCache;
 };
 /**
  * Creates a prover coordination service.

package/dest/prover-coordination/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGlG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGrD,KAAK,sBAAsB,GAAG;IAC5B,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD,QAAQ,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACpC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAqC7B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGlG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAGL,KAAK,QAAQ,EACd,MAAM,mCAAmC,CAAC;AAG3C,KAAK,sBAAsB,GAAG;IAC5B,mBAAmB,CAAC,EAAE,QAAQ,CAAC;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAAC;IACnC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CA2C7B"}

package/dest/prover-coordination/factory.js

@@ -7,6 +7,7 @@ import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import { makeTracedFetch } from '@aztec/telemetry-client';
+import { CombinedProverCoordination } from './combined-prover-coordination.js';
 /**
  * Creates a prover coordination service.
  * If p2p is enabled, prover coordination is done via p2p.
@@ -14,29 +15,34 @@ import { makeTracedFetch } from '@aztec/telemetry-client';
  * If an aztec node is provided, it is returned directly.
  */ export async function createProverCoordination(config, deps) {
     const log = createLogger('prover-node:prover-coordination');
+    const coordinationConfig = {
+        txGatheringBatchSize: config.txGatheringBatchSize ?? 10,
+        txGatheringMaxParallelRequestsPerNode: config.txGatheringMaxParallelRequestsPerNode ?? 10
+    };
     if (deps.aztecNodeTxProvider) {
         log.info('Using prover coordination via aztec node');
-        return deps.aztecNodeTxProvider;
+        return new CombinedProverCoordination(undefined, [
+            deps.aztecNodeTxProvider
+        ], coordinationConfig);
     }
     if (config.p2pEnabled) {
         log.info('Using prover coordination via p2p');
         if (!deps.archiver || !deps.worldStateSynchronizer || !deps.telemetry || !deps.epochCache) {
             throw new Error('Missing dependencies for p2p prover coordination');
         }
-        const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
-        const p2pClient = await createP2PClient(P2PClientType.Prover, config, deps.archiver, proofVerifier, deps.worldStateSynchronizer, deps.epochCache, deps.telemetry);
-        await p2pClient.start();
-        return p2pClient;
     }
-    if (config.proverCoordinationNodeUrl) {
-        log.info('Using prover coordination via node url');
+    let nodes = [];
+    if (config.proverCoordinationNodeUrls.length > 0) {
+        log.info('Using prover coordination via node urls');
         const versions = getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
-        return createAztecNodeClient(config.proverCoordinationNodeUrl, versions, makeTracedFetch([
-            1,
-            2,
-            3
-        ], false));
-    } else {
-        throw new Error(`Aztec Node URL for Tx Provider is not set.`);
+        nodes = config.proverCoordinationNodeUrls.map((url)=>createAztecNodeClient(url, versions, makeTracedFetch([
+                1,
+                2,
+                3
+            ], false)));
     }
+    const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
+    const p2pClient = await createP2PClient(P2PClientType.Prover, config, deps.archiver, proofVerifier, deps.worldStateSynchronizer, deps.epochCache, deps.telemetry);
+    await p2pClient.start();
+    return new CombinedProverCoordination(p2pClient, nodes, coordinationConfig);
 }

package/dest/prover-node-publisher.d.ts

@@ -15,8 +15,6 @@ export type L1SubmitEpochProofArgs = {
     epochSize: number;
     previousArchive: Fr;
     endArchive: Fr;
-    previousBlockHash: Fr;
-    endBlockHash: Fr;
     endTimestamp: Fr;
     outHash: Fr;
     proverId: Fr;
@@ -36,6 +34,7 @@ export declare class ProverNodePublisher {
         l1TxUtils: L1TxUtils;
         telemetry?: TelemetryClient;
     });
+    getRollupContract(): RollupContract;
     /**
      * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
      * Be warned, the call may return false even if the tx subsequently gets successfully mined.

package/dest/prover-node-publisher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF;;GAEG;AACH,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,iBAAiB,EAAE,EAAE,CAAC;IACtB,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAoB;IAEnC,SAAS,CAAC,GAAG,yCAA+C;IAE5D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAgB,SAAS,EAAE,SAAS,CAAC;gBAGnC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAYH;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAIP,gBAAgB;IAIV,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,OAAO,CAAC;YA+CN,4BAA4B;YAwD5B,sBAAsB;IAmDpC,OAAO,CAAC,uBAAuB;cA8Bf,kBAAkB;CAGnC"}
+{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF;;GAEG;AACH,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAA6B;IAE5C,SAAS,CAAC,GAAG,yCAA+C;IAE5D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAgB,SAAS,EAAE,SAAS,CAAC;gBAGnC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAYI,iBAAiB;IAIxB;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAIP,gBAAgB;IAIV,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,OAAO,CAAC;YA+CN,4BAA4B;YA+C5B,sBAAsB;IAmDpC,OAAO,CAAC,uBAAuB;cA4Bf,kBAAkB;CAGnC"}

package/dest/prover-node-publisher.js

@@ -9,7 +9,7 @@ import { Timer } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { encodeFunctionData } from 'viem';
-import { ProverNodeMetrics } from './metrics.js';
+import { ProverNodePublisherMetrics } from './metrics.js';
 export class ProverNodePublisher {
     interruptibleSleep = new InterruptibleSleep();
     sleepTimeMs;
@@ -21,10 +21,13 @@ export class ProverNodePublisher {
     constructor(config, deps){
         this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60_000;
         const telemetry = deps.telemetry ?? getTelemetryClient();
-        this.metrics = new ProverNodeMetrics(telemetry, 'ProverNode');
+        this.metrics = new ProverNodePublisherMetrics(telemetry, 'ProverNode');
         this.rollupContract = deps.rollupContract;
         this.l1TxUtils = deps.l1TxUtils;
     }
+    getRollupContract() {
+        return this.rollupContract;
+    }
     /**
    * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
    * Be warned, the call may return false even if the tx subsequently gets successfully mined.
@@ -100,23 +103,16 @@ export class ProverNodePublisher {
         if (toBlock > pending) {
             throw new Error(`Cannot submit epoch proof for ${fromBlock}-${toBlock} as pending block is ${pending}`);
         }
-        // Check the block hash and archive for the immediate block before the epoch
+        // Check the archive for the immediate block before the epoch
         const blockLog = await this.rollupContract.getBlock(BigInt(fromBlock - 1));
         if (publicInputs.previousArchive.root.toString() !== blockLog.archive) {
             throw new Error(`Previous archive root mismatch: ${publicInputs.previousArchive.root.toString()} !== ${blockLog.archive}`);
         }
-        // TODO: Remove zero check once we inject the proper zero blockhash
-        if (blockLog.blockHash !== Fr.ZERO.toString() && publicInputs.previousBlockHash.toString() !== blockLog.blockHash) {
-            throw new Error(`Previous block hash mismatch: ${publicInputs.previousBlockHash.toString()} !== ${blockLog.blockHash}`);
-        }
-        // Check the block hash and archive for the last block in the epoch
+        // Check the archive for the last block in the epoch
         const endBlockLog = await this.rollupContract.getBlock(BigInt(toBlock));
         if (publicInputs.endArchive.root.toString() !== endBlockLog.archive) {
             throw new Error(`End archive root mismatch: ${publicInputs.endArchive.root.toString()} !== ${endBlockLog.archive}`);
         }
-        if (publicInputs.endBlockHash.toString() !== endBlockLog.blockHash) {
-            throw new Error(`End block hash mismatch: ${publicInputs.endBlockHash.toString()} !== ${endBlockLog.blockHash}`);
-        }
         // Compare the public inputs computed by the contract with the ones injected
         const rollupPublicInputs = await this.rollupContract.getEpochProofPublicInputs(this.getSubmitEpochProofArgs(args));
         const argsPublicInputs = [
@@ -173,8 +169,6 @@ export class ProverNodePublisher {
             {
                 previousArchive: args.publicInputs.previousArchive.root.toString(),
                 endArchive: args.publicInputs.endArchive.root.toString(),
-                previousBlockHash: args.publicInputs.previousBlockHash.toString(),
-                endBlockHash: args.publicInputs.endBlockHash.toString(),
                 endTimestamp: args.publicInputs.endTimestamp.toBigInt(),
                 outHash: args.publicInputs.outHash.toString(),
                 proverId: EthAddress.fromField(args.publicInputs.proverId).toString()

package/dest/prover-node.d.ts

@@ -1,11 +1,9 @@
 import type { Maybe } from '@aztec/foundation/types';
-import type { P2P } from '@aztec/p2p';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { type EpochProverManager, type ProverCoordination, type ProverNodeApi, type Service, type WorldStateSyncStatus, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { P2PClientType } from '@aztec/stdlib/p2p';
 import type { Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-job.js';
@@ -15,9 +13,7 @@ export type ProverNodeOptions = {
     pollingIntervalMs: number;
     maxPendingJobs: number;
     maxParallelBlocksPerEpoch: number;
-    txGatheringTimeoutMs: number;
     txGatheringIntervalMs: number;
-    txGatheringMaxParallelRequests: number;
 };
 /**
  * An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
@@ -32,31 +28,33 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
     protected readonly contractDataSource: ContractDataSource;
     protected readonly worldState: WorldStateSynchronizer;
-    protected readonly coordination: ProverCoordination & Maybe<Service>;
+    protected readonly coordination: ProverCoordination;
     protected readonly epochsMonitor: EpochMonitor;
     protected readonly telemetryClient: TelemetryClient;
     private log;
     private dateProvider;
     private jobs;
     private options;
-    private metrics;
+    private jobMetrics;
+    private rewardsMetrics;
     private l1Metrics;
     private txFetcher;
     private lastBlockNumber;
     readonly tracer: Tracer;
-    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination & Maybe<Service>, epochsMonitor: EpochMonitor, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
+    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination, epochsMonitor: EpochMonitor, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
     getProverId(): import("@aztec/foundation/schemas").Fr;
-    getP2P(): P2P<P2PClientType.Prover> | undefined;
+    getP2P(): import("@aztec/stdlib/interfaces/server").P2PClient | undefined;
     /**
      * 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.
+     * @returns false if there is an error, true otherwise
      */
-    handleEpochReadyToProve(epochNumber: bigint): Promise<void>;
+    handleEpochReadyToProve(epochNumber: bigint): Promise<boolean>;
     /**
      * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
      * starts proving jobs for them.
      */
-    start(): void;
+    start(): Promise<void>;
     /**
      * Stops the prover node and all its dependencies.
      */

package/dest/prover-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}

package/dest/prover-node.js

@@ -6,6 +6,7 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 import { compact } from '@aztec/foundation/collection';
 import { memoize } from '@aztec/foundation/decorators';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { DateProvider } from '@aztec/foundation/timer';
@@ -14,7 +15,7 @@ import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers
 import { EpochProvingJobTerminalState, tryStop } from '@aztec/stdlib/interfaces/server';
 import { Attributes, L1Metrics, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { EpochProvingJob } from './job/epoch-proving-job.js';
-import { ProverNodeMetrics } from './metrics.js';
+import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
 /**
  * An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
  * submits bids for proving them, and monitors if they are accepted. If so, the prover node fetches the txs
@@ -34,7 +35,8 @@ import { ProverNodeMetrics } from './metrics.js';
     dateProvider;
     jobs;
     options;
-    metrics;
+    jobMetrics;
+    rewardsMetrics;
     l1Metrics;
     txFetcher;
     lastBlockNumber;
@@ -52,35 +54,32 @@ import { ProverNodeMetrics } from './metrics.js';
         this.log = createLogger('prover-node');
         this.dateProvider = new DateProvider();
         this.jobs = new Map();
-        this.l1Metrics = new L1Metrics(telemetryClient.getMeter('ProverNodeL1Metrics'), publisher.l1TxUtils.publicClient, [
+        this.l1Metrics = new L1Metrics(telemetryClient.getMeter('ProverNodeL1Metrics'), publisher.l1TxUtils.client, [
             publisher.getSenderAddress()
         ]);
         this.options = {
             pollingIntervalMs: 1_000,
             maxPendingJobs: 100,
             maxParallelBlocksPerEpoch: 32,
-            txGatheringTimeoutMs: 60_000,
             txGatheringIntervalMs: 1_000,
-            txGatheringMaxParallelRequests: 100,
             ...compact(options)
         };
-        this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
+        const meter = telemetryClient.getMeter('ProverNode');
         this.tracer = telemetryClient.getTracer('ProverNode');
+        this.jobMetrics = new ProverNodeJobMetrics(meter, telemetryClient.getTracer('EpochProvingJob'));
+        this.rewardsMetrics = new ProverNodeRewardsMetrics(meter, EthAddress.fromField(this.prover.getProverId()), this.publisher.getRollupContract());
         this.txFetcher = new RunningPromise(()=>this.checkForTxs(), this.log, this.options.txGatheringIntervalMs);
     }
     getProverId() {
         return this.prover.getProverId();
     }
     getP2P() {
-        const asP2PClient = this.coordination;
-        if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
-            return asP2PClient;
-        }
-        return undefined;
+        return this.coordination.getP2PClient();
     }
     /**
    * 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.
+   * @returns false if there is an error, true otherwise
    */ async handleEpochReadyToProve(epochNumber) {
         try {
             this.log.debug(`Running jobs as ${epochNumber} is ready to prove`, {
@@ -91,24 +90,27 @@ import { ProverNodeMetrics } from './metrics.js';
                 this.log.warn(`Not starting proof for ${epochNumber} since there are active jobs for the epoch`, {
                     activeJobs: activeJobs.map((job)=>job.uuid)
                 });
-                return;
+                return true;
             }
             await this.startProof(epochNumber);
+            return true;
         } catch (err) {
             if (err instanceof EmptyEpochError) {
                 this.log.info(`Not starting proof for ${epochNumber} since no blocks were found`);
             } else {
                 this.log.error(`Error handling epoch completed`, err);
             }
+            return false;
         }
     }
     /**
    * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
    * starts proving jobs for them.
-   */ start() {
+   */ async start() {
         this.txFetcher.start();
         this.epochsMonitor.start(this);
         this.l1Metrics.start();
+        await this.rewardsMetrics.start();
         this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.options);
     }
     /**
@@ -124,11 +126,13 @@ import { ProverNodeMetrics } from './metrics.js';
         await this.worldState.stop();
         await tryStop(this.coordination);
         this.l1Metrics.stop();
+        this.rewardsMetrics.stop();
         await this.telemetryClient.stop();
         this.log.info('Stopped ProverNode');
     }
-    /** Returns world state status. */ getWorldStateSyncStatus() {
-        return this.worldState.status().then((s)=>s.syncSummary);
+    /** Returns world state status. */ async getWorldStateSyncStatus() {
+        const { syncSummary } = await this.worldState.status();
+        return syncSummary;
     }
     /** Returns archiver status. */ getL2Tips() {
         return this.l2BlockSource.getL2Tips();
@@ -213,7 +217,7 @@ import { ProverNodeMetrics } from './metrics.js';
             }
             const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
             this.log.verbose(`Fetching ${txHashes.length} tx hashes for block number ${blockNumber} from coordination`);
-            await this.coordination.getTxsByHash(txHashes); // This stores the txs in the tx pool, no need to persist them here
+            await this.coordination.gatherTxs(txHashes); // This stores the txs in the tx pool, no need to persist them here
             this.lastBlockNumber = blockNumber;
         }
     }
@@ -247,7 +251,7 @@ import { ProverNodeMetrics } from './metrics.js';
         throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
     }
     /** Extracted for testing purposes. */ doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory) {
-        return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, deadline, {
+        return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.jobMetrics, deadline, {
             parallelBlockLimit: this.options.maxParallelBlocksPerEpoch
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -14,8 +14,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "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}"
   },
@@ -53,25 +51,25 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.85.0",
-    "@aztec/bb-prover": "0.85.0",
-    "@aztec/blob-sink": "0.85.0",
-    "@aztec/constants": "0.85.0",
-    "@aztec/epoch-cache": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/kv-store": "0.85.0",
-    "@aztec/l1-artifacts": "0.85.0",
-    "@aztec/node-lib": "0.85.0",
-    "@aztec/noir-protocol-circuits-types": "0.85.0",
-    "@aztec/p2p": "0.85.0",
-    "@aztec/protocol-contracts": "0.85.0",
-    "@aztec/prover-client": "0.85.0",
-    "@aztec/sequencer-client": "0.85.0",
-    "@aztec/simulator": "0.85.0",
-    "@aztec/stdlib": "0.85.0",
-    "@aztec/telemetry-client": "0.85.0",
-    "@aztec/world-state": "0.85.0",
+    "@aztec/archiver": "0.86.0",
+    "@aztec/bb-prover": "0.86.0",
+    "@aztec/blob-sink": "0.86.0",
+    "@aztec/constants": "0.86.0",
+    "@aztec/epoch-cache": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/kv-store": "0.86.0",
+    "@aztec/l1-artifacts": "0.86.0",
+    "@aztec/node-lib": "0.86.0",
+    "@aztec/noir-protocol-circuits-types": "0.86.0",
+    "@aztec/p2p": "0.86.0",
+    "@aztec/protocol-contracts": "0.86.0",
+    "@aztec/prover-client": "0.86.0",
+    "@aztec/sequencer-client": "0.86.0",
+    "@aztec/simulator": "0.86.0",
+    "@aztec/stdlib": "0.86.0",
+    "@aztec/telemetry-client": "0.86.0",
+    "@aztec/world-state": "0.86.0",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.23.7"