@steerprotocol/data-connector-loader 3.2.1 → 3.2.2

package/README.md

@@ -1,6 +1,7 @@
 # Steer Protocol App Loader
 
 ## Public API
+
 - `ExecutionAppConfig`: Configuration object for `ExecutionApp` (vault, chainId, subgraph URL, pool type flags, API keys, retries).
 - `ExecutionApp`: High-level execution entrypoint for running bundles with a config-based constructor.
 - `DataConnectorExecution`: Executes data connector bundles and handles request/response flow.
@@ -8,23 +9,13 @@
 ## Installation
 
 ```bash
-npm install test-data-connector-loader
+npm install @steerprotocol/data-connector-loader
 # or
-yarn add test-data-connector-loader
+yarn add @steerprotocol/data-connector-loader
 # or
-pnpm add test-data-connector-loader
+pnpm add @steerprotocol/data-connector-loader
 ```
 
-The package includes an automatic postinstall script that fixes ESM/CJS interoperability issues with dependencies. No additional configuration is needed.
-
 ## ESM Support
 
-This package is an ESM module (`"type": "module"`). It automatically fixes ESM compatibility issues in its dependencies during installation.
-
-If you encounter import errors after installation, you can manually run the fix script:
-
-```bash
-npm run postinstall
-```
-
-For more details about the ESM fixes, see [docs/esm-fixes.md](docs/esm-fixes.md).
+This package publishes both CommonJS and ESM entrypoints via `exports`.

package/lib/bundle/bundleBase.js

@@ -11,7 +11,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BundleBase = void 0;
 const app_loader_1 = require("@steerprotocol/app-loader");
-const providerUtils_js_1 = require("../utils/providerUtils.js");
+const ethers_1 = require("ethers");
+const UNSTABLE_RPC_PATTERNS = [/drpc\.org/i];
+function createFallbackRpcProvider(urls) {
+    const seen = new Set();
+    const preferred = [];
+    const deprioritized = [];
+    for (const url of urls) {
+        const trimmed = url.trim();
+        if (trimmed.length === 0 || seen.has(trimmed)) {
+            continue;
+        }
+        seen.add(trimmed);
+        if (UNSTABLE_RPC_PATTERNS.some((pattern) => pattern.test(trimmed))) {
+            deprioritized.push(trimmed);
+        }
+        else {
+            preferred.push(trimmed);
+        }
+    }
+    const prioritized = preferred.length > 0 ? [...preferred, ...deprioritized] : [...preferred, ...deprioritized];
+    if (prioritized.length === 0) {
+        throw new Error('No RPC URLs configured');
+    }
+    const providers = prioritized.map((url) => new ethers_1.ethers.JsonRpcProvider(url));
+    return providers.length === 1 ? providers[0] : new ethers_1.ethers.FallbackProvider(providers);
+}
 function bigIntReplacer(_key, value) {
     return typeof value === 'bigint' ? value.toString() : value;
 }
