@aztec/prover-node 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/prover-node.js

@@ -1,12 +1,18 @@
-import { __esDecorate, __runInitializers } from "tslib";
-import { EpochProvingJobTerminalState, getTimestampRangeForEpoch, tryStop, } from '@aztec/circuit-types';
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
 import { compact } from '@aztec/foundation/collection';
 import { memoize } from '@aztec/foundation/decorators';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
-import { Attributes, getTelemetryClient, trackSpan, } from '@aztec/telemetry-client';
+import { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { EpochProvingJobTerminalState, tryStop } from '@aztec/stdlib/interfaces/server';
+import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { EpochProvingJob } from './job/epoch-proving-job.js';
 import { ProverNodeMetrics } from './metrics.js';
 /**
@@ -14,232 +20,239 @@ import { ProverNodeMetrics } from './metrics.js';
  * submits bids for proving them, and monitors if they are accepted. If so, the prover node fetches the txs
  * from a tx source in the p2p network or an external node, re-executes their public functions, creates a rollup
  * proof for the epoch, and submits it to L1.
- */
-let ProverNode = (() => {
-    var _a;
-    let _instanceExtraInitializers = [];
-    let _createProvingJob_decorators;
-    let _getL1Constants_decorators;
-    let _checkForTxs_decorators;
-    let _gatherEpochData_decorators;
-    return _a = class ProverNode {
-            constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()) {
-                this.prover = (__runInitializers(this, _instanceExtraInitializers), prover);
-                this.publisher = publisher;
-                this.l2BlockSource = l2BlockSource;
-                this.l1ToL2MessageSource = l1ToL2MessageSource;
-                this.contractDataSource = contractDataSource;
-                this.worldState = worldState;
-                this.coordination = coordination;
-                this.epochsMonitor = epochsMonitor;
-                this.telemetryClient = telemetryClient;
-                this.log = createLogger('prover-node');
-                this.dateProvider = new DateProvider();
-                this.jobs = new Map();
-                this.cachedEpochData = undefined;
-                this.options = {
-                    pollingIntervalMs: 1000,
-                    maxPendingJobs: 100,
-                    maxParallelBlocksPerEpoch: 32,
-                    txGatheringTimeoutMs: 60000,
-                    txGatheringIntervalMs: 1000,
-                    txGatheringMaxParallelRequests: 100,
-                    ...compact(options),
-                };
-                this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
-                this.tracer = telemetryClient.getTracer('ProverNode');
-                this.txFetcher = new RunningPromise(() => this.checkForTxs(), this.log, this.options.txGatheringIntervalMs);
-            }
-            getP2P() {
-                const asP2PClient = this.coordination;
-                if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
-                    return asP2PClient;
-                }
-                return 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.
-             */
-            async handleEpochCompleted(epochNumber) {
-                try {
-                    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;
-                    }
-                    // 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 starting proof for ${epochNumber} since no blocks were found`);
-                    }
-                    else {
-                        this.log.error(`Error handling epoch completed`, err);
-                    }
-                }
-            }
-            /**
-             * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
-             * starts proving jobs for them.
-             */
-            start() {
-                this.txFetcher.start();
-                this.epochsMonitor.start(this);
-                this.log.info('Started ProverNode', this.options);
-            }
-            /**
-             * Stops the prover node and all its dependencies.
-             */
-            async stop() {
-                this.log.info('Stopping ProverNode');
-                await this.txFetcher.stop();
-                await this.epochsMonitor.stop();
-                await this.prover.stop();
-                await tryStop(this.l2BlockSource);
-                this.publisher.interrupt();
-                await Promise.all(Array.from(this.jobs.values()).map(job => job.stop()));
-                await this.worldState.stop();
-                await tryStop(this.coordination);
-                await this.telemetryClient.stop();
-                this.log.info('Stopped ProverNode');
-            }
-            /**
-             * Creates a proof for a block range. Returns once the proof has been submitted to L1.
-             */
-            async prove(epochNumber) {
-                const job = await this.createProvingJob(BigInt(epochNumber));
-                return job.run();
-            }
-            /**
-             * Starts a proving process and returns immediately.
-             */
-            async startProof(epochNumber) {
-                const job = await this.createProvingJob(BigInt(epochNumber));
-                void job.run().catch(err => this.log.error(`Error proving epoch ${epochNumber}`, err));
-            }
-            /**
-             * Returns the prover instance.
-             */
-            getProver() {
-                return this.prover;
-            }
-            /**
-             * Returns an array of jobs being processed.
-             */
-            getJobs() {
-                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;
-                return maxPendingJobs === 0 || this.jobs.size < maxPendingJobs;
-            }
-            async createProvingJob(epochNumber) {
-                if (!this.checkMaximumPendingJobs()) {
-                    throw new Error(`Maximum pending proving jobs ${this.options.maxPendingJobs} reached. Cannot create new job.`);
-                }
-                // Gather blocks for this epoch
-                const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
-                const { blocks, txs } = cachedEpochData ?? (await this.gatherEpochData(epochNumber));
-                const fromBlock = blocks[0].number;
-                const toBlock = blocks.at(-1).number;
-                // Fast forward world state to right before the target block and get a fork
-                this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
-                await this.worldState.syncImmediate(fromBlock - 1);
-                // Create a processor using the forked world state
-                const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.dateProvider, this.telemetryClient);
-                const cleanUp = () => {
-                    this.jobs.delete(job.getId());
-                    return Promise.resolve();
-                };
-                const [_, endTimestamp] = getTimestampRangeForEpoch(epochNumber + 1n, await this.getL1Constants());
-                const deadline = new Date(Number(endTimestamp) * 1000);
-                const job = this.doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp);
-                this.jobs.set(job.getId(), job);
-                return job;
-            }
-            getL1Constants() {
-                return this.l2BlockSource.getL1Constants();
-            }
-            /** Monitors for new blocks and requests their txs from the p2p layer to ensure they are available for proving. */
-            async checkForTxs() {
-                const blockNumber = await this.l2BlockSource.getBlockNumber();
-                if (this.lastBlockNumber === undefined || blockNumber > this.lastBlockNumber) {
-                    const block = await this.l2BlockSource.getBlock(blockNumber);
-                    if (!block) {
-                        return;
-                    }
-                    const txHashes = block.body.txEffects.map(tx => tx.txHash);
-                    this.log.verbose(`Fetching ${txHashes.length} 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
-                    this.lastBlockNumber = blockNumber;
-                }
-            }
-            async gatherEpochData(epochNumber) {
-                // Gather blocks for this epoch and their txs
-                const blocks = await this.gatherBlocks(epochNumber);
-                const txs = await this.gatherTxs(epochNumber, blocks);
-                return { blocks, txs };
-            }
-            async gatherBlocks(epochNumber) {
-                const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
-                if (blocks.length === 0) {
-                    throw new EmptyEpochError(epochNumber);
-                }
-                return blocks;
-            }
-            async gatherTxs(epochNumber, blocks) {
-                const txsToFind = blocks.flatMap(block => block.body.txEffects.map(tx => tx.txHash));
-                const txs = await this.coordination.getTxsByHash(txsToFind);
-                if (txs.length === txsToFind.length) {
-                    this.log.verbose(`Gathered all ${txs.length} txs for epoch ${epochNumber}`, { epochNumber });
-                    return txs;
-                }
-                const txHashesFound = await Promise.all(txs.map(tx => tx.getTxHash()));
-                const missingTxHashes = txsToFind
-                    .filter(txHashToFind => !txHashesFound.some(txHashFound => txHashToFind.equals(txHashFound)))
-                    .join(', ');
-                throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
+ */ export class ProverNode {
+    prover;
+    publisher;
+    l2BlockSource;
+    l1ToL2MessageSource;
+    contractDataSource;
+    worldState;
+    coordination;
+    epochsMonitor;
+    telemetryClient;
+    log;
+    dateProvider;
+    latestEpochWeAreProving;
+    jobs;
+    cachedEpochData;
+    options;
+    metrics;
+    txFetcher;
+    lastBlockNumber;
+    tracer;
+    constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()){
+        this.prover = prover;
+        this.publisher = publisher;
+        this.l2BlockSource = l2BlockSource;
+        this.l1ToL2MessageSource = l1ToL2MessageSource;
+        this.contractDataSource = contractDataSource;
+        this.worldState = worldState;
+        this.coordination = coordination;
+        this.epochsMonitor = epochsMonitor;
+        this.telemetryClient = telemetryClient;
+        this.log = createLogger('prover-node');
+        this.dateProvider = new DateProvider();
+        this.jobs = new Map();
+        this.cachedEpochData = undefined;
+        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');
+        this.tracer = telemetryClient.getTracer('ProverNode');
+        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;
+    }
+    /**
+   * 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 handleEpochReadyToProve(epochNumber) {
+        try {
+            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;
             }
-            /** Extracted for testing purposes. */
-            doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp) {
-                return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, deadline, { parallelBlockLimit: this.options.maxParallelBlocksPerEpoch }, cleanUp);
+            // 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 starting proof for ${epochNumber} since no blocks were found`);
+            } else {
+                this.log.error(`Error handling epoch completed`, err);
             }
-            /** Extracted for testing purposes. */
-            async triggerMonitors() {
-                await this.epochsMonitor.work();
+        }
+    }
+    /**
+   * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
+   * starts proving jobs for them.
+   */ start() {
+        this.txFetcher.start();
+        this.epochsMonitor.start(this);
+        this.log.info('Started ProverNode', this.options);
+    }
+    /**
+   * Stops the prover node and all its dependencies.
+   */ async stop() {
+        this.log.info('Stopping ProverNode');
+        await this.txFetcher.stop();
+        await this.epochsMonitor.stop();
+        await this.prover.stop();
+        await tryStop(this.l2BlockSource);
+        this.publisher.interrupt();
+        await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
+        await this.worldState.stop();
+        await tryStop(this.coordination);
+        await this.telemetryClient.stop();
+        this.log.info('Stopped ProverNode');
+    }
+    /**
+   * Creates a proof for a block range. Returns once the proof has been submitted to L1.
+   */ async prove(epochNumber) {
+        const job = await this.createProvingJob(BigInt(epochNumber));
+        return job.run();
+    }
+    /**
+   * Starts a proving process and returns immediately.
+   */ async startProof(epochNumber) {
+        const job = await this.createProvingJob(BigInt(epochNumber));
+        void job.run().catch((err)=>this.log.error(`Error proving epoch ${epochNumber}`, err));
+    }
+    /**
+   * Returns the prover instance.
+   */ getProver() {
+        return this.prover;
+    }
+    /**
+   * Returns an array of jobs being processed.
+   */ getJobs() {
+        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;
+        return maxPendingJobs === 0 || this.jobs.size < maxPendingJobs;
+    }
+    async createProvingJob(epochNumber) {
+        if (!this.checkMaximumPendingJobs()) {
+            throw new Error(`Maximum pending proving jobs ${this.options.maxPendingJobs} reached. Cannot create new job.`);
+        }
+        // Gather blocks for this epoch
+        const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
+        const { blocks, txs } = cachedEpochData ?? await this.gatherEpochData(epochNumber);
+        const fromBlock = blocks[0].number;
+        const toBlock = blocks.at(-1).number;
+        // Fast forward world state to right before the target block and get a fork
+        this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
+        await this.worldState.syncImmediate(toBlock);
+        // Create a processor using the forked world state
+        const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.dateProvider, this.telemetryClient);
+        const cleanUp = ()=>{
+            this.jobs.delete(job.getId());
+            return Promise.resolve();
+        };
+        const [_, endTimestamp] = getTimestampRangeForEpoch(epochNumber + 1n, await this.getL1Constants());
+        const deadline = new Date(Number(endTimestamp) * 1000);
+        const job = this.doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp);
+        this.jobs.set(job.getId(), job);
+        return job;
+    }
+    getL1Constants() {
+        return this.l2BlockSource.getL1Constants();
+    }
+    /** Monitors for new blocks and requests their txs from the p2p layer to ensure they are available for proving. */ async checkForTxs() {
+        const blockNumber = await this.l2BlockSource.getBlockNumber();
+        if (this.lastBlockNumber === undefined || blockNumber > this.lastBlockNumber) {
+            const block = await this.l2BlockSource.getBlock(blockNumber);
+            if (!block) {
+                return;
             }
-        },
-        (() => {
-            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _createProvingJob_decorators = [trackSpan('ProverNode.createProvingJob', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))];
-            _getL1Constants_decorators = [memoize];
-            _checkForTxs_decorators = [trackSpan('ProverNode.checkForTxs')];
-            _gatherEpochData_decorators = [trackSpan('ProverNode.gatherEpochData', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))];
-            __esDecorate(_a, null, _createProvingJob_decorators, { kind: "method", name: "createProvingJob", static: false, private: false, access: { has: obj => "createProvingJob" in obj, get: obj => obj.createProvingJob }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _getL1Constants_decorators, { kind: "method", name: "getL1Constants", static: false, private: false, access: { has: obj => "getL1Constants" in obj, get: obj => obj.getL1Constants }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _checkForTxs_decorators, { kind: "method", name: "checkForTxs", static: false, private: false, access: { has: obj => "checkForTxs" in obj, get: obj => obj.checkForTxs }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _gatherEpochData_decorators, { kind: "method", name: "gatherEpochData", static: false, private: false, access: { has: obj => "gatherEpochData" in obj, get: obj => obj.gatherEpochData }, metadata: _metadata }, null, _instanceExtraInitializers);
-            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-        })(),
-        _a;
-})();
-export { ProverNode };
+            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
+            this.lastBlockNumber = blockNumber;
+        }
+    }
+    async gatherEpochData(epochNumber) {
+        // Gather blocks for this epoch and their txs
+        const blocks = await this.gatherBlocks(epochNumber);
+        const txs = await this.gatherTxs(epochNumber, blocks);
+        return {
+            blocks,
+            txs
+        };
+    }
+    async gatherBlocks(epochNumber) {
+        const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
+        if (blocks.length === 0) {
+            throw new EmptyEpochError(epochNumber);
+        }
+        return blocks;
+    }
+    async gatherTxs(epochNumber, blocks) {
+        const txsToFind = blocks.flatMap((block)=>block.body.txEffects.map((tx)=>tx.txHash));
+        const txs = await this.coordination.getTxsByHash(txsToFind);
+        if (txs.length === txsToFind.length) {
+            this.log.verbose(`Gathered all ${txs.length} txs for epoch ${epochNumber}`, {
+                epochNumber
+            });
+            return txs;
+        }
+        const txHashesFound = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+        const missingTxHashes = txsToFind.filter((txHashToFind)=>!txHashesFound.some((txHashFound)=>txHashToFind.equals(txHashFound))).join(', ');
+        throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
+    }
+    /** Extracted for testing purposes. */ doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp) {
+        return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, deadline, {
+            parallelBlockLimit: this.options.maxParallelBlocksPerEpoch
+        }, cleanUp);
+    }
+    /** Extracted for testing purposes. */ async triggerMonitors() {
+        await this.epochsMonitor.work();
+    }
+}
+_ts_decorate([
+    trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
+            [Attributes.EPOCH_NUMBER]: Number(epochNumber)
+        }))
+], ProverNode.prototype, "createProvingJob", null);
+_ts_decorate([
+    memoize
+], ProverNode.prototype, "getL1Constants", null);
+_ts_decorate([
+    trackSpan('ProverNode.checkForTxs')
+], ProverNode.prototype, "checkForTxs", null);
+_ts_decorate([
+    trackSpan('ProverNode.gatherEpochData', (epochNumber)=>({
+            [Attributes.EPOCH_NUMBER]: Number(epochNumber)
+        }))
+], ProverNode.prototype, "gatherEpochData", null);
 class EmptyEpochError extends Error {
-    constructor(epochNumber) {
+    constructor(epochNumber){
         super(`No blocks found for epoch ${epochNumber}`);
         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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"}

package/dest/test/index.d.ts

@@ -1,5 +1,5 @@
-import { type EpochProverManager } from '@aztec/circuit-types';
-import { type ProverNodePublisher } from '../prover-node-publisher.js';
+import type { EpochProverManager } from '@aztec/stdlib/interfaces/server';
+import type { ProverNodePublisher } from '../prover-node-publisher.js';
 import { ProverNode } from '../prover-node.js';
 declare class TestProverNode_ extends ProverNode {
     prover: EpochProverManager;

package/dest/test/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,cAAM,eAAgB,SAAQ,UAAU;IACtB,MAAM,EAAG,kBAAkB,CAAC;IAC5B,SAAS,EAAG,mBAAmB,CAAC;CACjD;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,cAAM,eAAgB,SAAQ,UAAU;IACtB,MAAM,EAAG,kBAAkB,CAAC;IAC5B,SAAS,EAAG,mBAAmB,CAAC;CACjD;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC"}

package/dest/test/index.js

@@ -1,4 +1,5 @@
 import { ProverNode } from '../prover-node.js';
 class TestProverNode_ extends ProverNode {
+    prover;
+    publisher;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFL0MsTUFBTSxlQUFnQixTQUFRLFVBQVU7Q0FHdkMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.76.4",
+  "version": "0.77.0-testnet-ignition.21",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -17,7 +17,7 @@
     "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": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "jest": {
     "moduleNameMapper": {
@@ -47,31 +47,30 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.76.4",
-    "@aztec/bb-prover": "0.76.4",
-    "@aztec/blob-sink": "0.76.4",
-    "@aztec/circuit-types": "0.76.4",
-    "@aztec/circuits.js": "0.76.4",
-    "@aztec/epoch-cache": "0.76.4",
-    "@aztec/ethereum": "0.76.4",
-    "@aztec/foundation": "0.76.4",
-    "@aztec/kv-store": "0.76.4",
-    "@aztec/l1-artifacts": "0.76.4",
-    "@aztec/noir-protocol-circuits-types": "0.76.4",
-    "@aztec/p2p": "0.76.4",
-    "@aztec/protocol-contracts": "0.76.4",
-    "@aztec/prover-client": "0.76.4",
-    "@aztec/sequencer-client": "0.76.4",
-    "@aztec/simulator": "0.76.4",
-    "@aztec/telemetry-client": "0.76.4",
-    "@aztec/types": "0.76.4",
-    "@aztec/world-state": "0.76.4",
+    "@aztec/archiver": "0.77.0-testnet-ignition.21",
+    "@aztec/bb-prover": "0.77.0-testnet-ignition.21",
+    "@aztec/blob-sink": "0.77.0-testnet-ignition.21",
+    "@aztec/constants": "0.77.0-testnet-ignition.21",
+    "@aztec/epoch-cache": "0.77.0-testnet-ignition.21",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.21",
+    "@aztec/foundation": "0.77.0-testnet-ignition.21",
+    "@aztec/kv-store": "0.77.0-testnet-ignition.21",
+    "@aztec/l1-artifacts": "0.77.0-testnet-ignition.21",
+    "@aztec/noir-protocol-circuits-types": "0.77.0-testnet-ignition.21",
+    "@aztec/p2p": "0.77.0-testnet-ignition.21",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.21",
+    "@aztec/prover-client": "0.77.0-testnet-ignition.21",
+    "@aztec/sequencer-client": "0.77.0-testnet-ignition.21",
+    "@aztec/simulator": "0.77.0-testnet-ignition.21",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.21",
+    "@aztec/telemetry-client": "0.77.0-testnet-ignition.21",
+    "@aztec/world-state": "0.77.0-testnet-ignition.21",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.22.8"