@lido-nestjs/execution 1.17.0 → 1.18.0

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

@@ -166,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
@@ -176,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(() => {
@@ -199,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) {
@@ -214,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.
@@ -239,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',
@@ -351,19 +353,29 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
             try {
                 // Uses perform() which handles fallback switching automatically
                 const receipt = await this.getTransactionReceipt(txHash);
-                if (receipt && receipt.confirmations >= 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 };
+                if (!receipt) {
+                    // Transaction pending in mempool, not yet included in a block
+                    lastError = null;
+                    await sleep.sleep(pollInterval);
+                    continue;
                 }
-                lastError = null;
+                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);
             }
-            await sleep.sleep(pollInterval);
         }
         const elapsedMs = Date.now() - startTime;
         const errorContext = lastError

package/package.json

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