@aztec/ethereum 3.0.0-nightly.20250929 → 3.0.0-nightly.20251001

package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts

@@ -3,113 +3,22 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 
-import { type Hex, type TransactionSerializable, formatGwei } from 'viem';
+import type { TransactionSerializable } from 'viem';
 
 import type { EthSigner } from '../eth-signer/eth-signer.js';
 import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
 import type { L1TxUtilsConfig } from './config.js';
 import { L1TxUtils } from './l1_tx_utils.js';
 import { createViemSigner } from './signer.js';
-import type { GasPrice, SigningCallback } from './types.js';
+import type { L1BlobInputs, SigningCallback } from './types.js';
 
+/** Extends L1TxUtils with the capability to cancel blobs. This needs to be a separate class so we don't require a dependency on blob-lib unnecessarily. */
 export class L1TxUtilsWithBlobs extends L1TxUtils {
-  /**
-   * Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
-   * @param nonce - The nonce of the transaction to cancel
-   * @param allVersions - Hashes of all transactions submitted under the same nonce (any of them could mine)
-   * @param previousGasPrice - The gas price of the previous transaction
-   * @param attempts - The number of attempts to cancel the transaction
-   * @returns The hash of the cancellation transaction
-   */
-  protected override async attemptTxCancellation(
-    currentTxHash: Hex,
-    nonce: number,
-    allVersions: Set<Hex>,
-    isBlobTx = false,
-    previousGasPrice?: GasPrice,
-    attempts = 0,
-  ) {
-    // 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,
-      attempts + 1,
-      previousGasPrice,
-    );
-
-    this.logger?.info(`Attempting to cancel blob L1 transaction ${currentTxHash} with nonce ${nonce}`, {
-      maxFeePerGas: formatGwei(cancelGasPrice.maxFeePerGas),
-      maxPriorityFeePerGas: formatGwei(cancelGasPrice.maxPriorityFeePerGas),
-      maxFeePerBlobGas:
-        cancelGasPrice.maxFeePerBlobGas === undefined ? undefined : formatGwei(cancelGasPrice.maxFeePerBlobGas),
-    });
-    const request = {
-      to: this.getSenderAddress().toString(),
-      value: 0n,
-    };
-
-    // Send 0-value tx to self with higher gas price
-    if (!isBlobTx) {
-      const txData = {
-        ...request,
-        nonce,
-        gas: 21_000n, // Standard ETH transfer gas
-        maxFeePerGas: cancelGasPrice.maxFeePerGas,
-        maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas,
-      };
-      const signedRequest = await this.prepareSignedTransaction(txData);
-      const cancelTxHash = await this.client.sendRawTransaction({ serializedTransaction: signedRequest });
-
-      this.logger?.info(`Sent cancellation tx ${cancelTxHash} for timed out tx ${currentTxHash}`);
-
-      const receipt = await this.monitorTransaction(
-        request,
-        cancelTxHash,
-        allVersions,
-        { gasLimit: 21_000n },
-        undefined,
-        undefined,
-        true,
-      );
-
-      return receipt.transactionHash;
-    } else {
-      const blobData = new Uint8Array(131072).fill(0);
-      const kzg = Blob.getViemKzgInstance();
-      const blobInputs = {
-        blobs: [blobData],
-        kzg,
-        maxFeePerBlobGas: cancelGasPrice.maxFeePerBlobGas!,
-      };
-      const txData = {
-        ...request,
-        ...blobInputs,
-        nonce,
-        gas: 21_000n,
-        maxFeePerGas: cancelGasPrice.maxFeePerGas,
-        maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas,
-      };
-      const signedRequest = await this.prepareSignedTransaction(txData);
-      const cancelTxHash = await this.client.sendRawTransaction({ serializedTransaction: signedRequest });
-
-      this.logger?.info(`Sent cancellation tx ${cancelTxHash} for timed out tx ${currentTxHash}`);
-
-      const receipt = await this.monitorTransaction(
-        request,
-        cancelTxHash,
-        allVersions,
-        { gasLimit: 21_000n },
-        undefined,
-        blobInputs,
-        true,
-      );
-
-      return receipt.transactionHash;
-    }
+  /** Makes empty blob inputs for the cancellation tx. */
+  protected override makeEmptyBlobInputs(maxFeePerBlobGas: bigint): Required<L1BlobInputs> {
+    const blobData = new Uint8Array(131072).fill(0);
+    const kzg = Blob.getViemKzgInstance();
+    return { blobs: [blobData], kzg, maxFeePerBlobGas };
   }
 }
 

package/src/l1_tx_utils/readonly_l1_tx_utils.ts

@@ -34,7 +34,7 @@ import type { GasPrice, L1BlobInputs, L1TxRequest, TransactionStats } from './ty
 import { getCalldataGasUsage, tryGetCustomErrorNameContractFunction } from './utils.js';
 
 export class ReadOnlyL1TxUtils {
-  public readonly config: L1TxUtilsConfig;
+  public config: L1TxUtilsConfig;
   protected interrupted = false;
 
   constructor(

package/src/l1_tx_utils/types.ts

@@ -1,7 +1,8 @@
+import type { BlobKzgInstance } from '@aztec/blob-lib/types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemTransactionSignature } from '@aztec/foundation/eth-signature';
 
-import type { Abi, Address, Hex, TransactionSerializable } from 'viem';
+import type { Abi, Address, Hex, TransactionReceipt, TransactionSerializable } from 'viem';
 
 import type { L1TxUtilsConfig } from './config.js';
 
@@ -16,7 +17,7 @@ export type L1GasConfig = Partial<L1TxUtilsConfig> & { gasLimit?: bigint; txTime
 
 export interface L1BlobInputs {
   blobs: Uint8Array[];
-  kzg: any;
+  kzg: BlobKzgInstance;
   maxFeePerBlobGas?: bigint;
 }
 
@@ -46,6 +47,19 @@ export enum TxUtilsState {
   MINED,
 }
 
+export type L1TxState = {
+  txHashes: Hex[];
+  cancelTxHashes: Hex[];
+  gasLimit: bigint;
+  gasPrice: GasPrice;
+  txConfig: L1GasConfig;
+  request: L1TxRequest;
+  status: TxUtilsState;
+  nonce: number;
+  receipt?: TransactionReceipt;
+  blobInputs: L1BlobInputs | undefined;
+};
+
 export type SigningCallback = (
   transaction: TransactionSerializable,
   signingAddress: EthAddress,