nyxora 26.6.26 → 26.6.27

package/dist/packages/core/src/agent/llmProvider.js

@@ -12,7 +12,8 @@ class OpenAIAdapter {
             message: {
                 content: response.choices[0].message.content,
                 tool_calls: response.choices[0].message.tool_calls
-            }
+            },
+            usage: response.usage ? { total_tokens: response.usage.total_tokens } : undefined
         };
     }
 }
@@ -124,7 +125,8 @@ class AnthropicAdapter {
             message: {
                 content: contentStr,
                 tool_calls: toolCalls.length > 0 ? toolCalls : undefined
-            }
+            },
+            usage: response.usage ? { total_tokens: response.usage.input_tokens + response.usage.output_tokens } : undefined
         };
     }
 }
@@ -254,11 +256,16 @@ class GeminiAdapter {
                 }
             }
         }
+        let totalTokens = 0;
+        if (data.usageMetadata && data.usageMetadata.totalTokenCount) {
+            totalTokens = data.usageMetadata.totalTokenCount;
+        }
         return {
             message: {
                 content: contentStr,
                 tool_calls: toolCalls.length > 0 ? toolCalls : undefined
-            }
+            },
+            usage: totalTokens > 0 ? { total_tokens: totalTokens } : undefined
         };
     }
 }

package/dist/packages/core/src/gateway/server.js

