@steerprotocol/data-connector-loader 2.1.1 → 3.0.1

package/lib/execution/executionApp.js

@@ -20,36 +20,36 @@ class ExecutionApp extends executionBase_1.ExecutionBase {
             const slot0Abi = [
                 {
                     inputs: [],
-                    name: "slot0",
+                    name: 'slot0',
                     outputs: [
-                        { internalType: "uint160", name: "sqrtPriceX96", type: "uint160" },
-                        { internalType: "int24", name: "tick", type: "int24" },
-                        { internalType: "uint16", name: "observationIndex", type: "uint16" },
+                        { internalType: 'uint160', name: 'sqrtPriceX96', type: 'uint160' },
+                        { internalType: 'int24', name: 'tick', type: 'int24' },
+                        { internalType: 'uint16', name: 'observationIndex', type: 'uint16' },
                         {
-                            internalType: "uint16",
-                            name: "observationCardinality",
-                            type: "uint16",
+                            internalType: 'uint16',
+                            name: 'observationCardinality',
+                            type: 'uint16',
                         },
                         {
-                            internalType: "uint16",
-                            name: "observationCardinalityNext",
-                            type: "uint16",
+                            internalType: 'uint16',
+                            name: 'observationCardinalityNext',
+                            type: 'uint16',
                         },
-                        { internalType: "uint8", name: "feeProtocol", type: "uint8" },
-                        { internalType: "bool", name: "unlocked", type: "bool" },
+                        { internalType: 'uint8', name: 'feeProtocol', type: 'uint8' },
+                        { internalType: 'bool', name: 'unlocked', type: 'bool' },
                     ],
-                    stateMutability: "view",
-                    type: "function",
+                    stateMutability: 'view',
+                    type: 'function',
                 },
             ];
             const slot0 = yield (0, utils_1.readSlot0Contract)({
                 address: pool,
                 abi: slot0Abi,
                 currentExecutionContext,
-                functionName: "slot0",
+                functionName: 'slot0',
                 provider: provider,
                 rpc,
-                chainId: this.chainId
+                chainId: this.chainId,
             });
             return {
                 sqrtPriceX96: slot0[0],
@@ -66,104 +66,104 @@ class ExecutionApp extends executionBase_1.ExecutionBase {
                 !this.isDirectionalPool
                     ? {
                         inputs: [],
-                        name: "globalState",
+                        name: 'globalState',
                         outputs: [
                             {
-                                internalType: "uint160",
-                                name: "price",
-                                type: "uint160",
+                                internalType: 'uint160',
+                                name: 'price',
+                                type: 'uint160',
                             },
                             {
-                                internalType: "int24",
-                                name: "tick",
-                                type: "int24",
+                                internalType: 'int24',
+                                name: 'tick',
+                                type: 'int24',
                             },
                             {
-                                internalType: "int24",
-                                name: "prevInitializedTick",
-                                type: "int24",
+                                internalType: 'int24',
+                                name: 'prevInitializedTick',
+                                type: 'int24',
                             },
                             {
-                                internalType: "uint16",
-                                name: "fee",
-                                type: "uint16",
+                                internalType: 'uint16',
+                                name: 'fee',
+                                type: 'uint16',
                             },
                             {
-                                internalType: "uint16",
-                                name: "timepointIndex",
-                                type: "uint16",
+                                internalType: 'uint16',
+                                name: 'timepointIndex',
+                                type: 'uint16',
                             },
                             {
-                                internalType: "uint8",
-                                name: "communityFee",
-                                type: "uint8",
+                                internalType: 'uint8',
+                                name: 'communityFee',
+                                type: 'uint8',
                             },
                             {
-                                internalType: "bool",
-                                name: "unlocked",
-                                type: "bool",
+                                internalType: 'bool',
+                                name: 'unlocked',
+                                type: 'bool',
                             },
                         ],
-                        stateMutability: "view",
-                        type: "function",
+                        stateMutability: 'view',
+                        type: 'function',
                     }
                     : {
                         inputs: [],
-                        name: "globalState",
+                        name: 'globalState',
                         outputs: [
                             {
-                                internalType: "uint160",
-                                name: "price",
-                                type: "uint160",
+                                internalType: 'uint160',
+                                name: 'price',
+                                type: 'uint160',
                             },
                             {
-                                internalType: "int24",
-                                name: "tick",
-                                type: "int24",
+                                internalType: 'int24',
+                                name: 'tick',
+                                type: 'int24',
                             },
                             {
-                                internalType: "uint16",
-                                name: "feeZto",
-                                type: "uint16",
+                                internalType: 'uint16',
+                                name: 'feeZto',
+                                type: 'uint16',
                             },
                             {
-                                internalType: "uint16",
-                                name: "feeOtz",
-                                type: "uint16",
+                                internalType: 'uint16',
+                                name: 'feeOtz',
+                                type: 'uint16',
                             },
                             {
-                                internalType: "uint16",
-                                name: "timepointIndex",
-                                type: "uint16",
+                                internalType: 'uint16',
+                                name: 'timepointIndex',
+                                type: 'uint16',
                             },
                             {
-                                internalType: "uint8",
-                                name: "communityFeeToken0",
-                                type: "uint8",
+                                internalType: 'uint8',
+                                name: 'communityFeeToken0',
+                                type: 'uint8',
                             },
                             {
-                                internalType: "uint8",
-                                name: "communityFeeToken1",
-                                type: "uint8",
+                                internalType: 'uint8',
+                                name: 'communityFeeToken1',
+                                type: 'uint8',
                             },
                             {
-                                internalType: "bool",
-                                name: "unlocked",
-                                type: "bool",
+                                internalType: 'bool',
+                                name: 'unlocked',
+                                type: 'bool',
                             },
                         ],
-                        stateMutability: "view",
-                        type: "function",
+                        stateMutability: 'view',
+                        type: 'function',
                     },
             ];
             const slot0 = yield (0, utils_1.readSlot0Contract)({
                 address: pool,
                 abi: slot0Abi,
                 currentExecutionContext,
-                functionName: "globalState",
+                functionName: 'globalState',
                 provider: provider,
                 rpc,
-                chainId: this.chainId
+                chainId: this.chainId,
             });
             return this.isDirectionalPool
                 ? {
@@ -229,10 +229,10 @@ class ExecutionApp extends executionBase_1.ExecutionBase {
                       }
                   }
               `,
-                }
+                },
             };
             const response = yield (0, utils_1.fetchData)(request, 4);
-            this.log("Subgraph response vault positions :", response);
+            this.log('Subgraph response vault positions :', response);
             const requestSnapshot = {
                 method: 'POST',
                 url: this.steerSubgraph,
@@ -248,10 +248,10 @@ class ExecutionApp extends executionBase_1.ExecutionBase {
                     }
                 }
               `,
-                }
+                },
             };
             const responseSnapshot = yield (0, utils_1.fetchData)(requestSnapshot, 4);
