@ring-protocol/smart-order-router 0.5.29 → 0.5.31

package/build/module/util/methodParameters.js

@@ -1,15 +1,17 @@
 import { MixedRouteSDK, Protocol, SwapRouter as SwapRouter02, Trade, } from '@ring-protocol/router-sdk';
 import { TradeType } from '@ring-protocol/sdk-core';
-import { UNIVERSAL_ROUTER_ADDRESS, SwapRouter as UniversalRouter,
-// UNIVERSAL_ROUTER_ADDRESS,
- } from '@ring-protocol/universal-router-sdk';
+import { UNIVERSAL_ROUTER_ADDRESS, SwapRouter as UniversalRouter, UniversalRouterVersion, } from '@ring-protocol/universal-router-sdk';
 import { Route as RingFewV2RouteRaw } from '@ring-protocol/few-v2-sdk';
 import { Route as V2RouteRaw } from '@ring-protocol/v2-sdk';
 import { Route as V3RouteRaw } from '@ring-protocol/v3-sdk';
-import { Route as V4RouteRaw } from '@ring-protocol/v4-sdk';
+import { Route as V4RouteRaw, Pool as V4Pool } from '@ring-protocol/v4-sdk';
 import _ from 'lodash';
 import { CurrencyAmount, SwapType, SWAP_ROUTER_02_ADDRESSES, } from '..';
 export function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, fewTokenOutToken, tradeType, routeAmounts) {
+    // fewTokenInToken/fewTokenOutToken 保留参数以维持 API 兼容性，
+    // 但 FewV2 路由现在统一使用 tokenInCurrency/tokenOutCurrency
+    void fewTokenInToken;
+    void fewTokenOutToken;
     /// Removed partition because of new mixedRoutes
     const v4RouteAmounts = _.filter(routeAmounts, (routeAmount) => routeAmount.protocol === Protocol.V4);
     const v3RouteAmounts = _.filter(routeAmounts, (routeAmount) => routeAmount.protocol === Protocol.V3);
@@ -97,12 +99,12 @@ export function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, f
     });
     const fewV2Routes = _.map(ringFewV2RouteAmounts, (routeAmount) => {
         const { route, amount, quote } = routeAmount;
-        // The route, amount and quote are all in terms of wrapped tokens.
-        // When constructing the Trade object the inputAmount/outputAmount must
-        // use native currencies if specified by the user. This is so that the Trade knows to wrap/unwrap.
+        // FewV2 路由内部使用 fewToken，但 trade 对外的 inputAmount/outputAmount
+        // 必须使用用户指定的原始 currency（与 V2/V3/V4 保持一致），
+        // 否则 Trade.outputAmount 在 reduce 聚合多个路由时会因 currency 不匹配而崩溃。
         if (tradeType == TradeType.EXACT_INPUT) {
-            const amountCurrency = CurrencyAmount.fromFractionalAmount(fewTokenInToken, amount.numerator, amount.denominator);
-            const quoteCurrency = CurrencyAmount.fromFractionalAmount(fewTokenOutToken, quote.numerator, quote.denominator);
+            const amountCurrency = CurrencyAmount.fromFractionalAmount(tokenInCurrency, amount.numerator, amount.denominator);
+            const quoteCurrency = CurrencyAmount.fromFractionalAmount(tokenOutCurrency, quote.numerator, quote.denominator);
             const ringFewRouteV2SDK = new RingFewV2RouteRaw(route.pairs, amountCurrency.currency, quoteCurrency.currency);
             return {
                 fewRouteV2: ringFewRouteV2SDK,
@@ -111,8 +113,8 @@ export function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, f
             };
         }
         else {
-            const quoteCurrency = CurrencyAmount.fromFractionalAmount(fewTokenInToken, quote.numerator, quote.denominator);
-            const amountCurrency = CurrencyAmount.fromFractionalAmount(fewTokenOutToken, amount.numerator, amount.denominator);
+            const quoteCurrency = CurrencyAmount.fromFractionalAmount(tokenInCurrency, quote.numerator, quote.denominator);
+            const amountCurrency = CurrencyAmount.fromFractionalAmount(tokenOutCurrency, amount.numerator, amount.denominator);
             const ringFewRouteV2SDK = new RingFewV2RouteRaw(route.pairs, quoteCurrency.currency, amountCurrency.currency);
             return {
                 fewRouteV2: ringFewRouteV2SDK,
@@ -131,9 +133,16 @@ export function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, f
         // use native currencies if specified by the user. This is so that the Trade knows to wrap/unwrap.
         const amountCurrency = CurrencyAmount.fromFractionalAmount(tokenInCurrency, amount.numerator, amount.denominator);
         const quoteCurrency = CurrencyAmount.fromFractionalAmount(tokenOutCurrency, quote.numerator, quote.denominator);
-        // we cannot retain fake pools for mixed routes,
-        // when we generate the ur swap calldata
-        const routeRaw = new MixedRouteSDK(route.pools, amountCurrency.currency, quoteCurrency.currency);
+        // 必须保留桥接池（retainFakePools=true）！
+        //
+        // 原因：MixedRouteSDK 构造函数默认会过滤掉 tickSpacing=0 的 V4Pool。
+        // 但桥接池承载了 token 空间转换信息（如 USDC→fwUSDC），如果被过滤掉，
+        // token 路径会断裂：V3 输出 USDC，而下一个 FewV2 池期望 fwUSDC。
+        //
+        // 在执行阶段，Universal Router 的 addMixedSwap 会识别这些桥接池，
+        // 将它们转换为 WRAP_FEW_TOKEN / UNWRAP_FEW_TOKEN 等命令。
+        const routeRaw = new MixedRouteSDK(route.pools, amountCurrency.currency, quoteCurrency.currency, true // retainFakePools — 保留桥接池，不要过滤
+        );
         return {
             mixedRoute: routeRaw,
             inputAmount: amountCurrency,
@@ -152,14 +161,47 @@ export function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, f
     });
     return trade;
 }
+/**
+ * 判断 trade 是否需要 Universal Router（而非 SwapRouter02）来编码 calldata。
+ *
+ * SwapRouter02 不支持 V4Pool 编码。当 trade 中包含任何 V4Pool 实例时
+ * （无论是真实 V4 池还是桥接池），都必须使用 Universal Router。
+ *
+ * 常见触发场景：mixed 路由包含 fewToken 桥接池（V4Pool, tickSpacing=0）。
+ */
+function tradeRequiresUniversalRouter(trade) {
+    return trade.swaps.some((swap) => {
+        var _a;
+        if (swap.route.protocol === Protocol.V4)
+            return true;
+        if (swap.route.protocol === Protocol.MIXED) {
+            return (_a = swap.route.pools) === null || _a === void 0 ? void 0 : _a.some((pool) => pool instanceof V4Pool);
+        }
+        return false;
+    });
+}
 export function buildSwapMethodParameters(trade, swapConfig, chainId) {
+    // 自动切换逻辑：SwapRouter02 无法编码 V4Pool（会抛出 UNSUPPORTED_PROTOCOL）。
+    // 当 trade 包含 V4Pool 实例（包括桥接池）时，自动升级到 Universal Router。
+    const needsUniversalRouter = tradeRequiresUniversalRouter(trade);
     if (swapConfig.type == SwapType.UNIVERSAL_ROUTER) {
         return {
             ...UniversalRouter.swapCallParameters(trade, swapConfig),
             to: UNIVERSAL_ROUTER_ADDRESS(swapConfig.version, chainId),
         };
     }
-    else if (swapConfig.type == SwapType.SWAP_ROUTER_02) {
+    if (needsUniversalRouter) {
+        // 用户请求了 SwapRouter02，但 trade 含 V4Pool → 自动切换到 Universal Router
+        return {
+            ...UniversalRouter.swapCallParameters(trade, {
+                slippageTolerance: swapConfig.slippageTolerance,
+                recipient: swapConfig.recipient,
+                deadlineOrPreviousBlockhash: swapConfig.deadline,
+            }),
+            to: UNIVERSAL_ROUTER_ADDRESS(UniversalRouterVersion.V1_2, chainId),
+        };
+    }
+    if (swapConfig.type == SwapType.SWAP_ROUTER_02) {
         const { recipient, slippageTolerance, deadline, inputTokenPermit } = swapConfig;
         return {
             ...SwapRouter02.swapCallParameters(trade, {
@@ -173,4 +215,4 @@ export function buildSwapMethodParameters(trade, swapConfig, chainId) {
     }
     throw new Error(`Unsupported swap type ${swapConfig}`);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"methodParameters.js","sourceRoot":"","sources":["../../../src/util/methodParameters.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"methodParameters.js","sourceRoot":"","sources":["../../../src/util/methodParameters.ts"],"names":[],"mappings":"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"}

package/build/module/util/mixedRouteFilterOutV4Pools.d.ts

@@ -1,3 +1,23 @@
 import { MixedRoute } from '../routers';
+/**
+ * 判断路由是否包含「真实」V4 池（即 tickSpacing !== 0 的 V4Pool）。
+ *
+ * 注意区分：
+ * - 真实 V4 池：tickSpacing > 0，代表真实流动性，需要 V4 quoter 报价
+ * - 桥接池：tickSpacing === 0，只是 wrap/unwrap 的占位符（见 compute-all-routes.ts 的架构注释）
+ *
+ * 这个区分很重要，因为 mixed-quoter.ts 会用此函数决定是否过滤路由：
+ * 含真实 V4 池的路由在不支持 V4 的场景下需要被过滤，
+ * 但只含桥接池的路由应该被保留（桥接池不需要 V4 报价能力）。
+ */
+export declare function mixedRouteContainsRealV4Pools(route: MixedRoute): boolean;
+/**
+ * @deprecated 使用 mixedRouteContainsRealV4Pools 代替。
+ * 此函数不区分真实 V4 池和桥接池，会误过滤含桥接池的 V3↔FewV2 路由。
+ */
 export declare function mixedRouteContainsV4Pools(route: MixedRoute): boolean;
+/**
+ * 过滤掉包含真实 V4 池的路由，但保留只含桥接池的路由。
+ * 用于 mixed-quoter 在不启用 V4 协议时筛选路由。
+ */
 export declare function mixedRouteFilterOutV4Pools(routes: MixedRoute[]): MixedRoute[];

package/build/module/util/mixedRouteFilterOutV4Pools.js

@@ -1,12 +1,36 @@
 import { Pool as V4Pool } from '@ring-protocol/v4-sdk';
+/**
+ * 判断路由是否包含「真实」V4 池（即 tickSpacing !== 0 的 V4Pool）。
+ *
+ * 注意区分：
+ * - 真实 V4 池：tickSpacing > 0，代表真实流动性，需要 V4 quoter 报价
+ * - 桥接池：tickSpacing === 0，只是 wrap/unwrap 的占位符（见 compute-all-routes.ts 的架构注释）
+ *
+ * 这个区分很重要，因为 mixed-quoter.ts 会用此函数决定是否过滤路由：
+ * 含真实 V4 池的路由在不支持 V4 的场景下需要被过滤，
+ * 但只含桥接池的路由应该被保留（桥接池不需要 V4 报价能力）。
+ */
+export function mixedRouteContainsRealV4Pools(route) {
+    return route.pools.some((pool) => {
+        return pool instanceof V4Pool && pool.tickSpacing !== 0;
+    });
+}
+/**
+ * @deprecated 使用 mixedRouteContainsRealV4Pools 代替。
+ * 此函数不区分真实 V4 池和桥接池，会误过滤含桥接池的 V3↔FewV2 路由。
+ */
 export function mixedRouteContainsV4Pools(route) {
     return route.pools.some((pool) => {
         return pool instanceof V4Pool;
     });
 }
+/**
+ * 过滤掉包含真实 V4 池的路由，但保留只含桥接池的路由。
+ * 用于 mixed-quoter 在不启用 V4 协议时筛选路由。
+ */
 export function mixedRouteFilterOutV4Pools(routes) {
     return routes.filter((route) => {
-        return !mixedRouteContainsV4Pools(route);
+        return !mixedRouteContainsRealV4Pools(route);
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4ZWRSb3V0ZUZpbHRlck91dFY0UG9vbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbC9taXhlZFJvdXRlRmlsdGVyT3V0VjRQb29scy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxJQUFJLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3ZELE1BQU0sVUFBVSx5QkFBeUIsQ0FBQyxLQUFpQjtJQUN6RCxPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDL0IsT0FBTyxJQUFJLFlBQVksTUFBTSxDQUFDO0lBQ2hDLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVELE1BQU0sVUFBVSwwQkFBMEIsQ0FBQyxNQUFvQjtJQUM3RCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM3QixPQUFPLENBQUMseUJBQXlCLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDM0MsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4ZWRSb3V0ZUZpbHRlck91dFY0UG9vbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbC9taXhlZFJvdXRlRmlsdGVyT3V0VjRQb29scy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxJQUFJLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3ZEOzs7Ozs7Ozs7O0dBVUc7QUFDSCxNQUFNLFVBQVUsNkJBQTZCLENBQUMsS0FBaUI7SUFDN0QsT0FBTyxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQy9CLE9BQU8sSUFBSSxZQUFZLE1BQU0sSUFBSSxJQUFJLENBQUMsV0FBVyxLQUFLLENBQUMsQ0FBQztJQUMxRCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUseUJBQXlCLENBQUMsS0FBaUI7SUFDekQsT0FBTyxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQy9CLE9BQU8sSUFBSSxZQUFZLE1BQU0sQ0FBQztJQUNoQyxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsMEJBQTBCLENBQUMsTUFBb0I7SUFDN0QsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsT0FBTyxDQUFDLDZCQUE2QixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQy9DLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ring-protocol/smart-order-router",
-  "version": "0.5.29",
+  "version": "0.5.31",
   "description": "Few Smart Order Router",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
@@ -36,12 +36,12 @@
     "@eth-optimism/sdk": "^3.2.2",
     "@uniswap/default-token-list": "^11.13.0",
     "@ring-protocol/permit2-sdk": "0.1.4",
-    "@ring-protocol/router-sdk": "0.1.37",
+    "@ring-protocol/router-sdk": "0.1.38",
     "@ring-protocol/sdk-core": "0.1.6",
     "@uniswap/swap-router-contracts": "^1.3.1",
     "@uniswap/token-lists": "^1.0.0-beta.31",
     "@uniswap/universal-router": "^1.6.0",
-    "@ring-protocol/universal-router-sdk": "0.1.40",
+    "@ring-protocol/universal-router-sdk": "0.1.41",
     "@ring-protocol/few-v2-sdk": "0.1.14",
     "@ring-protocol/v2-sdk": "0.1.10",
     "@ring-protocol/v3-sdk": "0.1.10",