@aztec/node-lib 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

package/dest/actions/build-snapshot-metadata.d.ts

@@ -2,4 +2,4 @@ import type { Archiver } from '@aztec/archiver';
 import type { UploadSnapshotMetadata } from '@aztec/stdlib/snapshots';
 import type { UploadSnapshotConfig } from './upload-snapshot.js';
 export declare function buildSnapshotMetadata(archiver: Archiver, config: UploadSnapshotConfig): Promise<UploadSnapshotMetadata>;
-//# sourceMappingURL=build-snapshot-metadata.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtc25hcHNob3QtbWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2J1aWxkLXNuYXBzaG90LW1ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFdEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRSx3QkFBc0IscUJBQXFCLENBQ3pDLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLE1BQU0sRUFBRSxvQkFBb0IsR0FDM0IsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBb0JqQyJ9

package/dest/actions/build-snapshot-metadata.js

@@ -1,10 +1,10 @@
 export async function buildSnapshotMetadata(archiver, config) {
-    const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
+    const [rollupAddress, l1BlockNumber, tips] = await Promise.all([
         archiver.getRollupAddress(),
         archiver.getL1BlockNumber(),
         archiver.getL2Tips()
     ]);
-    const { number: l2BlockNumber, hash: l2BlockHash } = latest;
+    const { number: l2BlockNumber, hash: l2BlockHash } = tips.proposed;
     if (!l2BlockHash) {
         throw new Error(`Failed to get L2 block hash from archiver.`);
     }

package/dest/actions/create-backups.d.ts

@@ -3,4 +3,4 @@ import type { Logger } from '@aztec/foundation/log';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { SnapshotDataUrls } from '@aztec/stdlib/snapshots';
 export declare function createBackups(backupDir: string, archiver: Archiver, worldState: WorldStateSynchronizer, log: Logger): Promise<SnapshotDataUrls>;
-//# sourceMappingURL=create-backups.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWJhY2t1cHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2NyZWF0ZS1iYWNrdXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUtoRSx3QkFBc0IsYUFBYSxDQUNqQyxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsUUFBUSxFQUNsQixVQUFVLEVBQUUsc0JBQXNCLEVBQ2xDLEdBQUcsRUFBRSxNQUFNLDZCQTRCWiJ9

package/dest/actions/index.d.ts

@@ -2,4 +2,4 @@ export * from './snapshot-sync.js';
 export * from './upload-snapshot.js';
 export * from './create-backups.js';
 export * from './build-snapshot-metadata.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsOEJBQThCLENBQUMifQ==

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

@@ -1,12 +1,13 @@
 import { type ArchiverConfig } from '@aztec/archiver';
-import { type EthereumClientConfig } from '@aztec/ethereum';
+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 SnapshotMetadata } from '@aztec/stdlib/snapshots';
 import type { SharedNodeConfig } from '../config/index.js';
-type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
+type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
     snapshotsUrls?: string[];
     minL1BlocksToTriggerReplace?: number;
 };
@@ -24,4 +25,4 @@ export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'
     snapshotsUrl: string;
 }): Promise<void>;
 export {};
-//# sourceMappingURL=snapshot-sync.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHeEQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBS3RCLE1BQU0seUJBQXlCLENBQUM7QUFNakMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUszRCxLQUFLLGtCQUFrQixHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsR0FDMUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQ2hELElBQUksQ0FBQyxpQkFBaUIsRUFBRSxvQkFBb0IsQ0FBQyxHQUM3QyxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQ3pCLG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFpSzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQXFEbkYifQ==

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,iBAAiB,CAAC;AAC7E,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,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,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"}

package/dest/actions/snapshot-sync.js

@@ -1,6 +1,6 @@
 import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore } from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { getPublicClient } from '@aztec/ethereum';
+import { getPublicClient } from '@aztec/ethereum/client';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { P2P_STORE_NAME } from '@aztec/p2p';
 import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
@@ -32,13 +32,15 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
     }
     // Create an archiver store to check the current state (do this only once)
     log.verbose(`Creating temporary archiver data store`);
