@aztec/prover-node 2.0.0-nightly.20250826 → 2.0.0-nightly.20250828

package/dest/bin/run-failed-epoch.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-console */ import { Fr } from '@aztec/foundation/fields';
+/* eslint-disable no-console */ import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { downloadEpochProvingJob, getProverNodeConfigFromEnv, rerunEpochProvingJob } from '@aztec/prover-node';
@@ -19,7 +19,7 @@ async function rerunFailedEpoch(provingJobUrl, baseLocalDir) {
         ...getProverNodeConfigFromEnv(),
         dataDirectory: dataDir,
         dataStoreMapSizeKB: env.dataStoreMapSizeKB ?? 1024 * 1024,
-        proverId: env.proverId ?? Fr.random()
+        proverId: env.proverId ?? EthAddress.random()
     };
     let metadata;
     const metadataPath = join(localDir, 'metadata.json');

package/dest/config.d.ts

@@ -3,13 +3,14 @@ import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
 import { type GenesisStateConfig } from '@aztec/ethereum';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
+import { type KeyStore, type KeyStoreConfig } from '@aztec/node-keystore';
 import { type SharedNodeConfig } from '@aztec/node-lib/config';
 import { type P2PConfig } from '@aztec/p2p/config';
 import { type ProverAgentConfig, type ProverBrokerConfig } from '@aztec/prover-client/broker';
-import { type ProverClientConfig, type ProverClientUserConfig } from '@aztec/prover-client/config';
+import { type ProverClientUserConfig } from '@aztec/prover-client/config';
 import { type PublisherConfig, type TxSenderConfig } from '@aztec/sequencer-client/config';
 import { type WorldStateConfig } from '@aztec/world-state/config';
-export type ProverNodeConfig = ArchiverConfig & ProverClientUserConfig & P2PConfig & WorldStateConfig & PublisherConfig & TxSenderConfig & DataStoreConfig & SharedNodeConfig & SpecificProverNodeConfig & GenesisStateConfig;
+export type ProverNodeConfig = ArchiverConfig & ProverClientUserConfig & P2PConfig & WorldStateConfig & PublisherConfig & TxSenderConfig & DataStoreConfig & KeyStoreConfig & SharedNodeConfig & SpecificProverNodeConfig & GenesisStateConfig;
 export type SpecificProverNodeConfig = {
     proverNodeMaxPendingJobs: number;
     proverNodePollingIntervalMs: number;
@@ -24,5 +25,5 @@ export declare const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConf
 export declare function getProverNodeConfigFromEnv(): ProverNodeConfig;
 export declare function getProverNodeBrokerConfigFromEnv(): ProverBrokerConfig;
 export declare function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig & ACVMConfig;
-export declare function resolveConfig(userConfig: ProverNodeConfig): ProverNodeConfig & ProverClientConfig;
+export declare function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined;
 //# sourceMappingURL=config.d.ts.map

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAAwD,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAG5B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,sBAAsB,GACtB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,gBAAgB,GAChB,wBAAwB,GACxB,kBAAkB,CAAC;AAErB,MAAM,MAAM,wBAAwB,GAAG;IACrC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,0BAA0B,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AA6CF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAWzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,kBAAkB,CAMjG"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAIL,KAAK,QAAQ,EACb,KAAK,cAAc,EAEpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,sBAAsB,EAAgD,MAAM,6BAA6B,CAAC;AACxH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,sBAAsB,GACtB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,cAAc,GACd,gBAAgB,GAChB,wBAAwB,GACxB,kBAAkB,CAAC;AAErB,MAAM,MAAM,wBAAwB,GAAG;IACrC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,0BAA0B,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AA6CF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAYzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AAkED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,wBAM/D"}

package/dest/config.js

@@ -1,8 +1,8 @@
 import { archiverConfigMappings } from '@aztec/archiver/config';
-import { genesisStateConfigMappings, getAddressFromPrivateKey } from '@aztec/ethereum';
+import { genesisStateConfigMappings } from '@aztec/ethereum';
 import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
-import { Fr } from '@aztec/foundation/fields';
 import { dataConfigMappings } from '@aztec/kv-store/config';
+import { keyStoreConfigMappings } from '@aztec/node-keystore';
 import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { p2pConfigMappings } from '@aztec/p2p/config';
 import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
@@ -53,6 +53,7 @@ const specificProverNodeConfigMappings = {
 };
 export const proverNodeConfigMappings = {
     ...dataConfigMappings,
+    ...keyStoreConfigMappings,
     ...archiverConfigMappings,
     ...proverClientConfigMappings,
     ...p2pConfigMappings,
@@ -77,10 +78,56 @@ export function getProverNodeAgentConfigFromEnv() {
         ...getConfigFromMappings(bbConfigMappings)
     };
 }
-export function resolveConfig(userConfig) {
-    const proverId = userConfig.proverId && !userConfig.proverId.isZero() ? userConfig.proverId : Fr.fromHexString(getAddressFromPrivateKey(userConfig.publisherPrivateKey.getValue()));
-    return {
-        ...userConfig,
-        proverId
+function createKeyStoreFromWeb3Signer(config) {
+    // See what we have been given for proverId.
+    const proverId = config.proverId ? config.proverId.toString() : 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) {
+        return undefined;
+    }
+    // Also, we need at least one publisher address.
+    const publishers = config.publisherAddresses ? config.publisherAddresses.map((k)=>k.toChecksumString()) : [];
+    if (publishers.length === 0) {
+        return undefined;
+    }
+    const keyStore = {
+        schemaVersion: 1,
+        slasher: undefined,
+        prover: {
+            id: proverId,
+            publisher: publishers
+        },
+        remoteSigner: config.web3SignerUrl,
+        validators: undefined
+    };
+    return keyStore;
+}
+function createKeyStoreFromPublisherKeys(config) {
+    // Extract the publisher keys from the provided config.
+    const publisherKeys = config.publisherPrivateKeys ? config.publisherPrivateKeys.map((k)=>k.getValue()) : [];
+    // There must be at least 1.
+    if (publisherKeys.length === 0) {
+        return undefined;
+    }
+    // Now see what we have been given for proverId.
+    const proverId = config.proverId ? config.proverId.toString() : 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).
+    const keyStore = {
+        schemaVersion: 1,
+        slasher: undefined,
+        prover: proverId === undefined ? publisherKeys[0] : {
+            id: proverId,
+            publisher: publisherKeys.map((key)=>key)
+        },
+        remoteSigner: undefined,
+        validators: undefined
     };
+    return keyStore;
+}
+export function createKeyStoreForProver(config) {
+    if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
+        return createKeyStoreFromWeb3Signer(config);
+    }
+    return createKeyStoreFromPublisherKeys(config);
 }

