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

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,7 +1,16 @@
 {
   "name": "@aztec/node-lib",
-  "version": "0.0.1-commit.b655e406",
+  "version": "0.0.1-commit.b6e433891",
   "type": "module",
+  "typedocOptions": {
+    "entryPoints": [
+      "./src/actions/index.ts",
+      "./src/config/index.ts",
+      "./src/factories/index.ts"
+    ],
+    "name": "Node Library",
+    "tsconfig": "./tsconfig.json"
+  },
   "exports": {
     "./actions": "./dest/actions/index.js",
     "./config": "./dest/config/index.js",
@@ -13,8 +22,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 +66,37 @@
     ]
   },
   "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.b6e433891",
+    "@aztec/bb-prover": "0.0.1-commit.b6e433891",
+    "@aztec/blob-client": "0.0.1-commit.b6e433891",
+    "@aztec/constants": "0.0.1-commit.b6e433891",
+    "@aztec/epoch-cache": "0.0.1-commit.b6e433891",
+    "@aztec/ethereum": "0.0.1-commit.b6e433891",
+    "@aztec/foundation": "0.0.1-commit.b6e433891",
+    "@aztec/kv-store": "0.0.1-commit.b6e433891",
+    "@aztec/p2p": "0.0.1-commit.b6e433891",
+    "@aztec/protocol-contracts": "0.0.1-commit.b6e433891",
+    "@aztec/prover-client": "0.0.1-commit.b6e433891",
+    "@aztec/sequencer-client": "0.0.1-commit.b6e433891",
+    "@aztec/simulator": "0.0.1-commit.b6e433891",
+    "@aztec/stdlib": "0.0.1-commit.b6e433891",
+    "@aztec/telemetry-client": "0.0.1-commit.b6e433891",
+    "@aztec/validator-client": "0.0.1-commit.b6e433891",
+    "@aztec/world-state": "0.0.1-commit.b6e433891",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/blob-lib": "0.0.1-commit.b655e406",
+    "@aztec/blob-lib": "0.0.1-commit.b6e433891",
+    "@aztec/node-keystore": "0.0.1-commit.b6e433891",
     "@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,14 +1,15 @@
 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';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { P2P_STORE_NAME } from '@aztec/p2p';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
+import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
 import { type ReadOnlyFileStore, createReadOnlyFileStore } from '@aztec/stdlib/file-store';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import {
   type SnapshotMetadata,
   type SnapshotsIndexMetadata,
@@ -28,8 +29,10 @@ 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> &
+  DataStoreConfig &
+  Required<Pick<DataStoreConfig, 'l1Contracts'>> &
   EthereumClientConfig & {
     snapshotsUrls?: string[];
     minL1BlocksToTriggerReplace?: number;
@@ -64,7 +67,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   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 });
@@ -80,7 +83,11 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   }
 
   const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