-    const archiverStore = await createArchiverStore(config);
+    const archiverStore = await createArchiverStore(config, {
+        epochDuration: config.aztecEpochDuration
+    });
     let archiverL1BlockNumber;
     let archiverL2BlockNumber;
     try {
         [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
             archiverStore.getSynchPoint().then((s)=>s.blocksSynchedTo),
-            archiverStore.getSynchedL2BlockNumber()
+            archiverStore.getLatestBlockNumber()
         ]);
     } finally{
         log.verbose(`Closing temporary archiver data store`, {
@@ -123,7 +125,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         });
     }
     if (snapshotCandidates.length === 0) {
-        log.verbose(`No valid snapshots found from any URL. Skipping snapshot sync.`, {
+        log.verbose(`No valid snapshots found from any URL, skipping snapshot sync`, {
             ...indexMetadata,
             snapshotsUrls
         });
@@ -150,14 +152,14 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
             });
             return true;
         } catch (err) {
-            log.error(`Failed to download snapshot from ${url}. Trying next candidate.`, err, {
+            log.error(`Failed to download snapshot from ${url}, trying next candidate`, err, {
                 snapshot,
                 snapshotsUrl: url
             });
             continue;
         }
     }
-    log.error(`Failed to download snapshot from all URLs.`, {
+    log.error(`Failed to download snapshot from all URLs`, {
         snapshotsUrls
     });
     return false;

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

@@ -9,4 +9,4 @@ export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersio
  * 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=upload-snapshot.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNuYXBzaG90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWN0aW9ucy91cGxvYWQtc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixLQUFLLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFXOUUsTUFBTSxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNqRixJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRXpDOzs7R0FHRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixHQUFHLEVBQUUsTUFBTSxpQkFvQloifQ==

package/dest/config/index.d.ts

@@ -14,6 +14,10 @@ export type SharedNodeConfig = {
     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;
 };
 export declare const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig>;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdLQUFnSztJQUNoSyxRQUFRLEVBQUUsTUFBTSxHQUFHLFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQztJQUNqRCw2SUFBNkk7SUFDN0ksYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFFekIscU9BQXFPO0lBQ3JPLFVBQVUsQ0FBQyxFQUFFLFVBQVUsR0FBRyxRQUFRLEdBQUcsUUFBUSxHQUFHLG9CQUFvQixDQUFDO0lBQ3JFLHNEQUFzRDtJQUN0RCxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFdkIscUNBQXFDO0lBQ3JDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN2Qix1Q0FBdUM7SUFDdkMsYUFBYSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBRXhCLG1FQUFtRTtJQUNuRSw2QkFBNkIsRUFBRSxPQUFPLENBQUM7Q0FDeEMsQ0FBQztBQUVGLGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FvRHpFLENBQUMifQ==

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;CACxB,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CA0CzE,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,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"}

package/dest/config/index.js

@@ -37,5 +37,15 @@ export const sharedNodeConfigMappings = {
         env: 'WEB3_SIGNER_URL',
         description: 'URL of the Web3Signer instance',
         parseEnv: (val)=>val.trim()
+    },
+    fishermanMode: {
+        env: 'FISHERMAN_MODE',
+        description: 'Whether to run in fisherman mode.',
+        ...booleanConfigHelper(false)
+    },
+    debugForceTxProofVerification: {
+        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)
     }
 };

package/dest/factories/index.d.ts

@@ -1,2 +1,2 @@
 export * from './l1_tx_utils.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQyJ9

package/dest/factories/l1_tx_utils.d.ts

@@ -1,4 +1,6 @@
-import type { EthSigner, ExtendedViemWalletClient, L1TxUtilsConfig, ViemClient } from '@aztec/ethereum';
+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 { createLogger } from '@aztec/foundation/log';
 import type { DateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
@@ -16,7 +18,7 @@ export declare function createL1TxUtilsWithBlobsFromViemWallet(clients: Extended
     dateProvider?: DateProvider;
 }): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
 /**
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
+ * 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;
@@ -37,9 +39,9 @@ export declare function createL1TxUtilsFromViemWalletWithStore(clients: Extended
     logger?: ReturnType<typeof createLogger>;
     dateProvider?: DateProvider;
     scope?: L1TxScope;
-}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
+}): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
 /**
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
+ * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
  */
 export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
     debugMaxGasLimit?: boolean;
@@ -49,5 +51,29 @@ export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient
     logger?: ReturnType<typeof createLogger>;
     dateProvider?: DateProvider;
     scope?: L1TxScope;
-}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
-//# sourceMappingURL=l1_tx_utils.d.ts.map
+}): 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.
+ */
+export declare function createForwarderL1TxUtilsFromViemWallet(clients: ExtendedViemWalletClient[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, 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").ForwarderL1TxUtils[]>;
+/**
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
+ * This wraps all transactions through a forwarder contract for testing purposes.
+ */
+export declare function createForwarderL1TxUtilsFromEthSigner(client: ViemClient, signers: EthSigner[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, 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").ForwarderL1TxUtils[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFLNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFPbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBK0I3RDs7R0FFRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkFPRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHFDQUFxQyxDQUN6RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FB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

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":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMxG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AA+B7D;;GAEG;AACH,wBAAsB,sCAAsC,CAC1D,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,CAAC,EAAE,YAAY,CAAC;CAC7B,kFAOF;AAED;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,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,CAAC,EAAE,YAAY,CAAC;CAC7B,kFAOF;AAED;;GAEG;AACH,wBAAsB,sCAAsC,CAC1D,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,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,kDAKF;AAED;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,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,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,kDAKF"}
+{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"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"}

package/dest/factories/l1_tx_utils.js

@@ -1,5 +1,5 @@
-import { createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase, createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase } from '@aztec/ethereum';
-import { createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase, createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+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 { omit } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
@@ -31,10 +31,23 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
     return clients.map((client)=>createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit));
 }
 /**
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
+ * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
  */ export async function createL1TxUtilsWithBlobsFromEthSigner(client, signers, config, deps) {
     const sharedDeps = await createSharedDeps(config, deps);
-    return signers.map((signer)=>createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit));
+    // 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)=>createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit));
 }
 /**
  * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
@@ -43,8 +56,35 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
     return clients.map((client)=>createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
 }
 /**
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
+ * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
  */ export async function createL1TxUtilsFromEthSignerWithStore(client, signers, config, deps) {
     const sharedDeps = await createSharedDeps(config, deps);
-    return signers.map((signer)=>createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
+    // 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));
 }

package/dest/metrics/index.d.ts

@@ -1,2 +1,2 @@
 export * from './l1_tx_metrics.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZXRyaWNzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUMifQ==

package/dest/metrics/l1_tx_metrics.d.ts

@@ -1,4 +1,4 @@
-import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum';
+import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum/l1-tx-utils';
 import { type Meter } from '@aztec/telemetry-client';
 export type L1TxScope = 'sequencer' | 'prover' | 'other';
 /**
@@ -26,4 +26,4 @@ export declare class L1TxMetrics implements IL1TxMetrics {
     recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
     recordDroppedTx(state: L1TxState): void;
 }
-//# sourceMappingURL=l1_tx_metrics.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUE4QixLQUFLLEtBQUssRUFBK0IsTUFBTSx5QkFBeUIsQ0FBQztBQUU5RyxNQUFNLE1BQU0sU0FBUyxHQUFHLFdBQVcsR0FBRyxRQUFRLEdBQUcsT0FBTyxDQUFDO0FBRXpEOztHQUVHO0FBQ0gscUJBQWEsV0FBWSxZQUFXLFlBQVk7SUFtQjVDLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsTUFBTTtJQW5CaEIsT0FBTyxDQUFDLGVBQWUsQ0FBWTtJQUduQyxPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFHeEMsT0FBTyxDQUFDLFlBQVksQ0FBZ0I7SUFDcEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFDdkMsT0FBTyxDQUFDLGdCQUFnQixDQUFnQjtJQUN4QyxPQUFPLENBQUMsZUFBZSxDQUFnQjtJQUd2QyxPQUFPLENBQUMsdUJBQXVCLENBQVk7SUFDM0MsT0FBTyxDQUFDLGVBQWUsQ0FBWTtJQUNuQyxPQUFPLENBQUMsZ0JBQWdCLENBQVk7SUFFcEMsWUFDVSxLQUFLLEVBQUUsS0FBSyxFQUNaLEtBQUssR0FBRSxTQUFtQixFQUMxQixNQUFNLHlDQUFzQyxFQW1CckQ7SUFFRDs7OztPQUlHO0lBQ0ksYUFBYSxDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsV0FBVyxFQUFFLElBQUksR0FBRyxJQUFJLENBb0Q5RDtJQUVNLGVBQWUsQ0FBQyxLQUFLLEVBQUUsU0FBUyxHQUFHLElBQUksQ0FpQjdDO0NBQ0YifQ==

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,iBAAiB,CAAC;AAG/D,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;gBAG1B,KAAK,EAAE,KAAK,EACZ,KAAK,GAAE,SAAmB,EAC1B,MAAM,yCAAsC;IAqDtD;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI;IAsDxD,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;CAkB/C"}
+{"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,EAA8B,KAAK,KAAK,EAA+B,MAAM,yBAAyB,CAAC;AAE9G,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,EAmBrD;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"}

package/dest/metrics/l1_tx_metrics.js

@@ -1,6 +1,6 @@
-import { TxUtilsState } from '@aztec/ethereum';
+import { TxUtilsState } from '@aztec/ethereum/l1-tx-utils';
 import { createLogger } from '@aztec/foundation/log';
-import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
+import { Attributes, Metrics } from '@aztec/telemetry-client';
 /**
  * Metrics for L1 transaction utils tracking tx lifecycle and gas costs.
  */ export class L1TxMetrics {
@@ -24,47 +24,15 @@ import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
         this.meter = meter;
         this.scope = scope;
         this.logger = logger;
-        this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION, {
-            description: 'Time from initial tx send until mined',
-            unit: 's',
-            valueType: ValueType.INT
-        });
-        this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED, {
-            description: 'Number of tx attempts (including speed-ups) until mined',
-            unit: 'attempts',
-            valueType: ValueType.INT
-        });
-        this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT, {
-            description: 'Count of transactions successfully mined',
-            valueType: ValueType.INT
-        });
-        this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT, {
-            description: 'Count of transactions that reverted',
-            valueType: ValueType.INT
-        });
-        this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT, {
-            description: 'Count of transactions cancelled',
-            valueType: ValueType.INT
-        });
-        this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT, {
-            description: 'Count of transactions not mined (timed out)',
-            valueType: ValueType.INT
-        });
-        this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE, {
-            description: 'Max priority fee per gas at tx end state (in wei)',
-            unit: 'wei',
-            valueType: ValueType.INT
-        });
-        this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE, {
-            description: 'Max fee per gas at tx end state (in wei)',
-            unit: 'wei',
-            valueType: ValueType.INT
-        });
-        this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE, {
-            description: 'Max fee per blob gas at tx end state (in wei)',
-            unit: 'wei',
-            valueType: ValueType.INT
-        });
+        this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION);
+        this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED);
+        this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT);
+        this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT);
+        this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT);
+        this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT);
+        this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE);
+        this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE);
+        this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE);
     }
     /**
    * Records metrics when a transaction is mined.

package/dest/stores/index.d.ts

@@ -1,2 +1,2 @@
 export * from './l1_tx_store.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQyJ9

package/dest/stores/l1_tx_store.d.ts

@@ -1,4 +1,4 @@
-import type { IL1TxStore, L1BlobInputs, L1TxState } from '@aztec/ethereum';
+import type { IL1TxStore, L1BlobInputs, L1TxState } from '@aztec/ethereum/l1-tx-utils';
 import type { Logger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 /**
@@ -54,7 +54,7 @@ export declare class L1TxStore implements IL1TxStore {
      * @param account - The sender account address
      * @param stateId - The state ID to delete
      */
