@aztec/node-lib 3.0.0-canary.a9708bd → 3.0.0-devnet.3

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

@@ -6,7 +6,8 @@ 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' | 'snapshotsUrl'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
+type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
+    snapshotsUrls?: string[];
     minL1BlocksToTriggerReplace?: number;
 };
 /**

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,GAAG,cAAc,CAAC,GAC3E,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,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBA2H5E;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,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"}

package/dest/actions/snapshot-sync.js

@@ -15,29 +15,22 @@ 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, snapshotsUrl, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
+    const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
     if (syncMode === 'full') {
         log.debug('Snapshot sync is disabled. Running full sync.', {
             syncMode: syncMode
         });
         return false;
     }
-    if (!snapshotsUrl) {
-        log.verbose('Snapshot sync is disabled. No snapshots URL provided.');
+    if (!snapshotsUrls || snapshotsUrls.length === 0) {
+        log.verbose('Snapshot sync is disabled. No snapshots URLs provided.');
         return false;
     }
     if (!dataDirectory) {
         log.verbose('Snapshot sync is disabled. No local data directory defined.');
         return false;
     }
-    let fileStore;
-    try {
-        fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
-    } catch (err) {
-        log.error(`Invalid config for downloading snapshots`, err);
-        return false;
-    }
-    // Create an archiver store to check the current state
+    // 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);
     let archiverL1BlockNumber;
@@ -73,59 +66,101 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         rollupVersion,
         rollupAddress: l1Contracts.rollupAddress
     };
-    let snapshot;
-    try {
-        snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
-    } catch (err) {
-        log.error(`Failed to get latest snapshot metadata. Skipping snapshot sync.`, err, {
-            ...indexMetadata,
-            snapshotsUrl
+    const snapshotCandidates = [];
+    for (const snapshotsUrl of snapshotsUrls){
+        let fileStore;
+        try {
+            fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
+        } catch (err) {
+            log.error(`Invalid config for downloading snapshots from ${snapshotsUrl}`, err);
+            continue;
+        }
+        let snapshot;
+        try {
+            snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
+        } catch (err) {
+            log.error(`Failed to get latest snapshot metadata from ${snapshotsUrl}. Skipping this URL.`, err, {
+                ...indexMetadata,
+                snapshotsUrl
+            });
+            continue;
+        }
+        if (!snapshot) {
+            log.verbose(`No snapshot found at ${snapshotsUrl}. Skipping this URL.`, {
+                ...indexMetadata,
+                snapshotsUrl
+            });
+            continue;
+        }
+        if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
+            log.warn(`Skipping snapshot from ${snapshotsUrl} as it has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
+            continue;
+        }
+        if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
+            log.warn(`Skipping snapshot from ${snapshotsUrl} as it has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
+            continue;
+        }
+        if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
+            log.verbose(`Skipping snapshot from ${snapshotsUrl} since local archiver is at L1 block ${archiverL1BlockNumber} which is further than snapshot at ${snapshot.l1BlockNumber}`, {
+                snapshot,
+                archiverL1BlockNumber,
+                snapshotsUrl
+            });
+            continue;
+        }
+        if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
+            log.verbose(`Skipping snapshot from ${snapshotsUrl} as archiver is less than ${snapshot.l1BlockNumber - Number(archiverL1BlockNumber)} L1 blocks behind this snapshot.`, {
+                snapshot,
+                archiverL1BlockNumber,
+                snapshotsUrl
+            });
+            continue;
+        }
+        snapshotCandidates.push({
+            snapshot,
+            url: snapshotsUrl,
+            fileStore
         });
-        return false;
     }
-    if (!snapshot) {
-        log.verbose(`No snapshot found. Skipping snapshot sync.`, {
+    if (snapshotCandidates.length === 0) {
+        log.verbose(`No valid snapshots found from any URL. Skipping snapshot sync.`, {
             ...indexMetadata,
-            snapshotsUrl
-        });
-        return false;
-    }
-    if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
-        log.warn(`Skipping snapshot sync as last snapshot has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
-        return false;
-    }
-    if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
-        log.warn(`Skipping snapshot sync as last snapshot has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
-        return false;
-    }
-    if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
-        log.verbose(`Skipping snapshot sync since local archiver is at L1 block ${archiverL1BlockNumber} which is further than last snapshot at ${snapshot.l1BlockNumber}`, {
-            snapshot,
-            archiverL1BlockNumber
+            snapshotsUrls
         });
         return false;
     }
-    if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
-        log.verbose(`Skipping snapshot sync as archiver is less than ${snapshot.l1BlockNumber - Number(archiverL1BlockNumber)} L1 blocks behind latest snapshot.`, {
+    // 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){
+        const { l1BlockNumber, l2BlockNumber } = snapshot;
+        log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
             snapshot,
-            archiverL1BlockNumber
+            snapshotsUrl: url
         });
-        return false;
+        try {
+            await snapshotSync(snapshot, log, {
+                dataDirectory: config.dataDirectory,
+                rollupAddress: config.l1Contracts.rollupAddress,
+                snapshotsUrl: url
+            });
+            log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
+                snapshot,
+                snapshotsUrl: url
+            });
+            return true;
+        } catch (err) {
+            log.error(`Failed to download snapshot from ${url}. Trying next candidate.`, err, {
+                snapshot,
+                snapshotsUrl: url
+            });
+            continue;
+        }
     }
-    const { l1BlockNumber, l2BlockNumber } = snapshot;
-    log.info(`Syncing from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
-        snapshot,
-        snapshotsUrl
-    });
-    await snapshotSync(snapshot, log, {
-        dataDirectory: config.dataDirectory,
-        rollupAddress: config.l1Contracts.rollupAddress,
-        snapshotsUrl
-    });
-    log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
-        snapshot
+    log.error(`Failed to download snapshot from all URLs.`, {
+        snapshotsUrls
     });
-    return true;
+    return false;
 }
 /**
  * Downloads the given snapshot replacing any local data stores.

package/dest/config/index.d.ts

@@ -6,8 +6,8 @@ export type SharedNodeConfig = {
     sponsoredFPC: boolean;
     /** 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 URL for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
-    snapshotsUrl?: string;
+    /** 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 */

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,4IAA4I;IAC5I,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,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,CAmCzE,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;CACxB,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CA0CzE,CAAC"}

