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

package/dest/l1_tx_utils/config.js

@@ -30,7 +30,7 @@ export const l1TxUtilsConfigMappings = {
         env: 'L1_FIXED_PRIORITY_FEE_PER_GAS',
         ...numberConfigHelper(0)
     },
-    maxAttempts: {
+    maxSpeedUpAttempts: {
         description: 'Maximum number of speed-up attempts',
         env: 'L1_TX_MONITOR_MAX_ATTEMPTS',
         ...numberConfigHelper(3)
@@ -50,17 +50,23 @@ export const l1TxUtilsConfigMappings = {
         env: 'L1_TX_MONITOR_TX_TIMEOUT_MS',
         ...numberConfigHelper(120_000)
     },
-    txPropagationMaxQueryAttempts: {
-        description: 'How many attempts will be done to get a tx after it was sent',
-        env: 'L1_TX_PROPAGATION_MAX_QUERY_ATTEMPTS',
-        ...numberConfigHelper(3)
-    },
     cancelTxOnTimeout: {
         description: "Whether to attempt to cancel a tx if it's not mined after txTimeoutMs",
         env: 'L1_TX_MONITOR_CANCEL_TX_ON_TIMEOUT',
         ...booleanConfigHelper(true)
+    },
+    txCancellationFinalTimeoutMs: {
+        description: 'How long to wait for a cancellation tx after its last attempt before giving up',
+        env: 'L1_TX_MONITOR_TX_CANCELLATION_TIMEOUT_MS',
+        ...numberConfigHelper(24 * 12 * 1000)
+    },
+    txUnseenConsideredDroppedMs: {
+        description: 'How long a tx nonce can be unseen in the mempool before considering it dropped',
+        env: 'L1_TX_MONITOR_TX_UNSEEN_CONSIDERED_DROPPED_MS',
+        ...numberConfigHelper(6 * 12 * 1000)
     }
 };
+// We abuse the fact that all mappings above have a non null default value and force-type this to Required
 export const defaultL1TxUtilsConfig = getDefaultConfig(l1TxUtilsConfigMappings);
 export function getL1TxUtilsConfigEnvVars() {
     return getConfigFromMappings(l1TxUtilsConfigMappings);

package/dest/l1_tx_utils/l1_tx_utils.d.ts

@@ -5,7 +5,7 @@ import { type Abi, type BlockOverrides, type Hex, type NonceManager, type Prepar
 import type { ViemClient } from '../types.js';
 import { type L1TxUtilsConfig } from './config.js';
 import { ReadOnlyL1TxUtils } from './readonly_l1_tx_utils.js';
-import { type L1BlobInputs, type L1GasConfig, type L1TxRequest, type L1TxState, type SigningCallback, TxUtilsState } from './types.js';
+import { type L1BlobInputs, type L1TxConfig, type L1TxRequest, type L1TxState, type SigningCallback, TxUtilsState } from './types.js';
 export declare class L1TxUtils extends ReadOnlyL1TxUtils {
     client: ViemClient;
     address: EthAddress;
@@ -28,22 +28,32 @@ export declare class L1TxUtils extends ReadOnlyL1TxUtils {
      * @param gasConfig - Optional gas configuration
      * @returns The transaction hash and parameters used
      */
-    sendTransaction(request: L1TxRequest, gasConfigOverrides?: L1GasConfig, blobInputs?: L1BlobInputs, stateChange?: TxUtilsState): Promise<{
+    sendTransaction(request: L1TxRequest, gasConfigOverrides?: L1TxConfig, blobInputs?: L1BlobInputs, stateChange?: TxUtilsState): Promise<{
         txHash: Hex;
         state: L1TxState;
     }>;
     private tryGetTxReceipt;
+    /**
+     * Returns whether a given tx should be considered as timed out and no longer monitored.
+     * Relies on the txTimeout setting for user txs, and on the txCancellationTimeout for cancel txs.
+     * @remarks We check against the latestBlockTimestamp as opposed to the current time to avoid a race condition where
+     * the tx is mined in a block with the same timestamp as txTimeoutAt, but our execution node has not yet processed it,
+     * or the loop here has not yet checked the tx before that timeout.
+     */
+    private isTxTimedOut;
     /**
      * Monitors a transaction until completion, handling speed-ups if needed
      */
     protected monitorTransaction(state: L1TxState): Promise<TransactionReceipt>;
+    /** Returns when all monitor loops have stopped. */
+    waitMonitoringStopped(timeoutSeconds?: number): Promise<void>;
     /**
      * Sends a transaction and monitors it until completion
      * @param request - The transaction request (to, data, value)
      * @param gasConfig - Optional gas configuration
      * @returns The receipt of the successful transaction
      */
-    sendAndMonitorTransaction(request: L1TxRequest, gasConfig?: L1GasConfig, blobInputs?: L1BlobInputs): Promise<{
+    sendAndMonitorTransaction(request: L1TxRequest, gasConfig?: L1TxConfig, blobInputs?: L1BlobInputs): Promise<{
         receipt: TransactionReceipt;
         state: L1TxState;
     }>;
@@ -59,9 +69,11 @@ export declare class L1TxUtils extends ReadOnlyL1TxUtils {
     }>;
     /**
      * Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
+     * Only sends the cancellation if the original tx is still pending, not if it was dropped
      * @returns The hash of the cancellation transaction
      */
-    protected attemptTxCancellation(state: L1TxState, attempts: number): Promise<`0x${string}`>;
+    protected attemptTxCancellation(state: L1TxState): Promise<void>;
+    private getL1Timestamp;
     /** Makes empty blob inputs for the cancellation tx. To be overridden in L1TxUtilsWithBlobs. */
     protected makeEmptyBlobInputs(_maxFeePerBlobGas: bigint): Required<L1BlobInputs>;
 }

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

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