@aztec/node-lib 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

package/dest/actions/snapshot-sync.d.ts

@@ -3,11 +3,12 @@ import { type EthereumClientConfig } from '@aztec/ethereum/client';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ChainConfig } from '@aztec/stdlib/config';
+import { type ReadOnlyFileStore } from '@aztec/stdlib/file-store';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { type SnapshotMetadata } from '@aztec/stdlib/snapshots';
 import type { SharedNodeConfig } from '../config/index.js';
-type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
+type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> & DataStoreConfig & Required<Pick<DataStoreConfig, 'rollupAddress'>> & EthereumClientConfig & {
     snapshotsUrls?: string[];
     minL1BlocksToTriggerReplace?: number;
 };
@@ -22,7 +23,7 @@ export declare function trySnapshotSync(config: SnapshotSyncConfig, log: Logger)
 export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'>, log: Logger, config: {
     dataDirectory: string;
     rollupAddress: EthAddress;
-    snapshotsUrl: string;
+    fileStore: ReadOnlyFileStore;
 }): Promise<void>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHeEQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBS3RCLE1BQU0seUJBQXlCLENBQUM7QUFNakMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUszRCxLQUFLLGtCQUFrQixHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsR0FDMUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQ2hELElBQUksQ0FBQyxpQkFBaUIsRUFBRSxvQkFBb0IsQ0FBQyxHQUM3QyxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQ3pCLG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFpSzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQXFEbkYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0saUJBQWlCLENBQUM7QUFFekIsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQW1CLE1BQU0sd0JBQXdCLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV4RCxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBMkIsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFLdEIsTUFBTSx5QkFBeUIsQ0FBQztBQU1qQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSzNELEtBQUssa0JBQWtCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxHQUMxRCxJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxlQUFlLENBQUMsR0FDaEQsSUFBSSxDQUFDLGlCQUFpQixFQUFFLG9CQUFvQixDQUFDLEdBQzdDLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLENBQUMsR0FDOUMsZUFBZSxHQUNmLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDLEdBQ2hELG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkF1SzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsU0FBUyxFQUFFLGlCQUFpQixDQUFBO0NBQUUsaUJBbUQzRiJ9

package/dest/actions/snapshot-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,QAAQ,CAAC,eAAe,CAAC,GACzB,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAiK5E;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,iBAqDnF"}
+{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,IAAI,CAAC,cAAc,EAAE,wBAAwB,CAAC,GAC9C,eAAe,GACf,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,GAChD,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAuK5E;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,iBAAiB,CAAA;CAAE,iBAmD3F"}

package/dest/actions/snapshot-sync.js

@@ -1,8 +1,9 @@
-import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore } from '@aztec/archiver';
+import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore, getArchiverSynchPoint } from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { getPublicClient } from '@aztec/ethereum/client';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { P2P_STORE_NAME } from '@aztec/p2p';
+import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/stdlib/block';
 import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
 import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
 import { downloadSnapshot, getLatestSnapshotMetadata, makeSnapshotPaths } from '@aztec/stdlib/snapshots';
