@steerprotocol/data-connector-loader 3.1.1 → 3.2.2

package/lib/execution/executionBase.d.ts

@@ -1,11 +1,11 @@
-import { ethers } from 'ethers';
-import { DataConnector } from '../bundle/bundleDataConnector';
-import { VaultConfigPayload, ExecutionContext, EtherRpcConfig } from '../types';
+import type { ethers } from 'ethers';
+import type { DataConnector } from '../bundle/bundleDataConnector.js';
+import type { EtherRpcConfig, ExecutionContext, VaultConfigPayload } from '../types.js';
 export declare class ExecutionBase {
     maxRetries: number;
     constructor(maxRetries?: number);
     protected delay(ms: number): Promise<void>;
-    protected log(...args: any[]): void;
+    protected log(...args: Array<any>): void;
     protected getExecutionContext(dataConnector: DataConnector, vaultConfig: VaultConfigPayload): Promise<ExecutionContext>;
     execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
     protected getDataConnectorVersion(dataConnector: DataConnector): Promise<number>;

package/lib/execution/executionBase.js

@@ -18,7 +18,6 @@ class ExecutionBase {
     delay(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     log(...args) {
         if (process.env.DEBUG === 'true') {
             console.log(...args);
@@ -29,25 +28,25 @@ class ExecutionBase {
             const provider = dataConnector.getProvider({});
             let blockTime = 0;
             let blockNumber = 9;
-            const anchorBlockNumber = vaultConfig.anchorBlockNumber;
-            const anchorProvided = typeof anchorBlockNumber === 'number' && anchorBlockNumber >= 0;
-            if (provider) {
-                blockTime = yield this.getAverageBlockTime(provider);
-                if (!anchorProvided) {
-                    blockNumber = yield this.getBlockNumberFromAvgBlockTime(provider, vaultConfig.epochTimestamp / 1000, // convert to seconds
-                    blockTime);
+            // Use anchorBlockNumber if provided, otherwise calculate from average block time
+            if (vaultConfig.anchorBlockNumber !== undefined) {
+                blockNumber = vaultConfig.anchorBlockNumber;
+                if (provider) {
+                    blockTime = yield this.getAverageBlockTime(provider);
                 }
             }
-            if (anchorProvided) {
-                blockNumber = anchorBlockNumber;
+            else if (provider) {
+                blockTime = yield this.getAverageBlockTime(provider);
+                blockNumber = yield this.getBlockNumberFromAvgBlockTime(provider, vaultConfig.epochTimestamp / 1000, // convert to seconds
+                blockNumber);
             }
             const context = {
                 executionTimestamp: new Date().getTime(),
                 epochTimestamp: vaultConfig.epochTimestamp,
                 epochLength: Number(vaultConfig.strategyConfigData.epochLength),
                 vaultAddress: vaultConfig.vaultAddress,
-                blockTime: blockTime,
-                blockNumber: blockNumber,
+                blockTime,
+                blockNumber,
             };
             return context;
         });

package/lib/execution/executionDataConnector.d.ts

@@ -1,9 +1,11 @@
-import { ExecutionBase } from './executionBase';
-import { DataConnector } from '../bundle/bundleDataConnector';
+import type { DataConnector } from '../bundle/bundleDataConnector.js';
+import { ExecutionBase } from './executionBase.js';
 export declare class DataConnectorExecution extends ExecutionBase {
     private dataConnectors;
     constructor(dataConnectors: Array<DataConnector>, maxRetries?: number);
     execute<T>(_vaultConfig: string): Promise<Array<T>>;
+    private executeV2Bundle;
+    executeDynamicJob<T>(_vaultConfig: string): Promise<Array<T>>;
     private handleRequestResponse;
     private transformData;
 }

package/lib/execution/executionDataConnector.js

@@ -10,10 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataConnectorExecution = void 0;
-const executionBase_1 = require("./executionBase");
-const pluginManager_1 = require("../utils/pluginManager");
-const utils_1 = require("../utils/utils");
-class DataConnectorExecution extends executionBase_1.ExecutionBase {
+const pluginManager_js_1 = require("../utils/pluginManager.js");
+const replace_old_subgraphs_js_1 = require("../utils/replace-old-subgraphs.js");
+const utils_js_1 = require("../utils/utils.js");
+const executionBase_js_1 = require("./executionBase.js");
+class DataConnectorExecution extends executionBase_js_1.ExecutionBase {
     constructor(dataConnectors, maxRetries = 3) {
         super(maxRetries);
         this.dataConnectors = dataConnectors;
@@ -22,30 +23,69 @@ class DataConnectorExecution extends executionBase_1.ExecutionBase {
         return __awaiter(this, void 0, void 0, function* () {
             const vaultConfig = JSON.parse(_vaultConfig);
             const transformationData = [];
-            const pluginManager = new pluginManager_1.PluginManager();
+            const pluginManager = new pluginManager_js_1.PluginManager();
             yield pluginManager.registerFromPublicConfig();
             for (const dataConnector of this.dataConnectors) {
                 if (!dataConnector.module) {
                     yield dataConnector.load();
                 }
-                const executionContext = yield this.getExecutionContext(dataConnector, vaultConfig);
-                dataConnector.setExecutionContextDataConnector(executionContext);
-                const version = yield this.getDataConnectorVersion(dataConnector);
-                if (version === 1) {
-                    const initialRequest = yield dataConnector.execute('');
-                    const finalResponse = yield this.handleRequestResponse(dataConnector, pluginManager, initialRequest);
-                    const transformedData = yield this.transformData(dataConnector, finalResponse);
-                    transformationData.push(transformedData);
+                let version = 1;
+                try {
+                    version = dataConnector.version();
+                }
+                catch (e) {
+                    version = 1;
+                }
+                if (version >= 2) {
+                    const transformData = yield this.executeV2Bundle(dataConnector, vaultConfig);
+                    transformationData.push(transformData);
                 }
                 else {
-                    const finalResponse = yield dataConnector.execute('');
-                    const transformedData = yield this.transformData(dataConnector, finalResponse);
-                    transformationData.push(transformedData);
+                    try {
+                        const executionContext = yield this.getExecutionContext(dataConnector, vaultConfig);
+                        dataConnector.setExecutionContextDataConnector(executionContext);
+                        const initialRequest = yield dataConnector.execute('');
+                        const finalResponse = yield this.handleRequestResponse(dataConnector, pluginManager, initialRequest);
+                        const transformedData = yield this.transformData(dataConnector, finalResponse);
+                        transformationData.push(transformedData);
+                    }
+                    catch (e) {
+                        const transformData = yield this.executeV2Bundle(dataConnector, vaultConfig);
+                        transformationData.push(transformData);
+                    }
                 }
             }
             return transformationData;
         });
     }
+    executeV2Bundle(dataConnector, vaultConfig) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const executionContext = yield this.getExecutionContext(dataConnector, vaultConfig);
+            dataConnector.setExecutionContextDataConnector(executionContext);
+            yield dataConnector.execute('');
+            const result = yield dataConnector.transform();
+            return JSON.parse(result);
+        });
+    }
+    executeDynamicJob(_vaultConfig) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const vaultConfig = JSON.parse(_vaultConfig);
+            const transformationData = [];
+            const pluginManager = new pluginManager_js_1.PluginManager();
+            yield pluginManager.registerFromPublicConfig();
+            for (const dataConnector of this.dataConnectors) {
+                if (!dataConnector.module) {
+                    yield dataConnector.load();
+                }
+                const executionContext = yield this.getExecutionContext(dataConnector, vaultConfig);
+                dataConnector.setExecutionContextDataConnector(executionContext);
+                yield dataConnector.execute('');
+                const result = yield dataConnector.transform();
+                transformationData.push(JSON.parse(result));
+            }
+            return transformationData;
+        });
+    }
     handleRequestResponse(dataConnector, pluginManager, initialRequest) {
         return __awaiter(this, void 0, void 0, function* () {
             let request = initialRequest;
@@ -57,8 +97,11 @@ class DataConnectorExecution extends executionBase_1.ExecutionBase {
                     }
                     else {
                         const parsedRequest = yield pluginManager.process(typeof request == 'string' ? JSON.parse(request) : request);
+                        const url = (0, replace_old_subgraphs_js_1.changeUrlIfOld)(parsedRequest.url, dataConnector.configObj.subgraphStudioKey);
+                        parsedRequest.url = url;
+                        parsedRequest.headers = Object.assign({ 'Content-Type': url && !url.includes('subgraph-proxy-server') ? 'application/json' : 'text/plain;charset=UTF-8' }, ((url === null || url === void 0 ? void 0 : url.includes('sentio')) ? { 'api-key': dataConnector.executionAppConfig.apiKeys.sentioApiKey } : {}));
                         yield this.delay(1000);
-                        response = yield (0, utils_1.fetchData)(parsedRequest, 0);
+                        response = yield (0, utils_js_1.fetchData)(parsedRequest, 0);
                     }
                     request = yield dataConnector.execute(JSON.stringify(response));
                 }
@@ -73,21 +116,10 @@ class DataConnectorExecution extends executionBase_1.ExecutionBase {
             return dataConnector.getResults();
         });
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     transformData(dataConnector, rawData) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             let transformedData = typeof rawData === 'string' ? JSON.parse(rawData) : rawData;
-            if (transformedData == null || transformedData.length == 0) {
-                const results = dataConnector.getResults();
-                const parsedResults = JSON.parse(results);
-                if (parsedResults.length == null) {
-                    transformedData = results;
-                }
-                else {
-                    transformedData = parsedResults;
-                }
-            }
             const version = yield this.getDataConnectorVersion(dataConnector);
             if (version == 1 && transformedData.length > 0) {
                 const keys = Object.keys(transformedData[0]);
@@ -98,7 +130,7 @@ class DataConnectorExecution extends executionBase_1.ExecutionBase {
                 if (hasAllKeys && !!lookback) {
                     // Now that we have identified a v1 data connector, we need to transform the data so that the data is up to the current execution epoch timestamp
                     if ((_b = dataConnector === null || dataConnector === void 0 ? void 0 : dataConnector.executionContext) === null || _b === void 0 ? void 0 : _b.epochTimestamp) {
-                        const extended = (0, utils_1.extendOHLCV)(transformedData, lookback, ((_c = dataConnector === null || dataConnector === void 0 ? void 0 : dataConnector.executionContext) === null || _c === void 0 ? void 0 : _c.epochTimestamp) * 1000);
+                        const extended = (0, utils_js_1.extendOHLCV)(transformedData, lookback, ((_c = dataConnector === null || dataConnector === void 0 ? void 0 : dataConnector.executionContext) === null || _c === void 0 ? void 0 : _c.epochTimestamp) * 1000);
                         transformedData = extended;
                     }
                 }

package/lib/index.d.ts

@@ -1,5 +1,7 @@
-import { DataConnector } from './bundle/bundleDataConnector';
-import { DataConnectorExecution } from './execution/executionDataConnector';
-import { ExecutionApp } from './execution/executionApp';
-export * from './types';
+import { DataConnector } from './bundle/bundleDataConnector.js';
+import { ExecutionApp, type ExecutionAppConfig } from './execution/executionApp.js';
+import { DataConnectorExecution } from './execution/executionDataConnector.js';
+import type { VaultConfigPayload } from './types.js';
+export type * from './types.js';
 export { DataConnector, DataConnectorExecution, ExecutionApp };
+export type { ExecutionAppConfig, VaultConfigPayload };

package/lib/index.js

@@ -1,24 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionApp = exports.DataConnectorExecution = exports.DataConnector = void 0;
-const bundleDataConnector_1 = require("./bundle/bundleDataConnector");
-Object.defineProperty(exports, "DataConnector", { enumerable: true, get: function () { return bundleDataConnector_1.DataConnector; } });
-const executionDataConnector_1 = require("./execution/executionDataConnector");
-Object.defineProperty(exports, "DataConnectorExecution", { enumerable: true, get: function () { return executionDataConnector_1.DataConnectorExecution; } });
-const executionApp_1 = require("./execution/executionApp");
-Object.defineProperty(exports, "ExecutionApp", { enumerable: true, get: function () { return executionApp_1.ExecutionApp; } });
-__exportStar(require("./types"), exports);
+const bundleDataConnector_js_1 = require("./bundle/bundleDataConnector.js");
+Object.defineProperty(exports, "DataConnector", { enumerable: true, get: function () { return bundleDataConnector_js_1.DataConnector; } });
+const executionApp_js_1 = require("./execution/executionApp.js");
+Object.defineProperty(exports, "ExecutionApp", { enumerable: true, get: function () { return executionApp_js_1.ExecutionApp; } });
+const executionDataConnector_js_1 = require("./execution/executionDataConnector.js");
+Object.defineProperty(exports, "DataConnectorExecution", { enumerable: true, get: function () { return executionDataConnector_js_1.DataConnectorExecution; } });

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { InterfaceAbi } from 'ethers';
+import type { InterfaceAbi } from 'ethers';
 export type VaultInput = {
     _id?: string;
     tokenId: string;
@@ -23,7 +23,7 @@ export type VaultInput = {
 export interface VaultConfigPayload {
     strategyConfigData: StrategyConfigData;
     vaultPayload: VaultPayload;
-    dataConnectorsData: DataConnectorsDaum[];
+    dataConnectorsData: Array<DataConnectorsDaum>;
     vaultAddress: string;
     epochTimestamp: number;
     anchorBlockNumber?: number;
@@ -63,12 +63,16 @@ export interface Position {
     weight: number;
 }
 export interface SmartPoolExecutionContext extends ExecutionContext {
-    positions: Position[];
+    positions: Array<Position>;
     currentTick: number;
     lastExecutionTime: number;
+    totalAmount0: string;
+    totalAmount1: string;
+    tickSpacing: number;
 }
 export type RpcConfig = {
     url: string;
+    urls?: ReadonlyArray<string>;
     network?: string;
 };
 export type EtherRpcConfig = {
@@ -78,7 +82,7 @@ export interface ViewConfig {
     address: string;
     abi: InterfaceAbi;
     method: string;
-    arguments: unknown[];
+    arguments: Array<unknown>;
 }
 export interface Slot0 {
     sqrtPriceX96?: bigint;
@@ -102,3 +106,12 @@ export type ViewContractConfig = {
     method: string;
     rpcUrl?: string;
 };
+export type JobDetails = {
+    id: string;
+    name: string;
+    timestamp: string;
+    jobInfo: ReadonlyArray<unknown>;
+    targetAddresses: ReadonlyArray<string>;
+    ipfsHash: string;
+    status: string;
+};

package/lib/utils/blockFinder.d.ts

@@ -1,4 +1,4 @@
-import { ethers } from 'ethers';
+import type { ethers } from 'ethers';
 /**
  * Iterates down from current block to find the block previous or equal to the given timestamp
  * Not the most efficient for far past timestamps, a binary search could be used for better performance

package/lib/utils/consts.js

@@ -2,6 +2,48 @@
 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';
+// export const API_BASE_URL = "http://localhost:3000/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 = [
+    '999',
+    '43114',
+    '6900',
+    '5464',
+    '2020',
+    '747474',
+    '1116',
+    '43111',
+    '80094',
+    '129399',
+    '130',
+    '146',
+    '1868',
+    '1',
+    '80084',
+    '2222',
+    '1329',
+    '1284',
+    '42161',
+    '9001',
+    '137',
+    '56',
+    '5000',
+    '250',
+    '3776',
+    '81457',
+    '592',
+    '1088',
+    '34443',
+    // "8453",
+    '30',
+    // "8453",
+    '167000',
+    '196',
+    '810180',
+    '137',
+    '314',
+    '33139',
+    '7000',
+    '3338',
+];

package/lib/utils/pluginManager.d.ts

@@ -1,4 +1,4 @@
-import { AxiosRequestConfig } from 'axios';
+import type { AxiosRequestConfig } from 'axios';
 export declare class PluginManager {
     private registeredPluginConfigs;
     constructor();

package/lib/utils/replace-old-subgraphs.d.ts

@@ -0,0 +1,23 @@
+export interface SubgraphUrlConfig {
+    chain: string;
+    protocol: string;
+    newUrl: string;
+    oldUrl: string;
+}
+export interface SubgraphReplacerConfig {
+    subgraphStudioKey?: string;
+    customConfigs?: Array<SubgraphUrlConfig>;
+}
+export declare class SubgraphUrlReplacer {
+    private readonly subgraphStudioKey;
+    private readonly subgraphUrlConfigs;
+    constructor(config?: SubgraphReplacerConfig);
+    changeUrlIfOld(url?: string): string | undefined;
+    private getArbitrumSubgraphUrl;
+    private getDefaultConfigs;
+}
+/**
+ * Convenience function that uses the default SubgraphUrlReplacer instance
+ * For custom configuration, create a new SubgraphUrlReplacer instance
+ */
+export declare const changeUrlIfOld: (url?: string, subgraphStudioKey?: string) => string | undefined;

package/lib/utils/replace-old-subgraphs.js

@@ -0,0 +1,129 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.changeUrlIfOld = exports.SubgraphUrlReplacer = void 0;
+class SubgraphUrlReplacer {
+    constructor(config) {
+        var _a;
+        this.subgraphStudioKey = (_a = config === null || config === void 0 ? void 0 : config.subgraphStudioKey) !== null && _a !== void 0 ? _a : '';
+        this.subgraphUrlConfigs = (config === null || config === void 0 ? void 0 : config.customConfigs) || this.getDefaultConfigs();
+    }
+    changeUrlIfOld(url) {
+        const subgraphUrl = this.subgraphUrlConfigs.find(({ oldUrl }) => url === oldUrl);
+        if (subgraphUrl) {
+            return subgraphUrl.newUrl;
+        }
+        return url;
+    }
+    getArbitrumSubgraphUrl(subgraphId, isDeploymentId) {
+        return `https://gateway-arbitrum.network.thegraph.com/api/${this.subgraphStudioKey}/${isDeploymentId ? 'deployments' : 'subgraphs'}/id/${subgraphId}`;
+    }
+    getDefaultConfigs() {
+        return [
+            {
+                chain: 'polygon',
+                protocol: 'quickswap',
+                newUrl: this.getArbitrumSubgraphUrl(`FqsRcH1XqSjqVx9GRTvEJe959aCbKrcyGgDWBrUkG24g`, false),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/sameepsi/quickswap-v3',
+            },
+            {
+                chain: 'polygon',
+                protocol: 'uniswap',
+                newUrl: this.getArbitrumSubgraphUrl(`3hCPRGf4z88VC5rsBKU5AA9FBBq5nF3jbKJG7VZCbhjm`, false),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/ianlapham/uniswap-v3-polygon',
+            },
+            {
+                chain: 'optimism',
+                protocol: 'uniswap',
+                newUrl: this.getArbitrumSubgraphUrl(`Cghf4LfVqPiFw6fp6Y5X5Ubc8UpmUhSfJL82zwiBFLaj`, false),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/ianlapham/optimism-post-regenesis',
+            },
+            {
+                chain: 'arbitrum',
+                protocol: 'uniswap',
+                newUrl: this.getArbitrumSubgraphUrl(`FbCGRftH4a3yZugY7TnbYgPJVEv2LvMT6oF1fxPe9aJM`, false),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/ianlapham/arbitrum-dev',
+            },
+            {
+                chain: 'celo',
+                protocol: 'uniswap',
+                newUrl: this.getArbitrumSubgraphUrl(`ESdrTJ3twMwWVoQ1hUE2u7PugEHX3QkenudD6aXCkDQ4`, false),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/jesse-sawa/uniswap-celo',
+            },
+            {
+                chain: 'base',
+                protocol: 'baseswap',
+                newUrl: 'https://api.goldsky.com/api/public/project_cltceeuudv1ij01x7ekxhfl46/subgraphs/v3-base/prod/gn',
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/harleen-m/basex',
+            },
+            {
+                chain: 'arbitrum',
+                protocol: 'sushi',
+                newUrl: this.getArbitrumSubgraphUrl('QmevuQAmgiou1UX7Z2BQf6RKdX1WunQjH8VtawhkzSLj4V', true),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/sushi-v3/v3-arbitrum',
+            },
+            {
+                chain: 'avalanche',
+                protocol: 'sushi',
+                newUrl: this.getArbitrumSubgraphUrl('Qmcdd4SGVwG9VY4itrXBnBPWBVsQvsxfzaib9bVny9C8jT', true),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/sushi-v3/v3-avalanche',
+            },
+            {
+                chain: 'bsc',
+                protocol: 'sushi',
+                newUrl: this.getArbitrumSubgraphUrl('QmXsPN4TD4PUhT1ZWd5d1mdQPePFNMdJwUr6guSh1z9ZzA', true),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/sushi-v3/v3-bsc',
+            },
+            {
+                chain: 'base',
+                protocol: 'sushi',
+                newUrl: this.getArbitrumSubgraphUrl('QmZ2R9ABG9ienaZdGyPLcDWDNDkG187RhXmh6fFuEtUaaS', true),
+                oldUrl: 'https://api.studio.thegraph.com/query/32073/v3-base/v0.0.1',
+            },
+            {
+                chain: 'optimism',
+                protocol: 'sushi',
+                newUrl: this.getArbitrumSubgraphUrl('QmbT6ZsxJEZKUrbzLrAWV5EnQfSKZeYtZ265mQUaB552vK', true),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/sushi-v3/v3-optimism',
+            },
+            {
+                chain: 'polygon',
+                protocol: 'sushi',
+                newUrl: this.getArbitrumSubgraphUrl('QmPbbjK9vtY69kSxMJRVLVz1dRzUBNwYbWTRYMiFzp9Tzm', true),
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/sushi-v3/v3-polygon',
+            },
+            {
+                chain: 'zkevm',
+                protocol: 'sushi',
+                newUrl: this.getArbitrumSubgraphUrl('QmWH5ChjmF4Yp5Yhiaxczh5QwbG6HFSEi8bRwbKaUrJA6C', true),
+                oldUrl: 'https://api.studio.thegraph.com/query/32073/v3-polygon-zkevm/v0.0.2',
+            },
+            {
+                chain: 'arbitrum',
+                protocol: 'camelot',
+                newUrl: 'https://subgraph-proxy-server-xf2uthetka-as.a.run.app/gateway-arbitrum/3utanEBA9nqMjPnuQP1vMCCys6enSM3EawBpKTVwnUw2',
+                oldUrl: 'https://api.thegraph.com/subgraphs/name/camelotlabs/camelot-amm-v3',
+            },
+            {
+                chain: 'mode',
+                protocol: 'swapmode',
+                newUrl: 'https://api.goldsky.com/api/public/project_cltceeuudv1ij01x7ekxhfl46/subgraphs/swapmode-v3/prod/gn',
+                oldUrl: 'https://api.goldsky.com/api/public/project_cltceeuudv1ij01x7ekxhfl46/subgraphs/swapmode-v3/1.0.0/gn',
+            },
+            {
+                chain: 'linea',
+                protocol: 'lynex',
+                newUrl: 'https://api.goldsky.com/api/public/project_cltyhthusbmxp01s95k9l8a1u/subgraphs/lynex-cl/v1.0.2/gn',
+                oldUrl: 'https://graph-query.linea.build/subgraphs/name/cryptoalgebra/analytics',
+            },
+        ];
+    }
+}
+exports.SubgraphUrlReplacer = SubgraphUrlReplacer;
+/**
+ * Convenience function that uses the default SubgraphUrlReplacer instance
+ * For custom configuration, create a new SubgraphUrlReplacer instance
+ */
+const changeUrlIfOld = (url, subgraphStudioKey) => {
+    return new SubgraphUrlReplacer({ subgraphStudioKey }).changeUrlIfOld(url);
+};
+exports.changeUrlIfOld = changeUrlIfOld;

package/lib/utils/utils.d.ts

@@ -1,16 +1,17 @@
-import { Candle } from '@steerprotocol/app-loader';
-import { AxiosRequestConfig } from 'axios';
-import { ExecutionContext, ViewContractConfig } from '../types';
-import { Provider } from 'ethers';
-export declare const extendOHLCV: (rawData: Candle[], period: number, endTimestamp: number) => Candle[];
+import type { Candle } from '@steerprotocol/app-loader';
+import type { AxiosRequestConfig } from 'axios';
+import { type Provider } from 'ethers';
+import type { ExecutionContext, ViewContractConfig } from '../types.js';
+export declare const extendOHLCV: (rawData: Array<Candle>, period: number, endTimestamp: number) => Array<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 readContract({ abi, address, chainId, contractArguments, currentExecutionContext, functionName, provider, rpc, }: {
     address: string;
     abi: any;
     currentExecutionContext: ExecutionContext;
     functionName: string;
     provider: Provider;
     rpc: string;
+    contractArguments?: Array<any>;
     chainId: number;
 }): Promise<any>;
 export declare function callWithRetry(config: ViewContractConfig): Promise<any>;

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);