package/dest/factory.d.ts

@@ -4,25 +4,26 @@ import { L1TxUtils } from '@aztec/ethereum';
 import { type Logger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
+import { type KeyStoreConfig } from '@aztec/node-keystore';
 import type { AztecNode, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type ProverNodeConfig } from './config.js';
-import { ProverNodePublisher } from './prover-node-publisher.js';
 import { ProverNode } from './prover-node.js';
+import { ProverPublisherFactory } from './prover-publisher-factory.js';
 export type ProverNodeDeps = {
     telemetry?: TelemetryClient;
     log?: Logger;
     aztecNodeTxProvider?: Pick<AztecNode, 'getTxsByHash'>;
     archiver?: Archiver;
-    publisher?: ProverNodePublisher;
+    publisherFactory?: ProverPublisherFactory;
     blobSinkClient?: BlobSinkClientInterface;
     broker?: ProvingJobBroker;
     l1TxUtils?: L1TxUtils;
     dateProvider?: DateProvider;
 };
 /** Creates a new prover node given a config. */
-export declare function createProverNode(userConfig: ProverNodeConfig & DataStoreConfig, deps?: ProverNodeDeps, options?: {
+export declare function createProverNode(userConfig: ProverNodeConfig & DataStoreConfig & KeyStoreConfig, deps?: ProverNodeDeps, options?: {
     prefilledPublicData?: PublicDataTreeLeaf[];
 }): Promise<ProverNode>;
 //# sourceMappingURL=factory.d.ts.map

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAE7F,OAAO,EAAE,SAAS,EAA+D,MAAM,iBAAiB,CAAC;AAEzG,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,EAAE,KAAK,gBAAgB,EAAiB,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,gDAAgD;AAChD,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,gBAAgB,GAAG,eAAe,EAC9C,IAAI,GAAE,cAAmB,EACzB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACvC,uBAiGP"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAE7F,OAAO,EAEL,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,KAAK,cAAc,EAAkD,MAAM,sBAAsB,CAAC;AAK3G,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAa,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAK9F,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,aAAa,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,gDAAgD;AAChD,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,gBAAgB,GAAG,eAAe,GAAG,cAAc,EAC/D,IAAI,GAAE,cAAmB,EACzB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACvC,uBAgKP"}

package/dest/factory.js

@@ -2,30 +2,64 @@ import { createArchiver } from '@aztec/archiver';
 import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { EpochCache } from '@aztec/epoch-cache';
-import { L1TxUtils, RollupContract, createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
+import { PublisherManager, RollupContract, createEthereumChain, createL1TxUtilsFromEthSigner } from '@aztec/ethereum';
 import { pick } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
+import { KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
 import { trySnapshotSync } from '@aztec/node-lib/actions';
 import { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
 import { createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
-import { getTelemetryClient } from '@aztec/telemetry-client';
+import { L1Metrics, getTelemetryClient } from '@aztec/telemetry-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
-import { resolveConfig } from './config.js';
+import { createPublicClient, fallback, http } from 'viem';
+import { createKeyStoreForProver } from './config.js';
 import { EpochMonitor } from './monitors/epoch-monitor.js';
-import { ProverNodePublisher } from './prover-node-publisher.js';
 import { ProverNode } from './prover-node.js';
+import { ProverPublisherFactory } from './prover-publisher-factory.js';
 /** Creates a new prover node given a config. */ export async function createProverNode(userConfig, deps = {}, options = {}) {
-    const config = resolveConfig(userConfig);
+    const config = {
+        ...userConfig
+    };
     const telemetry = deps.telemetry ?? getTelemetryClient();
     const dateProvider = deps.dateProvider ?? new DateProvider();
     const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config, {
         logger: createLogger('prover-node:blob-sink:client')
     });
     const log = deps.log ?? createLogger('prover-node');
+    // Build a key store from file if given or from environment otherwise
+    let keyStoreManager;
+    const keyStoreProvided = config.keyStoreDirectory !== undefined && config.keyStoreDirectory.length > 0;
+    if (keyStoreProvided) {
+        const keyStores = loadKeystores(config.keyStoreDirectory);
+        keyStoreManager = new KeystoreManager(mergeKeystores(keyStores));
+    } else {
+        const keyStore = createKeyStoreForProver(config);
+        if (keyStore) {
+            keyStoreManager = new KeystoreManager(keyStore);
+        }
+    }
+    // Extract the prover signers from the key store and verify that we have one.
+    const proverSigners = keyStoreManager?.createProverSigners();
+    if (proverSigners === undefined) {
+        throw new Error('Failed to create prover key store configuration');
+    } else if (proverSigners.signers.length === 0) {
+        throw new Error('No prover signers found in the key store');
+    } else if (!keyStoreProvided) {
+        log.warn('KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS');
+    }
+    // Only consider user provided config if it is valid
+    const proverIdInUserConfig = config.proverId === undefined || config.proverId.isZero() ? undefined : config.proverId;
+    // ProverId: Take from key store if provided, otherwise from user config if valid, otherwise address of first signer
+    const proverId = proverSigners.id ?? proverIdInUserConfig ?? proverSigners.signers[0].address;
+    // Now create the prover client configuration from this.
+    const proverClientConfig = {
+        ...config,
+        proverId
+    };
     await trySnapshotSync(config, log);
     const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
     const archiver = deps.archiver ?? await createArchiver(config, {
@@ -44,16 +78,24 @@ import { ProverNode } from './prover-node.js';
     const worldStateSynchronizer = await createWorldStateSynchronizer(worldStateConfig, archiver, options.prefilledPublicData, telemetry);
     await worldStateSynchronizer.start();
     const broker = deps.broker ?? await createAndStartProvingBroker(config, telemetry);
-    const prover = await createProverClient(config, worldStateSynchronizer, broker, telemetry);
-    const { l1RpcUrls: rpcUrls, l1ChainId: chainId, publisherPrivateKey } = config;
+    const prover = await createProverClient(proverClientConfig, worldStateSynchronizer, broker, telemetry);
+    const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
     const chain = createEthereumChain(rpcUrls, chainId);
-    const l1Client = createExtendedL1Client(rpcUrls, publisherPrivateKey.getValue(), chain.chainInfo);
-    const rollupContract = new RollupContract(l1Client, config.l1Contracts.rollupAddress.toString());
-    const l1TxUtils = deps.l1TxUtils ?? new L1TxUtils(l1Client, log, deps.dateProvider, config);
-    const publisher = deps.publisher ?? new ProverNodePublisher(config, {
-        telemetry,
+    const publicClient = createPublicClient({
+        chain: chain.chainInfo,
+        transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
+        pollingInterval: config.viemPollingIntervalMS
+    });
+    const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
+    const l1TxUtils = deps.l1TxUtils ? [
+        deps.l1TxUtils
+    ] : proverSigners.signers.map((signer)=>{
+        return createL1TxUtilsFromEthSigner(publicClient, signer, log, dateProvider, config);
+    });
+    const publisherFactory = deps.publisherFactory ?? new ProverPublisherFactory(config, {
         rollupContract,
-        l1TxUtils
+        publisherManager: new PublisherManager(l1TxUtils),
+        telemetry
     });
     const proofVerifier = new QueuedIVCVerifier(config, config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier());
     const p2pClient = await createP2PClient(P2PClientType.Prover, config, archiver, proofVerifier, worldStateSynchronizer, epochCache, getPackageVersion() ?? '', dateProvider, telemetry, {
@@ -68,5 +110,6 @@ import { ProverNode } from './prover-node.js';
     const epochMonitor = await EpochMonitor.create(archiver, {
         pollingIntervalMs: config.proverNodePollingIntervalMs
     }, telemetry);
-    return new ProverNode(prover, publisher, archiver, archiver, archiver, worldStateSynchronizer, p2pClient, epochMonitor, proverNodeConfig, telemetry);
+    const l1Metrics = new L1Metrics(telemetry.getMeter('ProverNodeL1Metrics'), publicClient, l1TxUtils.map((utils)=>utils.getSenderAddress()));
+    return new ProverNode(prover, publisherFactory, archiver, archiver, archiver, worldStateSynchronizer, p2pClient, epochMonitor, rollupContract, l1Metrics, proverNodeConfig, telemetry);
 }

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,KAAK,WAAW,EAAoC,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EACL,KAAK,SAAS,EACd,KAAK,cAAc,EAEnB,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAGzB,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;AAOnF,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;QACb,iBAAiB,EAAE,WAAW,CAAC;QAC/B,YAAY,EAAE,wBAAwB,EAAE,CAAC;KAC1C,GAAG,OAAO,CAAC,OAAO,CAAC;YA+CN,4BAA4B;YA0D5B,sBAAsB;IAyCpC,OAAO,CAAC,6BAA6B;IAyBrC,OAAO,CAAC,uBAAuB;cAsBf,kBAAkB;CAGnC"}
+{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAoC,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EACL,KAAK,SAAS,EACd,KAAK,cAAc,EAEnB,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAGzB,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;AAOnF,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;QACb,iBAAiB,EAAE,WAAW,CAAC;QAC/B,YAAY,EAAE,wBAAwB,EAAE,CAAC;KAC1C,GAAG,OAAO,CAAC,OAAO,CAAC;YAkDN,4BAA4B;YA0D5B,sBAAsB;IAyCpC,OAAO,CAAC,6BAA6B;IAyBrC,OAAO,CAAC,uBAAuB;cAsBf,kBAAkB;CAGnC"}

package/dest/prover-node-publisher.js

@@ -44,7 +44,7 @@ export class ProverNodePublisher {
         this.interrupted = false;
     }
     getSenderAddress() {
-        return EthAddress.fromString(this.l1TxUtils.getSenderAddress());
+        return this.l1TxUtils.getSenderAddress();
     }
     async submitEpochProof(args) {
         const { epochNumber, fromBlock, toBlock } = args;
@@ -62,7 +62,7 @@ export class ProverNodePublisher {
                 return false;
             }
             try {
-                this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress());
+                this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress().toString());
             } catch (err) {
                 this.log.warn(`Failed to record the ETH balance of the prover node: ${err}`);
             }
@@ -134,7 +134,11 @@ export class ProverNodePublisher {
         const txArgs = [
             this.getSubmitEpochProofArgs(args)
         ];
-        this.log.info(`SubmitEpochProof proofSize=${args.proof.withoutPublicInputs().length} bytes`);
+        this.log.info(`Submitting epoch proof to L1 rollup contract`, {
+            proofSize: args.proof.withoutPublicInputs().length,
+            fromBlock: args.fromBlock,
+            toBlock: args.toBlock
+        });
         const data = encodeFunctionData({
             abi: RollupAbi,
             functionName: 'submitEpochRootProof',

package/dest/prover-node.d.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { RollupContract } from '@aztec/ethereum';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { P2PClient } from '@aztec/p2p';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
@@ -8,12 +8,13 @@ import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { type EpochProverManager, 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 TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
+import { L1Metrics, type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import type { SpecificProverNodeConfig } from './config.js';
 import type { EpochProvingJobData } from './job/epoch-proving-job-data.js';
 import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-job.js';
 import type { EpochMonitor, EpochMonitorHandler } from './monitors/epoch-monitor.js';
 import type { ProverNodePublisher } from './prover-node-publisher.js';
+import type { ProverPublisherFactory } from './prover-publisher-factory.js';
 type ProverNodeOptions = SpecificProverNodeConfig & Partial<DataStoreOptions>;
 type DataStoreOptions = Pick<DataStoreConfig, 'dataDirectory'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'>;
 /**
@@ -23,13 +24,15 @@ type DataStoreOptions = Pick<DataStoreConfig, 'dataDirectory'> & Pick<ChainConfi
  */
 export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable {
     protected readonly prover: EpochProverManager;
-    protected readonly publisher: ProverNodePublisher;
+    protected readonly publisherFactory: ProverPublisherFactory;
     protected readonly l2BlockSource: L2BlockSource & Partial<Service>;
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
     protected readonly contractDataSource: ContractDataSource;
     protected readonly worldState: WorldStateSynchronizer;
     protected readonly p2pClient: Pick<P2PClient<P2PClientType.Prover>, 'getTxProvider'> & Partial<Service>;
     protected readonly epochsMonitor: EpochMonitor;
+    protected readonly rollupContract: RollupContract;
+    protected readonly l1Metrics: L1Metrics;
     protected readonly telemetryClient: TelemetryClient;
     private log;
     private dateProvider;
@@ -37,10 +40,10 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
     private config;
     private jobMetrics;
     private rewardsMetrics;
-    private l1Metrics;
     readonly tracer: Tracer;
-    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Partial<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, p2pClient: Pick<P2PClient<P2PClientType.Prover>, 'getTxProvider'> & Partial<Service>, epochsMonitor: EpochMonitor, config?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
-    getProverId(): Fr;
+    protected publisher: ProverNodePublisher | undefined;
+    constructor(prover: EpochProverManager, publisherFactory: ProverPublisherFactory, l2BlockSource: L2BlockSource & Partial<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, p2pClient: Pick<P2PClient<P2PClientType.Prover>, 'getTxProvider'> & Partial<Service>, epochsMonitor: EpochMonitor, rollupContract: RollupContract, l1Metrics: L1Metrics, config?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
+    getProverId(): import("@aztec/stdlib/block").EthAddress;
     getP2P(): Pick<P2PClient<P2PClientType.Prover>, "getTxProvider"> & Partial<Service>;
     /**
      * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
@@ -92,7 +95,7 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
     private gatherMessages;
     private gatherPreviousBlockHeader;
     /** Extracted for testing purposes. */
-    protected doCreateEpochProvingJob(data: EpochProvingJobData, deadline: Date | undefined, publicProcessorFactory: PublicProcessorFactory, opts?: {
+    protected doCreateEpochProvingJob(data: EpochProvingJobData, deadline: Date | undefined, publicProcessorFactory: PublicProcessorFactory, publisher: ProverNodePublisher, opts?: {
         skipEpochCheck?: boolean;
     }): EpochProvingJob;
     /** Extracted for testing purposes. */

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,13 +6,12 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 import { assertRequired, compact, pick, sum } from '@aztec/foundation/collection';
 import { memoize } from '@aztec/foundation/decorators';
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 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 { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { uploadEpochProofFailure } from './actions/upload-epoch-proof-failure.js';
 import { EpochProvingJob } from './job/epoch-proving-job.js';
 import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
@@ -22,13 +21,15 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
  * proof for the epoch, and submits it to L1.
  */ export class ProverNode {
     prover;
-    publisher;
+    publisherFactory;
     l2BlockSource;
     l1ToL2MessageSource;
     contractDataSource;
     worldState;
     p2pClient;
     epochsMonitor;
+    rollupContract;
+    l1Metrics;
     telemetryClient;
     log;
     dateProvider;
@@ -36,24 +37,23 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     config;
     jobMetrics;
     rewardsMetrics;
-    l1Metrics;
     tracer;
-    constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, config = {}, telemetryClient = getTelemetryClient()){
+    publisher;
+    constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient()){
         this.prover = prover;
-        this.publisher = publisher;
+        this.publisherFactory = publisherFactory;
         this.l2BlockSource = l2BlockSource;
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.contractDataSource = contractDataSource;
         this.worldState = worldState;
         this.p2pClient = p2pClient;
         this.epochsMonitor = epochsMonitor;
+        this.rollupContract = rollupContract;
+        this.l1Metrics = l1Metrics;
         this.telemetryClient = telemetryClient;
         this.log = createLogger('prover-node');
         this.dateProvider = new DateProvider();
         this.jobs = new Map();
-        this.l1Metrics = new L1Metrics(telemetryClient.getMeter('ProverNodeL1Metrics'), publisher.l1TxUtils.client, [
-            publisher.getSenderAddress()
-        ]);
         this.config = {
             proverNodePollingIntervalMs: 1_000,
             proverNodeMaxPendingJobs: 100,
@@ -69,7 +69,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         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.rewardsMetrics = new ProverNodeRewardsMetrics(meter, this.prover.getProverId(), rollupContract);
     }
     getProverId() {
         return this.prover.getProverId();
@@ -109,8 +109,9 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
    * starts proving jobs for them.
    */ async start() {
         this.epochsMonitor.start(this);
-        this.l1Metrics.start();
+        this.publisher = await this.publisherFactory.create();
         await this.rewardsMetrics.start();
+        this.l1Metrics.start();
         this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.config);
     }
     /**
@@ -121,11 +122,11 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         await this.prover.stop();
         await tryStop(this.p2pClient);
         await tryStop(this.l2BlockSource);
-        this.publisher.interrupt();
+        this.publisher?.interrupt();
         await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
         await this.worldState.stop();
-        this.l1Metrics.stop();
         this.rewardsMetrics.stop();
+        this.l1Metrics.stop();
         await this.telemetryClient.stop();
         this.log.info('Stopped ProverNode');
     }
@@ -202,6 +203,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     }
     async createProvingJob(epochNumber, opts = {}) {
         this.checkMaximumPendingJobs();
+        this.publisher = await this.publisherFactory.create();
         // Gather all data for this epoch
         const epochData = await this.gatherEpochData(epochNumber);
         const fromBlock = epochData.blocks[0].number;
@@ -214,7 +216,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         // Set deadline for this job to run. It will abort if it takes too long.
         const deadlineTs = getProofSubmissionDeadlineTimestamp(epochNumber, await this.getL1Constants());
         const deadline = new Date(Number(deadlineTs) * 1000);
-        const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, opts);
+        const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, this.publisher, opts);
         this.jobs.set(job.getId(), job);
         return job;
     }
@@ -285,9 +287,9 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         this.log.verbose(`Gathered previous block header ${header.getBlockNumber()} for epoch ${epochNumber}`);
         return header;
     }
-    /** Extracted for testing purposes. */ doCreateEpochProvingJob(data, deadline, publicProcessorFactory, opts = {}) {
+    /** Extracted for testing purposes. */ doCreateEpochProvingJob(data, deadline, publicProcessorFactory, publisher, opts = {}) {
         const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit } = this.config;
-        return new EpochProvingJob(data, this.worldState, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.jobMetrics, deadline, {
+        return new EpochProvingJob(data, this.worldState, this.prover.createEpochProver(), publicProcessorFactory, publisher, this.l2BlockSource, this.jobMetrics, deadline, {
             parallelBlockLimit,
             ...opts
         });

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

@@ -0,0 +1,19 @@
+import type { L1TxUtils, PublisherManager, RollupContract } from '@aztec/ethereum';
+import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
+import type { TelemetryClient } from '@aztec/telemetry-client';
+import { ProverNodePublisher } from './prover-node-publisher.js';
+export declare class ProverPublisherFactory {
+    private config;
+    private deps;
+    constructor(config: TxSenderConfig & PublisherConfig, deps: {
+        rollupContract: RollupContract;
+        publisherManager: PublisherManager<L1TxUtils>;
+        telemetry?: TelemetryClient;
+    });
+    /**
+     * Creates a new Prover Publisher instance.
+     * @returns A new ProverNodePublisher instance.
+     */
+    create(): Promise<ProverNodePublisher>;
+}
+//# sourceMappingURL=prover-publisher-factory.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prover-publisher-factory.d.ts","sourceRoot":"","sources":["../src/prover-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;gBADJ,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAEH;;;OAGG;IACU,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAQpD"}

package/dest/prover-publisher-factory.js

@@ -0,0 +1,20 @@
+import { ProverNodePublisher } from './prover-node-publisher.js';
+export class ProverPublisherFactory {
+    config;
+    deps;
+    constructor(config, deps){
+        this.config = config;
+        this.deps = deps;
+    }
+    /**
+   * Creates a new Prover Publisher instance.
+   * @returns A new ProverNodePublisher instance.
+   */ async create() {
+        const l1Publisher = await this.deps.publisherManager.getAvailablePublisher();
+        return new ProverNodePublisher(this.config, {
+            rollupContract: this.deps.rollupContract,
+            l1TxUtils: l1Publisher,
+            telemetry: this.deps.telemetry
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "2.0.0-nightly.20250826",
+  "version": "2.0.0-nightly.20250828",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -56,26 +56,27 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "2.0.0-nightly.20250826",
-    "@aztec/bb-prover": "2.0.0-nightly.20250826",
-    "@aztec/blob-lib": "2.0.0-nightly.20250826",
-    "@aztec/blob-sink": "2.0.0-nightly.20250826",
-    "@aztec/constants": "2.0.0-nightly.20250826",
-    "@aztec/epoch-cache": "2.0.0-nightly.20250826",
-    "@aztec/ethereum": "2.0.0-nightly.20250826",
-    "@aztec/foundation": "2.0.0-nightly.20250826",
-    "@aztec/kv-store": "2.0.0-nightly.20250826",
-    "@aztec/l1-artifacts": "2.0.0-nightly.20250826",
-    "@aztec/node-lib": "2.0.0-nightly.20250826",
-    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250826",
-    "@aztec/p2p": "2.0.0-nightly.20250826",
-    "@aztec/protocol-contracts": "2.0.0-nightly.20250826",
-    "@aztec/prover-client": "2.0.0-nightly.20250826",
-    "@aztec/sequencer-client": "2.0.0-nightly.20250826",
-    "@aztec/simulator": "2.0.0-nightly.20250826",
-    "@aztec/stdlib": "2.0.0-nightly.20250826",
-    "@aztec/telemetry-client": "2.0.0-nightly.20250826",
-    "@aztec/world-state": "2.0.0-nightly.20250826",
+    "@aztec/archiver": "2.0.0-nightly.20250828",
+    "@aztec/bb-prover": "2.0.0-nightly.20250828",
+    "@aztec/blob-lib": "2.0.0-nightly.20250828",
+    "@aztec/blob-sink": "2.0.0-nightly.20250828",
+    "@aztec/constants": "2.0.0-nightly.20250828",
+    "@aztec/epoch-cache": "2.0.0-nightly.20250828",
+    "@aztec/ethereum": "2.0.0-nightly.20250828",
+    "@aztec/foundation": "2.0.0-nightly.20250828",
+    "@aztec/kv-store": "2.0.0-nightly.20250828",
+    "@aztec/l1-artifacts": "2.0.0-nightly.20250828",
+    "@aztec/node-keystore": "2.0.0-nightly.20250828",
+    "@aztec/node-lib": "2.0.0-nightly.20250828",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250828",
+    "@aztec/p2p": "2.0.0-nightly.20250828",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250828",
+    "@aztec/prover-client": "2.0.0-nightly.20250828",
+    "@aztec/sequencer-client": "2.0.0-nightly.20250828",
+    "@aztec/simulator": "2.0.0-nightly.20250828",
+    "@aztec/stdlib": "2.0.0-nightly.20250828",
+    "@aztec/telemetry-client": "2.0.0-nightly.20250828",
+    "@aztec/world-state": "2.0.0-nightly.20250828",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.23.7"

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

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import type { L1ContractAddresses } from '@aztec/ethereum';
-import { Fr } from '@aztec/foundation/fields';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { downloadEpochProvingJob, getProverNodeConfigFromEnv, rerunEpochProvingJob } from '@aztec/prover-node';
@@ -26,7 +26,7 @@ async function rerunFailedEpoch(provingJobUrl: string, baseLocalDir: string) {
     ...getProverNodeConfigFromEnv(),
     dataDirectory: dataDir,
     dataStoreMapSizeKB: env.dataStoreMapSizeKB ?? 1024 * 1024,
-    proverId: env.proverId ?? Fr.random(),
+    proverId: env.proverId ?? EthAddress.random(),
   };
 
   let metadata: UploadSnapshotMetadata;

package/src/config.ts

@@ -1,9 +1,16 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
-import { type GenesisStateConfig, genesisStateConfigMappings, getAddressFromPrivateKey } from '@aztec/ethereum';
+import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum';
 import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
-import { Fr } from '@aztec/foundation/fields';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
+import {
+  type EthAccount,
+  type EthAddressHex,
+  type EthRemoteSignerAccount,
+  type KeyStore,
+  type KeyStoreConfig,
+  keyStoreConfigMappings,
+} from '@aztec/node-keystore';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import {
@@ -12,12 +19,7 @@ import {
   proverAgentConfigMappings,
   proverBrokerConfigMappings,
 } from '@aztec/prover-client/broker';
-import {
-  type ProverClientConfig,
-  type ProverClientUserConfig,
-  bbConfigMappings,
-  proverClientConfigMappings,
-} from '@aztec/prover-client/config';
+import { type ProverClientUserConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
 import {
   type PublisherConfig,
   type TxSenderConfig,
@@ -33,6 +35,7 @@ export type ProverNodeConfig = ArchiverConfig &
   PublisherConfig &
   TxSenderConfig &
   DataStoreConfig &
+  KeyStoreConfig &
   SharedNodeConfig &
   SpecificProverNodeConfig &
   GenesisStateConfig;
@@ -93,6 +96,7 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
   ...dataConfigMappings,
+  ...keyStoreConfigMappings,
   ...archiverConfigMappings,
   ...proverClientConfigMappings,
   ...p2pConfigMappings,
@@ -121,10 +125,74 @@ export function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig
   };
 }
 
-export function resolveConfig(userConfig: ProverNodeConfig): ProverNodeConfig & ProverClientConfig {
-  const proverId =
-    userConfig.proverId && !userConfig.proverId.isZero()
-      ? userConfig.proverId
-      : Fr.fromHexString(getAddressFromPrivateKey(userConfig.publisherPrivateKey.getValue()));
-  return { ...userConfig, proverId };
+function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
+  // See what we have been given for proverId.
+  const proverId = config.proverId ? (config.proverId.toString() as EthAddressHex) : 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) {
+    return undefined;
+  }
+
+  // Also, we need at least one publisher address.
+  const publishers = config.publisherAddresses
+    ? config.publisherAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount)
+    : [];
+
+  if (publishers.length === 0) {
+    return undefined;
+  }
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover: {
+      id: proverId,
+      publisher: publishers,
+    },
+    remoteSigner: config.web3SignerUrl,
+    validators: undefined,
+  };
+  return keyStore;
+}
+
+function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
+  // Extract the publisher keys from the provided config.
+  const publisherKeys = config.publisherPrivateKeys
+    ? config.publisherPrivateKeys.map(k => k.getValue() as EthAddressHex)
+    : [];
+
+  // There must be at least 1.
+  if (publisherKeys.length === 0) {
+    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).
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover:
+      proverId === undefined
+        ? (publisherKeys[0] as EthAccount)
+        : {
+            id: proverId,
+            publisher: publisherKeys.map(key => key as EthAccount),
+          },
+    remoteSigner: undefined,
+    validators: undefined,
+  };
+  return keyStore;
+}
+
+export function createKeyStoreForProver(config: ProverNodeConfig) {
+  if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
+    return createKeyStoreFromWeb3Signer(config);
+  }
+
+  return createKeyStoreFromPublisherKeys(config);
 }

package/src/factory.ts

@@ -2,33 +2,43 @@ 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 { L1TxUtils, RollupContract, createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
+import {
+  type EthSigner,
+  L1TxUtils,
+  PublisherManager,
+  RollupContract,
+  createEthereumChain,
+  createL1TxUtilsFromEthSigner,
+} from '@aztec/ethereum';
 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 { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
-import { createProverClient } from '@aztec/prover-client';
+import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
 import type { AztecNode, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
-import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
+import { L1Metrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 
-import { type ProverNodeConfig, resolveConfig } from './config.js';
+import { createPublicClient, fallback, http } from 'viem';
+
+import { type ProverNodeConfig, createKeyStoreForProver } from './config.js';
 import { EpochMonitor } from './monitors/epoch-monitor.js';
-import { ProverNodePublisher } from './prover-node-publisher.js';
 import { ProverNode } from './prover-node.js';
+import { ProverPublisherFactory } from './prover-publisher-factory.js';
 
 export type ProverNodeDeps = {
   telemetry?: TelemetryClient;
   log?: Logger;
   aztecNodeTxProvider?: Pick<AztecNode, 'getTxsByHash'>;
   archiver?: Archiver;
-  publisher?: ProverNodePublisher;
+  publisherFactory?: ProverPublisherFactory;
   blobSinkClient?: BlobSinkClientInterface;
   broker?: ProvingJobBroker;
   l1TxUtils?: L1TxUtils;
@@ -37,19 +47,57 @@ export type ProverNodeDeps = {
 
 /** Creates a new prover node given a config. */
 export async function createProverNode(
-  userConfig: ProverNodeConfig & DataStoreConfig,
+  userConfig: ProverNodeConfig & DataStoreConfig & KeyStoreConfig,
   deps: ProverNodeDeps = {},
   options: {
     prefilledPublicData?: PublicDataTreeLeaf[];
   } = {},
 ) {
-  const config = resolveConfig(userConfig);
+  const config = { ...userConfig };
   const telemetry = deps.telemetry ?? getTelemetryClient();
   const dateProvider = deps.dateProvider ?? new DateProvider();
   const blobSinkClient =
     deps.blobSinkClient ?? createBlobSinkClient(config, { logger: createLogger('prover-node:blob-sink:client') });
   const log = deps.log ?? createLogger('prover-node');
 
+  // Build a key store from file if given or from environment otherwise
+  let keyStoreManager: KeystoreManager | undefined;
+  const keyStoreProvided = config.keyStoreDirectory !== undefined && config.keyStoreDirectory.length > 0;
+  if (keyStoreProvided) {
+    const keyStores = loadKeystores(config.keyStoreDirectory!);
+    keyStoreManager = new KeystoreManager(mergeKeystores(keyStores));
+  } else {
+    const keyStore = createKeyStoreForProver(config);
+    if (keyStore) {
+      keyStoreManager = new KeystoreManager(keyStore);
+    }
+  }
+
+  // Extract the prover signers from the key store and verify that we have one.
+  const proverSigners = keyStoreManager?.createProverSigners();
+
+  if (proverSigners === undefined) {
+    throw new Error('Failed to create prover key store configuration');
+  } else if (proverSigners.signers.length === 0) {
+    throw new Error('No prover signers found in the key store');
+  } else if (!keyStoreProvided) {
+    log.warn(
+      'KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS',
+    );
+  }
+
+  // Only consider user provided config if it is valid
+  const proverIdInUserConfig = config.proverId === undefined || config.proverId.isZero() ? undefined : config.proverId;
+
+  // ProverId: Take from key store if provided, otherwise from user config if valid, otherwise address of first signer
+  const proverId = proverSigners.id ?? proverIdInUserConfig ?? proverSigners.signers[0].address;
+
+  // Now create the prover client configuration from this.
+  const proverClientConfig: ProverClientConfig = {
+    ...config,
+    proverId,
+  };
+
   await trySnapshotSync(config, log);
 
   const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
@@ -69,16 +117,33 @@ export async function createProverNode(
   await worldStateSynchronizer.start();
 
   const broker = deps.broker ?? (await createAndStartProvingBroker(config, telemetry));
-  const prover = await createProverClient(config, worldStateSynchronizer, broker, telemetry);
 
-  const { l1RpcUrls: rpcUrls, l1ChainId: chainId, publisherPrivateKey } = config;
+  const prover = await createProverClient(proverClientConfig, worldStateSynchronizer, broker, telemetry);
+
+  const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
   const chain = createEthereumChain(rpcUrls, chainId);
-  const l1Client = createExtendedL1Client(rpcUrls, publisherPrivateKey.getValue(), chain.chainInfo);
 
-  const rollupContract = new RollupContract(l1Client, config.l1Contracts.rollupAddress.toString());
+  const publicClient = createPublicClient({
+    chain: chain.chainInfo,
+    transport: fallback(config.l1RpcUrls.map((url: string) => http(url))),
+    pollingInterval: config.viemPollingIntervalMS,
+  });
 
-  const l1TxUtils = deps.l1TxUtils ?? new L1TxUtils(l1Client, log, deps.dateProvider, config);
-  const publisher = deps.publisher ?? new ProverNodePublisher(config, { telemetry, rollupContract, l1TxUtils });
+  const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
+
+  const l1TxUtils = deps.l1TxUtils
+    ? [deps.l1TxUtils]
+    : proverSigners.signers.map((signer: EthSigner) => {
+        return createL1TxUtilsFromEthSigner(publicClient, signer, log, dateProvider, config);
+      });
+
+  const publisherFactory =
+    deps.publisherFactory ??
+    new ProverPublisherFactory(config, {
+      rollupContract,
+      publisherManager: new PublisherManager(l1TxUtils),
+      telemetry,
+    });
 
   const proofVerifier = new QueuedIVCVerifier(
     config,
@@ -126,15 +191,23 @@ export async function createProverNode(
     telemetry,
   );
 
+  const l1Metrics = new L1Metrics(
+    telemetry.getMeter('ProverNodeL1Metrics'),
+    publicClient,
+    l1TxUtils.map(utils => utils.getSenderAddress()),
+  );
+
   return new ProverNode(
     prover,
-    publisher,
+    publisherFactory,
     archiver,
     archiver,
     archiver,
     worldStateSynchronizer,
     p2pClient,
     epochMonitor,
+    rollupContract,
+    l1Metrics,
     proverNodeConfig,
     telemetry,
   );

package/src/prover-node-publisher.ts

@@ -89,7 +89,7 @@ export class ProverNodePublisher {
   }
 
   public getSenderAddress() {
-    return EthAddress.fromString(this.l1TxUtils.getSenderAddress());
+    return this.l1TxUtils.getSenderAddress();
   }
 
   public async submitEpochProof(args: {
@@ -114,7 +114,10 @@ export class ProverNodePublisher {
       }
 
       try {
-        this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress());
+        this.metrics.recordSenderBalance(
+          await this.l1TxUtils.getSenderBalance(),
+          this.l1TxUtils.getSenderAddress().toString(),
+        );
       } catch (err) {
         this.log.warn(`Failed to record the ETH balance of the prover node: ${err}`);
       }
@@ -215,18 +218,18 @@ export class ProverNodePublisher {
   }): Promise<TransactionReceipt | undefined> {
     const txArgs = [this.getSubmitEpochProofArgs(args)] as const;
 
-    this.log.info(`SubmitEpochProof proofSize=${args.proof.withoutPublicInputs().length} bytes`);
+    this.log.info(`Submitting epoch proof to L1 rollup contract`, {
+      proofSize: args.proof.withoutPublicInputs().length,
+      fromBlock: args.fromBlock,
+      toBlock: args.toBlock,
+    });
     const data = encodeFunctionData({
       abi: RollupAbi,
       functionName: 'submitEpochRootProof',
       args: txArgs,
     });
     try {
-      const { receipt } = await this.l1TxUtils.sendAndMonitorTransaction({
-        to: this.rollupContract.address,
-        data,
-      });
-
+      const { receipt } = await this.l1TxUtils.sendAndMonitorTransaction({ to: this.rollupContract.address, data });
       return receipt;
     } catch (err) {
       this.log.error(`Rollup submit epoch proof failed`, err);

package/src/prover-node.ts

@@ -1,8 +1,7 @@
 import type { Archiver } from '@aztec/archiver';
-import type { ViemPublicClient } from '@aztec/ethereum';
+import type { RollupContract } from '@aztec/ethereum';
 import { assertRequired, compact, pick, sum } from '@aztec/foundation/collection';
 import { memoize } from '@aztec/foundation/decorators';
-import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
@@ -42,6 +41,7 @@ import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-
 import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
 import type { EpochMonitor, EpochMonitorHandler } from './monitors/epoch-monitor.js';
 import type { ProverNodePublisher } from './prover-node-publisher.js';
+import type { ProverPublisherFactory } from './prover-publisher-factory.js';
 
 type ProverNodeOptions = SpecificProverNodeConfig & Partial<DataStoreOptions>;
 type DataStoreOptions = Pick<DataStoreConfig, 'dataDirectory'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'>;
@@ -59,28 +59,25 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
   private config: ProverNodeOptions;
   private jobMetrics: ProverNodeJobMetrics;
   private rewardsMetrics: ProverNodeRewardsMetrics;
-  private l1Metrics: L1Metrics;
 
   public readonly tracer: Tracer;
 
+  protected publisher: ProverNodePublisher | undefined;
+
   constructor(
     protected readonly prover: EpochProverManager,
-    protected readonly publisher: ProverNodePublisher,
+    protected readonly publisherFactory: ProverPublisherFactory,
     protected readonly l2BlockSource: L2BlockSource & Partial<Service>,
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource,
     protected readonly contractDataSource: ContractDataSource,
     protected readonly worldState: WorldStateSynchronizer,
     protected readonly p2pClient: Pick<P2PClient<P2PClientType.Prover>, 'getTxProvider'> & Partial<Service>,
     protected readonly epochsMonitor: EpochMonitor,
+    protected readonly rollupContract: RollupContract,
+    protected readonly l1Metrics: L1Metrics,
     config: Partial<ProverNodeOptions> = {},
     protected readonly telemetryClient: TelemetryClient = getTelemetryClient(),
   ) {
-    this.l1Metrics = new L1Metrics(
-      telemetryClient.getMeter('ProverNodeL1Metrics'),
-      publisher.l1TxUtils.client as unknown as ViemPublicClient,
-      [publisher.getSenderAddress()],
-    );
-
     this.config = {
       proverNodePollingIntervalMs: 1_000,
       proverNodeMaxPendingJobs: 100,
@@ -100,11 +97,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
 
     this.jobMetrics = new ProverNodeJobMetrics(meter, telemetryClient.getTracer('EpochProvingJob'));
 
-    this.rewardsMetrics = new ProverNodeRewardsMetrics(
-      meter,
-      EthAddress.fromField(this.prover.getProverId()),
-      this.publisher.getRollupContract(),
-    );
+    this.rewardsMetrics = new ProverNodeRewardsMetrics(meter, this.prover.getProverId(), rollupContract);
   }
 
   public getProverId() {
@@ -150,8 +143,9 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
    */
   async start() {
     this.epochsMonitor.start(this);
-    this.l1Metrics.start();
+    this.publisher = await this.publisherFactory.create();
     await this.rewardsMetrics.start();
+    this.l1Metrics.start();
     this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.config);
   }
 
@@ -164,11 +158,11 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     await this.prover.stop();
     await tryStop(this.p2pClient);
     await tryStop(this.l2BlockSource);
-    this.publisher.interrupt();
+    this.publisher?.interrupt();
     await Promise.all(Array.from(this.jobs.values()).map(job => job.stop()));
     await this.worldState.stop();
-    this.l1Metrics.stop();
     this.rewardsMetrics.stop();
+    this.l1Metrics.stop();
     await this.telemetryClient.stop();
     this.log.info('Stopped ProverNode');
   }
@@ -270,6 +264,8 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
   private async createProvingJob(epochNumber: bigint, opts: { skipEpochCheck?: boolean } = {}) {
     this.checkMaximumPendingJobs();
 
+    this.publisher = await this.publisherFactory.create();
+
     // Gather all data for this epoch
     const epochData = await this.gatherEpochData(epochNumber);
 
@@ -291,7 +287,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     const deadlineTs = getProofSubmissionDeadlineTimestamp(epochNumber, await this.getL1Constants());
     const deadline = new Date(Number(deadlineTs) * 1000);
 
-    const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, opts);
+    const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, this.publisher, opts);
     this.jobs.set(job.getId(), job);
     return job;
   }
@@ -367,6 +363,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     data: EpochProvingJobData,
     deadline: Date | undefined,
     publicProcessorFactory: PublicProcessorFactory,
+    publisher: ProverNodePublisher,
     opts: { skipEpochCheck?: boolean } = {},
   ) {
     const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit } = this.config;
@@ -375,7 +372,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
       this.worldState,
       this.prover.createEpochProver(),
       publicProcessorFactory,
-      this.publisher,
+      publisher,
       this.l2BlockSource,
       this.jobMetrics,
       deadline,

package/src/prover-publisher-factory.ts

@@ -0,0 +1,28 @@
+import type { L1TxUtils, PublisherManager, RollupContract } from '@aztec/ethereum';
+import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
+import type { TelemetryClient } from '@aztec/telemetry-client';
+
+import { ProverNodePublisher } from './prover-node-publisher.js';
+
+export class ProverPublisherFactory {
+  constructor(
+    private config: TxSenderConfig & PublisherConfig,
+    private deps: {
+      rollupContract: RollupContract;
+      publisherManager: PublisherManager<L1TxUtils>;
+      telemetry?: TelemetryClient;
+    },
+  ) {}
+  /**
+   * Creates a new Prover Publisher instance.
+   * @returns A new ProverNodePublisher instance.
+   */
+  public async create(): Promise<ProverNodePublisher> {
+    const l1Publisher = await this.deps.publisherManager.getAvailablePublisher();
+    return new ProverNodePublisher(this.config, {
+      rollupContract: this.deps.rollupContract,
+      l1TxUtils: l1Publisher,
+      telemetry: this.deps.telemetry,
+    });
+  }
+}