@aztec/ethereum 3.0.0-nightly.20250930 → 3.0.0-nightly.20251002

package/dest/l1_tx_utils/l1_tx_utils.js

@@ -1,3 +1,4 @@
+import { maxBigint } from '@aztec/foundation/bigint';
 import { times } from '@aztec/foundation/collection';
 import { TimeoutError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
@@ -13,32 +14,39 @@ import { l1TxUtilsConfigMappings } from './config.js';
 import { LARGE_GAS_LIMIT } from './constants.js';
 import { ReadOnlyL1TxUtils } from './readonly_l1_tx_utils.js';
 import { TxUtilsState } from './types.js';
+const MAX_L1_TX_STATES = 32;
 export class L1TxUtils extends ReadOnlyL1TxUtils {
     client;
     address;
     signer;
     logger;
-    txUtilsState;
-    lastMinedBlockNumber;
     nonceManager;
+    txs;
     constructor(client, address, signer, logger = createLogger('L1TxUtils'), dateProvider = new DateProvider(), config, debugMaxGasLimit = false){
-        super(client, logger, dateProvider, config, debugMaxGasLimit), this.client = client, this.address = address, this.signer = signer, this.logger = logger, this.txUtilsState = TxUtilsState.IDLE, this.lastMinedBlockNumber = undefined;
+        super(client, logger, dateProvider, config, debugMaxGasLimit), this.client = client, this.address = address, this.signer = signer, this.logger = logger, this.txs = [];
         this.nonceManager = createNonceManager({
             source: jsonRpc()
         });
     }
     get state() {
-        return this.txUtilsState;
+        return this.txs.at(-1)?.status ?? TxUtilsState.IDLE;
     }
     get lastMinedAtBlockNumber() {
-        return this.lastMinedBlockNumber;
+        const minedBlockNumbers = this.txs.map((tx)=>tx.receipt?.blockNumber).filter((bn)=>bn !== undefined);
+        return minedBlockNumbers.length === 0 ? undefined : maxBigint(...minedBlockNumbers);
     }
-    set lastMinedAtBlockNumber(blockNumber) {
-        this.lastMinedBlockNumber = blockNumber;
+    updateState(l1TxState, newState) {
+        const oldState = l1TxState.status;
+        l1TxState.status = newState;
+        const sender = this.getSenderAddress().toString();
+        this.logger.debug(`State changed from ${TxUtilsState[oldState]} to ${TxUtilsState[newState]} for nonce ${l1TxState.nonce} account ${sender}`);
     }
-    set state(state) {
-        this.txUtilsState = state;
-        this.logger?.debug(`L1TxUtils state changed to ${TxUtilsState[state]} for sender: ${this.getSenderAddress().toString()}`);
+    updateConfig(newConfig) {
+        this.config = {
+            ...this.config,
+            ...newConfig
+        };
+        this.logger.info('Updated L1TxUtils config', pickBy(newConfig, (_, key)=>key in l1TxUtilsConfigMappings));
     }
     getSenderAddress() {
         return this.address;
@@ -61,11 +69,11 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
    * @param request - The transaction request (to, data, value)
    * @param gasConfig - Optional gas configuration
    * @returns The transaction hash and parameters used
-   */ async sendTransaction(request, _gasConfig, blobInputs, stateChange = TxUtilsState.SENT) {
+   */ async sendTransaction(request, gasConfigOverrides, blobInputs, stateChange = TxUtilsState.SENT) {
         try {
             const gasConfig = {
                 ...this.config,
-                ..._gasConfig
+                ...gasConfigOverrides
             };
             const account = this.getSenderAddress().toString();
             let gasLimit;
@@ -89,35 +97,39 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                 address: account,
                 chainId: this.client.chain.id
             });
-            let txHash;
-            if (blobInputs) {
-                const txData = {
-                    ...request,
-                    ...blobInputs,
-                    gas: gasLimit,
-                    maxFeePerGas: gasPrice.maxFeePerGas,
-                    maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
-                    maxFeePerBlobGas: gasPrice.maxFeePerBlobGas,
-                    nonce
-                };
-                const signedRequest = await this.prepareSignedTransaction(txData);
-                txHash = await this.client.sendRawTransaction({
-                    serializedTransaction: signedRequest
-                });
-            } else {
-                const txData = {
-                    ...request,
-                    gas: gasLimit,
-                    maxFeePerGas: gasPrice.maxFeePerGas,
-                    maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
-                    nonce
-                };
-                const signedRequest = await this.prepareSignedTransaction(txData);
-                txHash = await this.client.sendRawTransaction({
-                    serializedTransaction: signedRequest
-                });
+            const l1TxState = {
+                txHashes: [],
+                cancelTxHashes: [],
+                gasPrice,
+                request,
+                status: TxUtilsState.IDLE,
+                nonce,
+                gasLimit,
+                txConfig: gasConfig,
+                blobInputs
+            };
+            this.updateState(l1TxState, stateChange);
+            const baseTxData = {
+                ...request,
+                gas: gasLimit,
+                maxFeePerGas: gasPrice.maxFeePerGas,
+                maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
+                nonce
+            };
+            const txData = blobInputs ? {
+                ...baseTxData,
+                ...blobInputs,
+                maxFeePerBlobGas: gasPrice.maxFeePerBlobGas
+            } : baseTxData;
+            const signedRequest = await this.prepareSignedTransaction(txData);
+            const txHash = await this.client.sendRawTransaction({
+                serializedTransaction: signedRequest
+            });
+            l1TxState.txHashes.push(txHash);
+            this.txs.push(l1TxState);
+            if (this.txs.length > MAX_L1_TX_STATES) {
+                this.txs.shift();
             }
-            this.state = stateChange;
             const cleanGasConfig = pickBy(gasConfig, (_, key)=>key in l1TxUtilsConfigMappings);
             this.logger?.info(`Sent L1 transaction ${txHash}`, {
                 gasLimit,
@@ -130,8 +142,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
             });
             return {
                 txHash,
-                gasLimit,
-                gasPrice
+                state: l1TxState
             };
         } catch (err) {
             const viemError = formatViemError(err, request.abi);
@@ -141,42 +152,42 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
             throw viemError;
         }
     }
+    async tryGetTxReceipt(txHashes, nonce, isCancelTx) {
+        for (const hash of txHashes){
+            try {
+                const receipt = await this.client.getTransactionReceipt({
+                    hash
+                });
+                if (receipt) {
+                    const what = isCancelTx ? 'Cancellation L1 transaction' : 'L1 transaction';
+                    if (receipt.status === 'reverted') {
+                        this.logger?.warn(`${what} ${hash} with nonce ${nonce} reverted`, receipt);
+                    } else {
+                        this.logger?.verbose(`${what} ${hash} with nonce ${nonce} mined`, receipt);
+                    }
+                    return receipt;
+                }
+            } catch (err) {
+                if (err instanceof Error && err.name === 'TransactionReceiptNotFoundError') {
+                    continue;
+                } else {
+                    this.logger.error(`Error getting receipt for tx ${hash}`, err);
+                    continue;
+                }
+            }
+        }
+    }
     /**
    * Monitors a transaction until completion, handling speed-ups if needed
-   * @param request - Original transaction request (needed for speed-ups)
-   * @param initialTxHash - Hash of the initial transaction
-   * @param allVersions - Hashes of all transactions submitted under the same nonce (any of them could mine)
-   * @param params - Parameters used in the initial transaction
-   * @param gasConfig - Optional gas configuration
-   */ async monitorTransaction(request, initialTxHash, allVersions, params, _gasConfig, _blobInputs, isCancelTx = false) {
-        const isBlobTx = !!_blobInputs;
-        const gasConfig = {
-            ...this.config,
-            ..._gasConfig
-        };
+   */ async monitorTransaction(state) {
+        const { request, nonce, txHashes, cancelTxHashes, gasLimit, blobInputs, txConfig: gasConfig } = state;
+        const isCancelTx = cancelTxHashes.length > 0;
+        const isBlobTx = !!blobInputs;
         const account = this.getSenderAddress().toString();
-        const blobInputs = _blobInputs || {};
         const makeGetTransactionBackoff = ()=>makeBackoff(times(gasConfig.txPropagationMaxQueryAttempts ?? 3, (i)=>i + 1));
-        // Retry a few times, in case the tx is not yet propagated.
-        const tx = await retry(()=>this.client.getTransaction({
-                hash: initialTxHash
-            }), `Getting L1 transaction ${initialTxHash}`, makeGetTransactionBackoff(), this.logger, true);
-        if (!tx) {
-            throw new Error(`Failed to get L1 transaction ${initialTxHash} to monitor`);
-        }
-        if (tx?.nonce === undefined || tx?.nonce === null) {
-            throw new Error(`Failed to get L1 transaction ${initialTxHash} nonce`);
-        }
-        const nonce = tx.nonce;
-        allVersions.add(initialTxHash);
-        let currentTxHash = initialTxHash;
+        let currentTxHash = isCancelTx ? cancelTxHashes[0] : txHashes[0];
         let attempts = 0;
         let lastAttemptSent = this.dateProvider.now();
-        let lastGasPrice = {
-            maxFeePerGas: tx.maxFeePerGas,
-            maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
-            maxFeePerBlobGas: tx.maxFeePerBlobGas
-        };
         const initialTxTime = lastAttemptSent;
         let txTimedOut = false;
         let latestBlockTimestamp;
@@ -195,30 +206,15 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                 });
                 // If the current nonce on our account is greater than our transaction's nonce then a tx with the same nonce has been mined.
                 if (currentNonce > nonce) {
-                    for (const hash of allVersions){
-                        try {
-                            const receipt = await this.client.getTransactionReceipt({
-                                hash
-                            });
-                            if (receipt) {
-                                if (receipt.status === 'reverted') {
-                                    this.logger?.error(`L1 transaction ${hash} reverted`, receipt);
-                                } else {
-                                    this.logger?.debug(`L1 transaction ${hash} mined`);
-                                }
-                                this.state = TxUtilsState.MINED;
-                                this.lastMinedAtBlockNumber = receipt.blockNumber;
-                                return receipt;
-                            }
-                        } catch (err) {
-                            if (err instanceof Error && err.message.includes('reverted')) {
-                                throw formatViemError(err);
-                            }
-                        }
+                    const receipt = await this.tryGetTxReceipt(cancelTxHashes, nonce, true) ?? await this.tryGetTxReceipt(txHashes, nonce, false);
+                    if (receipt) {
+                        this.updateState(state, TxUtilsState.MINED);
+                        state.receipt = receipt;
+                        return receipt;
                     }
                     // If we get here then we have checked all of our tx versions and not found anything.
                     // We should consider the nonce as MINED
-                    this.state = TxUtilsState.MINED;
+                    this.updateState(state, TxUtilsState.MINED);
                     throw new Error(`Nonce ${nonce} is MINED but not by one of our expected transactions`);
                 }
                 this.logger?.trace(`Tx timeout check for ${currentTxHash}: ${isTimedOut()}`, {
@@ -252,7 +248,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                         maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
                         maxFeePerBlobGas: tx.maxFeePerBlobGas
                     } : undefined);
-                    lastGasPrice = newGasPrice;
+                    state.gasPrice = newGasPrice;
                     this.logger?.debug(`L1 transaction ${currentTxHash} appears stuck. Attempting speed-up ${attempts}/${gasConfig.maxAttempts} ` + `with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei`, {
                         maxFeePerGas: formatGwei(newGasPrice.maxFeePerGas),
                         maxPriorityFeePerGas: formatGwei(newGasPrice.maxPriorityFeePerGas),
@@ -260,27 +256,28 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                             maxFeePerBlobGas: formatGwei(newGasPrice.maxFeePerBlobGas)
                         }
                     });
-                    const txData = {
+                    const baseTxData = {
                         ...request,
-                        ...blobInputs,
-                        nonce,
-                        gas: params.gasLimit,
+                        gas: gasLimit,
                         maxFeePerGas: newGasPrice.maxFeePerGas,
-                        maxPriorityFeePerGas: newGasPrice.maxPriorityFeePerGas
+                        maxPriorityFeePerGas: newGasPrice.maxPriorityFeePerGas,
+                        nonce
                     };
-                    if (isBlobTx && newGasPrice.maxFeePerBlobGas) {
-                        txData.maxFeePerBlobGas = newGasPrice.maxFeePerBlobGas;
-                    }
+                    const txData = blobInputs ? {
+                        ...baseTxData,
+                        ...blobInputs,
+                        maxFeePerBlobGas: newGasPrice.maxFeePerBlobGas
+                    } : baseTxData;
                     const signedRequest = await this.prepareSignedTransaction(txData);
                     const newHash = await this.client.sendRawTransaction({
                         serializedTransaction: signedRequest
                     });
                     if (!isCancelTx) {
-                        this.state = TxUtilsState.SPEED_UP;
+                        this.updateState(state, TxUtilsState.SPEED_UP);
                     }
                     const cleanGasConfig = pickBy(gasConfig, (_, key)=>key in l1TxUtilsConfigMappings);
                     this.logger?.verbose(`Sent L1 speed-up tx ${newHash}, replacing ${currentTxHash}`, {
-                        gasLimit: params.gasLimit,
+                        gasLimit,
                         maxFeePerGas: formatGwei(newGasPrice.maxFeePerGas),
                         maxPriorityFeePerGas: formatGwei(newGasPrice.maxPriorityFeePerGas),
                         gasConfig: cleanGasConfig,
@@ -289,7 +286,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                         }
                     });
                     currentTxHash = newHash;
-                    allVersions.add(currentTxHash);
+                    (isCancelTx ? cancelTxHashes : txHashes).push(currentTxHash);
                     lastAttemptSent = this.dateProvider.now();
                 }
                 await sleep(gasConfig.checkIntervalMs);
@@ -307,25 +304,24 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
         // The transaction has timed out. If it's a cancellation then we are giving up on it.
         // Otherwise we may attempt to cancel it if configured to do so.
         if (isCancelTx) {
-            this.state = TxUtilsState.NOT_MINED;
+            this.updateState(state, TxUtilsState.NOT_MINED);
         } else if (gasConfig.cancelTxOnTimeout) {
             // Fire cancellation without awaiting to avoid blocking the main thread
-            this.attemptTxCancellation(currentTxHash, nonce, allVersions, isBlobTx, lastGasPrice, attempts).catch((err)=>{
+            this.attemptTxCancellation(state, attempts).catch((err)=>{
                 const viemError = formatViemError(err);
                 this.logger?.error(`Failed to send cancellation for timed out tx ${currentTxHash}:`, viemError.message, {
                     metaMessages: viemError.metaMessages
                 });
             });
         }
-        this.logger?.error(`L1 transaction ${currentTxHash} timed out`, undefined, {
+        this.logger?.warn(`L1 transaction ${currentTxHash} timed out`, {
             txHash: currentTxHash,
             txTimeoutAt: gasConfig.txTimeoutAt,
             txTimeoutMs: gasConfig.txTimeoutMs,
             txInitialTime: initialTxTime,
             now: this.dateProvider.now(),
             attempts,
-            isInterrupted: this.interrupted,
-            ...tx
+            isInterrupted: this.interrupted
         });
         throw new TimeoutError(`L1 transaction ${currentTxHash} timed out`);
     }
@@ -335,13 +331,11 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
    * @param gasConfig - Optional gas configuration
    * @returns The receipt of the successful transaction
    */ async sendAndMonitorTransaction(request, gasConfig, blobInputs) {
-        const { txHash, gasLimit, gasPrice } = await this.sendTransaction(request, gasConfig, blobInputs);
-        const receipt = await this.monitorTransaction(request, txHash, new Set(), {
-            gasLimit
-        }, gasConfig, blobInputs);
+        const { state } = await this.sendTransaction(request, gasConfig, blobInputs);
+        const receipt = await this.monitorTransaction(state);
         return {
             receipt,
-            gasPrice
+            state
         };
     }
     async simulate(request, _blockOverrides = {}, stateOverrides = [], abi = RollupAbi, _gasConfig) {
@@ -369,48 +363,58 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
     }
     /**
    * 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
-   */ async attemptTxCancellation(currentTxHash, nonce, allVersions, isBlobTx = false, previousGasPrice, attempts = 0) {
-        if (isBlobTx) {
-            throw new Error('Cannot cancel blob transactions, please use L1TxUtilsWithBlobsClass');
-        }
+   */ async attemptTxCancellation(state, attempts) {
+        const isBlobTx = state.blobInputs !== undefined;
+        const { nonce, gasPrice: previousGasPrice } = state;
         // 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
         }, isBlobTx, attempts + 1, previousGasPrice);
-        this.logger?.info(`Attempting to cancel L1 transaction ${currentTxHash} with nonce ${nonce}`, {
-            maxFeePerGas: formatGwei(cancelGasPrice.maxFeePerGas),
-            maxPriorityFeePerGas: formatGwei(cancelGasPrice.maxPriorityFeePerGas)
+        const { maxFeePerGas, maxPriorityFeePerGas, maxFeePerBlobGas } = cancelGasPrice;
+        this.logger?.info(`Attempting to cancel L1 ${isBlobTx ? 'blob' : 'vanilla'} transaction ${state.txHashes[0]} with nonce ${nonce}`, {
+            maxFeePerGas: formatGwei(maxFeePerGas),
+            maxPriorityFeePerGas: formatGwei(maxPriorityFeePerGas),
+            ...maxFeePerBlobGas && {
+                maxFeePerBlobGas: formatGwei(maxFeePerBlobGas)
+            }
         });
         const request = {
             to: this.getSenderAddress().toString(),
             value: 0n
         };
         // Send 0-value tx to self with higher gas price
-        const txData = {
+        const baseTxData = {
             ...request,
             nonce,
             gas: 21_000n,
-            maxFeePerGas: cancelGasPrice.maxFeePerGas,
-            maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas
+            maxFeePerGas,
+            maxPriorityFeePerGas
         };
+        const txData = isBlobTx ? {
+            ...baseTxData,
+            ...this.makeEmptyBlobInputs(maxFeePerBlobGas)
+        } : baseTxData;
         const signedRequest = await this.prepareSignedTransaction(txData);
         const cancelTxHash = await this.client.sendRawTransaction({
             serializedTransaction: signedRequest
         });
-        this.state = TxUtilsState.CANCELLED;
-        this.logger?.info(`Sent cancellation tx ${cancelTxHash} for timed out tx ${currentTxHash}`, {
-            nonce
+        state.gasPrice = cancelGasPrice;
+        state.gasLimit = 21_000n;
+        state.cancelTxHashes.push(cancelTxHash);
+        this.updateState(state, TxUtilsState.CANCELLED);
+        this.logger?.info(`Sent cancellation tx ${cancelTxHash} for timed out tx with nonce ${nonce}`, {
+            nonce,
+            txData,
+            isBlobTx,
+            txHashes: state.txHashes
         });
-        const receipt = await this.monitorTransaction(request, cancelTxHash, allVersions, {
-            gasLimit: 21_000n
-        }, undefined, undefined, true);
-        return receipt.transactionHash;
+        const { transactionHash } = await this.monitorTransaction(state);
+        return transactionHash;
+    }
+    /** Makes empty blob inputs for the cancellation tx. To be overridden in L1TxUtilsWithBlobs. */ makeEmptyBlobInputs(_maxFeePerBlobGas) {
+        throw new Error('Cannot make empty blob inputs for cancellation');
     }
 }

package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts

@@ -1,21 +1,14 @@
 import { type Logger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { type Hex } 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 type { GasPrice } from './types.js';
+import type { L1BlobInputs } 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 declare 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 attemptTxCancellation(currentTxHash: Hex, nonce: number, allVersions: Set<Hex>, isBlobTx?: boolean, previousGasPrice?: GasPrice, attempts?: number): Promise<`0x${string}`>;
+    /** Makes empty blob inputs for the cancellation tx. */
+    protected makeEmptyBlobInputs(maxFeePerBlobGas: bigint): Required<L1BlobInputs>;
 }
 export declare function createL1TxUtilsWithBlobsFromViemWallet(client: ExtendedViemWalletClient, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;
 export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signer: EthSigner, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;

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

@@ -1 +1 @@
-{"version":3,"file":"l1_tx_utils_with_blobs.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/l1_tx_utils_with_blobs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,GAAG,EAA4C,MAAM,MAAM,CAAC;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AAE5D,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C;;;;;;;OAOG;cACsB,qBAAqB,CAC5C,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,EACrB,QAAQ,UAAQ,EAChB,gBAAgB,CAAC,EAAE,QAAQ,EAC3B,QAAQ,SAAI;CAoFf;AAED,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,sBAWlC;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,SAAS,EACjB,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,sBAOlC"}
+{"version":3,"file":"l1_tx_utils_with_blobs.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/l1_tx_utils_with_blobs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AAEhE,2JAA2J;AAC3J,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C,uDAAuD;cACpC,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC;CAKzF;AAED,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,sBAWlC;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,SAAS,EACjB,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,sBAOlC"}

package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js

@@ -2,79 +2,19 @@ import { Blob } from '@aztec/blob-lib';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { formatGwei } from 'viem';
 import { L1TxUtils } from './l1_tx_utils.js';
 import { createViemSigner } from './signer.js';
-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
-   */ async attemptTxCancellation(currentTxHash, nonce, allVersions, isBlobTx = false, previousGasPrice, 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
-        }, 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
+/** 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 {
+    /** Makes empty blob inputs for the cancellation tx. */ makeEmptyBlobInputs(maxFeePerBlobGas) {
+        const blobData = new Uint8Array(131072).fill(0);
+        const kzg = Blob.getViemKzgInstance();
+        return {
+            blobs: [
+                blobData
+            ],
+            kzg,
+            maxFeePerBlobGas
         };
-        // Send 0-value tx to self with higher gas price
-        if (!isBlobTx) {
-            const txData = {
-                ...request,
-                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, 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;
-        }
     }
 }
 export function createL1TxUtilsWithBlobsFromViemWallet(client, logger = createLogger('L1TxUtils'), dateProvider = new DateProvider(), config, debugMaxGasLimit = false) {

package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts

@@ -9,7 +9,7 @@ export declare class ReadOnlyL1TxUtils {
     protected logger: Logger;
     readonly dateProvider: DateProvider;
     protected debugMaxGasLimit: boolean;
-    readonly config: L1TxUtilsConfig;
+    config: L1TxUtilsConfig;
     protected interrupted: boolean;
     constructor(client: ViemClient, logger: Logger | undefined, dateProvider: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean);
     interrupt(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"readonly_l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/readonly_l1_tx_utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"readonly_l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/readonly_l1_tx_utils.ts"],"names":[],"mappings":"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"}

package/dest/l1_tx_utils/types.d.ts

@@ -1,6 +1,7 @@
+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';
 export interface L1TxRequest {
     to: Address | null;
@@ -14,7 +15,7 @@ export type L1GasConfig = Partial<L1TxUtilsConfig> & {
 };
 export interface L1BlobInputs {
     blobs: Uint8Array[];
-    kzg: any;
+    kzg: BlobKzgInstance;
     maxFeePerBlobGas?: bigint;
 }
 export interface GasPrice {
@@ -40,5 +41,17 @@ export declare enum TxUtilsState {
     NOT_MINED = 4,
     MINED = 5
 }
+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) => Promise<ViemTransactionSignature>;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,uBAAuB,EAAE,MAAM,MAAM,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAE/F,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,GAAG,EAAE,GAAG,CAAC;IACT,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,6BAA6B;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,YAAY;IACtB,IAAI,IAAA;IACJ,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,KAAK,IAAA;CACN;AAED,MAAM,MAAM,eAAe,GAAG,CAC5B,WAAW,EAAE,uBAAuB,EACpC,cAAc,EAAE,UAAU,KACvB,OAAO,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,MAAM,CAAC;AAE3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAE/F,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,6BAA6B;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,YAAY;IACtB,IAAI,IAAA;IACJ,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,KAAK,IAAA;CACN;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,UAAU,EAAE,YAAY,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAC5B,WAAW,EAAE,uBAAuB,EACpC,cAAc,EAAE,UAAU,KACvB,OAAO,CAAC,wBAAwB,CAAC,CAAC"}