package/dest/config/index.js

@@ -15,9 +15,14 @@ export const sharedNodeConfigMappings = {
         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.',
         defaultValue: 'snapshot'
     },
-    snapshotsUrl: {
-        env: 'SYNC_SNAPSHOTS_URL',
-        description: 'Base URL for snapshots index.'
+    snapshotsUrls: {
+        env: 'SYNC_SNAPSHOTS_URLS',
+        description: 'Base URLs for snapshots index, comma-separated.',
+        parseEnv: (val)=>val.split(',').map((url)=>url.trim()).filter((url)=>url.length > 0),
+        fallback: [
+            'SYNC_SNAPSHOTS_URL'
+        ],
+        defaultValue: []
     },
     autoUpdate: {
         env: 'AUTO_UPDATE',

package/dest/factories/index.d.ts

@@ -0,0 +1,2 @@
+export * from './l1_tx_utils.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/dest/factories/index.js

@@ -0,0 +1 @@
+export * from './l1_tx_utils.js';

package/dest/factories/l1_tx_utils.d.ts

@@ -0,0 +1,53 @@
+import type { EthSigner, ExtendedViemWalletClient, L1TxUtilsConfig, ViemClient } from '@aztec/ethereum';
+import { createLogger } from '@aztec/foundation/log';
+import type { DateProvider } from '@aztec/foundation/timer';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
+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.
+ */
+export declare function createL1TxUtilsWithBlobsFromViemWallet(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.
+ */
+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;
+}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
+/**
+ * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
+ */
+export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
+    debugMaxGasLimit?: boolean;
+    scope?: L1TxScope;
+}, deps: {
+    telemetry: TelemetryClient;
+    logger?: ReturnType<typeof createLogger>;
+    dateProvider?: DateProvider;
+    scope?: L1TxScope;
+}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
+//# sourceMappingURL=l1_tx_utils.d.ts.map

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

@@ -0,0 +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"}

package/dest/factories/l1_tx_utils.js

@@ -0,0 +1,50 @@
+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 { omit } from '@aztec/foundation/collection';
+import { createLogger } from '@aztec/foundation/log';
+import { createStore } from '@aztec/kv-store/lmdb-v2';
+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.
+ */ 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 kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger);
+    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, config, deps) {
+    const sharedDeps = await createSharedDeps(config, deps);
+    return clients.map((client)=>createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit));
+}
+/**
+ * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
+ */ 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));
+}
+/**
+ * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
+ */ export async function createL1TxUtilsFromViemWalletWithStore(clients, config, deps) {
+    const sharedDeps = await createSharedDeps(config, deps);
+    return clients.map((client)=>createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
+}
+/**
+ * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
+ */ export async function createL1TxUtilsFromEthSignerWithStore(client, signers, config, deps) {
+    const sharedDeps = await createSharedDeps(config, deps);
+    return signers.map((signer)=>createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
+}

package/dest/metrics/index.d.ts

@@ -0,0 +1,2 @@
+export * from './l1_tx_metrics.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/metrics/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}

package/dest/metrics/index.js

@@ -0,0 +1 @@
+export * from './l1_tx_metrics.js';

package/dest/metrics/l1_tx_metrics.d.ts

@@ -0,0 +1,29 @@
+import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum';
+import { type Meter } from '@aztec/telemetry-client';
+export type L1TxScope = 'sequencer' | 'prover' | 'other';
+/**
+ * Metrics for L1 transaction utils tracking tx lifecycle and gas costs.
+ */
+export declare class L1TxMetrics implements IL1TxMetrics {
+    private meter;
+    private scope;
+    private logger;
+    private txMinedDuration;
+    private txAttemptsUntilMined;
+    private txMinedCount;
+    private txRevertedCount;
+    private txCancelledCount;
+    private txNotMinedCount;
+    private maxPriorityFeeHistogram;
+    private maxFeeHistogram;
+    private blobFeeHistogram;
+    constructor(meter: Meter, scope?: L1TxScope, logger?: import("@aztec/foundation/log").Logger);
+    /**
+     * Records metrics when a transaction is mined.
+     * @param state - The L1 transaction state
+     * @param l1Timestamp - The current L1 timestamp
+     */
+    recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
+    recordDroppedTx(state: L1TxState): void;
+}
+//# sourceMappingURL=l1_tx_metrics.d.ts.map

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

@@ -0,0 +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"}

package/dest/metrics/l1_tx_metrics.js

@@ -0,0 +1,138 @@
+import { TxUtilsState } from '@aztec/ethereum';
+import { createLogger } from '@aztec/foundation/log';
+import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
+/**
+ * Metrics for L1 transaction utils tracking tx lifecycle and gas costs.
+ */ export class L1TxMetrics {
+    meter;
+    scope;
+    logger;
+    // Time until tx is mined
+    txMinedDuration;
+    // Number of attempts until mined
+    txAttemptsUntilMined;
+    // Counters for end states
+    txMinedCount;
+    txRevertedCount;
+    txCancelledCount;
+    txNotMinedCount;
+    // Gas price histograms (at end state, in wei)
+    maxPriorityFeeHistogram;
+    maxFeeHistogram;
+    blobFeeHistogram;
+    constructor(meter, scope = 'other', logger = createLogger('l1-tx-utils:metrics')){
+        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
+        });
+    }
+    /**
+   * Records metrics when a transaction is mined.
+   * @param state - The L1 transaction state
+   * @param l1Timestamp - The current L1 timestamp
+   */ recordMinedTx(state, l1Timestamp) {
+        if (state.status !== TxUtilsState.MINED) {
+            this.logger.warn(`Attempted to record mined tx metrics for a tx not in MINED state (state: ${TxUtilsState[state.status]})`, {
+                scope: this.scope,
+                nonce: state.nonce
+            });
+            return;
+        }
+        const attributes = {
+            [Attributes.L1_TX_SCOPE]: this.scope
+        };
+        const isCancelTx = state.cancelTxHashes.length > 0;
+        const isReverted = state.receipt?.status === 'reverted';
+        if (isCancelTx) {
+            this.txCancelledCount.add(1, attributes);
+        } else if (isReverted) {
+            this.txRevertedCount.add(1, attributes);
+        } else {
+            this.txMinedCount.add(1, attributes);
+        }
+        // Record time to mine using provided L1 timestamp
+        const duration = Math.floor((l1Timestamp.getTime() - state.sentAtL1Ts.getTime()) / 1000);
+        this.txMinedDuration.record(duration, attributes);
+        // 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);
+        }
+        this.logger.debug(`Recorded tx end state metrics`, {
+            status: TxUtilsState[state.status],
+            nonce: state.nonce,
+            isCancelTx,
+            isReverted,
+            scope: this.scope,
+            maxPriorityFeeWei,
+            maxFeeWei,
+            blobFeeWei
+        });
+    }
+    recordDroppedTx(state) {
+        if (state.status !== TxUtilsState.NOT_MINED) {
+            this.logger.warn(`Attempted to record dropped tx metrics for a tx not in NOT_MINED state (state: ${TxUtilsState[state.status]})`, {
+                scope: this.scope,
+                nonce: state.nonce
+            });
+            return;
+        }
+        const attributes = {
+            [Attributes.L1_TX_SCOPE]: this.scope
+        };
+        this.txNotMinedCount.add(1, attributes);
+        this.logger.debug(`Recorded tx dropped metrics`, {
+            status: TxUtilsState[state.status],
+            nonce: state.nonce,
+            scope: this.scope
+        });
+    }
+}

