@steerprotocol/data-connector-loader 0.0.14 → 0.0.16

package/lib/index.js

@@ -122,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) {
@@ -140,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.14",
+  "version": "0.0.16",
   "description": "App Loader for Steer Protocol",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,7 +11,7 @@
     "lint:fix": "eslint src --fix --ext .js,.ts",
     "test": "jest --config jest.config.js",
     "prepare": "npm run build",
-    "prepublishOnly": "npm run lint",
+    "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags"
@@ -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"