@@ -183,7 +183,7 @@ app.post('/api/upload-google-credentials', (req, res) => {
 app.get('/api/history', (req, res) => {
     try {
         const sessionId = req.query.session_id;
-        const history = reasoning_1.logger.getHistory(sessionId);
+        const history = reasoning_1.logger.getHistory(sessionId, 1000);
         // Filter out internal system prompt for the frontend
         const cleanHistory = history.filter((msg) => msg.role !== 'system');
         res.json(cleanHistory);

package/dist/packages/core/src/memory/logger.js

@@ -150,19 +150,19 @@ class Logger {
     renameSession(sessionId, newTitle) {
         this.db.prepare('UPDATE sessions SET title = ? WHERE id = ?').run(newTitle, sessionId);
     }
-    getHistory(sessionId) {
+    getHistory(sessionId, limit = 40) {
         let rows;
         // Phase 2: Sliding Window Algorithm (LLM Context Limit)
-        // Fetch only the last 40 messages, then order them chronologically
+        // Fetch only the last X messages, then order them chronologically
         if (sessionId) {
             rows = this.db.prepare(`
         SELECT * FROM (
           SELECT role, content, name, tool_call_id, tool_calls, session_id, id 
           FROM messages 
           WHERE session_id = ? 
-          ORDER BY id DESC LIMIT 40
+          ORDER BY id DESC LIMIT ?
         ) ORDER BY id ASC
-      `).all(sessionId);
+      `).all(sessionId, limit);
         }
         else {
             rows = this.db.prepare(`
@@ -170,9 +170,9 @@ class Logger {
           SELECT role, content, name, tool_call_id, tool_calls, session_id, id 
           FROM messages 
           WHERE session_id IS NULL
-          ORDER BY id DESC LIMIT 40
+          ORDER BY id DESC LIMIT ?
         ) ORDER BY id ASC
-      `).all();
+      `).all(limit);
         }
         return rows.map((row) => {
             const entry = {

package/dist/packages/core/src/utils/httpClient.js

@@ -26,16 +26,29 @@ async function safeFetch(url, options = {}) {
     for (let attempt = 0; attempt <= retries; attempt++) {
         const controller = new AbortController();
         const id = setTimeout(() => controller.abort(), timeoutMs);
+        const externalSignal = fetchOptions.signal;
+        const onExternalAbort = () => controller.abort();
+        if (externalSignal) {
+            if (externalSignal.aborted)
+                controller.abort();
+            else
+                externalSignal.addEventListener('abort', onExternalAbort);
+        }
+        const cleanup = () => {
+            clearTimeout(id);
+            if (externalSignal)
+                externalSignal.removeEventListener('abort', onExternalAbort);
+        };
         try {
             const res = await fetch(url, {
                 ...fetchOptions,
                 headers: finalHeaders,
                 signal: controller.signal
             });
-            clearTimeout(id);
+            cleanup();
             // Handle Rate Limits specifically with a forced retry if attempts remain
             if (res.status === 429) {
-                if (attempt < retries) {
+                if (attempt < retries && !controller.signal.aborted) {
                     // Coingecko and others often need longer backoff, exponentially increase
                     await delay(retryDelayMs * (attempt + 1) * 2);
                     continue;
@@ -44,7 +57,7 @@ async function safeFetch(url, options = {}) {
             }
             // Handle Server Errors with retry
             if (res.status >= 500) {
-                if (attempt < retries) {
+                if (attempt < retries && !controller.signal.aborted) {
                     await delay(retryDelayMs * (attempt + 1));
                     continue;
                 }
@@ -53,8 +66,12 @@ async function safeFetch(url, options = {}) {
             return res;
         }
         catch (error) {
-            clearTimeout(id);
+            cleanup();
             lastError = error;
+            // Do not retry if the external aggregator specifically aborted us
+            if (externalSignal && externalSignal.aborted) {
+                throw new HttpError(499, 'Client Closed Request', '');
+            }
             // AbortError is a timeout
             if (error.name === 'AbortError') {
                 if (attempt < retries) {
@@ -64,7 +81,7 @@ async function safeFetch(url, options = {}) {
                 throw new HttpError(408, 'Request Timeout', '');
             }
             // Network errors (like fetch failed)
-            if (attempt < retries) {
+            if (attempt < retries && !controller.signal.aborted) {
                 await delay(retryDelayMs * (attempt + 1));
                 continue;
             }

package/dist/packages/core/src/web3/aggregator/defiRouter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.routeTransaction = routeTransaction;
 const routeSelector_1 = require("./routeSelector");
-async function routeTransaction(fromChain, toChain, fromToken, toToken, amountInWei, userAddress, slippageTolerance = "auto") {
+async function routeTransaction(fromChain, toChain, fromToken, toToken, amountInWei, amountFormatted, userAddress, slippageTolerance = "auto", providerName) {
     fromChain = String(fromChain || "");
     toChain = String(toChain || "");
     if (!fromChain || !toChain) {
@@ -35,8 +35,10 @@ async function routeTransaction(fromChain, toChain, fromToken, toToken, amountIn
         fromToken,
         toToken,
         amountInWei,
+        amountFormatted,
         userAddress,
-        slippageTolerance
+        slippageTolerance,
+        preferredProvider: providerName && providerName !== "auto" ? providerName : undefined
     };
     console.log(`[DeFi Router] Routing transaction via Extensible Provider Runtime...`);
     return await (0, routeSelector_1.fetchBestRoute)(request, "best_output");

package/dist/packages/core/src/web3/aggregator/providerRegistry.js

@@ -91,7 +91,14 @@ class AggregatorRegistry {
             fs_1.default.mkdirSync(providersDir, { recursive: true });
             return;
         }
-        const files = fs_1.default.readdirSync(providersDir).filter(f => f.endsWith('.ts') || f.endsWith('.js'));
+        const isCompiled = __dirname.includes('dist') || __dirname.includes('build') || process.env.NODE_ENV === 'production';
+        const files = fs_1.default.readdirSync(providersDir).filter(f => {
+            if (f.endsWith('.d.ts'))
+                return false;
+            if (isCompiled)
+                return f.endsWith('.js');
+            return f.endsWith('.ts') || f.endsWith('.js');
+        });
         for (const file of files) {
             const fullPath = path_1.default.join(providersDir, file);
             try {

package/dist/packages/core/src/web3/aggregator/providers/KyberSwapProvider.js

@@ -38,7 +38,7 @@ class KyberSwapProvider {
         const slipParam = request.slippageTolerance === "auto" ? 50 : (request.slippageTolerance * 100);
         // Phase 1: Route
         const routeUrl = `https://aggregator-api.kyberswap.com/${chainName}/api/v1/routes?tokenIn=${request.fromToken}&tokenOut=${request.toToken}&amountIn=${request.amountInWei}`;
-        const routeRes = await (0, httpClient_1.safeFetch)(routeUrl, { signal: context.abortSignal });
+        const routeRes = await (0, httpClient_1.safeFetch)(routeUrl, { signal: context.abortSignal, retries: 0 });
         if (!routeRes.ok)
             throw new Error(`KyberSwap Route Error: ${await routeRes.text()}`);
         const routeData = await routeRes.json();
@@ -55,13 +55,17 @@ class KyberSwapProvider {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(buildPayload),
-            signal: context.abortSignal
+            signal: context.abortSignal,
+            retries: 0
         });
         if (!buildRes.ok)
             throw new Error(`KyberSwap Build Error: ${await buildRes.text()}`);
         const buildData = await buildRes.json();
-        const isNative = request.fromToken.toLowerCase() === '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' ||
-            request.fromToken === '0x0000000000000000000000000000000000000000';
+        // KyberSwap returns calldata in 'data' field, and router address in 'routerAddress'
+        if (!buildData.data || !buildData.data.routerAddress || !buildData.data.data) {
+            throw new Error(`KyberSwap build response missing required fields (routerAddress or data). Got: ${JSON.stringify(Object.keys(buildData.data || {}))}`);
+        }
+        const isNative = request.fromToken.toLowerCase() === '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
         return {
             provider: this.manifest.name,
             routeId: `kyber-${crypto_1.default.randomUUID()}`,

package/dist/packages/core/src/web3/aggregator/providers/LifiProvider.js

@@ -44,17 +44,29 @@ class LifiProvider {
     async getQuote(request, context) {
         const key = context.apiKeys['lifi_key'];
         const slipParam = request.slippageTolerance === "auto" ? 0.005 : (request.slippageTolerance / 100);
-        const url = `https://li.quest/v1/quote?fromChain=${request.fromChain}&toChain=${request.toChain}&fromToken=${request.fromToken}&toToken=${request.toToken}&fromAmount=${request.amountInWei}&fromAddress=${request.userAddress}&slippage=${slipParam}`;
+        const fromChainId = CHAIN_IDS[request.fromChain];
+        const toChainId = CHAIN_IDS[request.toChain];
+        const url = `https://li.quest/v1/quote?fromChain=${fromChainId}&toChain=${toChainId}&fromToken=${request.fromToken}&toToken=${request.toToken}&fromAmount=${request.amountInWei}&fromAddress=${request.userAddress}&slippage=${slipParam}`;
         const headers = {};
         if (key)
             headers['x-lifi-api-key'] = key;
         const res = await (0, httpClient_1.safeFetch)(url, {
             headers,
-            signal: context.abortSignal
+            signal: context.abortSignal,
+            retries: 0
         });
         if (!res.ok)
             throw new Error(`LI.FI API Error: ${await res.text()}`);
         const data = await res.json();
+        // LiFi can return HTTP 200 with an 'errors' array if a tool fails
+        if (data.errors && data.errors.length > 0) {
+            const err = data.errors[0];
+            throw new Error(`LI.FI route error (${err.code || 'UNKNOWN'}): ${err.message}`);
+        }
+        // transactionRequest may be null if LiFi found no executable route
+        if (!data.transactionRequest || !data.transactionRequest.to) {
+            throw new Error(`[LifiProvider] No valid transactionRequest returned — no executable route found`);
+        }
         return {
             provider: this.manifest.name,
             routeId: `lifi-${crypto_1.default.randomUUID()}`,

package/dist/packages/core/src/web3/aggregator/providers/OneInchProvider.js

@@ -51,10 +51,12 @@ class OneInchProvider {
         }
         const chainId = CHAIN_IDS[request.fromChain];
         const slippage = request.slippageTolerance === "auto" ? "0.5" : request.slippageTolerance.toString();
+        // Re-added &disableEstimate=true to prevent 1inch API from returning 400 Bad Request on unapproved tokens
         const url = `https://api.1inch.dev/swap/v6.0/${chainId}/swap?src=${request.fromToken}&dst=${request.toToken}&amount=${request.amountInWei}&from=${request.userAddress}&slippage=${slippage}&disableEstimate=true`;
         const res = await (0, httpClient_1.safeFetch)(url, {
             headers: { 'Authorization': `Bearer ${key}` },
-            signal: context.abortSignal
+            signal: context.abortSignal,
+            retries: 0
         });
         if (!res.ok) {
             throw new Error(`1inch API Error: ${await res.text()}`);

package/dist/packages/core/src/web3/aggregator/providers/OpBridgeProvider.js

@@ -33,8 +33,16 @@ class OpBridgeProvider {
         return isNative;
     }
     async getQuote(request, context) {
-        // Official OP Stack L1 Standard Bridge on Sepolia
-        const bridgeAddress = '0xFBb0621E0B23b5478B630BD55a5f21f67730B0F1';
+        // Each OP Stack L2 has its OWN L1StandardBridgeProxy on Sepolia L1
+        // Using the wrong address sends ETH to the wrong contract = loss of funds
+        const BRIDGE_ADDRESSES = {
+            optimism_sepolia: '0xFBb0621E0B23b5478B630BD55a5f21f67730B0F1', // Confirmed: OP Sepolia L1StandardBridgeProxy
+            base_sepolia: '0xfd0Bf71F60660E2f608ed56e1659C450eB113120', // Confirmed: Base Sepolia L1StandardBridgeProxy
+        };
+        const bridgeAddress = BRIDGE_ADDRESSES[request.toChain];
+        if (!bridgeAddress) {
+            throw new Error(`[OpBridgeProvider] No bridge address configured for destination chain: ${request.toChain}`);
+        }
         // ABI for depositETH
         const depositEthAbi = (0, viem_1.parseAbi)([
             'function depositETH(uint32 _minGasLimit, bytes _extraData) payable'

package/dist/packages/core/src/web3/aggregator/providers/OpenOceanProvider.js

@@ -1,6 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenOceanProvider = void 0;
+const httpClient_1 = require("../../../utils/httpClient");
+const crypto_1 = __importDefault(require("crypto"));
+const CHAIN_IDS = {
+    ethereum: 1, base: 8453, bsc: 56, arbitrum: 42161, optimism: 10, polygon: 137
+};
 class OpenOceanProvider {
     manifest = {
         id: 'openocean',
@@ -8,7 +16,7 @@ class OpenOceanProvider {
         version: '1.0.0',
         networks: ['mainnet'],
         capabilities: ['swap'],
-        allowedDomains: ['openocean.finance'],
+        allowedDomains: ['open-api.openocean.finance'],
         permissions: {
             network: true,
             walletAccess: 'none',
@@ -16,17 +24,65 @@ class OpenOceanProvider {
         }
     };
     isCrossChainSupported() {
-        return true;
+        return false;
     }
     supports(request) {
-        // Mock implementation for MVP
-        return false;
+        if (request.fromChain !== request.toChain)
+            return false;
+        if (!CHAIN_IDS[request.fromChain])
+            return false;
+        return true;
     }
     async getQuote(request, context) {
-        throw new Error('OpenOcean Not Implemented in Provider Architecture yet');
+        const chainId = CHAIN_IDS[request.fromChain];
+        const slippage = request.slippageTolerance === "auto" ? "1" : request.slippageTolerance.toString();
+        const inTokenAddress = request.fromToken;
+        const outTokenAddress = request.toToken;
+        // OpenOcean v3 API requires the human-readable amount (e.g., '1' for 1 USDC), not wei.
+        if (!request.amountFormatted) {
+            throw new Error("OpenOceanProvider requires 'amountFormatted' (decimal string) in QuoteRequest.");
+        }
+        const amount = request.amountFormatted;
+        const account = request.userAddress;
+        const url = `https://open-api.openocean.finance/v3/${chainId}/swap_quote?inTokenAddress=${inTokenAddress}&outTokenAddress=${outTokenAddress}&amount=${amount}&slippage=${slippage}&account=${account}&gasPrice=5`;
+        const res = await (0, httpClient_1.safeFetch)(url, {
+            signal: context.abortSignal,
+            retries: 0
+        });
+        if (!res.ok) {
+            throw new Error(`OpenOcean API Error: ${await res.text()}`);
+        }
+        const json = await res.json();
+        if (json.code !== 200 || !json.data) {
+            throw new Error(`OpenOcean Route Error: ${json.error || 'Unknown error'}`);
+        }
+        const data = json.data;
+        return {
+            provider: this.manifest.name,
+            routeId: `openocean-${crypto_1.default.randomUUID()}`,
+            fromChainId: chainId,
+            toChainId: chainId,
+            inputAmount: BigInt(amount),
+            outputAmount: BigInt(data.outAmount),
+            executable: true,
+            expiresAt: Date.now() + 60000,
+            approvalAddress: data.to,
+            execution: {
+                target: data.to,
+                calldata: data.data,
+                value: BigInt(data.value || 0)
+            },
+            raw: json
+        };
     }
-    async isHealthy() {
-        return { ok: false, checkedAt: Date.now(), reason: 'Not Implemented' };
+    async isHealthy(context) {
+        try {
+            const res = await (0, httpClient_1.safeFetch)('https://open-api.openocean.finance/v3/1/tokenList?limit=1', { signal: context.abortSignal });
+            return { ok: res.ok, checkedAt: Date.now() };
+        }
+        catch (e) {
+            return { ok: false, checkedAt: Date.now(), reason: e.message };
+        }
     }
 }
 exports.OpenOceanProvider = OpenOceanProvider;

package/dist/packages/core/src/web3/aggregator/providers/RelayProvider.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelayProvider = void 0;
 const httpClient_1 = require("../../../utils/httpClient");
 const crypto_1 = __importDefault(require("crypto"));
+// Relay.link expects chain IDs as integers (number), not strings
 const CHAIN_IDS = {
-    ethereum: '1', base: '8453', bsc: '56', arbitrum: '42161', optimism: '10', polygon: '137',
-    sepolia: '11155111', base_sepolia: '84532'
+    ethereum: 1, base: 8453, bsc: 56, arbitrum: 42161, optimism: 10, polygon: 137,
+    sepolia: 11155111, base_sepolia: 84532
 };
 class RelayProvider {
     manifest = {
@@ -36,16 +37,16 @@ class RelayProvider {
     async getQuote(request, context) {
         const isTestnet = request.fromChain.includes('sepolia') || request.toChain.includes('sepolia');
         const baseUrl = isTestnet ? 'https://api.testnets.relay.link' : 'https://api.relay.link';
-        const originChainId = CHAIN_IDS[request.fromChain];
-        const destChainId = CHAIN_IDS[request.toChain];
+        const originChainId = CHAIN_IDS[request.fromChain]; // number, as required by Relay API
+        const destChainId = CHAIN_IDS[request.toChain]; // number, as required by Relay API
         const originCurrency = request.fromToken.toLowerCase() === '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
             ? '0x0000000000000000000000000000000000000000' : request.fromToken;
         const destCurrency = request.toToken.toLowerCase() === '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
             ? '0x0000000000000000000000000000000000000000' : request.toToken;
         const payload = {
             user: request.userAddress,
-            originChainId,
-            destinationChainId: destChainId,
+            originChainId, // now a number, not string
+            destinationChainId: destChainId, // now a number, not string
             originCurrency,
             destinationCurrency: destCurrency,
             recipient: request.userAddress,
@@ -58,7 +59,8 @@ class RelayProvider {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(payload),
-            signal: context.abortSignal
+            signal: context.abortSignal,
+            retries: 0
         });
         if (!res.ok)
             throw new Error(`Relay API Error: ${await res.text()}`);
@@ -66,14 +68,23 @@ class RelayProvider {
         const txPayload = data.steps?.[0]?.items?.[0]?.data;
         if (!txPayload)
             throw new Error("Missing Relay transaction payload");
+        // Relay /quote/v2 may structure outputAmount differently; provide fallbacks
+        const outputAmount = BigInt(data.details?.currencyOut?.amount ||
+            data.details?.currencyOut?.minimumAmount ||
+            0);
+        if (outputAmount === 0n) {
+            throw new Error("Relay API returned 0 output amount or invalid route details.");
+        }
+        // Determine executability from whether we have a valid tx payload, not an undocumented 'executable' field
+        const isExecutable = !!txPayload && !!txPayload.to && !!txPayload.data;
         return {
             provider: this.manifest.name,
             routeId: `relay-${crypto_1.default.randomUUID()}`,
             fromChainId: Number(originChainId),
             toChainId: Number(destChainId),
             inputAmount: BigInt(request.amountInWei),
-            outputAmount: BigInt(data.details?.currencyOut?.amount || 0),
-            executable: true,
+            outputAmount: outputAmount,
+            executable: isExecutable,
             expiresAt: Date.now() + 60000,
             execution: {
                 target: txPayload.to,

package/dist/packages/core/src/web3/aggregator/providers/ZeroXProvider.js

@@ -13,7 +13,7 @@ class ZeroXProvider {
     manifest = {
         id: '0x',
         name: '0x API',
-        version: '1.0.0',
+        version: '2.0.0', // Updated to v2
         networks: ['mainnet'],
         capabilities: ['swap'],
         requiredApiKeys: [
@@ -23,9 +23,10 @@ class ZeroXProvider {
                 envKey: 'ZEROX_API_KEY',
                 required: true,
                 secret: true,
-                docsUrl: 'https://0x.org/docs/0x-swap-api/introduction'
+                docsUrl: 'https://0x.org/docs/introduction/getting-started'
             }
         ],
+        // v2 uses a single unified endpoint, no longer chain-specific subdomains
         allowedDomains: ['api.0x.org'],
         permissions: {
             network: true,
@@ -47,28 +48,55 @@ class ZeroXProvider {
         const key = context.apiKeys['zero_x_key'];
         if (!key)
             throw new Error(`[ZeroXProvider] Missing required API key 'zero_x_key'`);
-        const slipParam = request.slippageTolerance === "auto" ? "0.005" : (request.slippageTolerance / 100).toString();
-        const url = `https://api.0x.org/swap/v1/quote?sellToken=${request.fromToken}&buyToken=${request.toToken}&sellAmount=${request.amountInWei}&takerAddress=${request.userAddress}&slippagePercentage=${slipParam}`;
+        const chainId = CHAIN_IDS[request.fromChain];
+        // v2: slippage is in BASIS POINTS (bps), NOT percentage decimal
+        // 0.5% = 50 bps
+        const slipBps = request.slippageTolerance === "auto"
+            ? "50"
+            : Math.round(request.slippageTolerance * 100).toString();
+        // v2: unified URL, chain differentiated by chainId param
+        // Using /allowance-holder/quote as it's simpler (no EIP-712 signing required)
+        const params = new URLSearchParams({
+            chainId: String(chainId),
+            sellToken: request.fromToken,
+            buyToken: request.toToken,
+            sellAmount: request.amountInWei,
+            taker: request.userAddress, // v2: 'taker' replaces v1's 'takerAddress'
+            slippageBps: slipBps, // v2: 'slippageBps' replaces v1's 'slippagePercentage'
+        });
+        const url = `https://api.0x.org/swap/allowance-holder/quote?${params.toString()}`;
         const res = await (0, httpClient_1.safeFetch)(url, {
-            headers: { '0x-api-key': key },
-            signal: context.abortSignal
+            headers: {
+                '0x-api-key': key,
+                '0x-version': 'v2' // v2: mandatory version header
+            },
+            signal: context.abortSignal,
+            retries: 0
         });
         if (!res.ok)
-            throw new Error(`0x API Error: ${await res.text()}`);
+            throw new Error(`0x API v2 Error: ${await res.text()}`);
         const data = await res.json();
+        if (data.liquidityAvailable === false) {
+            throw new Error(`[ZeroXProvider] No liquidity available for this pair`);
+        }
+        // v2: transaction fields are nested under data.transaction, NOT root level
+        if (!data.transaction || !data.transaction.to || !data.transaction.data) {
+            throw new Error(`[ZeroXProvider] Missing transaction payload in v2 response`);
+        }
         return {
             provider: this.manifest.name,
             routeId: `0x-${crypto_1.default.randomUUID()}`,
-            fromChainId: CHAIN_IDS[request.fromChain],
-            toChainId: CHAIN_IDS[request.toChain],
+            fromChainId: chainId,
+            toChainId: chainId,
             inputAmount: BigInt(request.amountInWei),
             outputAmount: BigInt(data.buyAmount),
             executable: true,
             expiresAt: Date.now() + 60000,
+            approvalAddress: data.issues?.allowance?.spender || data.transaction.to,
             execution: {
-                target: data.to,
-                calldata: data.data,
-                value: BigInt(data.value || 0)
+                target: data.transaction.to, // FIXED: was data.to in v1
+                calldata: data.transaction.data, // FIXED: was data.data in v1
+                value: BigInt(data.transaction.value || 0) // FIXED: was data.value in v1
             },
             raw: data
         };

package/dist/packages/core/src/web3/aggregator/routeSelector.js

@@ -8,8 +8,9 @@ const providerRegistry_1 = require("./providerRegistry");
 const quoteValidator_1 = require("./quoteValidator");
 const routeScorer_1 = require("./routeScorer");
 const defiConfigManager_1 = require("../../config/defiConfigManager");
+const providerHealthService_1 = require("./providerHealthService");
 const crypto_1 = __importDefault(require("crypto"));
-const PROVIDER_TIMEOUT_MS = 4000;
+// Dynamic timeout implemented inside fetchBestRoute
 function withTimeout(promise, ms, signal) {
     return new Promise((resolve, reject) => {
         const timer = setTimeout(() => reject(new Error('Provider timeout')), ms);
@@ -33,7 +34,10 @@ function withTimeout(promise, ms, signal) {
 }
 async function fetchBestRoute(request, preference = "best_output") {
     // 1. Resolve eligible providers
-    const eligibleProviders = providerRegistry_1.aggregatorRegistry.resolveEligibleProviders(request);
+    let eligibleProviders = providerRegistry_1.aggregatorRegistry.resolveEligibleProviders(request);
+    if (request.preferredProvider && request.preferredProvider !== "auto") {
+        eligibleProviders = eligibleProviders.filter(p => p.manifest.id === request.preferredProvider);
+    }
     if (eligibleProviders.length === 0) {
         throw new Error('[RouteSelector] No eligible providers found for this route.');
     }
@@ -45,8 +49,10 @@ async function fetchBestRoute(request, preference = "best_output") {
         abortSignal: controller.signal,
         apiKeys: keys
     };
-    // 3. Parallel fetch with timeout
-    const promises = eligibleProviders.map(provider => withTimeout(provider.getQuote(request, context), PROVIDER_TIMEOUT_MS, controller.signal)
+    // 3. Parallel fetch with adaptive timeout
+    // Same-chain swaps are fast, but cross-chain bridges (Relay, LiFi) need more time to calculate routes
+    const timeoutMs = request.fromChain === request.toChain ? 4000 : 8000;
+    const promises = eligibleProviders.map(provider => withTimeout(provider.getQuote(request, context), timeoutMs, controller.signal)
         .then(quote => {
         // Validate immediately after receiving
         const error = quoteValidator_1.quoteValidator.validate(quote, request);
@@ -56,21 +62,26 @@ async function fetchBestRoute(request, preference = "best_output") {
         return quote;
     }));
     const settled = await Promise.allSettled(promises);
-    // 4. Collect fulfilled quotes
-    const quotes = settled
-        .filter((result) => result.status === 'fulfilled')
-        .map(result => result.value);
+    // 4. Collect fulfilled quotes and record health
+    const quotes = [];
+    settled.forEach((result, i) => {
+        const providerId = eligibleProviders[i].manifest.id;
+        if (result.status === 'fulfilled') {
+            quotes.push(result.value);
+            providerHealthService_1.healthService.recordSuccess(providerId);
+        }
+        else {
+            console.warn(`[RouteSelector] Provider ${eligibleProviders[i].manifest.name} failed:`, result.reason);
+            providerHealthService_1.healthService.recordFailure(providerId, result.reason?.message || "Unknown error");
+        }
+    });
     if (quotes.length === 0) {
-        // Log reasons for failure
-        settled.forEach((res, i) => {
-            if (res.status === 'rejected') {
-                console.warn(`[RouteSelector] Provider ${eligibleProviders[i].manifest.name} failed:`, res.reason);
-            }
-        });
         throw new Error('[RouteSelector] All providers failed or timed out. No route found.');
     }
     // 5. Score and select best
     const bestQuote = routeScorer_1.routeScorer.selectBest(quotes, request, preference);
+    // Abort any slow providers still running in background
+    controller.abort();
     if (!bestQuote) {
         throw new Error('[RouteSelector] Failed to score quotes. No route found.');
     }