@@ -15,7 +16,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
  * Connects to a remote snapshot index and downloads the latest snapshot if the local archiver is behind.
  * Behaviour depends on syncing mode.
  */ export async function trySnapshotSync(config, log) {
-    const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
+    const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
     if (syncMode === 'full') {
         log.debug('Snapshot sync is disabled. Running full sync.', {
             syncMode: syncMode
@@ -30,24 +31,24 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         log.verbose('Snapshot sync is disabled. No local data directory defined.');
         return false;
     }
-    // Create an archiver store to check the current state (do this only once)
+    // Create an archiver store to check the current state (do this only once). This temporary store is only
+    // read for its sync point and never serves tagged-log queries, so the genesis block hash it carries is
+    // immaterial — pass the protocol constant.
     log.verbose(`Creating temporary archiver data store`);
-    const archiverStore = await createArchiverStore(config, {
-        epochDuration: config.aztecEpochDuration
-    });
+    const archiverStore = await createArchiverStore(config, GENESIS_BLOCK_HEADER_HASH);
     let archiverL1BlockNumber;
     let archiverL2BlockNumber;
     try {
         [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
-            archiverStore.getSynchPoint().then((s)=>s.blocksSynchedTo),
-            archiverStore.getLatestBlockNumber()
+            getArchiverSynchPoint(archiverStore).then((s)=>s.blocksSynchedTo),
+            archiverStore.blocks.getLatestL2BlockNumber()
         ]);
     } finally{
         log.verbose(`Closing temporary archiver data store`, {
             archiverL1BlockNumber,
             archiverL2BlockNumber
         });
-        await archiverStore.close();
+        await archiverStore.db.close();
     }
     const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
     if (syncMode === 'snapshot' && archiverL2BlockNumber !== undefined && archiverL2BlockNumber >= INITIAL_L2_BLOCK_NUM) {
@@ -55,7 +56,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         return false;
     }
     const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
-    if (archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
+    if (archiverL1BlockNumber && currentL1BlockNumber >= archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
         log.verbose(`Skipping snapshot sync as archiver is less than ${currentL1BlockNumber - archiverL1BlockNumber} L1 blocks behind.`, {
             archiverL1BlockNumber,
             currentL1BlockNumber,
@@ -66,7 +67,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
     const indexMetadata = {
         l1ChainId,
         rollupVersion,
-        rollupAddress: l1Contracts.rollupAddress
+        rollupAddress
     };
     const snapshotCandidates = [];
     for (const snapshotsUrl of snapshotsUrls){
@@ -134,7 +135,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
     // Sort candidates by L1 block number (highest first)
     snapshotCandidates.sort((a, b)=>b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
     // Try each candidate in order until one succeeds
-    for (const { snapshot, url } of snapshotCandidates){
+    for (const { snapshot, url, fileStore } of snapshotCandidates){
         const { l1BlockNumber, l2BlockNumber } = snapshot;
         log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
             snapshot,
@@ -143,8 +144,8 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         try {
             await snapshotSync(snapshot, log, {
                 dataDirectory: config.dataDirectory,
-                rollupAddress: config.l1Contracts.rollupAddress,
-                snapshotsUrl: url
+                rollupAddress: config.rollupAddress,
+                fileStore
             });
             log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
                 snapshot,
@@ -167,11 +168,10 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
 /**
  * Downloads the given snapshot replacing any local data stores.
  */ export async function snapshotSync(snapshot, log, config) {
-    const { dataDirectory, rollupAddress } = config;
+    const { dataDirectory, rollupAddress, fileStore } = config;
     if (!dataDirectory) {
         throw new Error(`No local data directory defined. Cannot sync snapshot.`);
     }
-    const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
     let downloadDir;
     try {
         // Download the snapshot to a temp location.

package/dest/actions/upload-snapshot.d.ts

@@ -1,12 +1,12 @@
 import { type Archiver } from '@aztec/archiver';
 import type { Logger } from '@aztec/foundation/log';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
 /**
  * Pauses the archiver and world state sync, creates backups of the archiver and world state lmdb environments,
  * and uploads them to the specified location. Location must be a URL supported by our file store (eg `gs://bucketname/path`).
  */
 export declare function uploadSnapshot(location: string, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadSnapshotConfig, log: Logger): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNuYXBzaG90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWN0aW9ucy91cGxvYWQtc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixLQUFLLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFXOUUsTUFBTSxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNqRixJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRXpDOzs7R0FHRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixHQUFHLEVBQUUsTUFBTSxpQkFvQloifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNuYXBzaG90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWN0aW9ucy91cGxvYWQtc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixLQUFLLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFXOUQsTUFBTSxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNqRixJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRXpDOzs7R0FHRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixHQUFHLEVBQUUsTUFBTSxpQkFvQloifQ==

package/dest/actions/upload-snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/actions/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAW9E,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GACjF,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAEzC;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,iBAoBZ"}
+{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/actions/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAW9D,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GACjF,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAEzC;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,iBAoBZ"}

package/dest/config/index.d.ts

@@ -4,20 +4,20 @@ export type SharedNodeConfig = {
     testAccounts: boolean;
     /** Whether to populate the genesis state with initial fee juice for the sponsored FPC */
     sponsoredFPC: boolean;
+    /** Additional addresses to prefund with fee juice at genesis */
+    prefundAddresses: string[];
     /** Sync mode: full to always sync via L1, snapshot to download a snapshot if there is no local data, force-snapshot to download even if there is local data. */
     syncMode: 'full' | 'snapshot' | 'force-snapshot';
     /** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
     snapshotsUrls?: string[];
-    /** Auto update mode: disabled - to completely ignore remote signals to update the node. enabled - to respect the signals (potentially shutting this node down). log - check for updates but log a warning instead of applying them*/
-    autoUpdate?: 'disabled' | 'notify' | 'config' | 'config-and-version';
-    /** The base URL against which to check for updates */
-    autoUpdateUrl?: string;
     /** URL of the Web3Signer instance */
     web3SignerUrl?: string;
     /** Whether to run in fisherman mode */
     fishermanMode?: boolean;
     /** Force verification of tx Chonk proofs. Only used for testnet */
     debugForceTxProofVerification: boolean;
+    /** Soft-shutdown the node when the canonical rollup is no longer compatible, keeping the health server up for K8s probes */
+    enableAutoShutdown: boolean;
 };
 export declare const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdLQUFnSztJQUNoSyxRQUFRLEVBQUUsTUFBTSxHQUFHLFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQztJQUNqRCw2SUFBNkk7SUFDN0ksYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFFekIscU9BQXFPO0lBQ3JPLFVBQVUsQ0FBQyxFQUFFLFVBQVUsR0FBRyxRQUFRLEdBQUcsUUFBUSxHQUFHLG9CQUFvQixDQUFDO0lBQ3JFLHNEQUFzRDtJQUN0RCxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFdkIscUNBQXFDO0lBQ3JDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN2Qix1Q0FBdUM7SUFDdkMsYUFBYSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBRXhCLG1FQUFtRTtJQUNuRSw2QkFBNkIsRUFBRSxPQUFPLENBQUM7Q0FDeEMsQ0FBQztBQUVGLGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FvRHpFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdFQUFnRTtJQUNoRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUMzQixnS0FBZ0s7SUFDaEssUUFBUSxFQUFFLE1BQU0sR0FBRyxVQUFVLEdBQUcsZ0JBQWdCLENBQUM7SUFDakQsNklBQTZJO0lBQzdJLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLHFDQUFxQztJQUNyQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdkIsdUNBQXVDO0lBQ3ZDLGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUV4QixtRUFBbUU7SUFDbkUsNkJBQTZCLEVBQUUsT0FBTyxDQUFDO0lBRXZDLDRIQUE0SDtJQUM1SCxrQkFBa0IsRUFBRSxPQUFPLENBQUM7Q0FDN0IsQ0FBQztBQUVGLGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0E0RHpFLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,6IAA6I;IAC7I,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAEzB,qOAAqO;IACrO,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,oBAAoB,CAAC;IACrE,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mEAAmE;IACnE,6BAA6B,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAoDzE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,6IAA6I;IAC7I,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mEAAmE;IACnE,6BAA6B,EAAE,OAAO,CAAC;IAEvC,4HAA4H;IAC5H,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CA4DzE,CAAC"}

package/dest/config/index.js

@@ -10,6 +10,12 @@ export const sharedNodeConfigMappings = {
         description: 'Whether to populate the genesis state with initial fee juice for the sponsored FPC.',
         ...booleanConfigHelper(false)
     },
+    prefundAddresses: {
+        env: 'PREFUND_ADDRESSES',
+        description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis (local network only).',
+        parseEnv: (val)=>val.split(',').map((a)=>a.trim()).filter((a)=>a.length > 0),
+        defaultValue: []
+    },
     syncMode: {
         env: 'SYNC_MODE',
         description: 'Set sync mode to `full` to always sync via L1, `snapshot` to download a snapshot if there is no local data, `force-snapshot` to download even if there is local data.',
@@ -24,15 +30,6 @@ export const sharedNodeConfigMappings = {
         ],
         defaultValue: []
     },
-    autoUpdate: {
-        env: 'AUTO_UPDATE',
-        description: 'The auto update mode for this node',
-        defaultValue: 'disabled'
-    },
-    autoUpdateUrl: {
-        env: 'AUTO_UPDATE_URL',
-        description: 'Base URL to check for updates'
-    },
     web3SignerUrl: {
         env: 'WEB3_SIGNER_URL',
         description: 'URL of the Web3Signer instance',
@@ -47,5 +44,10 @@ export const sharedNodeConfigMappings = {
         env: 'DEBUG_FORCE_TX_PROOF_VERIFICATION',
         description: 'Whether to force tx proof verification. Only has an effect if real proving is turned off',
         ...booleanConfigHelper(false)
+    },
+    enableAutoShutdown: {
+        env: 'ENABLE_AUTO_SHUTDOWN',
+        description: 'Soft-shutdown the node when the canonical rollup is no longer compatible (protocol constants diverge), keeping the health server up so K8s probes keep passing. Only applies to nodes following the canonical rollup.',
+        ...booleanConfigHelper(false)
     }
 };

package/dest/factories/l1_tx_utils.d.ts

@@ -1,79 +1,66 @@
+import type { BlobKzgInstance } from '@aztec/blob-lib/types';
 import type { EthSigner } from '@aztec/ethereum/eth-signer';
 import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
 import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
 /**
- * Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
+ * Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export declare function createL1TxUtilsWithBlobsFromViemWallet(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
+export declare function createL1TxUtilsFromWallets(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
     debugMaxGasLimit?: boolean;
     scope?: L1TxScope;
 }, deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
-/**
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
- */
-export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
-    debugMaxGasLimit?: boolean;
-    scope?: L1TxScope;
-}, deps: {
-    telemetry: TelemetryClient;
-    logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
-/**
- * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
- */
-export declare function createL1TxUtilsFromViemWalletWithStore(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
-    debugMaxGasLimit?: boolean;
-    scope?: L1TxScope;
-}, deps: {
-    telemetry: TelemetryClient;
-    logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-    scope?: L1TxScope;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
 }): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
 /**
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
+ * Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
+ * Deduplicates signers by address to avoid creating multiple instances for the same publisher.
  */
-export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
+export declare function createL1TxUtilsFromSigners(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
     debugMaxGasLimit?: boolean;
     scope?: L1TxScope;
 }, deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-    scope?: L1TxScope;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
 }): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
 /**
- * Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
- * This wraps all transactions through a forwarder contract for testing purposes.
+ * Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export declare function createForwarderL1TxUtilsFromViemWallet(clients: ExtendedViemWalletClient[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
+export declare function createForwarderL1TxUtilsFromWallets(clients: ExtendedViemWalletClient[], forwarderAddress: EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
     debugMaxGasLimit?: boolean;
     scope?: L1TxScope;
 }, deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
 }): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
 /**
- * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
- * This wraps all transactions through a forwarder contract for testing purposes.
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export declare function createForwarderL1TxUtilsFromEthSigner(client: ViemClient, signers: EthSigner[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
+export declare function createForwarderL1TxUtilsFromSigners(client: ViemClient, signers: EthSigner[], forwarderAddress: EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
     debugMaxGasLimit?: boolean;
     scope?: L1TxScope;
 }, deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
 }): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFLNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFPbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBK0I3RDs7R0FFRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkFPRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHFDQUFxQyxDQUN6RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkF5QkY7QUFFRDs7R0FFRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixLQUFLLENBQUMsRUFBRSxTQUFTLENBQUM7Q0FDbkIsOERBS0Y7QUFFRDs7R0FFRztBQUNILHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLFVBQVUsRUFDbEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxFQUNwQixNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFDO0NBQ25CLDhEQXVCRjtBQUVEOzs7R0FHRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLGdCQUFnQixFQUFFLE9BQU8sK0JBQStCLEVBQUUsVUFBVSxFQUNwRSxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7Q0FDN0Isa0ZBT0Y7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IscUNBQXFDLENBQ3pELE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxTQUFTLEVBQUUsRUFDcEIsZ0JBQWdCLEVBQUUsT0FBTywrQkFBK0IsRUFBRSxVQUFVLEVBQ3BFLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkFjRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBc0M3RDs7O0dBR0c7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxFQUNuQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLEdBQUcsQ0FBQyxFQUFFLGVBQWUsQ0FBQztDQUN2Qiw4REFLRjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxTQUFTLEVBQUUsRUFDcEIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsOERBdUJGO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixtQ0FBbUMsQ0FDdkQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0Y7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLG1DQUFtQyxDQUN2RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0YifQ==

package/dest/factories/l1_tx_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAsC7D;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,wBAAwB,EAAE,EACnC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,8DAKF;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,8DAuBF;AAED;;;;GAIG;AACH,wBAAsB,mCAAmC,CACvD,OAAO,EAAE,wBAAwB,EAAE,EACnC,gBAAgB,EAAE,UAAU,EAC5B,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,kFAOF;AAED;;;;GAIG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,gBAAgB,EAAE,UAAU,EAC5B,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,kFAOF"}

package/dest/factories/l1_tx_utils.js

@@ -1,5 +1,5 @@
-import { createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase, createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils';
-import { createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase, createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase, createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase, createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import { createDelayer, createL1TxUtils as createL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils';
+import { createForwarderL1TxUtils as createForwarderL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { omit } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
@@ -7,32 +7,44 @@ import { L1TxMetrics } from '../metrics/l1_tx_metrics.js';
 import { L1TxStore } from '../stores/l1_tx_store.js';
 const L1_TX_STORE_NAME = 'l1-tx-utils';
 /**
- * Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
+ * Creates shared dependencies (logger, store, metrics, delayer) for L1TxUtils instances.
+ * When enableDelayer is set in config, a single shared delayer is created and passed to all instances.
  */ async function createSharedDeps(config, deps) {
     const logger = deps.logger ?? createLogger('l1-tx-utils');
     // Note that we do NOT bind them to the rollup address, since we still need to
     // monitor and cancel txs for previous rollups to free up our nonces.
-    const noRollupConfig = omit(config, 'l1Contracts');
+    const noRollupConfig = omit(config, 'rollupAddress');
     const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
     const store = new L1TxStore(kvStore, logger);
     const meter = deps.telemetry.getMeter('L1TxUtils');
     const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
+    // Create a single shared delayer for all L1TxUtils instances in this group
+    const delayer = config.enableDelayer && config.ethereumSlotDuration !== undefined ? createDelayer(deps.dateProvider, {
+        ethereumSlotDuration: config.ethereumSlotDuration
+    }, logger.getBindings()) : undefined;
     return {
         logger,
         store,
         metrics,
-        dateProvider: deps.dateProvider
+        dateProvider: deps.dateProvider,
+        delayer
     };
 }
 /**
- * Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
- */ export async function createL1TxUtilsWithBlobsFromViemWallet(clients, config, deps) {
+ * Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
+ */ export async function createL1TxUtilsFromWallets(clients, config, deps) {
     const sharedDeps = await createSharedDeps(config, deps);
-    return clients.map((client)=>createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit));
+    return clients.map((client)=>createL1TxUtilsBase(client, {
+            ...sharedDeps,
+            kzg: deps.kzg
+        }, config));
 }
 /**
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
- */ export async function createL1TxUtilsWithBlobsFromEthSigner(client, signers, config, deps) {
+ * Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
+ * Deduplicates signers by address to avoid creating multiple instances for the same publisher.
+ */ export async function createL1TxUtilsFromSigners(client, signers, config, deps) {
     const sharedDeps = await createSharedDeps(config, deps);
     // Deduplicate signers by address to avoid creating multiple L1TxUtils instances
     // for the same publisher address (e.g., when multiple attesters share the same publisher key)
@@ -47,44 +59,36 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
     if (uniqueSigners.length < signers.length) {
         sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
     }
-    return uniqueSigners.map((signer)=>createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit));
+    return uniqueSigners.map((signer)=>createL1TxUtilsBase({
+            client,
+            signer
+        }, {
+            ...sharedDeps,
+            kzg: deps.kzg
+        }, config));
 }
 /**
- * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
- */ export async function createL1TxUtilsFromViemWalletWithStore(clients, config, deps) {
+ * Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
+ */ export async function createForwarderL1TxUtilsFromWallets(clients, forwarderAddress, config, deps) {
     const sharedDeps = await createSharedDeps(config, deps);
-    return clients.map((client)=>createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
+    return clients.map((client)=>createForwarderL1TxUtilsBase(client, forwarderAddress, {
+            ...sharedDeps,
+            kzg: deps.kzg
+        }, config));
 }
 /**
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
- */ export async function createL1TxUtilsFromEthSignerWithStore(client, signers, config, deps) {
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
+ */ export async function createForwarderL1TxUtilsFromSigners(client, signers, forwarderAddress, config, deps) {
     const sharedDeps = await createSharedDeps(config, deps);
-    // Deduplicate signers by address to avoid creating multiple L1TxUtils instances
-    // for the same publisher address (e.g., when multiple attesters share the same publisher key)
-    const signersByAddress = new Map();
-    for (const signer of signers){
-        const addressKey = signer.address.toString().toLowerCase();
-        if (!signersByAddress.has(addressKey)) {
-            signersByAddress.set(addressKey, signer);
-        }
-    }
-    const uniqueSigners = Array.from(signersByAddress.values());
-    if (uniqueSigners.length < signers.length) {
-        sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
-    }
-    return uniqueSigners.map((signer)=>createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
-}
-/**
- * Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
- * This wraps all transactions through a forwarder contract for testing purposes.
- */ export async function createForwarderL1TxUtilsFromViemWallet(clients, forwarderAddress, config, deps) {
-    const sharedDeps = await createSharedDeps(config, deps);
-    return clients.map((client)=>createForwarderL1TxUtilsFromViemWalletBase(client, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
-}
-/**
- * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
- * This wraps all transactions through a forwarder contract for testing purposes.
- */ export async function createForwarderL1TxUtilsFromEthSigner(client, signers, forwarderAddress, config, deps) {
-    const sharedDeps = await createSharedDeps(config, deps);
-    return signers.map((signer)=>createForwarderL1TxUtilsFromEthSignerBase(client, signer, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
+    return signers.map((signer)=>createForwarderL1TxUtilsBase({
+            client,
+            signer
+        }, forwarderAddress, {
+            ...sharedDeps,
+            kzg: deps.kzg
+        }, config));
 }

package/dest/metrics/l1_tx_metrics.d.ts

@@ -26,4 +26,4 @@ export declare class L1TxMetrics implements IL1TxMetrics {
     recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
     recordDroppedTx(state: L1TxState): void;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFvQnJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQW9EOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFvQnJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQXNEOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=

package/dest/metrics/l1_tx_metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_tx_metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/l1_tx_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAGL,KAAK,KAAK,EAIX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAmB5C,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAnBhB,OAAO,CAAC,eAAe,CAAY;IAGnC,OAAO,CAAC,oBAAoB,CAAY;IAGxC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IAGvC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,gBAAgB,CAAY;IAEpC,YACU,KAAK,EAAE,KAAK,EACZ,KAAK,GAAE,SAAmB,EAC1B,MAAM,yCAAsC,EAoBrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAoD9D;IAEM,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiB7C;CACF"}
+{"version":3,"file":"l1_tx_metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/l1_tx_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAGL,KAAK,KAAK,EAIX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAmB5C,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAnBhB,OAAO,CAAC,eAAe,CAAY;IAGnC,OAAO,CAAC,oBAAoB,CAAY;IAGxC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IAGvC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,gBAAgB,CAAY;IAEpC,YACU,KAAK,EAAE,KAAK,EACZ,KAAK,GAAE,SAAmB,EAC1B,MAAM,yCAAsC,EAoBrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAsD9D;IAEM,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiB7C;CACF"}

package/dest/metrics/l1_tx_metrics.js

@@ -69,15 +69,15 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/tele
         // Record number of attempts until mined
         const attempts = isCancelTx ? state.cancelTxHashes.length : state.txHashes.length;
         this.txAttemptsUntilMined.record(attempts, attributes);
-        // Record gas prices at end state (in wei as integers)
-        const maxPriorityFeeWei = Number(state.gasPrice.maxPriorityFeePerGas);
-        const maxFeeWei = Number(state.gasPrice.maxFeePerGas);
-        const blobFeeWei = state.gasPrice.maxFeePerBlobGas ? Number(state.gasPrice.maxFeePerBlobGas) : undefined;
-        this.maxPriorityFeeHistogram.record(maxPriorityFeeWei, attributes);
-        this.maxFeeHistogram.record(maxFeeWei, attributes);
-        // Record blob fee if present (in wei as integer)
-        if (blobFeeWei !== undefined) {
-            this.blobFeeHistogram.record(blobFeeWei, attributes);
+        // Record gas prices at end state, converted from wei to gwei to match metric unit definitions
+        const weiToGwei = 1e9;
+        const maxPriorityFeeGwei = Number(state.gasPrice.maxPriorityFeePerGas) / weiToGwei;
+        const maxFeeGwei = Number(state.gasPrice.maxFeePerGas) / weiToGwei;
+        const blobFeeGwei = state.gasPrice.maxFeePerBlobGas ? Number(state.gasPrice.maxFeePerBlobGas) / weiToGwei : undefined;
+        this.maxPriorityFeeHistogram.record(maxPriorityFeeGwei, attributes);
+        this.maxFeeHistogram.record(maxFeeGwei, attributes);
+        if (blobFeeGwei !== undefined) {
+            this.blobFeeHistogram.record(blobFeeGwei, attributes);
         }
         this.logger.debug(`Recorded tx end state metrics`, {
             status: TxUtilsState[state.status],
@@ -85,9 +85,9 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/tele
             isCancelTx,
             isReverted,
             scope: this.scope,
-            maxPriorityFeeWei,
-            maxFeeWei,
-            blobFeeWei
+            maxPriorityFeeGwei,
+            maxFeeGwei,
+            blobFeeGwei
         });
     }
     recordDroppedTx(state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/node-lib",
-  "version": "0.0.1-commit.f2ce05ee",
+  "version": "0.0.1-commit.f5a9928",
   "type": "module",
   "typedocOptions": {
     "entryPoints": [
@@ -66,29 +66,28 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.f2ce05ee",
-    "@aztec/bb-prover": "0.0.1-commit.f2ce05ee",
-    "@aztec/blob-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/constants": "0.0.1-commit.f2ce05ee",
-    "@aztec/epoch-cache": "0.0.1-commit.f2ce05ee",
-    "@aztec/ethereum": "0.0.1-commit.f2ce05ee",
-    "@aztec/foundation": "0.0.1-commit.f2ce05ee",
-    "@aztec/kv-store": "0.0.1-commit.f2ce05ee",
-    "@aztec/merkle-tree": "0.0.1-commit.f2ce05ee",
-    "@aztec/p2p": "0.0.1-commit.f2ce05ee",
-    "@aztec/protocol-contracts": "0.0.1-commit.f2ce05ee",
-    "@aztec/prover-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/sequencer-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/simulator": "0.0.1-commit.f2ce05ee",
-    "@aztec/stdlib": "0.0.1-commit.f2ce05ee",
-    "@aztec/telemetry-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/validator-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/world-state": "0.0.1-commit.f2ce05ee",
+    "@aztec/archiver": "0.0.1-commit.f5a9928",
+    "@aztec/bb-prover": "0.0.1-commit.f5a9928",
+    "@aztec/blob-client": "0.0.1-commit.f5a9928",
+    "@aztec/constants": "0.0.1-commit.f5a9928",
+    "@aztec/epoch-cache": "0.0.1-commit.f5a9928",
+    "@aztec/ethereum": "0.0.1-commit.f5a9928",
+    "@aztec/foundation": "0.0.1-commit.f5a9928",
+    "@aztec/kv-store": "0.0.1-commit.f5a9928",
+    "@aztec/p2p": "0.0.1-commit.f5a9928",
+    "@aztec/protocol-contracts": "0.0.1-commit.f5a9928",
+    "@aztec/prover-client": "0.0.1-commit.f5a9928",
+    "@aztec/sequencer-client": "0.0.1-commit.f5a9928",
+    "@aztec/simulator": "0.0.1-commit.f5a9928",
+    "@aztec/stdlib": "0.0.1-commit.f5a9928",
+    "@aztec/telemetry-client": "0.0.1-commit.f5a9928",
+    "@aztec/validator-client": "0.0.1-commit.f5a9928",
+    "@aztec/world-state": "0.0.1-commit.f5a9928",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/blob-lib": "0.0.1-commit.f2ce05ee",
-    "@aztec/node-keystore": "0.0.1-commit.f2ce05ee",
+    "@aztec/blob-lib": "0.0.1-commit.f5a9928",
+    "@aztec/node-keystore": "0.0.1-commit.f5a9928",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/actions/snapshot-sync.ts

@@ -1,15 +1,22 @@
-import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, type ArchiverConfig, createArchiverStore } from '@aztec/archiver';
+import {
+  ARCHIVER_DB_VERSION,
+  ARCHIVER_STORE_NAME,
+  type ArchiverConfig,
+  createArchiverStore,
+  getArchiverSynchPoint,
+} from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum/client';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { tryRmDir } from '@aztec/foundation/fs';
 import type { Logger } from '@aztec/foundation/log';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { P2P_STORE_NAME } from '@aztec/p2p';
+import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/stdlib/block';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
 import { type ReadOnlyFileStore, createReadOnlyFileStore } from '@aztec/stdlib/file-store';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import {
   type SnapshotMetadata,
   type SnapshotsIndexMetadata,
@@ -30,8 +37,9 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
 type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
   Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> &
   Pick<L1ContractsConfig, 'aztecEpochDuration'> &
-  Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> &
-  Required<DataStoreConfig> &
+  Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> &
+  DataStoreConfig &
+  Required<Pick<DataStoreConfig, 'rollupAddress'>> &
   EthereumClientConfig & {
     snapshotsUrls?: string[];
     minL1BlocksToTriggerReplace?: number;
@@ -42,7 +50,7 @@ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
  * Behaviour depends on syncing mode.
  */
 export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
-  const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
+  const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
   if (syncMode === 'full') {
     log.debug('Snapshot sync is disabled. Running full sync.', { syncMode: syncMode });
     return false;
@@ -58,19 +66,21 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
     return false;
   }
 
-  // Create an archiver store to check the current state (do this only once)
+  // Create an archiver store to check the current state (do this only once). This temporary store is only
+  // read for its sync point and never serves tagged-log queries, so the genesis block hash it carries is
+  // immaterial — pass the protocol constant.
   log.verbose(`Creating temporary archiver data store`);
-  const archiverStore = await createArchiverStore(config, { epochDuration: config.aztecEpochDuration });
+  const archiverStore = await createArchiverStore(config, GENESIS_BLOCK_HEADER_HASH);
   let archiverL1BlockNumber: bigint | undefined;
   let archiverL2BlockNumber: number | undefined;
   try {
     [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
-      archiverStore.getSynchPoint().then(s => s.blocksSynchedTo),
-      archiverStore.getLatestBlockNumber(),
+      getArchiverSynchPoint(archiverStore).then(s => s.blocksSynchedTo),
+      archiverStore.blocks.getLatestL2BlockNumber(),
     ] as const);
   } finally {
     log.verbose(`Closing temporary archiver data store`, { archiverL1BlockNumber, archiverL2BlockNumber });
-    await archiverStore.close();
+    await archiverStore.db.close();
   }
 
   const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
@@ -82,7 +92,11 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   }
 
   const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
-  if (archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
+  if (
+    archiverL1BlockNumber &&
+    currentL1BlockNumber >= archiverL1BlockNumber &&
+    currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace
+  ) {
     log.verbose(
       `Skipping snapshot sync as archiver is less than ${
         currentL1BlockNumber - archiverL1BlockNumber
@@ -95,7 +109,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   const indexMetadata: SnapshotsIndexMetadata = {
     l1ChainId,
     rollupVersion,
-    rollupAddress: l1Contracts.rollupAddress,
+    rollupAddress,
   };
 
   // Fetch latest snapshot from each URL
@@ -173,7 +187,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   snapshotCandidates.sort((a, b) => b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
 
   // Try each candidate in order until one succeeds
-  for (const { snapshot, url } of snapshotCandidates) {
+  for (const { snapshot, url, fileStore } of snapshotCandidates) {
     const { l1BlockNumber, l2BlockNumber } = snapshot;
     log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
       snapshot,
@@ -183,8 +197,8 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
     try {
       await snapshotSync(snapshot, log, {
         dataDirectory: config.dataDirectory!,
-        rollupAddress: config.l1Contracts.rollupAddress,
-        snapshotsUrl: url,
+        rollupAddress: config.rollupAddress,
+        fileStore,
       });
       log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
         snapshot,
@@ -210,15 +224,13 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
 export async function snapshotSync(
   snapshot: Pick<SnapshotMetadata, 'dataUrls'>,
   log: Logger,
-  config: { dataDirectory: string; rollupAddress: EthAddress; snapshotsUrl: string },
+  config: { dataDirectory: string; rollupAddress: EthAddress; fileStore: ReadOnlyFileStore },
 ) {
-  const { dataDirectory, rollupAddress } = config;
+  const { dataDirectory, rollupAddress, fileStore } = config;
   if (!dataDirectory) {
     throw new Error(`No local data directory defined. Cannot sync snapshot.`);
   }
 
-  const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
-
   let downloadDir: string | undefined;
 
   try {

package/src/actions/upload-snapshot.ts

@@ -1,10 +1,10 @@
 import { ARCHIVER_DB_VERSION, type Archiver } from '@aztec/archiver';
 import { tryRmDir } from '@aztec/foundation/fs';
 import type { Logger } from '@aztec/foundation/log';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { createFileStore } from '@aztec/stdlib/file-store';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { uploadSnapshotToIndex } from '@aztec/stdlib/snapshots';
 import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
 

package/src/config/index.ts

@@ -5,16 +5,12 @@ export type SharedNodeConfig = {
   testAccounts: boolean;
   /** Whether to populate the genesis state with initial fee juice for the sponsored FPC */
   sponsoredFPC: boolean;
+  /** Additional addresses to prefund with fee juice at genesis */
+  prefundAddresses: string[];
   /** Sync mode: full to always sync via L1, snapshot to download a snapshot if there is no local data, force-snapshot to download even if there is local data. */
   syncMode: 'full' | 'snapshot' | 'force-snapshot';
   /** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
   snapshotsUrls?: string[];
-
-  /** Auto update mode: disabled - to completely ignore remote signals to update the node. enabled - to respect the signals (potentially shutting this node down). log - check for updates but log a warning instead of applying them*/
-  autoUpdate?: 'disabled' | 'notify' | 'config' | 'config-and-version';
-  /** The base URL against which to check for updates */
-  autoUpdateUrl?: string;
-
   /** URL of the Web3Signer instance */
   web3SignerUrl?: string;
   /** Whether to run in fisherman mode */
@@ -22,6 +18,9 @@ export type SharedNodeConfig = {
 
   /** Force verification of tx Chonk proofs. Only used for testnet */
   debugForceTxProofVerification: boolean;
+
+  /** Soft-shutdown the node when the canonical rollup is no longer compatible, keeping the health server up for K8s probes */
+  enableAutoShutdown: boolean;
 };
 
 export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
@@ -35,6 +34,16 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
     description: 'Whether to populate the genesis state with initial fee juice for the sponsored FPC.',
     ...booleanConfigHelper(false),
   },
+  prefundAddresses: {
+    env: 'PREFUND_ADDRESSES',
+    description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis (local network only).',
+    parseEnv: (val: string) =>
+      val
+        .split(',')
+        .map(a => a.trim())
+        .filter(a => a.length > 0),
+    defaultValue: [],
+  },
   syncMode: {
     env: 'SYNC_MODE',
     description:
@@ -52,15 +61,6 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
     fallback: ['SYNC_SNAPSHOTS_URL'],
     defaultValue: [],
   },
-  autoUpdate: {
-    env: 'AUTO_UPDATE',
-    description: 'The auto update mode for this node',
-    defaultValue: 'disabled',
-  },
-  autoUpdateUrl: {
-    env: 'AUTO_UPDATE_URL',
-    description: 'Base URL to check for updates',
-  },
   web3SignerUrl: {
     env: 'WEB3_SIGNER_URL',
     description: 'URL of the Web3Signer instance',
@@ -76,4 +76,11 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
     description: 'Whether to force tx proof verification. Only has an effect if real proving is turned off',
     ...booleanConfigHelper(false),
   },
+
+  enableAutoShutdown: {
+    env: 'ENABLE_AUTO_SHUTDOWN',
+    description:
+      'Soft-shutdown the node when the canonical rollup is no longer compatible (protocol constants diverge), keeping the health server up so K8s probes keep passing. Only applies to nodes following the canonical rollup.',
+    ...booleanConfigHelper(false),
+  },
 };

package/src/factories/l1_tx_utils.ts

@@ -1,21 +1,15 @@
+import type { BlobKzgInstance } from '@aztec/blob-lib/types';
 import type { EthSigner } from '@aztec/ethereum/eth-signer';
-import {
-  createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase,
-  createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase,
-} from '@aztec/ethereum/l1-tx-utils';
+import { createDelayer, createL1TxUtils as createL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils';
 import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
-import {
-  createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase,
-  createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase,
-  createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase,
-  createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase,
-} from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import { createForwarderL1TxUtils as createForwarderL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
 import { omit } from '@aztec/foundation/collection';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 
 import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
@@ -25,117 +19,70 @@ import { L1TxStore } from '../stores/l1_tx_store.js';
 const L1_TX_STORE_NAME = 'l1-tx-utils';
 
 /**
- * Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
+ * Creates shared dependencies (logger, store, metrics, delayer) for L1TxUtils instances.
+ * When enableDelayer is set in config, a single shared delayer is created and passed to all instances.
  */
 async function createSharedDeps(
-  config: DataStoreConfig & { scope?: L1TxScope },
+  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
   },
 ) {
   const logger = deps.logger ?? createLogger('l1-tx-utils');
 
   // Note that we do NOT bind them to the rollup address, since we still need to
   // monitor and cancel txs for previous rollups to free up our nonces.
-  const noRollupConfig = omit(config, 'l1Contracts');
+  const noRollupConfig = omit(config, 'rollupAddress');
   const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
   const store = new L1TxStore(kvStore, logger);
 
   const meter = deps.telemetry.getMeter('L1TxUtils');
   const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
 
-  return { logger, store, metrics, dateProvider: deps.dateProvider };
-}
-
-/**
- * Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
- */
-export async function createL1TxUtilsWithBlobsFromViemWallet(
-  clients: ExtendedViemWalletClient[],
-  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
-  deps: {
-    telemetry: TelemetryClient;
-    logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-  },
-) {
-  const sharedDeps = await createSharedDeps(config, deps);
+  // Create a single shared delayer for all L1TxUtils instances in this group
+  const delayer =
+    config.enableDelayer && config.ethereumSlotDuration !== undefined
+      ? createDelayer(deps.dateProvider, { ethereumSlotDuration: config.ethereumSlotDuration }, logger.getBindings())
+      : undefined;
 
-  return clients.map(client =>
-    createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit),
-  );
-}
-
-/**
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
- */
-export async function createL1TxUtilsWithBlobsFromEthSigner(
-  client: ViemClient,
-  signers: EthSigner[],
-  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
-  deps: {
-    telemetry: TelemetryClient;
-    logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-  },
-) {
-  const sharedDeps = await createSharedDeps(config, deps);
-
-  // Deduplicate signers by address to avoid creating multiple L1TxUtils instances
-  // for the same publisher address (e.g., when multiple attesters share the same publisher key)
-  const signersByAddress = new Map<string, EthSigner>();
-  for (const signer of signers) {
-    const addressKey = signer.address.toString().toLowerCase();
-    if (!signersByAddress.has(addressKey)) {
-      signersByAddress.set(addressKey, signer);
-    }
-  }
-
-  const uniqueSigners = Array.from(signersByAddress.values());
-
-  if (uniqueSigners.length < signers.length) {
-    sharedDeps.logger.info(
-      `Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`,
-    );
-  }
-
-  return uniqueSigners.map(signer =>
-    createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit),
-  );
+  return { logger, store, metrics, dateProvider: deps.dateProvider, delayer };
 }
 
 /**
- * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
+ * Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export async function createL1TxUtilsFromViemWalletWithStore(
+export async function createL1TxUtilsFromWallets(
   clients: ExtendedViemWalletClient[],
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-    scope?: L1TxScope;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
-  return clients.map(client => createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
+  return clients.map(client => createL1TxUtilsBase(client, { ...sharedDeps, kzg: deps.kzg }, config));
 }
 
 /**
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
+ * Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
+ * Deduplicates signers by address to avoid creating multiple instances for the same publisher.
  */
-export async function createL1TxUtilsFromEthSignerWithStore(
+export async function createL1TxUtilsFromSigners(
   client: ViemClient,
   signers: EthSigner[],
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-    scope?: L1TxScope;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
@@ -158,55 +105,52 @@ export async function createL1TxUtilsFromEthSignerWithStore(
     );
   }
 
-  return uniqueSigners.map(signer => createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
+  return uniqueSigners.map(signer => createL1TxUtilsBase({ client, signer }, { ...sharedDeps, kzg: deps.kzg }, config));
 }
 
 /**
- * Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
- * This wraps all transactions through a forwarder contract for testing purposes.
+ * Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export async function createForwarderL1TxUtilsFromViemWallet(
+export async function createForwarderL1TxUtilsFromWallets(
   clients: ExtendedViemWalletClient[],
-  forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
+  forwarderAddress: EthAddress,
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
   return clients.map(client =>
-    createForwarderL1TxUtilsFromViemWalletBase(client, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit),
+    createForwarderL1TxUtilsBase(client, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
   );
 }
 
 /**
- * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
- * This wraps all transactions through a forwarder contract for testing purposes.
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export async function createForwarderL1TxUtilsFromEthSigner(
+export async function createForwarderL1TxUtilsFromSigners(
   client: ViemClient,
   signers: EthSigner[],
-  forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
+  forwarderAddress: EthAddress,
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
   return signers.map(signer =>
-    createForwarderL1TxUtilsFromEthSignerBase(
-      client,
-      signer,
-      forwarderAddress,
-      sharedDeps,
-      config,
-      config.debugMaxGasLimit,
-    ),
+    createForwarderL1TxUtilsBase({ client, signer }, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
   );
 }

package/src/metrics/l1_tx_metrics.ts

@@ -92,17 +92,19 @@ export class L1TxMetrics implements IL1TxMetrics {
     const attempts = isCancelTx ? state.cancelTxHashes.length : state.txHashes.length;
     this.txAttemptsUntilMined.record(attempts, attributes);
 
-    // Record gas prices at end state (in wei as integers)
-    const maxPriorityFeeWei = Number(state.gasPrice.maxPriorityFeePerGas);
-    const maxFeeWei = Number(state.gasPrice.maxFeePerGas);
-    const blobFeeWei = state.gasPrice.maxFeePerBlobGas ? Number(state.gasPrice.maxFeePerBlobGas) : undefined;
-
-    this.maxPriorityFeeHistogram.record(maxPriorityFeeWei, attributes);
-    this.maxFeeHistogram.record(maxFeeWei, attributes);
-
-    // Record blob fee if present (in wei as integer)
-    if (blobFeeWei !== undefined) {
-      this.blobFeeHistogram.record(blobFeeWei, attributes);
+    // Record gas prices at end state, converted from wei to gwei to match metric unit definitions
+    const weiToGwei = 1e9;
+    const maxPriorityFeeGwei = Number(state.gasPrice.maxPriorityFeePerGas) / weiToGwei;
+    const maxFeeGwei = Number(state.gasPrice.maxFeePerGas) / weiToGwei;
+    const blobFeeGwei = state.gasPrice.maxFeePerBlobGas
+      ? Number(state.gasPrice.maxFeePerBlobGas) / weiToGwei
+      : undefined;
+
+    this.maxPriorityFeeHistogram.record(maxPriorityFeeGwei, attributes);
+    this.maxFeeHistogram.record(maxFeeGwei, attributes);
+
+    if (blobFeeGwei !== undefined) {
+      this.blobFeeHistogram.record(blobFeeGwei, attributes);
     }
 
     this.logger.debug(`Recorded tx end state metrics`, {
@@ -111,9 +113,9 @@ export class L1TxMetrics implements IL1TxMetrics {
       isCancelTx,
       isReverted,
       scope: this.scope,
-      maxPriorityFeeWei,
-      maxFeeWei,
-      blobFeeWei,
+      maxPriorityFeeGwei,
+      maxFeeGwei,
+      blobFeeGwei,
     });
   }