-    deleteState(account: string, stateId: number): Promise<void>;
+    deleteState(account: string, ...stateIds: number[]): Promise<void>;
     /**
      * Clears all transaction states for a specific account.
      * @param account - The sender account address
@@ -86,4 +86,4 @@ export declare class L1TxStore implements IL1TxStore {
      */
     private deserializeBlobInputs;
 }
-//# sourceMappingURL=l1_tx_store.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvbDFfdHhfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBYyxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVuRyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQTJFeEU7Ozs7R0FJRztBQUNILHFCQUFhLFNBQVUsWUFBVyxVQUFVO0lBUXhDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUN0QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFSdEIsZ0JBQXVCLGNBQWMsS0FBSztJQUUxQyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBZ0M7SUFDdkQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQWdDO0lBQ3RELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFnQztJQUUvRCxZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLEdBQUcsR0FBRSxNQUEwQyxFQUtqRTtJQUVEOztPQUVHO0lBQ0ksa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBTzFEO0lBRUQ7O09BRUc7SUFDSCxPQUFPLENBQUMsT0FBTztJQUlmOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBUTVFO0lBRUQ7Ozs7O09BS0c7SUFDVSxTQUFTLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxZQUFZLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FRNUc7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBb0M3RDtJQUVEOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQTBCdkY7SUFFRDs7OztPQUlHO0lBQ1UsV0FBVyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVk5RTtJQUVEOzs7T0FHRztJQUNVLFdBQVcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FXdkQ7SUFFRDs7O09BR0c7SUFDVSxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBUy9DO0lBRUQ7O09BRUc7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsQztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGNBQWM7SUFrQ3RCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtJQTJDeEI7O09BRUc7SUFDSCxPQUFPLENBQUMsbUJBQW1CO0lBTzNCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLHFCQUFxQjtDQVk5QiJ9

