@steerprotocol/data-connector-loader 3.1.0 → 3.2.1

package/lib/utils/utils.js

@@ -12,10 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callWithRetry = exports.readSlot0Contract = exports.fetchData = exports.extendOHLCV = void 0;
+exports.callWithRetry = exports.readContract = exports.fetchData = exports.extendOHLCV = void 0;
 const axios_1 = __importDefault(require("axios"));
 const ethers_1 = require("ethers");
-const consts_1 = require("./consts");
+const consts_js_1 = require("./consts.js");
 // The purpose of this function is to look at the end timestamp and extend the current candle array so that it backfills any missing candles up to the end timestamp
 const extendOHLCV = (rawData, period, endTimestamp) => {
     // Sort rawData by timestamp
@@ -82,31 +82,31 @@ function fetchData(request, attempts) {
     });
 }
 exports.fetchData = fetchData;
-function readSlot0Contract({ address, abi, currentExecutionContext, functionName, provider, rpc, chainId, }) {
+function readContract({ abi, address, chainId, contractArguments = [], currentExecutionContext, functionName, provider, rpc, }) {
     return __awaiter(this, void 0, void 0, function* () {
         // Create a new contract instance
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (!provider)
             throw new Error('Provider not initialized');
         const contract = new ethers_1.Contract(address, abi, provider);
         // For formatting the parameters if needed
-        const paramsArray = [];
+        const paramsArray = contractArguments || [];
         // Calculate block number for determinism
         // Best way to handle contextually non-null values?
         // const syncedBlock = await getBlockFromTimestamp(this.executionContext!.epochTimestamp, this.providerIdentity!) //@note uncomment for deterministic blocks
         // Call the desired method with the specified arguments at synced block
         // , {blockTag: syncedBlock}
         let result;
-        if (consts_1.CENTRALIZE_CONTRACT_INTERACTION_CHAINS.indexOf(chainId.toString()) === -1) {
+        if (consts_js_1.CENTRALIZE_CONTRACT_INTERACTION_CHAINS.indexOf(chainId.toString()) === -1) {
             result = yield contract[functionName](...paramsArray, {
                 blockTag: currentExecutionContext === null || currentExecutionContext === void 0 ? void 0 : currentExecutionContext.blockNumber,
-            }); //@note uncomment for deterministic blocks
+            }); // @note uncomment for deterministic blocks
         }
         else {
+            console.log('Calling the centralized view');
             const viewContractConfig = {
                 epochTimestamp: currentExecutionContext.epochTimestamp,
-                address: address,
-                abi: abi,
+                address,
+                abi,
                 arguments: paramsArray,
                 method: functionName,
                 rpcUrl: rpc,
@@ -117,28 +117,27 @@ function readSlot0Contract({ address, abi, currentExecutionContext, functionName
         return result;
     });
 }
-exports.readSlot0Contract = readSlot0Contract;
+exports.readContract = readContract;
 function callWithRetry(config) {
     return __awaiter(this, void 0, void 0, function* () {
         let retries = 0;
-        let delay = consts_1.API_INITIAL_DELAY;
-        while (retries < consts_1.API_MAX_RETRIES) {
+        let delay = consts_js_1.API_INITIAL_DELAY;
+        while (retries < consts_js_1.API_MAX_RETRIES) {
             try {
-                const response = yield axios_1.default.post(consts_1.API_BASE_URL, config);
+                const response = yield axios_1.default.post(consts_js_1.API_BASE_URL, config);
                 return JSON.parse(response.data); // Return the data if the call was successful
             }
             catch (error) {
-                console.error(`Attempt ${retries + 1} failed. Retrying in to fetch the contract method ${config.method} ${delay / 1000} seconds...`);
+                console.error(`Attempt ${retries + 1} failed. Retrying in to fetch the contract method ${config.method} ${delay / 1000} seconds...`, error);
                 yield new Promise((resolve) => setTimeout(resolve, delay));
                 delay *= 2; // Double the delay for the next retry
                 retries++;
             }
         }
-        throw new Error(`Failed after ${consts_1.API_MAX_RETRIES} attempts. to call method ${config.method}`);
+        throw new Error(`Failed after ${consts_js_1.API_MAX_RETRIES} attempts. to call method ${config.method}`);
     });
 }
 exports.callWithRetry = callWithRetry;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function log(...args) {
     if (process.env.DEBUG === 'true') {
         console.log(...args);

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@steerprotocol/data-connector-loader",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "App Loader for Steer Protocol",
+  "type": "module",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
   "types": "lib/index.d.ts",
@@ -20,7 +21,10 @@
     "format": "prettier --write \"src/**/*.(js|ts)\"",
     "lint": "eslint src --ext .js,.ts",
     "lint:fix": "eslint src --fix --ext .js,.ts",
-    "test": "jest --config jest.config.js",
+    "test": "jest --config jest.config.cjs",
+    "pack:local": "npm pack",
+    "publish:test": "node scripts/publish-test.cjs",
+    "postinstall": "node scripts/fix-node-modules.js",
     "prepare": "npm run build",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
@@ -63,6 +67,9 @@
     "@types/jest": "29.2.4",
     "@typescript-eslint/eslint-plugin": "5.46.0",
     "@typescript-eslint/parser": "5.47.1",
+    "@uniswap/sdk-core": "^7.10.0",
+    "@uniswap/v2-sdk": "^4.16.0",
+    "@uniswap/v3-sdk": "^3.26.0",
     "date-fns": "^2.29.3",
     "eslint": "8.30.0",
     "eslint-plugin-jest": "27.1.7",
@@ -70,13 +77,15 @@
     "prettier": "2.8.1",
     "semantic-release": "^24.2.9",
     "ts-jest": "29.0.3",
-    "typescript": "4.9.4"
+    "typescript": "5.0.4",
+    "viem": "^2.42.1"
   },
   "files": [
     "lib/**/*"
   ],
   "dependencies": {
-    "@steerprotocol/app-loader": "^2.1.0",
+    "@steerprotocol/sdk": "^1.28.0",
+    "@steerprotocol/app-loader": "^2.1.1",
     "@steerprotocol/strategy-utils": "^3.1.2",
     "axios": "^1.3.4",
     "ethers": "^6.16.0",