-  if (archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
+  if (
+    archiverL1BlockNumber &&
+    currentL1BlockNumber >= archiverL1BlockNumber &&
+    currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace
+  ) {
     log.verbose(
       `Skipping snapshot sync as archiver is less than ${
         currentL1BlockNumber - archiverL1BlockNumber
@@ -163,7 +170,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 +197,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 +205,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/actions/upload-snapshot.ts

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

package/src/config/index.ts

@@ -5,18 +5,22 @@ export type SharedNodeConfig = {
   testAccounts: boolean;
   /** Whether to populate the genesis state with initial fee juice for the sponsored FPC */
   sponsoredFPC: boolean;
+  /** Additional addresses to prefund with fee juice at genesis */
+  prefundAddresses: string[];
   /** Sync mode: full to always sync via L1, snapshot to download a snapshot if there is no local data, force-snapshot to download even if there is local data. */
   syncMode: 'full' | 'snapshot' | 'force-snapshot';
   /** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
   snapshotsUrls?: string[];
-
-  /** Auto update mode: disabled - to completely ignore remote signals to update the node. enabled - to respect the signals (potentially shutting this node down). log - check for updates but log a warning instead of applying them*/
-  autoUpdate?: 'disabled' | 'notify' | 'config' | 'config-and-version';
-  /** The base URL against which to check for updates */
-  autoUpdateUrl?: string;
-
   /** URL of the Web3Signer instance */
   web3SignerUrl?: string;
+  /** Whether to run in fisherman mode */
+  fishermanMode?: boolean;
+
+  /** Force verification of tx Chonk proofs. Only used for testnet */
+  debugForceTxProofVerification: boolean;
+
+  /** Check if the node version matches the latest version for the network */
+  enableVersionCheck: boolean;
 };
 
 export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
@@ -30,6 +34,16 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
     description: 'Whether to populate the genesis state with initial fee juice for the sponsored FPC.',
     ...booleanConfigHelper(false),
   },
+  prefundAddresses: {
+    env: 'PREFUND_ADDRESSES',
+    description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis (local network only).',
+    parseEnv: (val: string) =>
+      val
+        .split(',')
+        .map(a => a.trim())
+        .filter(a => a.length > 0),
+    defaultValue: [],
+  },
   syncMode: {
     env: 'SYNC_MODE',
     description:
@@ -47,18 +61,25 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
     fallback: ['SYNC_SNAPSHOTS_URL'],
     defaultValue: [],
   },
-  autoUpdate: {
-    env: 'AUTO_UPDATE',
-    description: 'The auto update mode for this node',
-    defaultValue: 'disabled',
-  },
-  autoUpdateUrl: {
-    env: 'AUTO_UPDATE_URL',
-    description: 'Base URL to check for updates',
-  },
   web3SignerUrl: {
     env: 'WEB3_SIGNER_URL',
     description: 'URL of the Web3Signer instance',
     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),
+  },
+
+  enableVersionCheck: {
+    env: 'ENABLE_VERSION_CHECK',
+    description: 'Check if the node is running the latest version and is following the latest rollup',
+    ...booleanConfigHelper(true),
+  },
 };

package/src/factories/l1_tx_utils.ts

@@ -1,17 +1,15 @@
-import {
-  createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase,
-  createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase,
-} from '@aztec/ethereum';
-import type { EthSigner, ExtendedViemWalletClient, L1TxUtilsConfig, ViemClient } from '@aztec/ethereum';
-import {
-  createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase,
-  createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase,
-} from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import type { BlobKzgInstance } from '@aztec/blob-lib/types';
+import type { EthSigner } from '@aztec/ethereum/eth-signer';
+import { createDelayer, createL1TxUtils as createL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils';
+import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
+import { createForwarderL1TxUtils as createForwarderL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
 import { omit } from '@aztec/foundation/collection';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 
 import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
@@ -21,14 +19,15 @@ import { L1TxStore } from '../stores/l1_tx_store.js';
 const L1_TX_STORE_NAME = 'l1-tx-utils';
 
 /**
- * Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
+ * Creates shared dependencies (logger, store, metrics, delayer) for L1TxUtils instances.
+ * When enableDelayer is set in config, a single shared delayer is created and passed to all instances.
  */
 async function createSharedDeps(
-  config: DataStoreConfig & { scope?: L1TxScope },
+  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
   },
 ) {
   const logger = deps.logger ?? createLogger('l1-tx-utils');
@@ -36,87 +35,122 @@ async function createSharedDeps(
   // 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 kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
   const store = new L1TxStore(kvStore, logger);
 
   const meter = deps.telemetry.getMeter('L1TxUtils');
   const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
 
-  return { logger, store, metrics, dateProvider: deps.dateProvider };
+  // Create a single shared delayer for all L1TxUtils instances in this group
+  const delayer =
+    config.enableDelayer && config.ethereumSlotDuration !== undefined
+      ? createDelayer(deps.dateProvider, { ethereumSlotDuration: config.ethereumSlotDuration }, logger.getBindings())
+      : undefined;
+
+  return { logger, store, metrics, dateProvider: deps.dateProvider, delayer };
 }
 
 /**
- * Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
+ * Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export async function createL1TxUtilsWithBlobsFromViemWallet(
+export async function createL1TxUtilsFromWallets(
   clients: ExtendedViemWalletClient[],
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
-  return clients.map(client =>
-    createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit),
-  );
+  return clients.map(client => createL1TxUtilsBase(client, { ...sharedDeps, kzg: deps.kzg }, config));
 }
 
 /**
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
+ * Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * When kzg is provided in deps, blob support is enabled.
+ * Deduplicates signers by address to avoid creating multiple instances for the same publisher.
  */
-export async function createL1TxUtilsWithBlobsFromEthSigner(
+export async function createL1TxUtilsFromSigners(
   client: ViemClient,
   signers: EthSigner[],
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   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<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 => createL1TxUtilsBase({ client, signer }, { ...sharedDeps, kzg: deps.kzg }, config));
 }
 
 /**
- * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
+ * Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export async function createL1TxUtilsFromViemWalletWithStore(
+export async function createForwarderL1TxUtilsFromWallets(
   clients: ExtendedViemWalletClient[],
+  forwarderAddress: EthAddress,
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-    scope?: L1TxScope;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
-  return clients.map(client => createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
+  return clients.map(client =>
+    createForwarderL1TxUtilsBase(client, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
+  );
 }
 
 /**
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
+ * Wraps all transactions through a forwarder contract for testing purposes.
+ * When kzg is provided in deps, blob support is enabled.
  */
-export async function createL1TxUtilsFromEthSignerWithStore(
+export async function createForwarderL1TxUtilsFromSigners(
   client: ViemClient,
   signers: EthSigner[],
+  forwarderAddress: EthAddress,
   config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
   deps: {
     telemetry: TelemetryClient;
     logger?: ReturnType<typeof createLogger>;
-    dateProvider?: DateProvider;
-    scope?: L1TxScope;
+    dateProvider: DateProvider;
+    kzg?: BlobKzgInstance;
   },
 ) {
   const sharedDeps = await createSharedDeps(config, deps);
 
-  return signers.map(signer => createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
+  return signers.map(signer =>
+    createForwarderL1TxUtilsBase({ client, signer }, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
+  );
 }

package/src/metrics/l1_tx_metrics.ts

@@ -1,5 +1,5 @@
-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,
@@ -7,7 +7,7 @@ import {
   type Meter,
   Metrics,
   type UpDownCounter,
-  ValueType,
+  createUpDownCounterWithDefault,
 } from '@aztec/telemetry-client';
 
 export type L1TxScope = 'sequencer' | 'prover' | 'other';
@@ -38,55 +38,24 @@ 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,
-    });
+    const scopeAttributes = [{ [Attributes.L1_TX_SCOPE]: this.scope }];
+    this.txMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_MINED_COUNT, scopeAttributes);
 
-    this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT, {
-      description: 'Count of transactions that reverted',
-      valueType: ValueType.INT,
-    });
+    this.txRevertedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_REVERTED_COUNT, scopeAttributes);
 
-    this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT, {
-      description: 'Count of transactions cancelled',
-      valueType: ValueType.INT,
-    });
+    this.txCancelledCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_CANCELLED_COUNT, scopeAttributes);
 
-    this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT, {
-      description: 'Count of transactions not mined (timed out)',
-      valueType: ValueType.INT,
-    });
+    this.txNotMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_NOT_MINED_COUNT, scopeAttributes);
 
-    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}`);
+    });
   }
 
   /**