@lido-nestjs/execution 1.16.0 → 1.18.0

package/dist/error/index.d.ts

@@ -2,3 +2,4 @@ export * from './all-providers-failed.error';
 export * from './fetch.error';
 export * from './no-new-blocks-while-polling.error';
 export * from './request-timeout.error';
+export * from './transaction-wait-timeout.error';

package/dist/error/transaction-wait-timeout.error.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Thrown when waitForTransactionWithFallback times out.
+ * lastError distinguishes network issues (present) from slow tx (null).
+ */
+export declare class TransactionWaitTimeoutError extends Error {
+    name: string;
+    txHash: string;
+    timeoutMs: number;
+    lastError: Error | null;
+    constructor(txHash: string, timeoutMs: number, lastError: Error | null);
+}

package/dist/error/transaction-wait-timeout.error.js

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Thrown when waitForTransactionWithFallback times out.
+ * lastError distinguishes network issues (present) from slow tx (null).
+ */
+class TransactionWaitTimeoutError extends Error {
+    constructor(txHash, timeoutMs, lastError) {
+        const baseMessage = `Transaction ${txHash} not confirmed within ${timeoutMs}ms`;
+        const errorContext = lastError
+            ? `. Last provider error: ${lastError.message}`
+            : ' (no provider errors, transaction may still be pending)';
+        super(baseMessage + errorContext);
+        this.name = 'TransactionWaitTimeoutError';
+        this.txHash = txHash;
+        this.timeoutMs = timeoutMs;
+        this.lastError = lastError;
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+exports.TransactionWaitTimeoutError = TransactionWaitTimeoutError;

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from './interfaces/fallback-provider';
 export * from './interfaces/simple-fallback-provider-config';
 export * from './interfaces/module.options';
 export * from './interfaces/non-empty-array';
+export * from './interfaces/wait-for-transaction';
 export * from './ethers/fee-history';
 export * from './ethers/block-tag';
 export * from './error';

package/dist/index.js

@@ -12,6 +12,7 @@ var allProvidersFailed_error = require('./error/all-providers-failed.error.js');
 var fetch_error = require('./error/fetch.error.js');
 var noNewBlocksWhilePolling_error = require('./error/no-new-blocks-while-polling.error.js');
 var requestTimeout_error = require('./error/request-timeout.error.js');
+var transactionWaitTimeout_error = require('./error/transaction-wait-timeout.error.js');
 
 
 
@@ -39,3 +40,4 @@ exports.AllProvidersFailedError = allProvidersFailed_error.AllProvidersFailedErr
 exports.FetchError = fetch_error.FetchError;
 exports.NoNewBlocksWhilePollingError = noNewBlocksWhilePolling_error.NoNewBlocksWhilePollingError;
 exports.RequestTimeoutError = requestTimeout_error.RequestTimeoutError;
+exports.TransactionWaitTimeoutError = transactionWaitTimeout_error.TransactionWaitTimeoutError;

package/dist/interfaces/wait-for-transaction.d.ts

@@ -0,0 +1,14 @@
+import { TransactionReceipt } from '@ethersproject/abstract-provider';
+export interface WaitForTransactionOptions {
+    /** Max wait time in ms. @default 60000 */
+    timeout?: number;
+    /** Polling interval in ms. @default 3000 */
+    pollInterval?: number;
+    /** Required confirmations. @default 1 */
+    confirmations?: number;
+}
+export interface WaitForTransactionResult {
+    receipt: TransactionReceipt;
+    pollCount: number;
+    elapsedMs: number;
+}

package/dist/provider/simple-fallback-json-rpc-batch-provider.d.ts

@@ -10,6 +10,7 @@ import { BigNumber, BigNumberish } from '@ethersproject/bignumber';
 import { Deferrable } from '@ethersproject/properties';
 import { EventType, Listener } from '@ethersproject/abstract-provider';
 import { FeeHistory } from '../ethers/fee-history';
+import { WaitForTransactionOptions, WaitForTransactionResult } from '../interfaces/wait-for-transaction';
 import { TraceConfig, TraceResult } from '../interfaces/debug-traces';
 import { FallbackProviderEvents } from '../events';
 /**
@@ -62,4 +63,16 @@ export declare class SimpleFallbackJsonRpcBatchProvider extends BaseProvider {
     protected networksEqual(networkA: Network, networkB: Network): boolean;
     get activeProviderIndex(): number;
     get eventEmitter(): SimpleFallbackJsonRpcBatchProviderEventEmitter;
+    /**
+     * Waits for transaction confirmation with fallback provider support.
+     *
+     * Use instead of tx.wait() which hangs forever when providers fail:
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1055 - polling calls getTransactionReceipt
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1060 - .catch(e => emit("error", e)) swallows error
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1313 - waits for event that never comes
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1412 - timeout=0 by default, no reject
+     *
+     * This method polls via perform() with fallback and always returns/throws.
+     */
+    waitForTransactionWithFallback(txHash: string, options?: WaitForTransactionOptions): Promise<WaitForTransactionResult>;
 }

package/dist/provider/simple-fallback-json-rpc-batch-provider.js

@@ -7,12 +7,14 @@ var providers = require('@ethersproject/providers');
 var extendedJsonRpcBatchProvider = require('./extended-json-rpc-batch-provider.js');
 var common = require('@nestjs/common');
 var retrier = require('../common/retrier.js');
+var sleep = require('../common/sleep.js');
 var formatterWithEip1898 = require('../ethers/formatter-with-eip1898.js');
 var networks = require('../common/networks.js');
 var noNewBlocksWhilePolling_error = require('../error/no-new-blocks-while-polling.error.js');
 var errors = require('../common/errors.js');
 var allProvidersFailed_error = require('../error/all-providers-failed.error.js');
 var requestTimeout_error = require('../error/request-timeout.error.js');
+var transactionWaitTimeout_error = require('../error/transaction-wait-timeout.error.js');
 var feeHistory = require('../ethers/fee-history.js');
 var debugTraceBlockByHash = require('../ethers/debug-trace-block-by-hash.js');
 var events = require('events');
@@ -164,8 +166,10 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
         ]);
     }
     async perform(method, params) {
+        var _a, _b;
         const retry = retrier.retrier(this.logger, this.config.maxRetries, this.config.minBackoffMs, this.config.maxBackoffMs, this.config.logRetries, (e) => this.isNonRetryableError(e));
         let attempt = 0;
+        (_b = (_a = this.logger).debug) === null || _b === void 0 ? void 0 : _b.call(_a, this.formatLog(`RPC call: ${method}`));
         // will perform maximum `this.config.maxRetries` retries for fetching data with single provider
         // after failure will switch to next provider
         // maximum number of switching is limited to total fallback provider count
@@ -174,7 +178,7 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
                 let performRetryAttempt = 0;
                 attempt++;
                 // Log which provider we're attempting to use
-                this.logger.log(this.formatLog(`Attempting request (attempt ${attempt}/${this.fallbackProviders.length})`, this.activeFallbackProviderIndex));
+                this.logger.log(this.formatLog(`Attempting ${method} (attempt ${attempt}/${this.fallbackProviders.length})`, this.activeFallbackProviderIndex));
                 // awaiting is extremely important here
                 // without it, the error will not be caught in current try-catch scope
                 const result = await retry(() => {
@@ -197,7 +201,7 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
                     return performPromise;
                 });
                 // Log successful request
-                this.logger.log(this.formatLog(`Request successful after ${performRetryAttempt} retry attempt(s)`, this.activeFallbackProviderIndex));
+                this.logger.log(this.formatLog(`${method} successful after ${performRetryAttempt} retry attempt(s)`, this.activeFallbackProviderIndex));
                 return result;
             }
             catch (e) {
@@ -212,18 +216,18 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
                     this._eventEmitter.emit('rpc', event);
                     // Log context (label + provider index) synchronously before error object
                     // to ensure proper ordering in async logging systems
-                    this.logger.error(this.formatLog(`Non-retryable error occurred`, this.activeFallbackProviderIndex));
+                    this.logger.error(this.formatLog(`${method} non-retryable error occurred`, this.activeFallbackProviderIndex));
                     this.logger.error(e);
                     throw e;
                 }
                 // Log context (label + provider index) synchronously before error object
                 // to ensure proper ordering in async logging systems
                 if (e instanceof requestTimeout_error.RequestTimeoutError) {
-                    this.logger.error(this.formatLog(`Request timeout after ${e.timeoutMs}ms. Will switch to next provider.`, this.activeFallbackProviderIndex));
+                    this.logger.error(this.formatLog(`${method} timeout after ${e.timeoutMs}ms. Will switch to next provider.`, this.activeFallbackProviderIndex));
                     this.logger.error(e);
                 }
                 else {
-                    this.logger.error(this.formatLog(`Error occurred. Will switch to next provider.`, this.activeFallbackProviderIndex));
+                    this.logger.error(this.formatLog(`${method} error occurred. Will switch to next provider.`, this.activeFallbackProviderIndex));
                     this.logger.error(e);
                 }
                 // This check is needed to avoid multiple `switchToNextProvider` calls when doing one JSON-RPC batch.