package/dest/stores/l1_tx_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AA2ExE;;;;GAIG;AACH,qBAAa,SAAU,YAAW,UAAU;IAQxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,gBAAuB,cAAc,KAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgC;gBAG5C,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAA0C;IAOlE;;OAEG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAS3D;;OAEG;IACH,OAAO,CAAC,OAAO;IAIf;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IAU7E;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7G;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAsC9D;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IA4BxF;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzE;;;OAGG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxD;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAWhD;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAY9B"}
+{"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AA2ExE;;;;GAIG;AACH,qBAAa,SAAU,YAAW,UAAU;IAQxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,gBAAuB,cAAc,KAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgC;IAE/D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAA0C,EAKjE;IAED;;OAEG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO1D;IAED;;OAEG;IACH,OAAO,CAAC,OAAO;IAIf;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ5E;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ5G;IAED;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAoC7D;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA0BvF;IAED;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;IAED;;;OAGG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvD;IAED;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAS/C;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAED;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAY9B"}

package/dest/stores/l1_tx_store.js

@@ -134,22 +134,30 @@ import { createLogger } from '@aztec/foundation/log';
    * Deletes a specific state and its associated blobs.
    * @param account - The sender account address
    * @param stateId - The state ID to delete
-   */ async deleteState(account, stateId) {
-        const key = this.makeKey(account, stateId);
-        await this.states.delete(key);
-        await this.blobs.delete(key);
-        this.log.debug(`Deleted state ${stateId} for account ${account}`);
+   */ async deleteState(account, ...stateIds) {
+        if (stateIds.length === 0) {
+            return;
+        }
+        await this.store.transactionAsync(async ()=>{
+            for (const stateId of stateIds){
+                const key = this.makeKey(account, stateId);
+                await this.states.delete(key);
+                await this.blobs.delete(key);
+            }
+        });
     }
     /**
    * Clears all transaction states for a specific account.
    * @param account - The sender account address
    */ async clearStates(account) {
-        const states = await this.loadStates(account);
-        for (const state of states){
-            await this.deleteState(account, state.id);
-        }
-        await this.stateIdCounter.delete(account);
-        this.log.info(`Cleared all tx states for account ${account}`);
+        await this.store.transactionAsync(async ()=>{
+            const states = await this.loadStates(account);
+            for (const state of states){
+                await this.deleteState(account, state.id);
+            }
+            await this.stateIdCounter.delete(account);
+            this.log.info(`Cleared all tx states for account ${account}`);
+        });
     }
     /**
    * Gets all accounts that have stored states.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/node-lib",
-  "version": "0.0.1-commit.b655e406",
+  "version": "0.0.1-commit.d1f2d6c",
   "type": "module",
   "exports": {
     "./actions": "./dest/actions/index.js",
@@ -13,8 +13,8 @@
     "../package.common.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "bb": "node --no-warnings ./dest/bb/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
@@ -57,35 +57,38 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.b655e406",
-    "@aztec/bb-prover": "0.0.1-commit.b655e406",
-    "@aztec/blob-sink": "0.0.1-commit.b655e406",
-    "@aztec/constants": "0.0.1-commit.b655e406",
-    "@aztec/epoch-cache": "0.0.1-commit.b655e406",
-    "@aztec/ethereum": "0.0.1-commit.b655e406",
-    "@aztec/foundation": "0.0.1-commit.b655e406",
-    "@aztec/kv-store": "0.0.1-commit.b655e406",
-    "@aztec/merkle-tree": "0.0.1-commit.b655e406",
-    "@aztec/p2p": "0.0.1-commit.b655e406",
-    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
-    "@aztec/prover-client": "0.0.1-commit.b655e406",
-    "@aztec/sequencer-client": "0.0.1-commit.b655e406",
-    "@aztec/simulator": "0.0.1-commit.b655e406",
-    "@aztec/stdlib": "0.0.1-commit.b655e406",
-    "@aztec/telemetry-client": "0.0.1-commit.b655e406",
-    "@aztec/validator-client": "0.0.1-commit.b655e406",
-    "@aztec/world-state": "0.0.1-commit.b655e406",
+    "@aztec/archiver": "0.0.1-commit.d1f2d6c",
+    "@aztec/bb-prover": "0.0.1-commit.d1f2d6c",
+    "@aztec/blob-client": "0.0.1-commit.d1f2d6c",
+    "@aztec/constants": "0.0.1-commit.d1f2d6c",
+    "@aztec/epoch-cache": "0.0.1-commit.d1f2d6c",
+    "@aztec/ethereum": "0.0.1-commit.d1f2d6c",
+    "@aztec/foundation": "0.0.1-commit.d1f2d6c",
+    "@aztec/kv-store": "0.0.1-commit.d1f2d6c",
+    "@aztec/merkle-tree": "0.0.1-commit.d1f2d6c",
+    "@aztec/p2p": "0.0.1-commit.d1f2d6c",
+    "@aztec/protocol-contracts": "0.0.1-commit.d1f2d6c",
+    "@aztec/prover-client": "0.0.1-commit.d1f2d6c",
+    "@aztec/sequencer-client": "0.0.1-commit.d1f2d6c",
+    "@aztec/simulator": "0.0.1-commit.d1f2d6c",
+    "@aztec/stdlib": "0.0.1-commit.d1f2d6c",
+    "@aztec/telemetry-client": "0.0.1-commit.d1f2d6c",
+    "@aztec/validator-client": "0.0.1-commit.d1f2d6c",
+    "@aztec/world-state": "0.0.1-commit.d1f2d6c",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/blob-lib": "0.0.1-commit.b655e406",
+    "@aztec/blob-lib": "0.0.1-commit.d1f2d6c",
+    "@aztec/node-keystore": "0.0.1-commit.d1f2d6c",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "files": [
     "dest",

package/src/actions/build-snapshot-metadata.ts

@@ -7,13 +7,13 @@ export async function buildSnapshotMetadata(
   archiver: Archiver,
   config: UploadSnapshotConfig,
 ): Promise<UploadSnapshotMetadata> {
-  const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
+  const [rollupAddress, l1BlockNumber, tips] = await Promise.all([
     archiver.getRollupAddress(),
     archiver.getL1BlockNumber(),
     archiver.getL2Tips(),
   ] as const);
 
-  const { number: l2BlockNumber, hash: l2BlockHash } = latest;
+  const { number: l2BlockNumber, hash: l2BlockHash } = tips.proposed;
   if (!l2BlockHash) {
     throw new Error(`Failed to get L2 block hash from archiver.`);
   }

package/src/actions/snapshot-sync.ts

@@ -1,6 +1,7 @@
 import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, type ArchiverConfig, createArchiverStore } from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum';
+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';
@@ -28,6 +29,7 @@ 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> &
   EthereumClientConfig & {
@@ -58,13 +60,13 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
 
   // Create an archiver store to check the current state (do this only once)
   log.verbose(`Creating temporary archiver data store`);
-  const archiverStore = await createArchiverStore(config);
+  const archiverStore = await createArchiverStore(config, { epochDuration: config.aztecEpochDuration });
   let archiverL1BlockNumber: bigint | undefined;
   let archiverL2BlockNumber: number | undefined;
   try {
     [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
       archiverStore.getSynchPoint().then(s => s.blocksSynchedTo),
-      archiverStore.getSynchedL2BlockNumber(),
+      archiverStore.getLatestBlockNumber(),
     ] as const);
   } finally {
     log.verbose(`Closing temporary archiver data store`, { archiverL1BlockNumber, archiverL2BlockNumber });
@@ -163,7 +165,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   }
 
   if (snapshotCandidates.length === 0) {
-    log.verbose(`No valid snapshots found from any URL. Skipping snapshot sync.`, { ...indexMetadata, snapshotsUrls });
+    log.verbose(`No valid snapshots found from any URL, skipping snapshot sync`, { ...indexMetadata, snapshotsUrls });
     return false;
   }
 
@@ -190,7 +192,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
       });
       return true;
     } catch (err) {
-      log.error(`Failed to download snapshot from ${url}. Trying next candidate.`, err, {
+      log.error(`Failed to download snapshot from ${url}, trying next candidate`, err, {
         snapshot,
         snapshotsUrl: url,
       });
@@ -198,7 +200,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
     }
   }
 
-  log.error(`Failed to download snapshot from all URLs.`, { snapshotsUrls });
+  log.error(`Failed to download snapshot from all URLs`, { snapshotsUrls });
   return false;
 }
 

package/src/config/index.ts

@@ -17,6 +17,11 @@ export type SharedNodeConfig = {
 
   /** 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;
 };
 
 export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
@@ -61,4 +66,14 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
     description: 'URL of the Web3Signer instance',
     parseEnv: (val: string) => val.trim(),
   },
+  fishermanMode: {
+    env: 'FISHERMAN_MODE',
+    description: 'Whether to run in fisherman mode.',
+    ...booleanConfigHelper(false),
+  },
+  debugForceTxProofVerification: {
+    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),
+  },
 };

package/src/factories/l1_tx_utils.ts

@@ -1,12 +1,16 @@
+import type { EthSigner } from '@aztec/ethereum/eth-signer';
 import {
   createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase,
   createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase,
-} from '@aztec/ethereum';
-import type { EthSigner, ExtendedViemWalletClient, L1TxUtilsConfig, ViemClient } from '@aztec/ethereum';
+} 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 type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
 import { omit } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import type { DateProvider } from '@aztec/foundation/timer';
@@ -65,7 +69,7 @@ export async function createL1TxUtilsWithBlobsFromViemWallet(
 }
 
 /**
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
+ * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
  */
 export async function createL1TxUtilsWithBlobsFromEthSigner(
   client: ViemClient,
@@ -79,7 +83,25 @@ export async function createL1TxUtilsWithBlobsFromEthSigner(
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
-  return signers.map(signer =>
+  // 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),
   );
 }
@@ -103,7 +125,7 @@ export async function createL1TxUtilsFromViemWalletWithStore(
 }
 
 /**
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
+ * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
  */
 export async function createL1TxUtilsFromEthSignerWithStore(
   client: ViemClient,
@@ -118,5 +140,73 @@ export async function createL1TxUtilsFromEthSignerWithStore(
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
-  return signers.map(signer => createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
+  // 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 => 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: ExtendedViemWalletClient[],
+  forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
+  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
+  deps: {
+    telemetry: TelemetryClient;
+    logger?: ReturnType<typeof createLogger>;
+    dateProvider?: DateProvider;
+  },
+) {
+  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: ViemClient,
+  signers: EthSigner[],
+  forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
+  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
+  deps: {
+    telemetry: TelemetryClient;
+    logger?: ReturnType<typeof createLogger>;
+    dateProvider?: DateProvider;
+  },
+) {
+  const sharedDeps = await createSharedDeps(config, deps);
+
+  return signers.map(signer =>
+    createForwarderL1TxUtilsFromEthSignerBase(
+      client,
+      signer,
+      forwarderAddress,
+      sharedDeps,
+      config,
+      config.debugMaxGasLimit,
+    ),
+  );
 }

package/src/metrics/l1_tx_metrics.ts

@@ -1,14 +1,7 @@
-import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum';
-import { TxUtilsState } from '@aztec/ethereum';
+import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum/l1-tx-utils';
+import { TxUtilsState } from '@aztec/ethereum/l1-tx-utils';
 import { createLogger } from '@aztec/foundation/log';
-import {
-  Attributes,
-  type Histogram,
-  type Meter,
-  Metrics,
-  type UpDownCounter,
-  ValueType,
-} from '@aztec/telemetry-client';
+import { Attributes, type Histogram, type Meter, Metrics, type UpDownCounter } from '@aztec/telemetry-client';
 
 export type L1TxScope = 'sequencer' | 'prover' | 'other';
 
@@ -38,55 +31,23 @@ export class L1TxMetrics implements IL1TxMetrics {
     private scope: L1TxScope = 'other',
     private logger = createLogger('l1-tx-utils:metrics'),
   ) {
-    this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION, {
-      description: 'Time from initial tx send until mined',
-      unit: 's',
-      valueType: ValueType.INT,
-    });
+    this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION);
 
-    this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED, {
-      description: 'Number of tx attempts (including speed-ups) until mined',
-      unit: 'attempts',
-      valueType: ValueType.INT,
-    });
+    this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED);
 
-    this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT, {
-      description: 'Count of transactions successfully mined',
-      valueType: ValueType.INT,
-    });
+    this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT);
 
