@aztec/ethereum 0.0.1-commit.c2eed6949 → 0.0.1-commit.c52d6e7

package/src/l1_contract_addresses.ts

@@ -1,15 +1,15 @@
-import type { ConfigMappingsType } from '@aztec/foundation/config';
+import type { ConfigMapping, ConfigMappingsType } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { schemas, zodFor } from '@aztec/foundation/schemas';
+import { schemas } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
 /**
- * The names of the current L1 contract addresses.
+ * Required L1 contract address keys.
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
  */
-export const L1ContractsNames = [
+const REQUIRED_L1_CONTRACT_ADDRESS_KEYS = [
   'rollupAddress',
   'registryAddress',
   'inboxAddress',
@@ -23,102 +23,128 @@ export const L1ContractsNames = [
   'stakingAssetAddress',
 ] as const;
 
+/** Optional L1 contract address keys — present only in some deployments. */
+export const OPTIONAL_L1_CONTRACT_ADDRESS_KEYS = [
+  'feeAssetHandlerAddress',
+  'stakingAssetHandlerAddress',
+  'zkPassportVerifierAddress',
+  'gseAddress',
+  'dateGatedRelayerAddress',
+] as const;
+
+type RequiredContractKey = (typeof REQUIRED_L1_CONTRACT_ADDRESS_KEYS)[number];
+type OptionalContractKey = (typeof OPTIONAL_L1_CONTRACT_ADDRESS_KEYS)[number];
+
 /** Provides the directory of current L1 contract addresses */
 export type L1ContractAddresses = {
-  [K in (typeof L1ContractsNames)[number]]: EthAddress;
+  [K in RequiredContractKey]: EthAddress;
 } & {
-  slashFactoryAddress?: EthAddress | undefined;
-  feeAssetHandlerAddress?: EthAddress | undefined;
-  stakingAssetHandlerAddress?: EthAddress | undefined;
-  zkPassportVerifierAddress?: EthAddress | undefined;
-  gseAddress?: EthAddress | undefined;
-  dateGatedRelayerAddress?: EthAddress | undefined;
+  [K in OptionalContractKey]?: EthAddress;
 };
 
-export const L1ContractAddressesSchema = zodFor<L1ContractAddresses>()(
-  z.object({
-    rollupAddress: schemas.EthAddress,
-    registryAddress: schemas.EthAddress,
-    inboxAddress: schemas.EthAddress,
-    outboxAddress: schemas.EthAddress,
-    feeJuiceAddress: schemas.EthAddress,
-    stakingAssetAddress: schemas.EthAddress,
-    feeJuicePortalAddress: schemas.EthAddress,
-    coinIssuerAddress: schemas.EthAddress,
-    rewardDistributorAddress: schemas.EthAddress,
-    governanceProposerAddress: schemas.EthAddress,
-    governanceAddress: schemas.EthAddress,
-    slashFactoryAddress: schemas.EthAddress.optional(),
-    feeAssetHandlerAddress: schemas.EthAddress.optional(),
-    stakingAssetHandlerAddress: schemas.EthAddress.optional(),
-    zkPassportVerifierAddress: schemas.EthAddress.optional(),
-    gseAddress: schemas.EthAddress.optional(),
-    dateGatedRelayerAddress: schemas.EthAddress.optional(),
-  }),
-);
+/**
+ * Names of required L1 contract addresses.
+ * NOTE: When changing the set of contracts, update CLI & CI scripts accordingly.
+ * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
+ */
+export const L1ContractsNames = REQUIRED_L1_CONTRACT_ADDRESS_KEYS;
 
 const parseEnv = (val: string) => EthAddress.fromString(val);
+const addrEnv = (description: string, env?: ConfigMapping<EthAddress>['env']): ConfigMapping<EthAddress> => ({
+  description,
+  parseEnv,
+  ...(env && { env }),
+});
 
-export const l1ContractAddressesMapping: ConfigMappingsType<
-  Omit<L1ContractAddresses, 'gseAddress' | 'zkPassportVerifierAddress' | 'dateGatedRelayerAddress'>
-> = {
-  registryAddress: {
-    env: 'REGISTRY_CONTRACT_ADDRESS',
-    description: 'The deployed L1 registry contract address.',
-    parseEnv,
-  },
-  slashFactoryAddress: {
-    env: 'SLASH_FACTORY_CONTRACT_ADDRESS',
-    description: 'The deployed L1 slashFactory contract address',
-    parseEnv,
-  },
-  feeAssetHandlerAddress: {
-    env: 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS',
-    description: 'The deployed L1 feeAssetHandler contract address',
-    parseEnv,
-  },
-  rollupAddress: {
-    description: 'The deployed L1 rollup contract address.',
-    parseEnv,
-  },
-  inboxAddress: {
-    description: 'The deployed L1 inbox contract address.',
-    parseEnv,
-  },
-  outboxAddress: {
-    description: 'The deployed L1 outbox contract address.',
-    parseEnv,
-  },
-  feeJuiceAddress: {
-    description: 'The deployed L1 Fee Juice contract address.',
-    parseEnv,
-  },
-  stakingAssetAddress: {
-    description: 'The deployed L1 staking asset contract address.',
-    parseEnv,
-  },
-  feeJuicePortalAddress: {
-    description: 'The deployed L1 Fee Juice portal contract address.',
-    parseEnv,
-  },
-  coinIssuerAddress: {
-    description: 'The deployed L1 coinIssuer contract address',
-    parseEnv,
-  },
-  rewardDistributorAddress: {
-    description: 'The deployed L1 rewardDistributor contract address',
-    parseEnv,
-  },
-  governanceProposerAddress: {
-    description: 'The deployed L1 governanceProposer contract address',
-    parseEnv,
-  },
-  governanceAddress: {
-    description: 'The deployed L1 governance contract address',
-    parseEnv,
-  },
-  stakingAssetHandlerAddress: {
-    description: 'The deployed L1 stakingAssetHandler contract address',
-    parseEnv,
-  },
+/**
+ * Config mapping for all L1 contract addresses.
+ * This is the single source of truth for which contract addresses exist and how to parse them.
+ */
+export const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses> = {
+  rollupAddress: addrEnv('The deployed L1 rollup contract address.'),
+  registryAddress: addrEnv('The deployed L1 registry contract address.', 'REGISTRY_CONTRACT_ADDRESS'),
+  inboxAddress: addrEnv('The deployed L1 inbox contract address.'),
+  outboxAddress: addrEnv('The deployed L1 outbox contract address.'),
+  feeJuiceAddress: addrEnv('The deployed L1 Fee Juice contract address.'),
+  feeJuicePortalAddress: addrEnv('The deployed L1 Fee Juice portal contract address.'),
+  coinIssuerAddress: addrEnv('The deployed L1 coinIssuer contract address'),
+  rewardDistributorAddress: addrEnv('The deployed L1 rewardDistributor contract address'),
+  governanceProposerAddress: addrEnv('The deployed L1 governanceProposer contract address'),
+  governanceAddress: addrEnv('The deployed L1 governance contract address'),
+  stakingAssetAddress: addrEnv('The deployed L1 staking asset contract address.'),
+  feeAssetHandlerAddress: addrEnv(
+    'The deployed L1 feeAssetHandler contract address',
+    'FEE_ASSET_HANDLER_CONTRACT_ADDRESS',
+  ),
+  stakingAssetHandlerAddress: addrEnv('The deployed L1 stakingAssetHandler contract address'),
+  zkPassportVerifierAddress: addrEnv('The deployed L1 ZK passport verifier contract address'),
+  gseAddress: addrEnv('The deployed L1 GSE contract address'),
+  dateGatedRelayerAddress: addrEnv('The deployed L1 date-gated relayer contract address'),
 };
+
+/** Keys present in {@link l1ContractAddressesMapping}. */
+export type L1ContractAddressMappingKey = keyof typeof l1ContractAddressesMapping;
+
+type RequiredAddressShape = { [K in RequiredContractKey]: typeof schemas.EthAddress };
+type OptionalAddressShape = { [K in OptionalContractKey]: ReturnType<typeof schemas.EthAddress.optional> };
+
+export const L1ContractAddressesSchema = z.object({
+  ...(Object.fromEntries(REQUIRED_L1_CONTRACT_ADDRESS_KEYS.map(k => [k, schemas.EthAddress])) as RequiredAddressShape),
+  ...(Object.fromEntries(
+    OPTIONAL_L1_CONTRACT_ADDRESS_KEYS.map(k => [k, schemas.EthAddress.optional()]),
+  ) as OptionalAddressShape),
+});
+
+/**
+ * Selects entries from {@link l1ContractAddressesMapping} so composed configs can reuse the same
+ * env vars, descriptions, and parsers without duplicating definitions.
+ *
+ * @example
+ * ```ts
+ * const mappings = {
+ *   ...pickL1ContractAddressMappings('rollupAddress'),
+ *   nodeId: { ... },
+ * };
+ * ```
+ */
+export function pickL1ContractAddressMappings<const K extends readonly L1ContractAddressMappingKey[]>(
+  ...keys: K
+): Pick<typeof l1ContractAddressesMapping, K[number]> {
+  return Object.fromEntries(keys.map(key => [key, l1ContractAddressesMapping[key]] as const)) as Pick<
+    typeof l1ContractAddressesMapping,
+    K[number]
+  >;
+}
+
+/**
+ * Like {@link pickL1ContractAddressMappings}, but returns a fragment of {@link L1ContractAddressesSchema}'s shape for
+ * spreading into `z.object({ ...pickL1ContractAddressesSchemaShape('rollupAddress'), localField: z... })`.
+ */
+export function pickL1ContractAddressesSchema<const K extends readonly L1ContractAddressMappingKey[]>(
+  ...keys: K
+): Pick<typeof L1ContractAddressesSchema.shape, K[number]> {
+  return Object.fromEntries(keys.map(key => [key, L1ContractAddressesSchema.shape[key]])) as Pick<
+    typeof L1ContractAddressesSchema.shape,
+    K[number]
+  >;
+}
+
+/** Builds an {@link L1ContractAddresses} object from config that stores those fields at the top level. */
+export function pickL1ContractAddresses<T extends L1ContractAddresses>(config: T): L1ContractAddresses {
+  const result: Partial<L1ContractAddresses> = {};
+  for (const key of REQUIRED_L1_CONTRACT_ADDRESS_KEYS) {
+    result[key] = config[key];
+  }
+  for (const key of OPTIONAL_L1_CONTRACT_ADDRESS_KEYS) {
+    const v = config[key];
+    if (v !== undefined) {
+      result[key] = v;
+    }
+  }
+  return result as L1ContractAddresses;
+}
+
+export function randomL1ContractAddresses(includeOptional: boolean = false): L1ContractAddresses {
+  const keys = includeOptional ? [...L1ContractsNames, ...OPTIONAL_L1_CONTRACT_ADDRESS_KEYS] : L1ContractsNames;
+  return Object.fromEntries(keys.map(name => [name, EthAddress.random()])) as L1ContractAddresses;
+}

package/src/l1_reader.ts

@@ -8,29 +8,23 @@ import {
 import { type L1ContractAddresses, l1ContractAddressesMapping } from './l1_contract_addresses.js';
 
 /** Configuration of the L1GlobalReader. */
-export interface L1ReaderConfig {
+export type L1ReaderConfig = {
   /** List of URLs of Ethereum RPC nodes that services will connect to (comma separated). */
   l1RpcUrls: string[];
   /** The RPC Url of the ethereum debug host for trace and debug methods. */
   l1DebugRpcUrls: string[];
   /** The chain ID of the ethereum host. */
   l1ChainId: number;
-  /** The deployed l1 contract addresses */
-  l1Contracts: L1ContractAddresses;
   /** The polling interval viem uses in ms */
   viemPollingIntervalMS: number;
   /** Timeout for HTTP requests to the L1 RPC node in ms. */
   l1HttpTimeoutMS?: number;
-}
+} & L1ContractAddresses;
 
 export const l1ReaderConfigMappings: ConfigMappingsType<L1ReaderConfig> = {
-  l1Contracts: {
-    description: 'The deployed L1 contract addresses',
-    nested: l1ContractAddressesMapping,
-  },
   l1ChainId: {
     env: 'L1_CHAIN_ID',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description: 'The chain ID of the ethereum host.',
   },
   l1RpcUrls: {
@@ -55,6 +49,7 @@ export const l1ReaderConfigMappings: ConfigMappingsType<L1ReaderConfig> = {
     description: 'Timeout for HTTP requests to the L1 RPC node in ms.',
     ...optionalNumberConfigHelper(),
   },
+  ...l1ContractAddressesMapping,
 };
 
 export function getL1ReaderConfigFromEnv(): L1ReaderConfig {

package/src/l1_tx_utils/config.ts

@@ -73,7 +73,7 @@ export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
   gasLimitBufferPercentage: {
     description: 'How much to increase calculated gas limit by (percentage)',
     env: 'L1_GAS_LIMIT_BUFFER_PERCENTAGE',
-    ...numberConfigHelper(20),
+    ...floatConfigHelper(20),
   },
   maxGwei: {
     description: 'Maximum gas price in gwei to be used for transactions.',
@@ -90,12 +90,12 @@ export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
   priorityFeeBumpPercentage: {
     description: 'How much to increase priority fee by each attempt (percentage)',
     env: 'L1_PRIORITY_FEE_BUMP_PERCENTAGE',
-    ...numberConfigHelper(20),
+    ...floatConfigHelper(20),
   },
   priorityFeeRetryBumpPercentage: {
     description: 'How much to increase priority fee by each retry attempt (percentage)',
     env: 'L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE',
-    ...numberConfigHelper(50),
+    ...floatConfigHelper(50),
   },
   minimumPriorityFeePerGas: {
     description:

package/src/l1_tx_utils/l1_fee_analyzer.ts

@@ -791,9 +791,6 @@ export class L1FeeAnalyzer {
     });
   }
 
-  /**
-   * Gets the minimum value from an array of bigints
-   */
   private minBigInt(values: bigint[]): bigint {
     if (values.length === 0) {
       return 0n;
@@ -801,3 +798,78 @@ export class L1FeeAnalyzer {
     return values.reduce((min, val) => (val < min ? val : min), values[0]);
   }
 }
+
+/** Per-block fee data for one mined L1 block, used to diagnose whether a tx was underpriced for it. */
+export interface WindowBlockFees {
+  blockNumber: bigint;
+  timestamp: bigint;
+  baseFeePerGas: bigint;
+  /** 75th percentile priority fee among the block's txs (gas-weighted, from eth_feeHistory). */
+  p75PriorityFee: bigint;
+  /** Minimum priority fee among all included txs — the inclusion bar for that block. */
+  minIncludedPriorityFee: bigint;
+  blockBlobsFull: boolean;
+  includedBlobCount: number;
+}
+
+/** Safety bound on how far back the window scan walks if the chain head is far ahead of the window. */
+const MAX_WINDOW_SCAN_BLOCKS = 64;
+
+/**
+ * Reads the already-mined L1 blocks whose timestamps fall in [windowStartS, windowEndS) — the L1
+ * inclusion window of an L2 slot — and extracts per-block fee data. Walks block headers to map the
+ * window to block numbers, then reads the priority-fee stats from a single eth_feeHistory call
+ * (percentile 0 is the cheapest included tx, i.e. the inclusion bar), so no transaction bodies are
+ * ever downloaded. Historical reads only, so it never waits on a future block. Returns the blocks in
+ * chronological order, [] on error, or the subset mined so far if the window is still in progress.
+ * Never throws.
+ */
+export async function captureWindowBlockFees(
+  client: ViemClient,
+  windowStartS: bigint,
+  windowEndS: bigint,
+): Promise<WindowBlockFees[]> {
+  try {
+    let current = await client.getBlock({ blockTag: 'latest' });
+    const inWindow: (typeof current)[] = [];
+    let scanned = 0;
+    // Walk back from the head, collecting blocks inside the window and skipping any past its end,
+    // until we cross below the window start (or hit the safety cap / genesis).
+    while (current.timestamp >= windowStartS && scanned < MAX_WINDOW_SCAN_BLOCKS) {
+      if (current.timestamp < windowEndS) {
+        inWindow.push(current);
+      }
+      if (current.number === 0n) {
+        break;
+      }
+      current = await client.getBlock({ blockNumber: current.number - 1n });
+      scanned++;
+    }
+    if (inWindow.length === 0) {
+      return [];
+    }
+    inWindow.reverse();
+    const newest = inWindow[inWindow.length - 1];
+    const feeHistory = await client.getFeeHistory({
+      blockCount: Number(newest.number - inWindow[0].number) + 1,
+      blockNumber: newest.number,
+      rewardPercentiles: [0, 75],
+    });
+    return inWindow.map(block => {
+      const idx = Number(block.number - feeHistory.oldestBlock);
+      const [minIncludedPriorityFee, p75PriorityFee] = feeHistory.reward?.[idx] ?? [0n, 0n];
+      const blobsInBlock = block.blobGasUsed ? Number(block.blobGasUsed / GAS_PER_BLOB) : 0;
+      return {
+        blockNumber: block.number,
+        timestamp: block.timestamp,
+        baseFeePerGas: block.baseFeePerGas ?? 0n,
+        p75PriorityFee,
+        minIncludedPriorityFee,
+        blockBlobsFull: blobsInBlock >= getMaxBlobCapacity(block.timestamp),
+        includedBlobCount: blobsInBlock,
+      };
+    });
+  } catch {
+    return [];
+  }
+}

package/src/l1_tx_utils/l1_tx_utils.ts

@@ -4,7 +4,8 @@ import { merge, pick } from '@aztec/foundation/collection';
 import { InterruptError, TimeoutError } from '@aztec/foundation/error';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
-import { retryUntil } from '@aztec/foundation/retry';
+import { Semaphore } from '@aztec/foundation/queue';
+import { makeBackoff, retry, retryUntil } from '@aztec/foundation/retry';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
@@ -35,6 +36,7 @@ import {
   type L1TxConfig,
   type L1TxRequest,
   type L1TxState,
+  L1TxTimeoutError,
   type SigningCallback,
   TerminalTxUtilsState,
   TxUtilsState,
@@ -43,10 +45,17 @@ import {
 
 const MAX_L1_TX_STATES = 32;
 
+// Backoff (in seconds) for retrying the read-only RPC calls that prepare a tx cancellation. A
+// cancellation is fired in the background after a tx times out and is important (it frees the stuck
+// nonce), so a transient RPC failure while reading the pending nonce or gas price must not abandon it.
+const CANCELLATION_PREP_RETRY_BACKOFF_S = [1, 2, 4, 8];
+
 export class L1TxUtils extends ReadOnlyL1TxUtils {
   protected txs: L1TxState[] = [];
   /** Last nonce successfully sent to the chain. Used as a lower bound when a fallback RPC node returns a stale count. */
   private lastSentNonce: number | undefined;
+  /** Mutex to prevent concurrent sendTransaction calls from racing on the same nonce. */
+  private readonly sendMutex = new Semaphore(1);
   /** Tx delayer for testing. Only set when enableDelayer config is true. */
   public delayer?: Delayer;
   /** KZG instance for blob operations. */
@@ -128,6 +137,14 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
     );
   }
 
+  /**
+   * Clears the cached `lastSentNonce` so the next `sendTransaction` call fetches the real
+   * nonce from the chain. Call this after an L1 reorg to prevent stale nonce references.
+   */
+  public resetNonce(): void {
+    this.lastSentNonce = undefined;
+  }
+
   public getSenderAddress() {
     return this.address;
   }
@@ -210,6 +227,19 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
     return await this.signTransaction(txRequest as TransactionSerializable);
   }
 
+  private async checkInterruptedOrTimedOut(gasConfig: Pick<L1TxConfig, 'txTimeoutAt'>): Promise<Date> {
+    if (this.interrupted) {
+      throw new InterruptError(`Transaction sending is interrupted`);
+    }
+    const now = new Date(await this.getL1Timestamp());
+    if (gasConfig.txTimeoutAt && now > gasConfig.txTimeoutAt) {
+      throw new TimeoutError(
+        `Transaction timed out before sending (now ${now.toISOString()} > timeoutAt ${gasConfig.txTimeoutAt.toISOString()})`,
+      );
+    }
+    return now;
+  }
+
   /**
    * Sends a transaction with gas estimation and pricing
    * @param request - The transaction request (to, data, value)
@@ -222,14 +252,15 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
     blobInputs?: L1BlobInputs,
     stateChange: TxUtilsState = TxUtilsState.SENT,
   ): Promise<{ txHash: Hex; state: L1TxState }> {
-    if (this.interrupted) {
-      throw new InterruptError(`Transaction sending is interrupted`);
-    }
-
     try {
       const gasConfig = merge(this.config, gasConfigOverrides);
       const account = this.getSenderAddress().toString();
 
+      // Fail fast before doing any work (gas estimation, balance check) if we've been interrupted
+      // or if the caller's deadline has already passed. The same check is repeated after gas
+      // estimation in case it took long enough to push us past the deadline.
+      await this.checkInterruptedOrTimedOut(gasConfig);
+
       let gasLimit: bigint;
       if (this.debugMaxGasLimit) {
         gasLimit = MAX_L1_TX_LIMIT;
@@ -242,42 +273,41 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
 
       const gasPrice = await this.getGasPrice(gasConfig, !!blobInputs);
 
-      if (this.interrupted) {
-        throw new InterruptError(`Transaction sending is interrupted`);
-      }
-
-      const now = new Date(await this.getL1Timestamp());
-      if (gasConfig.txTimeoutAt && now > gasConfig.txTimeoutAt) {
-        throw new TimeoutError(
-          `Transaction timed out before sending (now ${now.toISOString()} > timeoutAt ${gasConfig.txTimeoutAt.toISOString()})`,
-        );
-      }
-
-      const chainNonce = await this.client.getTransactionCount({ address: account, blockTag: 'pending' });
-      // If a fallback RPC node returns a stale count (lower than what we last sent), use our
-      // local lower bound to avoid sending a duplicate of an already-pending transaction.
-      const nonce =
-        this.lastSentNonce !== undefined && chainNonce <= this.lastSentNonce ? this.lastSentNonce + 1 : chainNonce;
+      const now = await this.checkInterruptedOrTimedOut(gasConfig);
 
-      const baseState = { request, gasLimit, blobInputs, gasPrice, nonce };
-      const txData = this.makeTxData(baseState, { isCancelTx: false });
+      let txHash: Hex;
+      let nonce: number;
+      let baseState: Pick<L1TxState, 'request' | 'gasLimit' | 'blobInputs' | 'gasPrice' | 'nonce'>;
 
-      // Send the new tx
-      const signedRequest = await this.prepareSignedTransaction(txData);
-      const txHash = await this.client.sendRawTransaction({ serializedTransaction: signedRequest });
-      // Update after tx is sent successfully
-      this.lastSentNonce = nonce;
+      await this.sendMutex.acquire();
+      try {
+        const chainNonce = await this.client.getTransactionCount({ address: account, blockTag: 'pending' });
+        // If a fallback RPC node returns a stale count (lower than what we last sent), use our
+        // local lower bound to avoid sending a duplicate of an already-pending transaction.
+        nonce =
+          this.lastSentNonce !== undefined && chainNonce <= this.lastSentNonce ? this.lastSentNonce + 1 : chainNonce;
+
+        baseState = { request, gasLimit, blobInputs, gasPrice, nonce };
+        const txData = this.makeTxData(baseState, { isCancelTx: false });
+
+        const signedRequest = await this.prepareSignedTransaction(txData);
+        txHash = await this.client.sendRawTransaction({ serializedTransaction: signedRequest });
+        this.lastSentNonce = nonce;
+      } finally {
+        this.sendMutex.release();
+      }
 
       // Create the new state for monitoring
       const l1TxState: L1TxState = {
         ...baseState,
-        id: (await this.store?.consumeNextStateId(account)) ?? Math.max(...this.txs.map(tx => tx.id), 0),
+        id: (await this.store?.consumeNextStateId(account)) ?? Math.max(...this.txs.map(tx => tx.id), -1) + 1,
         txHashes: [txHash],
         cancelTxHashes: [],
         status: TxUtilsState.IDLE,
         txConfigOverrides: gasConfigOverrides ?? {},
         sentAtL1Ts: now,
         lastSentAtL1Ts: now,
+        gasPriceHistory: [baseState.gasPrice],
       };
 
       // And persist it
@@ -408,10 +438,23 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
 
     const initialTxHash = txHashes[0];
     let currentTxHash = txHashes.at(-1)!;
-    let l1Timestamp: number;
+    let l1Timestamp = 0;
 
     while (true) {
-      l1Timestamp = await this.getL1Timestamp();
+      try {
+        l1Timestamp = await this.getL1Timestamp();
+      } catch (err) {
+        // A transient RPC failure here must not abort monitoring with a rejection: callers that
+        // fire this loop in the background would surface it as an unhandled rejection (e.g. when a
+        // test tears down its L1 node while a monitor iteration is in flight). Exit quietly if we
+        // are shutting down, otherwise retry on the next interval.
+        if (this.interrupted) {
+          break;
+        }
+        this.logger.error(`Error fetching L1 timestamp while monitoring tx ${currentTxHash}`, err, { nonce, account });
+        await sleep(gasConfig.checkIntervalMs!);
+        continue;
+      }
 
       try {
         const timePassed = l1Timestamp - state.lastSentAtL1Ts.getTime();
@@ -463,6 +506,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
         if (timePassed >= stallTimeMs && attempts <= maxSpeedUpAttempts) {
           const newGasPrice = await this.getGasPrice(gasConfig, isBlobTx, attempts, state.gasPrice);
           state.gasPrice = newGasPrice;
+          state.gasPriceHistory?.push(newGasPrice);
 
           this.logger.debug(
             `Tx ${currentTxHash} with nonce ${nonce} from ${account} appears stuck. ` +
@@ -631,8 +675,22 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
     blobInputs?: L1BlobInputs,
   ): Promise<{ receipt: TransactionReceipt; state: L1TxState }> {
     const { state } = await this.sendTransaction(request, gasConfig, blobInputs);
-    const receipt = await this.monitorTransaction(state);
-    return { receipt, state };
+    try {
+      const receipt = await this.monitorTransaction(state);
+      return { receipt, state };
+    } catch (err) {
+      if (err instanceof TimeoutError) {
+        // Snapshot the ladder now: the fire-and-forget cancellation mutates state.gasPrice moments later.
+        throw new L1TxTimeoutError(err.message, {
+          gasPriceHistory: state.gasPriceHistory ? [...state.gasPriceHistory] : undefined,
+          finalGasPrice: state.gasPrice,
+          attempts: state.txHashes.length,
+          nonce: state.nonce,
+          gasLimit: state.gasLimit,
+        });
+      }
+      throw err;
+    }
   }
 
   public override async simulate(
@@ -683,9 +741,37 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
       return;
     }
 
-    // Check if the original tx is still pending
-    const currentNonce = await this.client.getTransactionCount({ address: account, blockTag: 'pending' });
-    if (currentNonce < nonce) {
+    // Resolve the pending nonce and cancellation gas price up front. These are read-only RPC calls, so
+    // they are safe to retry; a transient RPC failure here must not permanently abandon the cancellation
+    // (which would leave the nonce stuck and the tx state stranded short of CANCELLED). We retry with a
+    // real backoff before giving up, unlike getGasPrice's tight internal retry which can be exhausted by
+    // a brief node hiccup. The retried block performs no state-changing send, so retrying cannot
+    // double-send the cancellation tx.
+    const { currentNonce, cancelGasPrice } = await retry(
+      async () => {
+        const currentNonce = await this.client.getTransactionCount({ address: account, blockTag: 'pending' });
+        if (currentNonce >= nonce) {
+          // Get gas price with higher priority fee for cancellation
+          const cancelGasPrice = await this.getGasPrice(
+            {
+              ...this.config,
+              // Use high bump for cancellation to ensure it replaces the original tx
+              priorityFeeRetryBumpPercentage: 150, // 150% bump should be enough to replace any tx
+            },
+            isBlobTx,
+            state.txHashes.length,
+            previousGasPrice,
+          );
+          return { currentNonce, cancelGasPrice };
+        }
+        return { currentNonce, cancelGasPrice: undefined };
+      },
+      `Preparing cancellation for L1 tx from account ${account} with nonce ${nonce}`,
+      makeBackoff(CANCELLATION_PREP_RETRY_BACKOFF_S),
+      this.logger,
+    );
+
+    if (cancelGasPrice === undefined) {
       this.logger.verbose(
         `Not sending cancellation for L1 tx from account ${account} with nonce ${nonce} as it is dropped`,
         { nonce, account, currentNonce },
@@ -694,18 +780,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
       return;
     }
 
-    // Get gas price with higher priority fee for cancellation
-    const cancelGasPrice = await this.getGasPrice(
-      {
-        ...this.config,
-        // Use high bump for cancellation to ensure it replaces the original tx
-        priorityFeeRetryBumpPercentage: 150, // 150% bump should be enough to replace any tx
-      },
-      isBlobTx,
-      state.txHashes.length,
-      previousGasPrice,
-    );
-
     const { maxFeePerGas, maxPriorityFeePerGas, maxFeePerBlobGas } = cancelGasPrice;
     this.logger.verbose(
       `Attempting to cancel L1 ${isBlobTx ? 'blob' : 'vanilla'} transaction from account ${account} with nonce ${nonce} after time out`,