@lido-nestjs/execution 1.3.0 → 1.4.0

package/dist/error/no-new-blocks-while-polling.error.d.ts

@@ -0,0 +1,6 @@
+export declare class NoNewBlocksWhilePollingError extends Error {
+    name: string;
+    message: string;
+    latestObservedBlockNumber: number;
+    constructor(message: string, latestObservedBlockNumber: number);
+}

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

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

package/dist/interfaces/simple-fallback-provider-config.d.ts

@@ -13,4 +13,5 @@ export interface SimpleFallbackProviderConfig {
     logRetries?: boolean;
     resetIntervalMs?: number;
     fetchMiddlewares?: MiddlewareCallback<Promise<any>>[];
+    maxTimeWithoutNewBlocksMs?: number;
 }

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

@@ -7,6 +7,7 @@ import { BlockTag } from '../ethers/block-tag';
 import { BigNumber, BigNumberish } from '@ethersproject/bignumber';
 import { Deferrable } from '@ethersproject/properties';
 import { TransactionRequest } from '@ethersproject/abstract-provider/src.ts/index';
+import { EventType, Listener } from '@ethersproject/abstract-provider';
 /**
  * EIP-1898 support
  * https://eips.ethereum.org/EIPS/eip-1898
@@ -30,6 +31,7 @@ export declare class SimpleFallbackJsonRpcBatchProvider extends BaseProvider {
     constructor(config: SimpleFallbackProviderConfig, logger: LoggerService);
     static _formatter: Formatter | null;
     static getFormatter(): Formatter;
+    on(eventName: EventType, listener: Listener): this;
     protected get provider(): FallbackProvider;
     protected switchToNextProvider(): void;
     perform(method: string, params: {

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

@@ -9,13 +9,14 @@ var common = require('@nestjs/common');
 var retrier = require('../common/retrier.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');
 
 exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchProvider extends providers.BaseProvider {
     constructor(config, logger) {
         super(config.network);
         this.detectNetworkFirstRun = true;
         this.resetTimer = null;
-        this.config = Object.assign({ maxRetries: 3, minBackoffMs: 500, maxBackoffMs: 5000, logRetries: true }, config);
+        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) => {
             if (!url) {
@@ -47,6 +48,25 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
         }
         return this._formatter;
     }
+    on(eventName, listener) {
+        let dieTimer = null;
+        const startDieTimer = (latestObservedBlockNumber) => {
+            if (dieTimer)
+                clearTimeout(dieTimer);
+            dieTimer = setTimeout(async () => {
+                const error = new noNewBlocksWhilePolling_error.NoNewBlocksWhilePollingError('No new blocks for a long time while polling', latestObservedBlockNumber);
+                this.emit('error', error);
+            }, this.config.maxTimeWithoutNewBlocksMs);
+        };
+        if (eventName === 'block') {
+            startDieTimer(-1);
+            super.on(eventName, function (...args) {
+                startDieTimer(args[0]);
+                return listener.apply(this, args);
+            });
+        }
+        return super.on(eventName, listener);
+    }
     get provider() {
         if (this.activeFallbackProviderIndex > this.fallbackProviders.length - 1) {
             this.activeFallbackProviderIndex = 0;
@@ -55,7 +75,7 @@ exports.SimpleFallbackJsonRpcBatchProvider = class SimpleFallbackJsonRpcBatchPro
         let attempt = 0;
         const isValid = (provider) => provider.network !== null &&
             provider.network.chainId === networks.getNetworkChain(this.config.network);
-        while (!isValid(fallbackProvider) ||
+        while (!isValid(fallbackProvider) &&
             attempt < this.fallbackProviders.length) {
             fallbackProvider =
                 this.fallbackProviders[this.activeFallbackProviderIndex];

package/package.json

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