-    this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT, {
-      description: 'Count of transactions that reverted',
-      valueType: ValueType.INT,
-    });
+    this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT);
 
-    this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT, {
-      description: 'Count of transactions cancelled',
-      valueType: ValueType.INT,
-    });
+    this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT);
 
-    this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT, {
-      description: 'Count of transactions not mined (timed out)',
-      valueType: ValueType.INT,
-    });
+    this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT);
 
-    this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE, {
-      description: 'Max priority fee per gas at tx end state (in wei)',
-      unit: 'wei',
-      valueType: ValueType.INT,
-    });
+    this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE);
 
-    this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE, {
-      description: 'Max fee per gas at tx end state (in wei)',
-      unit: 'wei',
-      valueType: ValueType.INT,
-    });
+    this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE);
 
-    this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE, {
-      description: 'Max fee per blob gas at tx end state (in wei)',
-      unit: 'wei',
-      valueType: ValueType.INT,
-    });
+    this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE);
   }
 
   /**

package/src/stores/l1_tx_store.ts

@@ -1,4 +1,4 @@
-import type { IL1TxStore, L1BlobInputs, L1TxConfig, L1TxState } from '@aztec/ethereum';
+import type { IL1TxStore, L1BlobInputs, L1TxConfig, L1TxState } from '@aztec/ethereum/l1-tx-utils';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { Logger } from '@aztec/foundation/log';
 import { createLogger } from '@aztec/foundation/log';
@@ -231,11 +231,18 @@ export class L1TxStore implements IL1TxStore {
    * @param account - The sender account address
    * @param stateId - The state ID to delete
    */
