@steerprotocol/data-connector-loader 0.0.15 → 0.0.16

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 import { DataConnector } from './dataConnector';
 import { ethers } from 'ethers';
-export { DataConnector };
 export declare class DataConnectorExecution {
     private dataConnectors;
     constructor(dataConnectors: Array<DataConnector>);

package/lib/index.js

@@ -12,9 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataConnectorExecution = exports.DataConnector = void 0;
-const dataConnector_1 = require("./dataConnector");
-Object.defineProperty(exports, "DataConnector", { enumerable: true, get: function () { return dataConnector_1.DataConnector; } });
+exports.DataConnectorExecution = void 0;
 const axios_1 = __importDefault(require("axios"));
 const pluginManager_1 = require("./pluginManager");
 class DataConnectorExecution {
@@ -124,17 +122,28 @@ class DataConnectorExecution {
     getAverageBlockTime(provider, blockCount = 5) {
         return __awaiter(this, void 0, void 0, function* () {
             const latestBlock = yield provider.getBlock('latest');
-            const startBlockNumber = Math.max(0, latestBlock.number - blockCount + 1);
-            let totalTimeDiff = 0;
-            let previousBlock = yield provider.getBlock(startBlockNumber);
-            for (let i = startBlockNumber + 1; i <= latestBlock.number; i++) {
-                const currentBlock = yield provider.getBlock(i);
-                const timeDiff = currentBlock.timestamp - previousBlock.timestamp;
-                totalTimeDiff += timeDiff;
-                previousBlock = currentBlock;
+            if (latestBlock) {
+                const startBlockNumber = Math.max(0, latestBlock.number - blockCount + 1);
+                let totalTimeDiff = 0;
+                let previousBlock = yield provider.getBlock(startBlockNumber);
+                if (!previousBlock) {
+                    return 0;
+                }
+                for (let i = startBlockNumber + 1; i <= latestBlock.number; i++) {
+                    const currentBlock = yield provider.getBlock(i);
+                    if (!currentBlock || !previousBlock || !currentBlock.timestamp || !previousBlock.timestamp) {
+                        continue;
+                    }
+                    const timeDiff = currentBlock.timestamp - previousBlock.timestamp;
+                    totalTimeDiff += timeDiff;
+                    previousBlock = currentBlock;
+                }
+                const averageBlockTime = totalTimeDiff / (blockCount - 1);
+                return averageBlockTime;
+            }
+            else {
+                return 0;
             }
-            const averageBlockTime = totalTimeDiff / (blockCount - 1);
-            return averageBlockTime;
         });
     }
     getBlockNumberFromAvgBlockTime(provider, targetTimestamp, avgBlockTime) {
@@ -142,6 +151,12 @@ class DataConnectorExecution {
             const latestBlock = yield provider.getBlock('latest');
             const currentTime = Math.floor(Date.now() / 1000);
             const timeDifference = currentTime - targetTimestamp;
+            if (!latestBlock) {
+                return 0;
+            }
+            if (avgBlockTime === 0) {
+                return latestBlock.number;
+            }
             // Calculate the estimated number of blocks based on the average block time
             const estimatedBlockCount = Math.floor(timeDifference / avgBlockTime);
             // Calculate the estimated block number

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerprotocol/data-connector-loader",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "App Loader for Steer Protocol",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -47,7 +47,7 @@
   ],
   "dependencies": {
     "@steerprotocol/app-loader": "0.1.6",
-    "@steerprotocol/strategy-utils": "^2.1.8",
+    "@steerprotocol/strategy-utils": "^2.1.0",
     "axios": "^1.3.4",
     "ethers": "^5.1.0",
     "pondjs": "1.0.0-alpha.10"