-            this.log("Subgraph response current snapshot", responseSnapshot);
+            this.log('Subgraph response current snapshot', responseSnapshot);
             const positions = [];
             if (((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.vaultPositions) && ((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.vaultPositions.length) > 0) {
                 const positionResponse = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.vaultPositions[0];
@@ -268,19 +268,17 @@ class ExecutionApp extends executionBase_1.ExecutionBase {
             if (((_d = responseSnapshot === null || responseSnapshot === void 0 ? void 0 : responseSnapshot.data) === null || _d === void 0 ? void 0 : _d.vaultSnapshots) && ((_e = responseSnapshot === null || responseSnapshot === void 0 ? void 0 : responseSnapshot.data) === null || _e === void 0 ? void 0 : _e.vaultSnapshots.length) > 0) {
                 lastSnapshot = (_f = responseSnapshot === null || responseSnapshot === void 0 ? void 0 : responseSnapshot.data) === null || _f === void 0 ? void 0 : _f.vaultSnapshots[0];
             }
-            this.log("Subgraph response vault positions", positions);
+            this.log('Subgraph response vault positions', positions);
             smartPoolExecutionContext.positions = positions;
             if (lastSnapshot) {
-                smartPoolExecutionContext.lastExecutionTime =
-                    (Date.now() - (Number(lastSnapshot.timestamp) * 1000)) / 1000;
+                smartPoolExecutionContext.lastExecutionTime = (Date.now() - Number(lastSnapshot.timestamp) * 1000) / 1000;
             }
             else {
-                smartPoolExecutionContext.lastExecutionTime =
-                    currentExecutionContext.epochTimestamp;
+                smartPoolExecutionContext.lastExecutionTime = currentExecutionContext.epochTimestamp;
             }
             const provider = dataConnector.getProvider(vaultConfig);
             if (!provider) {
-                throw new Error("Provider configuration issue, unable to process Smart Pool execution context.");
+                throw new Error('Provider configuration issue, unable to process Smart Pool execution context.');
             }
             const poolAddress = yield this.getVaultPoolAddress();
             const currentTick = yield this.getPoolCurrentTick(poolAddress, provider, currentExecutionContext, rpc);
@@ -315,7 +313,7 @@ class ExecutionApp extends executionBase_1.ExecutionBase {
                 }
             }
               `,
-                }
+                },
             };
             const response = yield (0, utils_1.fetchData)(requestSnapshot, 4);
             return response.data.vault.pool;

package/lib/execution/executionDataConnector.d.ts

@@ -1,5 +1,5 @@
-import { ExecutionBase } from "./executionBase";
-import { DataConnector } from "../bundle/bundleDataConnector";
+import { ExecutionBase } from './executionBase';
+import { DataConnector } from '../bundle/bundleDataConnector';
 export declare class DataConnectorExecution extends ExecutionBase {
     private dataConnectors;
     constructor(dataConnectors: Array<DataConnector>, maxRetries?: number);

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { ContractInterface } from "ethers";
+import { ContractInterface } from 'ethers';
 export type VaultInput = {
     _id?: string;
     tokenId: string;

package/lib/utils/consts.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CENTRALIZE_CONTRACT_INTERACTION_CHAINS = exports.API_INITIAL_DELAY = exports.API_MAX_RETRIES = exports.API_BASE_URL = void 0;
-exports.API_BASE_URL = "https://cvrlulno2m.execute-api.ap-southeast-1.amazonaws.com/dev/contract-view-call";
+exports.API_BASE_URL = 'https://cvrlulno2m.execute-api.ap-southeast-1.amazonaws.com/dev/contract-view-call';
 exports.API_MAX_RETRIES = 3;
 exports.API_INITIAL_DELAY = 1000;
-exports.CENTRALIZE_CONTRACT_INTERACTION_CHAINS = ["2222", "42161", "9001", "137", "56"];
+exports.CENTRALIZE_CONTRACT_INTERACTION_CHAINS = ['2222', '42161', '9001', '137', '56'];

package/lib/utils/utils.d.ts

@@ -1,10 +1,10 @@
-import { Candle } from "@steerprotocol/app-loader";
-import { AxiosRequestConfig } from "axios";
-import { ExecutionContext, ViewContractConfig } from "../types";
-import { providers } from "ethers";
+import { Candle } from '@steerprotocol/app-loader';
+import { AxiosRequestConfig } from 'axios';
+import { ExecutionContext, ViewContractConfig } from '../types';
+import { providers } from 'ethers';
 export declare const extendOHLCV: (rawData: Candle[], period: number, endTimestamp: number) => Candle[];
 export declare function fetchData(request: AxiosRequestConfig, attempts: number): Promise<any>;
-export declare function readSlot0Contract({ address, abi, currentExecutionContext, functionName, provider, rpc, chainId }: {
+export declare function readSlot0Contract({ address, abi, currentExecutionContext, functionName, provider, rpc, chainId, }: {
     address: string;
     abi: any;
     currentExecutionContext: ExecutionContext;

package/lib/utils/utils.js

@@ -54,18 +54,18 @@ function exponentialBackoffDelay(attempts) {
 }
 function fetchData(request, attempts) {
     return __awaiter(this, void 0, void 0, function* () {
-        log("Request payload: =============", request);
+        log('Request payload: =============', request);
         attempts = attempts + 1;
         try {
             const response = (yield (0, axios_1.default)(request)).data;
             // this.log('API Response: =============', response);
-            if ("errors" in response && response["errors"].length > 0) {
+            if ('errors' in response && response['errors'].length > 0) {
                 if (attempts < 3) {
                     yield delay(exponentialBackoffDelay(attempts));
                     return yield fetchData(request, attempts);
                 }
                 else {
-                    throw new Error("Maximum retry attempts reached");
+                    throw new Error('Maximum retry attempts reached');
                 }
             }
             return response;
@@ -82,12 +82,12 @@ function fetchData(request, attempts) {
     });
 }
 exports.fetchData = fetchData;
-function readSlot0Contract({ address, abi, currentExecutionContext, functionName, provider, rpc, chainId }) {
+function readSlot0Contract({ address, abi, currentExecutionContext, functionName, provider, rpc, chainId, }) {
     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");
+            throw new Error('Provider not initialized');
         const contract = new ethers_1.Contract(address, abi, provider);
         // For formatting the parameters if needed
         const paramsArray = [];

package/package.json

@@ -1,11 +1,22 @@
 {
   "name": "@steerprotocol/data-connector-loader",
-  "version": "2.1.1",
+  "version": "3.0.1",
   "description": "App Loader for Steer Protocol",
   "main": "lib/index.js",
+  "module": "lib/esm/index.js",
   "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/esm/index.js",
+      "require": "./lib/index.js"
+    },
+    "./*": "./lib/*"
+  },
   "scripts": {
-    "build": "tsc",
+    "build": "npm run build:cjs && npm run build:esm",
+    "build:cjs": "tsc -p tsconfig.json",
+    "build:esm": "tsc -p tsconfig.esm.json && echo '{\"type\": \"module\"}' > lib/esm/package.json",
     "format": "prettier --write \"src/**/*.(js|ts)\"",
     "lint": "eslint src --ext .js,.ts",
     "lint:fix": "eslint src --fix --ext .js,.ts",
@@ -18,7 +29,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/SteerProtocol/data-connector-loader.git"
+    "url": "https://github.com/SteerProtocol/data-connector-loader.git"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "keywords": [
     "boilerplate",
@@ -30,7 +44,22 @@
     "url": "https://github.com/SteerProtocol/data-connector-loader/issues"
   },
   "homepage": "https://github.com/SteerProtocol/data-connector-loader#readme",
+  "release": {
+    "branches": [
+      "main"
+    ],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/npm",
+      "@semantic-release/github"
+    ]
+  },
   "devDependencies": {
+    "@semantic-release/commit-analyzer": "^13.0.1",
+    "@semantic-release/github": "^10.3.5",
+    "@semantic-release/npm": "^12.0.2",
+    "@semantic-release/release-notes-generator": "^14.1.0",
     "@types/jest": "29.2.4",
     "@typescript-eslint/eslint-plugin": "5.46.0",
     "@typescript-eslint/parser": "5.47.1",
@@ -39,6 +68,7 @@
     "eslint-plugin-jest": "27.1.7",
     "jest": "29.3.1",
     "prettier": "2.8.1",
+    "semantic-release": "^24.2.9",
     "ts-jest": "29.0.3",
     "typescript": "4.9.4"
   },
@@ -46,7 +76,7 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "@steerprotocol/app-loader": "1.1.0",
+    "@steerprotocol/app-loader": "^2.0.0",
     "@steerprotocol/strategy-utils": "^3.1.2",
     "axios": "^1.3.4",
     "ethers": "^5.1.0",

package/lib/base/bundleBase.js

@@ -1,119 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BundleBase = void 0;
-const app_loader_1 = require("@steerprotocol/app-loader");
-const ethers_1 = require("ethers");
-class BundleBase {
-    constructor(wasmFile, _config, identity, etherRpcConfig) {
-        this.wasmFile = wasmFile;
-        this.config = _config;
-        this.configObj = JSON.parse(_config);
-        this.providerIdentity = identity;
-        this.etherRpcConfig = etherRpcConfig;
-    }
-    load() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const instance = yield (0, app_loader_1.loadWasm)(this.wasmFile, {});
-            this.module = instance;
-            this.module.initialize(this.config);
-            return this.module;
-        });
-    }
-    loadSync() {
-        if (typeof this.wasmFile === 'string')
-            throw new Error('Cannot load module synchronously unless wasmFile is of type ArrayBuffer');
-        this.module = (0, app_loader_1.loadWasmSync)(this.wasmFile, {});
-        return this.module;
-    }
-    execute(response) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.executionContext) {
-                throw new Error('Execution context missing');
-            }
-            // If the module is not initialized, try to load it
-            if (!this.module) {
-                try {
-                    yield this.load();
-                }
-                catch (_a) {
-                    throw new Error('Module not initialized');
-                }
-            }
-            // If the module is still not initialized, throw an error
-            if (!this.module)
-                throw new Error('Module not initialized');
-            // Call the main function with the response
-            return yield this.module.execute(response);
-        });
-    }
-    reset() {
-        if (this.module && this.module['reset']) {
-            this.module.reset();
-        }
-    }
-    setExecutionContext(executionContext) {
-        var _a;
-        // Determine the timestamp for epoch
-        const timestamp = this.subtractDate(executionContext.executionTimestamp, Number(executionContext.epochLength)).getTime();
-        // Divide milliseconds data to seconds for transformation bundle
-        const timestampInSecs = Math.floor(timestamp / 1000);
-        this.executionContext = Object.assign(Object.assign({}, executionContext), { epochTimestamp: timestampInSecs });
-        (_a = this.module) === null || _a === void 0 ? void 0 : _a.initialize(JSON.stringify(Object.assign(Object.assign({}, JSON.parse(this.config)), { executionContext: this.executionContext })));
-    }
-    executeModule(response) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.module) {
-                throw new Error('Module not initialized');
-            }
-            return yield this.module.execute(response);
-        });
-    }
-    // This function returns a provider based on the chainId of the request
-    // The chainId is first checked in the data connector config, and if not found
-    // it is checked in the request config. If the chainId is found in either of
-    // these places, the provider is returned from the etherRpcConfig object
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    getProvider(config) {
-        let chainId;
-        // check if chainId is configured in data connector config
-        if (this.configObj.chainId) {
-            chainId = this.configObj.chainId;
-        }
-        else if (config && config.chainId) {
-            // if chainId is in the request config from dataconnector execution
-            chainId = config.chainId;
-        }
-        if (chainId && this.etherRpcConfig && this.etherRpcConfig[chainId]) {
-            const provider = new ethers_1.providers.JsonRpcProvider(this.etherRpcConfig[chainId].url);
-            return provider;
-        }
-        else {
-            return this.providerIdentity;
-        }
-    }
-    getResults() {
-        if (!this.module)
-            throw new Error('Module not initialized');
-        return this.module.transform();
-    }
-    version() {
-        if (!this.module)
-            throw new Error('Module not initialized');
-        return Number(this.module.version());
-    }
-    subtractDate(timestamp, epochLength) {
-        const date = new Date(timestamp);
-        date.setSeconds(date.getSeconds() - epochLength);
-        return date;
-    }
-}
-exports.BundleBase = BundleBase;

package/lib/base/loaderBase.d.ts

@@ -1,14 +0,0 @@
-import { ethers } from 'ethers';
-import { DataConnector } from '../bundleDataConnector';
-import { VaultConfigPayload, ExecutionContext } from '../types';
-export declare class ExecutionBase {
-    maxRetries: number;
-    constructor(maxRetries?: number);
-    protected delay(ms: number): Promise<void>;
-    protected log(...args: any[]): void;
-    protected getExecutionContext(dataConnector: DataConnector, vaultConfig: VaultConfigPayload): Promise<ExecutionContext>;
-    execute<T>(_vaultConfig: string): Promise<Array<T>>;
-    private getDataConnectorVersion;
-    getAverageBlockTime(provider: ethers.providers.Provider, blockCount?: number): Promise<number>;
-    getBlockNumberFromAvgBlockTime(provider: ethers.providers.Provider, targetTimestamp: number, avgBlockTime: number): Promise<number>;
-}