@@ -179,7 +204,7 @@ class BundleBase {
         }
         if (chainId && this.etherRpcConfig && this.etherRpcConfig[chainId]) {
             const rpcConfig = this.etherRpcConfig[chainId];
-            return (0, providerUtils_js_1.createFallbackRpcProvider)((_a = rpcConfig.urls) !== null && _a !== void 0 ? _a : [rpcConfig.url]);
+            return createFallbackRpcProvider((_a = rpcConfig.urls) !== null && _a !== void 0 ? _a : [rpcConfig.url]);
         }
         else {
             return this.providerIdentity;

package/lib/bundle/bundleDataConnector.d.ts

@@ -6,10 +6,4 @@ export declare class DataConnector extends BundleBase {
     constructor(wasmFile: string | ArrayBuffer, _config: string, executionAppConfig: ExecutionAppConfig, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     getRpcUrl(config: any): string | undefined;
     view(config: ViewConfig): Promise<string>;
-    /**
-     * Attempts to decode raw return data when the declared ABI doesn't match the actual
-     * contract output. Tries removing trailing outputs one-by-one until decoding succeeds.
-     * This handles pool variants that omit optional fields (e.g. feeProtocol in slot0).
-     */
-    private decodeFallback;
 }

package/lib/bundle/bundleDataConnector.js

@@ -48,22 +48,9 @@ class DataConnector extends bundleBase_js_1.BundleBase {
             const paramsArray = config.arguments;
             let result;
             if (consts_js_1.CENTRALIZE_CONTRACT_INTERACTION_CHAINS.indexOf(this.configObj.chainId.toString()) === -1) {
-                try {
-                    result = yield contract[config.method](...paramsArray, {
-                        blockTag: (_a = this.executionContext) === null || _a === void 0 ? void 0 : _a.blockNumber,
-                    });
-                }
-                catch (err) {
-                    // Some pool variants return fewer ABI outputs than the standard spec (e.g. Aerodrome/
-                    // Velodrome slot0 has 6 fields instead of 7 — no feeProtocol). When ethers fails to
-                    // decode the raw return data, fall back to decoding with progressively fewer outputs.
-                    if ((err === null || err === void 0 ? void 0 : err.code) === 'BAD_DATA' && (err === null || err === void 0 ? void 0 : err.value)) {
-                        result = this.decodeFallback(err.value, config);
-                    }
-                    else {
-                        throw err;
-                    }
-                }
+                result = yield contract[config.method](...paramsArray, {
+                    blockTag: (_a = this.executionContext) === null || _a === void 0 ? void 0 : _a.blockNumber,
+                });
             }
             else {
                 const viewContractConfig = {
@@ -80,30 +67,5 @@ class DataConnector extends bundleBase_js_1.BundleBase {
             return result;
         });
     }
-    /**
-     * Attempts to decode raw return data when the declared ABI doesn't match the actual
-     * contract output. Tries removing trailing outputs one-by-one until decoding succeeds.
-     * This handles pool variants that omit optional fields (e.g. feeProtocol in slot0).
-     */
-    decodeFallback(rawData, config) {
-        var _a;
-        const iface = new ethers_1.Interface(config.abi);
-        const fragment = iface.getFunction(config.method);
-        if (!((_a = fragment === null || fragment === void 0 ? void 0 : fragment.outputs) === null || _a === void 0 ? void 0 : _a.length)) {
-            throw new Error(`Cannot find outputs for method "${config.method}" in ABI`);
-        }
-        const coder = ethers_1.AbiCoder.defaultAbiCoder();
-        for (let numOutputs = fragment.outputs.length - 1; numOutputs >= 1; numOutputs--) {
-            try {
-                const types = fragment.outputs.slice(0, numOutputs).map((o) => o.format());
-                const decoded = coder.decode(types, rawData);
-                return decoded;
-            }
-            catch (_b) {
-                // try with one fewer output
-            }
-        }
-        throw new Error(`Could not decode result data for method "${config.method}" — no matching ABI shape found`);
-    }
 }
 exports.DataConnector = DataConnector;

package/lib/esm/bundle/bundleBase.js

@@ -1,5 +1,30 @@
 import { loadWasm, loadWasmSync } from '@steerprotocol/app-loader';
-import { createFallbackRpcProvider } from '../utils/providerUtils.js';
+import { ethers } from 'ethers';
+const UNSTABLE_RPC_PATTERNS = [/drpc\.org/i];
+function createFallbackRpcProvider(urls) {
+    const seen = new Set();
+    const preferred = [];
+    const deprioritized = [];
+    for (const url of urls) {
+        const trimmed = url.trim();
+        if (trimmed.length === 0 || seen.has(trimmed)) {
+            continue;
+        }
+        seen.add(trimmed);
+        if (UNSTABLE_RPC_PATTERNS.some((pattern) => pattern.test(trimmed))) {
+            deprioritized.push(trimmed);
+        }
+        else {
+            preferred.push(trimmed);
+        }
+    }
+    const prioritized = preferred.length > 0 ? [...preferred, ...deprioritized] : [...preferred, ...deprioritized];
+    if (prioritized.length === 0) {
+        throw new Error('No RPC URLs configured');
+    }
+    const providers = prioritized.map((url) => new ethers.JsonRpcProvider(url));
+    return providers.length === 1 ? providers[0] : new ethers.FallbackProvider(providers);
+}
 function bigIntReplacer(_key, value) {
     return typeof value === 'bigint' ? value.toString() : value;
 }

package/lib/esm/bundle/bundleDataConnector.d.ts

@@ -6,10 +6,4 @@ export declare class DataConnector extends BundleBase {
     constructor(wasmFile: string | ArrayBuffer, _config: string, executionAppConfig: ExecutionAppConfig, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     getRpcUrl(config: any): string | undefined;
     view(config: ViewConfig): Promise<string>;
-    /**
-     * Attempts to decode raw return data when the declared ABI doesn't match the actual
-     * contract output. Tries removing trailing outputs one-by-one until decoding succeeds.
-     * This handles pool variants that omit optional fields (e.g. feeProtocol in slot0).
-     */
-    private decodeFallback;
 }

package/lib/esm/bundle/bundleDataConnector.js

@@ -1,4 +1,4 @@
-import { AbiCoder, Contract, Interface } from 'ethers';
+import { Contract } from 'ethers';
 import { CENTRALIZE_CONTRACT_INTERACTION_CHAINS } from '../utils/consts.js';
 import { callWithRetry } from '../utils/utils.js';
 import { BundleBase } from './bundleBase.js';
@@ -34,22 +34,9 @@ export class DataConnector extends BundleBase {
         const paramsArray = config.arguments;
         let result;
         if (CENTRALIZE_CONTRACT_INTERACTION_CHAINS.indexOf(this.configObj.chainId.toString()) === -1) {
-            try {
-                result = await contract[config.method](...paramsArray, {
-                    blockTag: this.executionContext?.blockNumber,
-                });
-            }
-            catch (err) {
-                // Some pool variants return fewer ABI outputs than the standard spec (e.g. Aerodrome/
-                // Velodrome slot0 has 6 fields instead of 7 — no feeProtocol). When ethers fails to
-                // decode the raw return data, fall back to decoding with progressively fewer outputs.
-                if (err?.code === 'BAD_DATA' && err?.value) {
-                    result = this.decodeFallback(err.value, config);
-                }
-                else {
-                    throw err;
-                }
-            }
+            result = await contract[config.method](...paramsArray, {
+                blockTag: this.executionContext?.blockNumber,
+            });
         }
         else {
             const viewContractConfig = {
@@ -65,28 +52,4 @@ export class DataConnector extends BundleBase {
         // This gets stringified before calling main
         return result;
     }
-    /**
-     * Attempts to decode raw return data when the declared ABI doesn't match the actual
-     * contract output. Tries removing trailing outputs one-by-one until decoding succeeds.
-     * This handles pool variants that omit optional fields (e.g. feeProtocol in slot0).
-     */
-    decodeFallback(rawData, config) {
-        const iface = new Interface(config.abi);
-        const fragment = iface.getFunction(config.method);
-        if (!fragment?.outputs?.length) {
-            throw new Error(`Cannot find outputs for method "${config.method}" in ABI`);
-        }
-        const coder = AbiCoder.defaultAbiCoder();
-        for (let numOutputs = fragment.outputs.length - 1; numOutputs >= 1; numOutputs--) {
-            try {
-                const types = fragment.outputs.slice(0, numOutputs).map((o) => o.format());
-                const decoded = coder.decode(types, rawData);
-                return decoded;
-            }
-            catch {
-                // try with one fewer output
-            }
-        }
-        throw new Error(`Could not decode result data for method "${config.method}" — no matching ABI shape found`);
-    }
 }

package/lib/esm/execution/executionApp.js

@@ -501,8 +501,12 @@ export class ExecutionApp extends ExecutionBase {
         const dataConnector = new DataConnector(_wasmFile, _vaultConfig, this.config, _identity, _etherRpcConfig);
         await dataConnector.loadSync();
         const executionContext = await this.getExecutionContext(dataConnector, JSON.parse(_vaultConfig));
+        const smartRewardsContractAddress = _job.targetAddresses[0];
+        if (!smartRewardsContractAddress) {
+            throw new Error('Dynamic job must include at least one target address');
+        }
         const dynamicJobExecutionContext = {
-            smartRewardsContractAddress: _job.targetAddresses?.[0],
+            smartRewardsContractAddress,
         };
         dataConnector.setExecutionContextStrategyExecution({
             ...executionContext,

package/lib/esm/types.d.ts

@@ -108,10 +108,10 @@ export type ViewContractConfig = {
 };
 export type JobDetails = {
     id: string;
-    name?: string;
-    timestamp?: string;
-    jobInfo?: ReadonlyArray<unknown>;
-    targetAddresses?: ReadonlyArray<string>;
-    ipfsHash?: string;
-    status?: string;
+    name: string;
+    timestamp: string;
+    jobInfo: ReadonlyArray<unknown>;
+    targetAddresses: ReadonlyArray<string>;
+    ipfsHash: string;
+    status: string;
 };

package/lib/execution/executionApp.js

@@ -509,13 +509,16 @@ class ExecutionApp extends executionBase_js_1.ExecutionBase {
         });
     }
     executeDynamicJobs(_wasmFile, _vaultConfig, _data, _job, _identity, _etherRpcConfig, forceDeposit) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const dataConnector = new bundleDataConnector_js_1.DataConnector(_wasmFile, _vaultConfig, this.config, _identity, _etherRpcConfig);
             yield dataConnector.loadSync();
             const executionContext = yield this.getExecutionContext(dataConnector, JSON.parse(_vaultConfig));
+            const smartRewardsContractAddress = _job.targetAddresses[0];
+            if (!smartRewardsContractAddress) {
+                throw new Error('Dynamic job must include at least one target address');
+            }
             const dynamicJobExecutionContext = {
-                smartRewardsContractAddress: (_a = _job.targetAddresses) === null || _a === void 0 ? void 0 : _a[0],
+                smartRewardsContractAddress,
             };
             dataConnector.setExecutionContextStrategyExecution(Object.assign(Object.assign({}, executionContext), dynamicJobExecutionContext), forceDeposit);
             _data = _data.map((element) => JSON.stringify(element));

package/lib/types.d.ts

@@ -108,10 +108,10 @@ export type ViewContractConfig = {
 };
 export type JobDetails = {
     id: string;
-    name?: string;
-    timestamp?: string;
-    jobInfo?: ReadonlyArray<unknown>;
-    targetAddresses?: ReadonlyArray<string>;
-    ipfsHash?: string;
-    status?: string;
+    name: string;
+    timestamp: string;
+    jobInfo: ReadonlyArray<unknown>;
+    targetAddresses: ReadonlyArray<string>;
+    ipfsHash: string;
+    status: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerprotocol/data-connector-loader",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "App Loader for Steer Protocol",
   "type": "module",
   "main": "lib/index.js",
@@ -24,7 +24,6 @@
     "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",
@@ -84,8 +83,8 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "@steerprotocol/sdk": "^1.28.0",
     "@steerprotocol/app-loader": "^2.1.1",
+    "@steerprotocol/sdk": "^2.0.0",
     "@steerprotocol/strategy-utils": "^3.1.2",
     "axios": "^1.3.4",
     "ethers": "^6.16.0",

package/lib/esm/utils/providerUtils.d.ts

@@ -1,4 +0,0 @@
-import { ethers } from 'ethers';
-export declare const prioritizeRpcUrls: (urls: ReadonlyArray<string>) => Array<string>;
-export declare const getPrimaryRpcUrl: (urls: ReadonlyArray<string>) => string;
-export declare const createFallbackRpcProvider: (urls: ReadonlyArray<string>) => ethers.Provider;

package/lib/esm/utils/providerUtils.js

@@ -1,37 +0,0 @@
-import { ethers } from 'ethers';
-const UNSTABLE_RPC_PATTERNS = [/drpc\.org/i];
-const uniqueUrls = (urls) => {
-    const seen = new Set();
-    const normalized = [];
-    for (const url of urls) {
-        const trimmed = url.trim();
-        if (trimmed.length === 0 || seen.has(trimmed)) {
-            continue;
-        }
-        seen.add(trimmed);
-        normalized.push(trimmed);
-    }
-    return normalized;
-};
-const isDeprioritizedRpcUrl = (url) => UNSTABLE_RPC_PATTERNS.some((pattern) => pattern.test(url));
-export const prioritizeRpcUrls = (urls) => {
-    const normalized = uniqueUrls(urls);
-    const preferred = normalized.filter((url) => !isDeprioritizedRpcUrl(url));
-    const deprioritized = normalized.filter((url) => isDeprioritizedRpcUrl(url));
-    return preferred.length > 0 ? [...preferred, ...deprioritized] : normalized;
-};
-export const getPrimaryRpcUrl = (urls) => {
-    const prioritized = prioritizeRpcUrls(urls);
-    if (prioritized.length === 0) {
-        throw new Error('No RPC URLs configured');
-    }
-    return prioritized[0];
-};
-export const createFallbackRpcProvider = (urls) => {
-    const prioritized = prioritizeRpcUrls(urls);
-    if (prioritized.length === 0) {
-        throw new Error('No RPC URLs configured');
-    }
-    const providers = prioritized.map((url) => new ethers.JsonRpcProvider(url));
-    return providers.length === 1 ? providers[0] : new ethers.FallbackProvider(providers);
-};

package/lib/utils/providerUtils.d.ts

@@ -1,4 +0,0 @@
-import { ethers } from 'ethers';
-export declare const prioritizeRpcUrls: (urls: ReadonlyArray<string>) => Array<string>;
-export declare const getPrimaryRpcUrl: (urls: ReadonlyArray<string>) => string;
-export declare const createFallbackRpcProvider: (urls: ReadonlyArray<string>) => ethers.Provider;

package/lib/utils/providerUtils.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFallbackRpcProvider = exports.getPrimaryRpcUrl = exports.prioritizeRpcUrls = void 0;
-const ethers_1 = require("ethers");
-const UNSTABLE_RPC_PATTERNS = [/drpc\.org/i];
-const uniqueUrls = (urls) => {
-    const seen = new Set();
-    const normalized = [];
-    for (const url of urls) {
-        const trimmed = url.trim();
-        if (trimmed.length === 0 || seen.has(trimmed)) {
-            continue;
-        }
-        seen.add(trimmed);
-        normalized.push(trimmed);
-    }
-    return normalized;
-};
-const isDeprioritizedRpcUrl = (url) => UNSTABLE_RPC_PATTERNS.some((pattern) => pattern.test(url));
-const prioritizeRpcUrls = (urls) => {
-    const normalized = uniqueUrls(urls);
-    const preferred = normalized.filter((url) => !isDeprioritizedRpcUrl(url));
-    const deprioritized = normalized.filter((url) => isDeprioritizedRpcUrl(url));
-    return preferred.length > 0 ? [...preferred, ...deprioritized] : normalized;
-};
-exports.prioritizeRpcUrls = prioritizeRpcUrls;
-const getPrimaryRpcUrl = (urls) => {
-    const prioritized = (0, exports.prioritizeRpcUrls)(urls);
-    if (prioritized.length === 0) {
-        throw new Error('No RPC URLs configured');
-    }
-    return prioritized[0];
-};
-exports.getPrimaryRpcUrl = getPrimaryRpcUrl;
-const createFallbackRpcProvider = (urls) => {
-    const prioritized = (0, exports.prioritizeRpcUrls)(urls);
-    if (prioritized.length === 0) {
-        throw new Error('No RPC URLs configured');
-    }
-    const providers = prioritized.map((url) => new ethers_1.ethers.JsonRpcProvider(url));
-    return providers.length === 1 ? providers[0] : new ethers_1.ethers.FallbackProvider(providers);
-};
-exports.createFallbackRpcProvider = createFallbackRpcProvider;