@steerprotocol/data-connector-loader 5.0.0-next.1 → 5.0.0-next.10

package/lib/esm/utils/consts.js

@@ -1,46 +1,46 @@
-export const API_BASE_URL = 'https://cvrlulno2m.execute-api.ap-southeast-1.amazonaws.com/dev/contract-view-call';
+export const 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";
 export const API_MAX_RETRIES = 3;
 export const API_INITIAL_DELAY = 1000;
 export const 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',
+    "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',
+    "30",
     // "8453",
-    '167000',
-    '196',
-    '810180',
-    '137',
-    '314',
-    '33139',
-    '7000',
-    '3338',
+    "167000",
+    "196",
+    "810180",
+    "137",
+    "314",
+    "33139",
+    "7000",
+    "3338",
 ];

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

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

package/lib/esm/utils/pluginManager.js

@@ -1,10 +1,10 @@
-import axios from 'axios';
+import axios from "axios";
 export class PluginManager {
     constructor() {
         this.registeredPluginConfigs = [];
     }
     async registerFromPublicConfig() {
-        const { data: dataConnectorPlugins } = await axios.get('https://ro81h8hq6b.execute-api.us-east-1.amazonaws.com/data-connector-plugins');
+        const { data: dataConnectorPlugins } = await axios.get("https://ro81h8hq6b.execute-api.us-east-1.amazonaws.com/data-connector-plugins");
         for (const plugin of dataConnectorPlugins) {
             this.registerPluginConfig(plugin.name, plugin.domain, plugin.headers);
         }
@@ -26,7 +26,7 @@ export class PluginManager {
             const envValue = process.env[envVar];
             if (envValue === undefined) {
                 console.log(`Environment variable '${envVar}' not found.`);
-                return '';
+                return "";
             }
             return envValue;
         });
@@ -34,13 +34,14 @@ export class PluginManager {
     interpolateHeaders(headers) {
         const interpolatedHeaders = {};
         for (const [key, value] of Object.entries(headers)) {
-            interpolatedHeaders[key] = typeof value === 'string' ? this.interpolateEnvVars(value) : value;
+            interpolatedHeaders[key] =
+                typeof value === "string" ? this.interpolateEnvVars(value) : value;
         }
         return interpolatedHeaders;
     }
     async process(config) {
         if (!config.url) {
-            throw new Error('Request URL is not provided');
+            throw new Error("Request URL is not provided");
         }
         const matchingHeaders = this.findMatchingPluginConfigs(config.url);
         const interpolatedHeaders = this.interpolateHeaders(matchingHeaders);

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

@@ -1,6 +1,6 @@
 export class SubgraphUrlReplacer {
     constructor(config) {
-        this.subgraphStudioKey = config?.subgraphStudioKey ?? '';
+        this.subgraphStudioKey = config?.subgraphStudioKey ?? "";
         this.subgraphUrlConfigs = config?.customConfigs || this.getDefaultConfigs();
     }
     changeUrlIfOld(url) {
@@ -8,108 +8,126 @@ export class SubgraphUrlReplacer {
         if (subgraphUrl) {
             return subgraphUrl.newUrl;
         }
+        // This retired Arbitrum Uniswap subgraph also appears in credential-bearing
+        // gateway URLs. Replace only its exact ID; never carry the embedded key over.
+        if (url) {
+            try {
+                const source = new URL(url);
+                if ((source.origin === "https://gateway.thegraph.com" ||
+                    source.origin ===
+                        "https://gateway-arbitrum.network.thegraph.com") &&
+                    !source.username &&
+                    !source.password &&
+                    /^\/api\/(?:[^/]+\/)?subgraphs\/id\/Fo8QBLpEGfXHWkGMD3jSM4vVLk4JxvxxQD3v3U4fsrbh$/.test(source.pathname)) {
+                    return this.getArbitrumSubgraphUrl("FbCGRftH4a3yZugY7TnbYgPJVEv2LvMT6oF1fxPe9aJM", false);
+                }
+            }
+            catch {
+                // Leave malformed or relative URLs for the request handler to process.
+            }
+        }
         return url;
     }
     getArbitrumSubgraphUrl(subgraphId, isDeploymentId) {
-        return `https://gateway-arbitrum.network.thegraph.com/api/${this.subgraphStudioKey}/${isDeploymentId ? 'deployments' : 'subgraphs'}/id/${subgraphId}`;
+        return `https://gateway-arbitrum.network.thegraph.com/api/${this.subgraphStudioKey ? `${this.subgraphStudioKey}/` : ""}${isDeploymentId ? "deployments" : "subgraphs"}/id/${subgraphId}`;
     }
     getDefaultConfigs() {
         return [
             {
-                chain: 'polygon',
-                protocol: 'quickswap',
+                chain: "polygon",
+                protocol: "quickswap",
                 newUrl: this.getArbitrumSubgraphUrl(`FqsRcH1XqSjqVx9GRTvEJe959aCbKrcyGgDWBrUkG24g`, false),
-                oldUrl: 'https://api.thegraph.com/subgraphs/name/sameepsi/quickswap-v3',
+                oldUrl: "https://api.thegraph.com/subgraphs/name/sameepsi/quickswap-v3",
             },
             {
-                chain: 'polygon',
-                protocol: 'uniswap',
+                chain: "polygon",
+                protocol: "uniswap",
                 newUrl: this.getArbitrumSubgraphUrl(`3hCPRGf4z88VC5rsBKU5AA9FBBq5nF3jbKJG7VZCbhjm`, false),
-                oldUrl: 'https://api.thegraph.com/subgraphs/name/ianlapham/uniswap-v3-polygon',
+                oldUrl: "https://api.thegraph.com/subgraphs/name/ianlapham/uniswap-v3-polygon",
             },
             {
-                chain: 'optimism',
-                protocol: 'uniswap',
+                chain: "optimism",
+                protocol: "uniswap",
                 newUrl: this.getArbitrumSubgraphUrl(`Cghf4LfVqPiFw6fp6Y5X5Ubc8UpmUhSfJL82zwiBFLaj`, false),
-                oldUrl: 'https://api.thegraph.com/subgraphs/name/ianlapham/optimism-post-regenesis',
+                oldUrl: "https://api.thegraph.com/subgraphs/name/ianlapham/optimism-post-regenesis",
             },
             {
-                chain: 'arbitrum',
-                protocol: 'uniswap',
+                chain: "arbitrum",
+                protocol: "uniswap",
                 newUrl: this.getArbitrumSubgraphUrl(`FbCGRftH4a3yZugY7TnbYgPJVEv2LvMT6oF1fxPe9aJM`, false),
-                oldUrl: 'https://api.thegraph.com/subgraphs/name/ianlapham/arbitrum-dev',
+                oldUrl: "https://api.thegraph.com/subgraphs/name/ianlapham/arbitrum-dev",
             },
             {
-                chain: 'celo',
-                protocol: 'uniswap',
+                chain: "celo",
+                protocol: "uniswap",
                 newUrl: this.getArbitrumSubgraphUrl(`ESdrTJ3twMwWVoQ1hUE2u7PugEHX3QkenudD6aXCkDQ4`, false),
-                oldUrl: 'https://api.thegraph.com/subgraphs/name/jesse-sawa/uniswap-celo',
+                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: "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: "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: "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: "bsc",
+                protocol: "sushi",
+                newUrl: this.getArbitrumSubgraphUrl("FiJDXMFCBv88GP17g2TtPh8BcA8jZozn5WRW7hCN7cUT", false),
+                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: "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: "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: "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: "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: "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: "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',
+                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",
             },
         ];
     }

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

@@ -0,0 +1,4 @@
+import { type PublicClient } from "viem";
+import type { RpcAccess } from "../types.js";
+/** Each URL is checked on the same transport that will serve its reads. */
+export declare function createRpcClient(access: RpcAccess, chainId: number): PublicClient;

package/lib/esm/utils/rpc.js

@@ -0,0 +1,32 @@
+import { createPublicClient, custom, fallback, http, } from "viem";
+/** Each URL is checked on the same transport that will serve its reads. */
+export function createRpcClient(access, chainId) {
+    if (!Number.isSafeInteger(chainId) || chainId <= 0)
+        throw new Error("Invalid execution chain ID");
+    if (access.client)
+        return access.client;
+    const urls = [
+        ...new Set(access.urls.map((url) => url.trim()).filter(Boolean)),
+    ];
+    if (!urls.length)
+        throw new Error("No RPC URLs configured");
+    const transports = urls.map((url) => {
+        const endpoint = createPublicClient({
+            transport: http(url, { retryCount: 0 }),
+        });
+        return custom({
+            async request({ method, params }) {
+                const actualChain = await endpoint.getChainId();
+                if (actualChain !== chainId) {
+                    throw new Error("EXECUTION_CONTEXT_MISMATCH: provider chain does not match supplied context.");
+                }
+                if (method === "eth_chainId")
+                    return `0x${actualChain.toString(16)}`;
+                return endpoint.request({ method, params });
+            },
+        }, { retryCount: 0 });
+    });
+    return createPublicClient({
+        transport: fallback(transports, { rank: false, retryCount: 0 }),
+    });
+}

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

@@ -1,17 +1,14 @@
-import type { Candle } from '@steerprotocol/app-loader';
-import type { AxiosRequestConfig } from 'axios';
-import { type Provider } from 'ethers';
-import type { LegacyExecutionContext, ViewContractConfig } from '../types.js';
+import type { Candle } from "@steerprotocol/app-loader";
+import type { AxiosRequestConfig } from "axios";
+import { type PublicClient } from "viem";
+import type { ContractAbi, ExecutionContext } 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 readContract({ abi, address, chainId, contractArguments, currentExecutionContext, functionName, provider, rpc, }: {
+export declare function readContract({ abi, address, contractArguments, currentExecutionContext, functionName, provider, }: {
     address: string;
-    abi: any;
-    currentExecutionContext: LegacyExecutionContext;
+    abi: ContractAbi;
+    currentExecutionContext?: Pick<ExecutionContext, "blockNumber">;
     functionName: string;
-    provider: Provider;
-    rpc: string;
+    provider: PublicClient;
     contractArguments?: Array<any>;
-    chainId: number;
 }): Promise<any>;
-export declare function callWithRetry(config: ViewContractConfig): Promise<any>;

package/lib/esm/utils/utils.js

@@ -1,6 +1,5 @@
-import axios from 'axios';
-import { Contract } from 'ethers';
-import { API_BASE_URL, API_INITIAL_DELAY, API_MAX_RETRIES, CENTRALIZE_CONTRACT_INTERACTION_CHAINS } from './consts.js';
+import axios from "axios";
+import { getAbiItem, parseAbi, parseAbiItem, toFunctionSelector, } from "viem";
 // 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
 export const extendOHLCV = (rawData, period, endTimestamp) => {
     // Sort rawData by timestamp
@@ -31,22 +30,25 @@ async function delay(ms) {
 function exponentialBackoffDelay(attempts) {
     const baseDelay = 1000; // 1 second
     const maxDelay = 30000; // 30 seconds
-    const delay = Math.min(baseDelay * Math.pow(2, attempts - 1), maxDelay);
+    const delay = Math.min(baseDelay * 2 ** (attempts - 1), maxDelay);
     return delay;
 }
 export async function fetchData(request, attempts) {
-    log('Request payload: =============', request);
+    log("Request payload: =============", request);
     attempts = attempts + 1;
     try {
         const response = (await axios(request)).data;
         // this.log('API Response: =============', response);
-        if ('errors' in response && response['errors'].length > 0) {
+        if (response !== null &&
+            typeof response === "object" &&
+            Array.isArray(response.errors) &&
+            response.errors.length > 0) {
             if (attempts < 3) {
                 await delay(exponentialBackoffDelay(attempts));
                 return await fetchData(request, attempts);
             }
             else {
-                throw new Error('Maximum retry attempts reached');
+                throw new Error("Maximum retry attempts reached");
             }
         }
         return response;
@@ -61,59 +63,63 @@ export async function fetchData(request, attempts) {
         }
     }
 }
-export async function readContract({ abi, address, chainId, contractArguments = [], currentExecutionContext, functionName, provider, rpc, }) {
-    // Create a new contract instance
-    if (!provider)
-        throw new Error('Provider not initialized');
-    const contract = new Contract(address, abi, provider);
-    // For formatting the parameters if needed
-    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 (CENTRALIZE_CONTRACT_INTERACTION_CHAINS.indexOf(chainId.toString()) === -1) {
-        result = await contract[functionName](...paramsArray, {
-            blockTag: currentExecutionContext?.blockNumber,
-        }); // @note uncomment for deterministic blocks
-    }
-    else {
-        console.log('Calling the centralized view');
-        const viewContractConfig = {
-            epochTimestamp: currentExecutionContext.epochTimestamp,
-            blockNumber: currentExecutionContext.blockNumber,
-            address,
-            abi,
-            arguments: paramsArray,
-            method: functionName,
-            rpcUrl: rpc,
+function positionalTuple(value, parameter) {
+    if (/\[[0-9]*\]$/.test(parameter.type)) {
+        const item = {
+            ...parameter,
+            type: parameter.type.replace(/\[[0-9]*\]$/, ""),
         };
-        result = await callWithRetry(viewContractConfig);
+        return value.map((entry) => positionalTuple(entry, item));
     }
-    // This gets stringified before calling main
-    return result;
+    if (parameter.type !== "tuple" || !("components" in parameter))
+        return value;
+    return parameter.components.map((component, index) => positionalTuple(Array.isArray(value) ? value[index] : value[component.name], component));
 }
-export async function callWithRetry(config) {
-    let retries = 0;
-    let delay = API_INITIAL_DELAY;
-    while (retries < API_MAX_RETRIES) {
-        try {
-            const response = await axios.post(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...`, error);
-            await new Promise((resolve) => setTimeout(resolve, delay));
-            delay *= 2; // Double the delay for the next retry
-            retries++;
-        }
-    }
-    throw new Error(`Failed after ${API_MAX_RETRIES} attempts. to call method ${config.method}`);
+export async function readContract({ abi, address, contractArguments = [], currentExecutionContext, functionName, provider, }) {
+    if (!provider)
+        throw new Error("Provider not initialized");
+    const input = typeof abi === "string" ? JSON.parse(abi) : abi;
+    // Existing bundles may use ethers' optional tuple keyword.
+    const normalizeSignature = (signature) => signature.replace(/\btuple\s*\(/g, "(");
+    const normalizedAbi = (input.every((item) => typeof item === "string")
+        ? parseAbi(input.map(normalizeSignature))
+        : input);
+    const explicit = functionName.includes("(")
+        ? parseAbiItem(`function ${normalizeSignature(functionName)}`)
+        : undefined;
+    if (explicit && explicit.type !== "function")
+        throw new Error("Expected a function signature");
+    const selectedAbi = explicit
+        ? normalizedAbi.filter((item) => item.type === "function" &&
+            toFunctionSelector(item) === toFunctionSelector(explicit))
+        : normalizedAbi;
+    if (explicit && !selectedAbi.length)
+        throw new Error(`Function ${functionName} not found in ABI`);
+    const resolvedName = explicit && "name" in explicit ? explicit.name : functionName;
+    const result = await provider.readContract({
+        address: address,
+        abi: selectedAbi,
+        functionName: resolvedName,
+        args: contractArguments,
+        ...(currentExecutionContext?.blockNumber !== undefined
+            ? { blockNumber: BigInt(currentExecutionContext.blockNumber) }
+            : {}),
+    });
+    const item = getAbiItem({
+        abi: selectedAbi,
+        name: resolvedName,
+        args: contractArguments,
+    });
+    if (!item || item.type !== "function")
+        return result;
+    if (!item.outputs?.length)
+        return [];
+    return item.outputs.length === 1
+        ? positionalTuple(result, item.outputs[0])
+        : item.outputs.map((output, index) => positionalTuple(result[index], output));
 }
 function log(...args) {
-    if (process.env.DEBUG === 'true') {
+    if (process.env.DEBUG === "true") {
         console.log(...args);
     }
 }

package/lib/execution/executionApp.d.ts

@@ -1,14 +1,14 @@
-import type { ethers } from 'ethers';
-import type { EtherRpcConfig, ExecuteWithContextOptions, JobDetails } from '../types.js';
-import { ExecutionBase } from './executionBase.js';
+import type { ExecuteWithContextOptions, JobDetails, RpcAccess } from "../types.js";
+import { ExecutionBase } from "./executionBase.js";
 export interface ExecutionAppConfig {
     /** Vault address used for execution context and subgraph queries. */
     vault: string;
     /** Chain ID used to resolve RPC configuration and on-chain reads. */
     chainId: number;
-    /** Subgraph endpoint used for protocol data queries. */
-    steerSubgraph: string;
-    poolType: {
+    /** Required by execute() for protocol discovery queries. */
+    steerSubgraph?: string;
+    /** Required by execute() for pool discovery; unused by executeWithContext(). */
+    poolType?: {
         /** Set true when the pool uses Algebra v1 semantics. */
         isAlgebraPool: boolean;
         /** Set true when the pool uses Algebra Integral semantics. */
@@ -20,11 +20,11 @@ export interface ExecutionAppConfig {
         /** Set true when the pool uses Aerodrome semantics. */
         isAerodromePool: boolean;
     };
-    apiKeys: {
-        /** API key for The Graph Studio / gateway endpoints. */
-        subgraphStudioKey: string;
+    apiKeys?: {
+        /** Host-only Graph credential; never added to WASM configuration. */
+        subgraphStudioKey?: string;
         /** API key for Sentio endpoints, if applicable. */
-        sentioApiKey: string;
+        sentioApiKey?: string;
     };
     /** Maximum number of retries for execution operations. */
     maxRetries?: number;
@@ -38,22 +38,23 @@ export declare class ExecutionApp extends ExecutionBase {
     isDirectionalPool: boolean;
     isPoolSharkPool: boolean;
     isAerodromePool: boolean;
-    subgraphStudioKey: string;
     sentioApiKey: string;
     config: ExecutionAppConfig;
     constructor(config: ExecutionAppConfig);
-    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig, forceDeposit?: boolean): Promise<Array<T>>;
+    execute<T = unknown>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, rpc?: RpcAccess, forceDeposit?: boolean): Promise<T | "continue">;
     /**
      * Executes a strategy against a supplied execution context.
      * This is the recommended API for new consumers. It intentionally bypasses
      * all legacy vault, pool, subgraph, clock, and block-estimation reads.
      */
-    executeWithContext<T>(options: ExecuteWithContextOptions): Promise<Array<T>>;
+    executeWithContext<T = unknown>(options: ExecuteWithContextOptions): Promise<T | "continue">;
+    /** T is the complete decoded JSON result. Only the exact sentinel skips JSON decoding. */
+    private parseStrategyResult;
     private parseVaultConfig;
     private validateExecutionContext;
     private redactError;
-    executeStabilityVault<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig, forceDeposit?: boolean): Promise<Array<T>>;
-    executeDynamicJobs<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _job: JobDetails, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig, forceDeposit?: boolean): Promise<Array<T>>;
+    executeStabilityVault<T = unknown>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, rpc?: RpcAccess, forceDeposit?: boolean): Promise<T | "continue">;
+    executeDynamicJobs<T = unknown>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _job: JobDetails, rpc?: RpcAccess, forceDeposit?: boolean): Promise<T | "continue">;
     private getSmartPoolExecutionContext;
     private getPoolCurrentTick;
     private getTickSpacing;