package/dest/stores/index.d.ts

@@ -0,0 +1,2 @@
+export * from './l1_tx_store.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/stores/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/dest/stores/index.js

@@ -0,0 +1 @@
+export * from './l1_tx_store.js';

package/dest/stores/l1_tx_store.d.ts

@@ -0,0 +1,89 @@
+import type { IL1TxStore, L1BlobInputs, L1TxState } from '@aztec/ethereum';
+import type { Logger } from '@aztec/foundation/log';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+/**
+ * Store for persisting L1 transaction states across all L1TxUtils instances.
+ * Each state is stored individually with a unique ID, and blobs are stored separately.
+ * @remarks This class lives in this package instead of `ethereum` because it depends on `kv-store`.
+ */
+export declare class L1TxStore implements IL1TxStore {
+    private readonly store;
+    private readonly log;
+    static readonly SCHEMA_VERSION = 2;
+    private readonly states;
+    private readonly blobs;
+    private readonly stateIdCounter;
+    constructor(store: AztecAsyncKVStore, log?: Logger);
+    /**
+     * Gets the next available state ID for an account.
+     */
+    consumeNextStateId(account: string): Promise<number>;
+    /**
+     * Creates a storage key for state/blob data.
+     */
+    private makeKey;
+    /**
+     * Saves a single transaction state for a specific account.
+     * Blobs are not stored here, use saveBlobs instead.
+     * @param account - The sender account address
+     * @param state - Transaction state to save
+     */
+    saveState(account: string, state: L1TxState): Promise<L1TxState>;
+    /**
+     * Saves blobs for a given state.
+     * @param account - The sender account address
+     * @param stateId - The state ID
+     * @param blobInputs - Blob inputs to save
+     */
+    saveBlobs(account: string, stateId: number, blobInputs: L1BlobInputs | undefined): Promise<void>;
+    /**
+     * Loads all transaction states for a specific account.
+     * @param account - The sender account address
+     * @returns Array of transaction states with their IDs
+     */
+    loadStates(account: string): Promise<L1TxState[]>;
+    /**
+     * Loads a single state by ID.
+     * @param account - The sender account address
+     * @param stateId - The state ID
+     * @returns The transaction state or undefined if not found
+     */
+    loadState(account: string, stateId: number): Promise<L1TxState | undefined>;
+    /**
+     * Deletes a specific state and its associated blobs.
+     * @param account - The sender account address
+     * @param stateId - The state ID to delete
+     */
+    deleteState(account: string, stateId: number): Promise<void>;
+    /**
+     * Clears all transaction states for a specific account.
+     * @param account - The sender account address
+     */
+    clearStates(account: string): Promise<void>;
+    /**
+     * Gets all accounts that have stored states.
+     * @returns Array of account addresses
+     */
+    getAllAccounts(): Promise<string[]>;
+    /**
+     * Closes the store.
+     */
+    close(): Promise<void>;
+    /**
+     * Serializes an L1TxState for storage.
+     */
+    private serializeState;
+    /**
+     * Deserializes a stored state back to L1TxState.
+     */
+    private deserializeState;
+    /**
+     * Serializes blob inputs for separate storage.
+     */
+    private serializeBlobInputs;
+    /**
+     * Deserializes blob inputs from storage, combining blob data with metadata.
+     */
+    private deserializeBlobInputs;
+}
+//# sourceMappingURL=l1_tx_store.d.ts.map

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

@@ -0,0 +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"}