-  public async deleteState(account: string, stateId: number): Promise<void> {
-    const key = this.makeKey(account, stateId);
-    await this.states.delete(key);
-    await this.blobs.delete(key);
-    this.log.debug(`Deleted state ${stateId} for account ${account}`);
+  public async deleteState(account: string, ...stateIds: number[]): Promise<void> {
+    if (stateIds.length === 0) {
+      return;
+    }
+
+    await this.store.transactionAsync(async () => {
+      for (const stateId of stateIds) {
+        const key = this.makeKey(account, stateId);
+        await this.states.delete(key);
+        await this.blobs.delete(key);
+      }
+    });
   }
 
   /**
@@ -243,14 +250,16 @@ export class L1TxStore implements IL1TxStore {
    * @param account - The sender account address
    */
   public async clearStates(account: string): Promise<void> {
-    const states = await this.loadStates(account);
+    await this.store.transactionAsync(async () => {
+      const states = await this.loadStates(account);
 
-    for (const state of states) {
-      await this.deleteState(account, state.id);
-    }
+      for (const state of states) {
+        await this.deleteState(account, state.id);
+      }
 
-    await this.stateIdCounter.delete(account);
-    this.log.info(`Cleared all tx states for account ${account}`);
+      await this.stateIdCounter.delete(account);
+      this.log.info(`Cleared all tx states for account ${account}`);
+    });
   }
 
   /**