@@ -237,7 +241,7 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
                 }
             }
         }
-        const allProvidersFailedError = new allProvidersFailed_error.AllProvidersFailedError('All attempts to do ETH1 RPC request failed');
+        const allProvidersFailedError = new allProvidersFailed_error.AllProvidersFailedError(`All attempts to do ETH1 RPC request failed for ${method}`);
         allProvidersFailedError.cause = this.lastError;
         const event = {
             action: 'fallback-provider:request:failed:all',
@@ -327,6 +331,59 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
     get eventEmitter() {
         return this._eventEmitter;
     }
+    /**
+     * Waits for transaction confirmation with fallback provider support.
+     *
+     * Use instead of tx.wait() which hangs forever when providers fail:
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1055 - polling calls getTransactionReceipt
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1060 - .catch(e => emit("error", e)) swallows error
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1313 - waits for event that never comes
+     * - node_modules/@ethersproject/providers/src.ts/base-provider.ts:1412 - timeout=0 by default, no reject
+     *
+     * This method polls via perform() with fallback and always returns/throws.
+     */
+    async waitForTransactionWithFallback(txHash, options = {}) {
+        const { timeout = 60000, pollInterval = 3000, confirmations = 1, } = options;
+        const startTime = Date.now();
+        let lastError = null;
+        let pollCount = 0;
+        this.logger.log(this.formatLog(`Starting waitForTransactionWithFallback for ${txHash} (timeout: ${timeout}ms, pollInterval: ${pollInterval}ms, confirmations: ${confirmations})`));
+        while (Date.now() - startTime < timeout) {
+            pollCount++;
+            try {
+                // Uses perform() which handles fallback switching automatically
+                const receipt = await this.getTransactionReceipt(txHash);
+                if (!receipt) {
+                    // Transaction pending in mempool, not yet included in a block
+                    lastError = null;
+                    await sleep.sleep(pollInterval);
+                    continue;
+                }
+                if (receipt.confirmations < confirmations) {
+                    // Transaction mined but waiting for more confirmations
+                    lastError = null;
+                    await sleep.sleep(pollInterval);
+                    continue;
+                }
+                // Transaction confirmed with enough confirmations
+                const elapsedMs = Date.now() - startTime;
+                this.logger.log(this.formatLog(`Transaction ${txHash} confirmed after ${pollCount} polls (${elapsedMs}ms, ${receipt.confirmations} confirmations)`));
+                return { receipt, pollCount, elapsedMs };
+            }
+            catch (error) {
+                // All providers failed - log and retry until timeout
+                lastError = error;
+                this.logger.warn(this.formatLog(`waitForTransactionWithFallback poll #${pollCount} failed for ${txHash}: ${error}`));
+                await sleep.sleep(pollInterval);
+            }
+        }
+        const elapsedMs = Date.now() - startTime;
+        const errorContext = lastError
+            ? `All providers failed on last poll: ${lastError.message}`
+            : 'Transaction not found in any block';
+        this.logger.error(this.formatLog(`waitForTransactionWithFallback timeout for ${txHash} after ${pollCount} polls (${elapsedMs}ms). ${errorContext}`));
+        throw new transactionWaitTimeout_error.TransactionWaitTimeoutError(txHash, timeout, lastError);
+    }
 };
 exports.SimpleFallbackJsonRpcBatchProvider._formatter = null;
 exports.SimpleFallbackJsonRpcBatchProvider = tslib.__decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lido-nestjs/execution",
-  "version": "1.16.0",
+  "version": "1.18.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",