@lido-nestjs/execution 1.17.0 → 1.19.0

package/dist/batch-provider.module.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var tslib = require('tslib');
 var common = require('@nestjs/common');
 var extendedJsonRpcBatchProvider = require('./provider/extended-json-rpc-batch-provider.js');

package/dist/common/errors.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var logger = require('@ethersproject/logger');
 
 const nonRetryableErrors = [

package/dist/common/lazy-event-emitter.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+/**
+ * EventEmitter with lazy event creation.
+ * The callback is only called if there are listeners for the event.
+ */
+export declare class LazyEventEmitter extends EventEmitter {
+    emitLazy<T>(eventName: string, createEvent: () => T): boolean;
+}

package/dist/common/lazy-event-emitter.js

@@ -0,0 +1,18 @@
+'use strict';
+
+var events = require('events');
+
+/**
+ * EventEmitter with lazy event creation.
+ * The callback is only called if there are listeners for the event.
+ */
+class LazyEventEmitter extends events.EventEmitter {
+    emitLazy(eventName, createEvent) {
+        if (this.listenerCount(eventName) > 0) {
+            return this.emit(eventName, createEvent());
+        }
+        return false;
+    }
+}
+
+exports.LazyEventEmitter = LazyEventEmitter;

package/dist/common/networks.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const IP_V4_REGEX = new RegExp(/^(?<domain>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?::(?<port>\d+))?/i);
 const DOMAIN_REGEX = new RegExp(/^(?<protocol>https?:\/\/)(?=(?<fqdn>[^:/]+))(?:(?<service>www|ww\d|cdn|ftp|mail|pop\d?|ns\d?|git)\.)?(?:(?<subdomain>[^:/]+)\.)*(?<domain>[^:/]+\.[a-z0-9]+)(?::(?<port>\d+))?(?<path>\/[^?]*)?(?:\?(?<query>[^#]*))?(?:#(?<hash>.*))?/i);
 const networksEqual = (networkA, networkB) => {

package/dist/common/promise-limit.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var queue = require('./queue.js');
 
 /* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 function pLimit(concurrency) {
     if (!((Number.isInteger(concurrency) ||
         concurrency === Number.POSITIVE_INFINITY) &&
@@ -62,4 +63,4 @@ function pLimit(concurrency) {
     return generator;
 }
 
-exports["default"] = pLimit;
+exports.default = pLimit;

package/dist/common/queue.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 class Queue {
     constructor() {
         this._store = [];

package/dist/common/retrier.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var sleep = require('./sleep.js');
 
 const retrier = (logger, defaultMaxRetryCount = 3, defaultMinBackoffMs = 1000, defaultMaxBackoffMs = 60000, defaultLogWarning = false, defaultErrorFilter) => {

package/dist/common/sleep.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 exports.sleep = sleep;

package/dist/constants/constants.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const FALLBACK_PROVIDER_MODULE_OPTIONS = Symbol('fallback-provider-module-options');
 const BATCH_PROVIDER_MODULE_OPTIONS = Symbol('batch-provider-module-options');
 

package/dist/error/all-providers-failed.error.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 class AllProvidersFailedError extends Error {
     constructor(message) {
         super(message);

package/dist/error/codes/error-codes.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 exports.ErrorCode = void 0;
 (function (ErrorCode) {
     ErrorCode["UNEXPECTED_BATCH_RESULT"] = "UNEXPECTED_BATCH_RESULT";

package/dist/error/fetch.error.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 class FetchError extends Error {
     constructor(message) {
         super(message);

package/dist/error/no-new-blocks-while-polling.error.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 class NoNewBlocksWhilePollingError extends Error {
     constructor(message, latestObservedBlockNumber) {
         super(message);

package/dist/error/request-timeout.error.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 class RequestTimeoutError extends Error {
     constructor(message, timeoutMs) {
         super(message);

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

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 /**
  * Thrown when waitForTransactionWithFallback times out.
  * lastError distinguishes network issues (present) from slow tx (null).

package/dist/ethers/debug-trace-block-by-hash.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 async function getDebugTraceBlockByHash(blockHash, traceConfig) {
     await this.getNetwork();
     return (await this.perform('getDebugTraceBlockByHash', {

package/dist/ethers/fee-history.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var bignumber = require('@ethersproject/bignumber');
 var bytes = require('@ethersproject/bytes');
 var formatBlockNumber = require('./format-block-number.js');

package/dist/ethers/format-block-number.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var bytes = require('@ethersproject/bytes');
 
 const formatBlockNumber = (blockNumber) => {

package/dist/ethers/formatter-with-eip1898.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var providers = require('@ethersproject/providers');
 
 /* eslint-disable @typescript-eslint/no-explicit-any */

package/dist/events/index.d.ts

@@ -1,6 +1,6 @@
 import { SimpleFallbackJsonRpcBatchProvider } from '../provider/simple-fallback-json-rpc-batch-provider';
 import { AllProvidersFailedError } from '../error';
-import { ExtendedJsonRpcBatchProvider, JsonRpcRequest, JsonRpcResponse } from '../provider/extended-json-rpc-batch-provider';
+import { ExtendedJsonRpcBatchProvider, JsonRpcRequest } from '../provider/extended-json-rpc-batch-provider';
 export declare type FallbackProviderRequestFailedAllEvent = {
     action: 'fallback-provider:request:failed:all';
     provider: SimpleFallbackJsonRpcBatchProvider;
@@ -29,7 +29,6 @@ export declare type ProviderResponseBatchedErrorEvent = {
 export declare type ProviderResponseBatchedEvent = {
     action: 'provider:response-batched';
     request: JsonRpcRequest[];
-    response: JsonRpcResponse[] | JsonRpcResponse;
     provider: ExtendedJsonRpcBatchProvider;
     domain: string;
 };

package/dist/fallback-provider.module.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var tslib = require('tslib');
 var common = require('@nestjs/common');
 var extendedJsonRpcBatchProvider = require('./provider/extended-json-rpc-batch-provider.js');

package/dist/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var extendedJsonRpcBatchProvider = require('./provider/extended-json-rpc-batch-provider.js');
 var simpleFallbackJsonRpcBatchProvider = require('./provider/simple-fallback-json-rpc-batch-provider.js');
 var queue = require('./common/queue.js');
@@ -16,20 +14,20 @@ var transactionWaitTimeout_error = require('./error/transaction-wait-timeout.err
 
 
 
-Object.defineProperty(exports, 'ExtendedJsonRpcBatchProvider', {
+Object.defineProperty(exports, "ExtendedJsonRpcBatchProvider", {
 	enumerable: true,
 	get: function () { return extendedJsonRpcBatchProvider.ExtendedJsonRpcBatchProvider; }
 });
-Object.defineProperty(exports, 'SimpleFallbackJsonRpcBatchProvider', {
+Object.defineProperty(exports, "SimpleFallbackJsonRpcBatchProvider", {
 	enumerable: true,
 	get: function () { return simpleFallbackJsonRpcBatchProvider.SimpleFallbackJsonRpcBatchProvider; }
 });
 exports.Queue = queue.Queue;
-Object.defineProperty(exports, 'FallbackProviderModule', {
+Object.defineProperty(exports, "FallbackProviderModule", {
 	enumerable: true,
 	get: function () { return fallbackProvider_module.FallbackProviderModule; }
 });
-Object.defineProperty(exports, 'BatchProviderModule', {
+Object.defineProperty(exports, "BatchProviderModule", {
 	enumerable: true,
 	get: function () { return batchProvider_module.BatchProviderModule; }
 });

package/dist/provider/extended-json-rpc-batch-provider.d.ts

@@ -10,8 +10,9 @@ import { BlockTag } from '../ethers/block-tag';
 import { MiddlewareCallback, MiddlewareService } from '@lido-nestjs/middleware';
 import { FeeHistory } from '../ethers/fee-history';
 import { TraceConfig, TraceResult } from '../interfaces/debug-traces';
+import { LazyEventEmitter } from '../common/lazy-event-emitter';
 import { ProviderEvents } from '../events';
-export interface ExtendedJsonRpcBatchProviderEventEmitter extends NodeJS.EventEmitter {
+export interface ExtendedJsonRpcBatchProviderEventEmitter extends LazyEventEmitter {
     on(eventName: 'rpc', listener: (event: ProviderEvents) => void): this;
     once(eventName: 'rpc', listener: (event: ProviderEvents) => void): this;
     addListener(eventName: 'rpc', listener: (event: ProviderEvents) => void): this;

package/dist/provider/extended-json-rpc-batch-provider.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var tslib = require('tslib');
 var properties = require('@ethersproject/properties');
 var web = require('@ethersproject/web');
@@ -16,7 +14,7 @@ var feeHistory = require('../ethers/fee-history.js');
 var errorCodes = require('../error/codes/error-codes.js');
 var debugTraceBlockByHash = require('../ethers/debug-trace-block-by-hash.js');
 var networks = require('../common/networks.js');
-var events = require('events');
+var lazyEventEmitter = require('../common/lazy-event-emitter.js');
 
 exports.ExtendedJsonRpcBatchProvider = class ExtendedJsonRpcBatchProvider extends providers.JsonRpcProvider {
     constructor(url, network, requestPolicy, fetchMiddlewares = []) {
@@ -24,14 +22,14 @@ exports.ExtendedJsonRpcBatchProvider = class ExtendedJsonRpcBatchProvider extend
         this._batchAggregator = null;
         this._queue = new queue.Queue();
         this._tickCounter = 0;
-        this._eventEmitter = new events.EventEmitter();
+        this._eventEmitter = new lazyEventEmitter.LazyEventEmitter();
         this._domain = networks.getConnectionFQDN(url);
         this._requestPolicy = requestPolicy !== null && requestPolicy !== void 0 ? requestPolicy : {
             jsonRpcMaxBatchSize: 200,
             maxConcurrentRequests: 5,
             batchAggregationWaitMs: 10,
         };
-        this._concurrencyLimiter = promiseLimit["default"](this._requestPolicy.maxConcurrentRequests);
+        this._concurrencyLimiter = promiseLimit.default(this._requestPolicy.maxConcurrentRequests);
         this._fetchMiddlewareService = new middleware.MiddlewareService({
             middlewares: fetchMiddlewares,
         });
@@ -51,13 +49,12 @@ exports.ExtendedJsonRpcBatchProvider = class ExtendedJsonRpcBatchProvider extend
             // if queue size is less then 'jsonRpcMaxBatchSize' - dequeue remaining elements
             const batch = this._queue.dequeueMultiple(this._requestPolicy.jsonRpcMaxBatchSize);
             const batchRequest = batch.map((intent) => intent.request);
-            const event = {
+            this._eventEmitter.emitLazy('rpc', () => ({
                 action: 'provider:request-batched',
                 request: properties.deepCopy(batchRequest),
                 provider: this,
                 domain: this._domain,
-            };
-            this._eventEmitter.emit('rpc', event);
+            }));
             this._concurrencyLimiter(() => {
                 return this._fetchMiddlewareService.go(() => this.fetchJson(this.connection, JSON.stringify(batchRequest)), {
                     provider: this,
@@ -66,14 +63,12 @@ exports.ExtendedJsonRpcBatchProvider = class ExtendedJsonRpcBatchProvider extend
             })
                 .then((batchResult) => {
                 var _a;
-                const event = {
+                this._eventEmitter.emitLazy('rpc', () => ({
                     action: 'provider:response-batched',
                     request: properties.deepCopy(batchRequest),
-                    response: properties.deepCopy(batchResult),
                     provider: this,
                     domain: this._domain,
-                };
-                this._eventEmitter.emit('rpc', event);
+                }));
                 if (!Array.isArray(batchResult)) {
                     const errMessage = 'Unexpected batch result.';
                     const jsonRpcErrorMessage = (_a = batchResult.error) === null || _a === void 0 ? void 0 : _a.message;
@@ -96,7 +91,11 @@ exports.ExtendedJsonRpcBatchProvider = class ExtendedJsonRpcBatchProvider extend
                     if (!payload) {
                         const error = new fetch_error.FetchError(`Partial payload batch result. Response ${inflightRequest.request.id} not found`);
                         error.code = errorCodes.ErrorCode.PARTIAL_BATCH_RESULT;
-                        error.data = batchResult;
+                        error.data = {
+                            requestedId: inflightRequest.request.id,
+                            receivedIds: batchResult.map((r) => r.id),
+                            batchSize: batchResult.length,
+                        };
                         inflightRequest.reject(error);
                     }
                     else if (payload.error) {
@@ -110,28 +109,26 @@ exports.ExtendedJsonRpcBatchProvider = class ExtendedJsonRpcBatchProvider extend
                     }
                 });
             }, (error) => {
-                const event = {
+                this._eventEmitter.emitLazy('rpc', () => ({
                     action: 'provider:response-batched:error',
                     error: error,
                     request: properties.deepCopy(batchRequest),
                     provider: this,
                     domain: this._domain,
-                };
-                this._eventEmitter.emit('rpc', event);
+                }));
                 batch.forEach((inflightRequest) => {
                     inflightRequest.reject(error);
                 });
             })
                 .catch((error) => {
                 // catch errors happening in the 'then' callback
-                const event = {
+                this._eventEmitter.emitLazy('rpc', () => ({
                     action: 'provider:response-batched:error',
                     error: error,
                     request: properties.deepCopy(batchRequest),
                     provider: this,
                     domain: this._domain,
-                };
-                this._eventEmitter.emit('rpc', event);
+                }));
                 batch.forEach((inflightRequest) => {
                     inflightRequest.reject(error);
                 });

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { BaseProvider, Formatter, TransactionRequest } from '@ethersproject/providers';
 import { CallOverrides as CallOverridesSource } from '@ethersproject/contracts';
 import { SimpleFallbackProviderConfig } from '../interfaces/simple-fallback-provider-config';
@@ -12,6 +11,7 @@ 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 { LazyEventEmitter } from '../common/lazy-event-emitter';
 import { FallbackProviderEvents } from '../events';
 /**
  * EIP-1898 support
@@ -29,7 +29,7 @@ declare module '@ethersproject/providers' {
         blockTag?: BlockTag;
     }
 }
-export interface SimpleFallbackJsonRpcBatchProviderEventEmitter extends NodeJS.EventEmitter {
+export interface SimpleFallbackJsonRpcBatchProviderEventEmitter extends LazyEventEmitter {
     on(eventName: 'rpc', listener: (event: FallbackProviderEvents) => void): this;
     once(eventName: 'rpc', listener: (event: FallbackProviderEvents) => void): this;
     addListener(eventName: 'rpc', listener: (event: FallbackProviderEvents) => void): this;
@@ -44,6 +44,7 @@ export declare class SimpleFallbackJsonRpcBatchProvider extends BaseProvider {
     protected lastPerformError: Error | null | unknown;
     protected lastError: Error | null | unknown;
     protected _eventEmitter: SimpleFallbackJsonRpcBatchProviderEventEmitter;
+    protected _childRpcListenersAttached: boolean;
     constructor(config: SimpleFallbackProviderConfig, logger: LoggerService);
     static _formatter: Formatter | null;
     static getFormatter(): Formatter;
@@ -63,6 +64,16 @@ export declare class SimpleFallbackJsonRpcBatchProvider extends BaseProvider {
     protected networksEqual(networkA: Network, networkB: Network): boolean;
     get activeProviderIndex(): number;
     get eventEmitter(): SimpleFallbackJsonRpcBatchProviderEventEmitter;
+    /**
+     * Sets up lazy subscription to child provider events.
+     * Only attaches listeners to child providers when someone subscribes to the parent eventEmitter.
+     * This avoids unnecessary event processing when no one is listening.
+     */
+    protected _setupLazyChildListeners(): void;
+    /**
+     * Attaches listeners to all child providers to re-emit their events on the parent eventEmitter.
+     */
+    protected _attachChildRpcListeners(): void;
     /**
      * Waits for transaction confirmation with fallback provider support.
      *

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

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var tslib = require('tslib');
 var providers = require('@ethersproject/providers');
 var extendedJsonRpcBatchProvider = require('./extended-json-rpc-batch-provider.js');
@@ -17,7 +15,7 @@ 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');
+var lazyEventEmitter = require('../common/lazy-event-emitter.js');
 
 exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchProvider extends providers.BaseProvider {
     constructor(config, logger) {
@@ -28,7 +26,9 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
         // it is crucial not to mix these two errors
         this.lastPerformError = null; // last error for 'perform' operations, is batch-oriented
         this.lastError = null; // last error for whole provider
-        this._eventEmitter = new events.EventEmitter();
+        this._childRpcListenersAttached = false;
+        this._eventEmitter = new lazyEventEmitter.LazyEventEmitter();
+        this._setupLazyChildListeners();
         this.config = Object.assign({ maxRetries: 3, minBackoffMs: 500, maxBackoffMs: 5000, logRetries: true, resetIntervalMs: 10000, maxTimeWithoutNewBlocksMs: 60000 }, config);
         this.logger = logger;
         const conns = config.urls.filter((url) => {
@@ -46,10 +46,6 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
         this.fallbackProviders = conns.map((conn, index) => {
             var _a;
             const provider = new extendedJsonRpcBatchProvider.ExtendedJsonRpcBatchProvider(conn, undefined, config.requestPolicy, (_a = config.fetchMiddlewares) !== null && _a !== void 0 ? _a : []);
-            // re-emitting events from fallback-providers
-            provider.eventEmitter.on('rpc', (event) => {
-                this._eventEmitter.emit('rpc', event);
-            });
             return {
                 network: null,
                 provider,
@@ -166,8 +162,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,20 +174,19 @@ 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(() => {
                     const provider = this.provider;
-                    const event = {
+                    this._eventEmitter.emitLazy('rpc', () => ({
                         action: 'fallback-provider:request',
                         provider: this,
                         activeFallbackProviderIndex: this.activeFallbackProviderIndex,
                         fallbackProvidersCount: this.fallbackProviders.length,
                         domain: provider.provider.domain,
                         retryAttempt: performRetryAttempt,
-                    };
-                    this._eventEmitter.emit('rpc', event);
+                    }));
                     performRetryAttempt++;
                     const performPromise = provider.provider.perform(method, params);
                     // Apply timeout if configured
@@ -199,33 +196,32 @@ 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) {
                 this.lastError = e;
                 // checking that error should not be retried on another provider
                 if (this.isNonRetryableError(e)) {
-                    const event = {
+                    this._eventEmitter.emitLazy('rpc', () => ({
                         action: 'fallback-provider:request:non-retryable-error',
                         provider: this,
                         error: e,
-                    };
-                    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,14 +235,13 @@ 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 = {
+        this._eventEmitter.emitLazy('rpc', () => ({
             action: 'fallback-provider:request:failed:all',
             provider: this,
             error: allProvidersFailedError,
-        };
-        this._eventEmitter.emit('rpc', event);
+        }));
         throw allProvidersFailedError;
     }
     async detectNetwork() {
@@ -329,6 +324,29 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
     get eventEmitter() {
         return this._eventEmitter;
     }
+    /**
+     * Sets up lazy subscription to child provider events.
+     * Only attaches listeners to child providers when someone subscribes to the parent eventEmitter.
+     * This avoids unnecessary event processing when no one is listening.
+     */
+    _setupLazyChildListeners() {
+        this._eventEmitter.on('newListener', (eventName) => {
+            if (eventName === 'rpc' && !this._childRpcListenersAttached) {
+                this._childRpcListenersAttached = true;
+                this._attachChildRpcListeners();
+            }
+        });
+    }
+    /**
+     * Attaches listeners to all child providers to re-emit their events on the parent eventEmitter.
+     */
+    _attachChildRpcListeners() {
+        for (const fallbackProvider of this.fallbackProviders) {
+            fallbackProvider.provider.eventEmitter.on('rpc', (event) => {
+                this._eventEmitter.emit('rpc', event);
+            });
+        }
+    }
     /**
      * Waits for transaction confirmation with fallback provider support.
      *
@@ -351,19 +369,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;
+                }
+                if (receipt.confirmations < confirmations) {
+                    // Transaction mined but waiting for more confirmations
+                    lastError = null;
+                    await sleep.sleep(pollInterval);
+                    continue;
                 }
-                lastError = null;
+                // 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.19.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",