@steerprotocol/data-connector-loader 5.0.0-next.5 → 5.0.0-next.6

package/lib/esm/execution/executionApp.d.ts

@@ -5,9 +5,10 @@ export interface ExecutionAppConfig {
     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. */
@@ -19,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;
@@ -37,7 +38,6 @@ export declare class ExecutionApp extends ExecutionBase {
     isDirectionalPool: boolean;
     isPoolSharkPool: boolean;
     isAerodromePool: boolean;
-    subgraphStudioKey: string;
     sentioApiKey: string;
     config: ExecutionAppConfig;
     constructor(config: ExecutionAppConfig);

package/lib/esm/execution/executionApp.js

@@ -451,18 +451,24 @@ export class ExecutionApp extends ExecutionBase {
                 };
         };
         this.vault = config.vault;
-        this.steerSubgraph = config.steerSubgraph;
+        this.steerSubgraph = config.steerSubgraph ?? "";
         this.chainId = config.chainId;
-        this.isAlgebraPool = config.poolType.isAlgebraPool;
-        this.isAlgebraIntegralPool = config.poolType.isAlgebraIntegralPool;
-        this.isDirectionalPool = config.poolType.isDirectionalPool;
-        this.isPoolSharkPool = config.poolType.isPoolSharkPool;
-        this.isAerodromePool = config.poolType.isAerodromePool;
-        this.subgraphStudioKey = config.apiKeys.subgraphStudioKey;
-        this.sentioApiKey = config.apiKeys.sentioApiKey;
+        this.isAlgebraPool = config.poolType?.isAlgebraPool ?? false;
+        this.isAlgebraIntegralPool =
+            config.poolType?.isAlgebraIntegralPool ?? false;
+        this.isDirectionalPool = config.poolType?.isDirectionalPool ?? false;
+        this.isPoolSharkPool = config.poolType?.isPoolSharkPool ?? false;
+        this.isAerodromePool = config.poolType?.isAerodromePool ?? false;
+        this.sentioApiKey = config.apiKeys?.sentioApiKey ?? "";
         this.config = config;
     }
     async execute(_wasmFile, _vaultConfig, _data, rpc, forceDeposit) {
+        if (!this.config.poolType) {
+            throw new Error("poolType is required by execute() for pool discovery.");
+        }
+        if (!this.steerSubgraph.trim()) {
+            throw new Error("steerSubgraph is required by execute() for pool discovery.");
+        }
         const dataConnector = new DataConnector({
             wasmFile: _wasmFile,
             config: _vaultConfig,

package/lib/esm/execution/executionDataConnector.js

@@ -142,12 +142,21 @@ export class DataConnectorExecution extends ExecutionBase {
                 }
                 else {
                     let parsedRequest = typeof request === "string" ? JSON.parse(request) : request;
-                    const url = changeUrlIfOld(parsedRequest.url, dataConnector.configObj.subgraphStudioKey);
+                    const graphApiKey = dataConnector.executionAppConfig.apiKeys?.subgraphStudioKey;
+                    const url = changeUrlIfOld(parsedRequest.url, graphApiKey ? undefined : dataConnector.configObj.subgraphStudioKey);
                     parsedRequest.url = url;
                     let sentio = false;
+                    let graph = false;
                     try {
                         const destination = new URL(axios.getUri(parsedRequest));
                         const hostname = destination.hostname.toLowerCase();
+                        graph =
+                            (destination.origin === "https://gateway.thegraph.com" ||
+                                destination.origin ===
+                                    "https://gateway-arbitrum.network.thegraph.com") &&
+                                /^\/api\/(subgraphs|deployments)\/id\/[a-zA-Z0-9]+$/.test(destination.pathname) &&
+                                !destination.username &&
+                                !destination.password;
                         sentio =
                             destination.protocol === "https:" &&
                                 (hostname === "sentio.xyz" || hostname.endsWith(".sentio.xyz"));
@@ -155,18 +164,22 @@ export class DataConnectorExecution extends ExecutionBase {
                     catch {
                         /* Axios will report an invalid URL when sending the request. */
                     }
+                    const sentioApiKey = dataConnector.executionAppConfig.apiKeys?.sentioApiKey;
                     parsedRequest.headers = {
                         "Content-Type": url && !url.includes("subgraph-proxy-server")
                             ? "application/json"
                             : "text/plain;charset=UTF-8",
-                        ...(sentio
+                        ...(sentio && sentioApiKey
                             ? {
-                                "api-key": dataConnector.executionAppConfig.apiKeys.sentioApiKey,
+                                "api-key": sentioApiKey,
                             }
                             : {}),
+                        ...(graph && graphApiKey
+                            ? { Authorization: `Bearer ${graphApiKey}` }
+                            : {}),
                         ...parsedRequest.headers,
                     };
-                    if (sentio) {
+                    if (sentio || (graph && graphApiKey)) {
                         const { url, baseURL, method, params, data, headers, timeout, responseType, allowAbsoluteUrls, } = parsedRequest;
                         parsedRequest = {
                             url,

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

@@ -11,7 +11,7 @@ export class SubgraphUrlReplacer {
         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 [

package/lib/execution/executionApp.d.ts

@@ -5,9 +5,10 @@ export interface ExecutionAppConfig {
     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. */
@@ -19,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;
@@ -37,7 +38,6 @@ export declare class ExecutionApp extends ExecutionBase {
     isDirectionalPool: boolean;
     isPoolSharkPool: boolean;
     isAerodromePool: boolean;
-    subgraphStudioKey: string;
     sentioApiKey: string;
     config: ExecutionAppConfig;
     constructor(config: ExecutionAppConfig);

package/lib/execution/executionApp.js

@@ -16,7 +16,7 @@ const utils_js_1 = require("../utils/utils.js");
 const executionBase_js_1 = require("./executionBase.js");
 class ExecutionApp extends executionBase_js_1.ExecutionBase {
     constructor(config) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         super((_a = config.maxRetries) !== null && _a !== void 0 ? _a : 3);
         this.getSlot0 = (pool, currentExecutionContext, provider) => __awaiter(this, void 0, void 0, function* () {
             const slot0Abi = [
@@ -464,19 +464,25 @@ class ExecutionApp extends executionBase_js_1.ExecutionBase {
                 };
         });
         this.vault = config.vault;
-        this.steerSubgraph = config.steerSubgraph;
+        this.steerSubgraph = (_b = config.steerSubgraph) !== null && _b !== void 0 ? _b : "";
         this.chainId = config.chainId;
-        this.isAlgebraPool = config.poolType.isAlgebraPool;
-        this.isAlgebraIntegralPool = config.poolType.isAlgebraIntegralPool;
-        this.isDirectionalPool = config.poolType.isDirectionalPool;
-        this.isPoolSharkPool = config.poolType.isPoolSharkPool;
-        this.isAerodromePool = config.poolType.isAerodromePool;
-        this.subgraphStudioKey = config.apiKeys.subgraphStudioKey;
-        this.sentioApiKey = config.apiKeys.sentioApiKey;
+        this.isAlgebraPool = (_d = (_c = config.poolType) === null || _c === void 0 ? void 0 : _c.isAlgebraPool) !== null && _d !== void 0 ? _d : false;
+        this.isAlgebraIntegralPool =
+            (_f = (_e = config.poolType) === null || _e === void 0 ? void 0 : _e.isAlgebraIntegralPool) !== null && _f !== void 0 ? _f : false;
+        this.isDirectionalPool = (_h = (_g = config.poolType) === null || _g === void 0 ? void 0 : _g.isDirectionalPool) !== null && _h !== void 0 ? _h : false;
+        this.isPoolSharkPool = (_k = (_j = config.poolType) === null || _j === void 0 ? void 0 : _j.isPoolSharkPool) !== null && _k !== void 0 ? _k : false;
+        this.isAerodromePool = (_m = (_l = config.poolType) === null || _l === void 0 ? void 0 : _l.isAerodromePool) !== null && _m !== void 0 ? _m : false;
+        this.sentioApiKey = (_p = (_o = config.apiKeys) === null || _o === void 0 ? void 0 : _o.sentioApiKey) !== null && _p !== void 0 ? _p : "";
         this.config = config;
     }
     execute(_wasmFile, _vaultConfig, _data, rpc, forceDeposit) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.config.poolType) {
+                throw new Error("poolType is required by execute() for pool discovery.");
+            }
+            if (!this.steerSubgraph.trim()) {
+                throw new Error("steerSubgraph is required by execute() for pool discovery.");
+            }
             const dataConnector = new bundleDataConnector_js_1.DataConnector({
                 wasmFile: _wasmFile,
                 config: _vaultConfig,

package/lib/execution/executionDataConnector.js

@@ -156,6 +156,7 @@ class DataConnectorExecution extends executionBase_js_1.ExecutionBase {
         });
     }
     handleRequestResponse(dataConnector, initialRequest, context) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let request = initialRequest;
             let response;
@@ -172,27 +173,39 @@ class DataConnectorExecution extends executionBase_js_1.ExecutionBase {
                     }
                     else {
                         let parsedRequest = typeof request === "string" ? JSON.parse(request) : request;
-                        const url = (0, replace_old_subgraphs_js_1.changeUrlIfOld)(parsedRequest.url, dataConnector.configObj.subgraphStudioKey);
+                        const graphApiKey = (_a = dataConnector.executionAppConfig.apiKeys) === null || _a === void 0 ? void 0 : _a.subgraphStudioKey;
+                        const url = (0, replace_old_subgraphs_js_1.changeUrlIfOld)(parsedRequest.url, graphApiKey ? undefined : dataConnector.configObj.subgraphStudioKey);
                         parsedRequest.url = url;
                         let sentio = false;
+                        let graph = false;
                         try {
                             const destination = new URL(axios_1.default.getUri(parsedRequest));
                             const hostname = destination.hostname.toLowerCase();
+                            graph =
+                                (destination.origin === "https://gateway.thegraph.com" ||
+                                    destination.origin ===
+                                        "https://gateway-arbitrum.network.thegraph.com") &&
+                                    /^\/api\/(subgraphs|deployments)\/id\/[a-zA-Z0-9]+$/.test(destination.pathname) &&
+                                    !destination.username &&
+                                    !destination.password;
                             sentio =
                                 destination.protocol === "https:" &&
                                     (hostname === "sentio.xyz" || hostname.endsWith(".sentio.xyz"));
                         }
-                        catch (_a) {
+                        catch (_c) {
                             /* Axios will report an invalid URL when sending the request. */
                         }
-                        parsedRequest.headers = Object.assign(Object.assign({ "Content-Type": url && !url.includes("subgraph-proxy-server")
+                        const sentioApiKey = (_b = dataConnector.executionAppConfig.apiKeys) === null || _b === void 0 ? void 0 : _b.sentioApiKey;
+                        parsedRequest.headers = Object.assign(Object.assign(Object.assign({ "Content-Type": url && !url.includes("subgraph-proxy-server")
                                 ? "application/json"
-                                : "text/plain;charset=UTF-8" }, (sentio
+                                : "text/plain;charset=UTF-8" }, (sentio && sentioApiKey
                             ? {
-                                "api-key": dataConnector.executionAppConfig.apiKeys.sentioApiKey,
+                                "api-key": sentioApiKey,
                             }
+                            : {})), (graph && graphApiKey
+                            ? { Authorization: `Bearer ${graphApiKey}` }
                             : {})), parsedRequest.headers);
-                        if (sentio) {
+                        if (sentio || (graph && graphApiKey)) {
                             const { url, baseURL, method, params, data, headers, timeout, responseType, allowAbsoluteUrls, } = parsedRequest;
                             parsedRequest = {
                                 url,

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

@@ -15,7 +15,7 @@ class SubgraphUrlReplacer {
         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 [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerprotocol/data-connector-loader",
-  "version": "5.0.0-next.5",
+  "version": "5.0.0-next.6",
   "description": "App Loader for Steer Protocol",
   "type": "module",
   "main": "lib/index.js",