@ring-protocol/smart-order-router 0.5.30 → 0.5.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/main/routers/alpha-router/alpha-router.js +7 -2
- package/build/main/routers/alpha-router/functions/best-swap-route.d.ts +1 -1
- package/build/main/routers/alpha-router/functions/best-swap-route.js +73 -49
- package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts +8 -0
- package/build/main/routers/alpha-router/functions/compute-all-routes.js +128 -23
- package/build/main/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js +8 -1
- package/build/main/routers/alpha-router/quoters/mixed-quoter.js +10 -8
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/amounts.d.ts +1 -1
- package/build/main/util/methodParameters.js +53 -12
- package/build/main/util/mixedRouteFilterOutV4Pools.d.ts +20 -0
- package/build/main/util/mixedRouteFilterOutV4Pools.js +28 -3
- package/build/module/routers/alpha-router/alpha-router.js +7 -2
- package/build/module/routers/alpha-router/functions/best-swap-route.d.ts +1 -1
- package/build/module/routers/alpha-router/functions/best-swap-route.js +74 -50
- package/build/module/routers/alpha-router/functions/compute-all-routes.d.ts +8 -0
- package/build/module/routers/alpha-router/functions/compute-all-routes.js +125 -22
- package/build/module/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js +8 -1
- package/build/module/routers/alpha-router/quoters/mixed-quoter.js +10 -8
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/methodParameters.js +58 -16
- package/build/module/util/mixedRouteFilterOutV4Pools.d.ts +20 -0
- package/build/module/util/mixedRouteFilterOutV4Pools.js +26 -2
- package/package.json +3 -3
|
@@ -5,6 +5,6 @@ export declare class CurrencyAmount extends CurrencyAmountRaw<Currency> {
|
|
|
5
5
|
export declare const MAX_UINT160 = "0xffffffffffffffffffffffffffffffffffffffff";
|
|
6
6
|
export declare function parseAmount(value: string, currency: Currency): CurrencyAmount;
|
|
7
7
|
export declare function parseFeeAmount(feeAmountStr: string): FeeAmount;
|
|
8
|
-
export declare function unparseFeeAmount(feeAmount: FeeAmount): "10000" | "3000" | "500" | "400" | "300" | "200"
|
|
8
|
+
export declare function unparseFeeAmount(feeAmount: FeeAmount): "100" | "10000" | "3000" | "500" | "400" | "300" | "200";
|
|
9
9
|
export declare function getApplicableV3FeeAmounts(chainId: ChainId): FeeAmount[];
|
|
10
10
|
export declare function getApplicableV4FeesTickspacingsHooks(chainId: ChainId): Array<[number, number, string]>;
|
|
@@ -14,6 +14,10 @@ const v4_sdk_1 = require("@ring-protocol/v4-sdk");
|
|
|
14
14
|
const lodash_1 = __importDefault(require("lodash"));
|
|
15
15
|
const __1 = require("..");
|
|
16
16
|
function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, fewTokenOutToken, tradeType, routeAmounts) {
|
|
17
|
+
// fewTokenInToken/fewTokenOutToken 保留参数以维持 API 兼容性,
|
|
18
|
+
// 但 FewV2 路由现在统一使用 tokenInCurrency/tokenOutCurrency
|
|
19
|
+
void fewTokenInToken;
|
|
20
|
+
void fewTokenOutToken;
|
|
17
21
|
/// Removed partition because of new mixedRoutes
|
|
18
22
|
const v4RouteAmounts = lodash_1.default.filter(routeAmounts, (routeAmount) => routeAmount.protocol === router_sdk_1.Protocol.V4);
|
|
19
23
|
const v3RouteAmounts = lodash_1.default.filter(routeAmounts, (routeAmount) => routeAmount.protocol === router_sdk_1.Protocol.V3);
|
|
@@ -101,12 +105,12 @@ function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, fewToken
|
|
|
101
105
|
});
|
|
102
106
|
const fewV2Routes = lodash_1.default.map(ringFewV2RouteAmounts, (routeAmount) => {
|
|
103
107
|
const { route, amount, quote } = routeAmount;
|
|
104
|
-
//
|
|
105
|
-
//
|
|
106
|
-
//
|
|
108
|
+
// FewV2 路由内部使用 fewToken,但 trade 对外的 inputAmount/outputAmount
|
|
109
|
+
// 必须使用用户指定的原始 currency(与 V2/V3/V4 保持一致),
|
|
110
|
+
// 否则 Trade.outputAmount 在 reduce 聚合多个路由时会因 currency 不匹配而崩溃。
|
|
107
111
|
if (tradeType == sdk_core_1.TradeType.EXACT_INPUT) {
|
|
108
|
-
const amountCurrency = __1.CurrencyAmount.fromFractionalAmount(
|
|
109
|
-
const quoteCurrency = __1.CurrencyAmount.fromFractionalAmount(
|
|
112
|
+
const amountCurrency = __1.CurrencyAmount.fromFractionalAmount(tokenInCurrency, amount.numerator, amount.denominator);
|
|
113
|
+
const quoteCurrency = __1.CurrencyAmount.fromFractionalAmount(tokenOutCurrency, quote.numerator, quote.denominator);
|
|
110
114
|
const ringFewRouteV2SDK = new few_v2_sdk_1.Route(route.pairs, amountCurrency.currency, quoteCurrency.currency);
|
|
111
115
|
return {
|
|
112
116
|
fewRouteV2: ringFewRouteV2SDK,
|
|
@@ -115,8 +119,8 @@ function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, fewToken
|
|
|
115
119
|
};
|
|
116
120
|
}
|
|
117
121
|
else {
|
|
118
|
-
const quoteCurrency = __1.CurrencyAmount.fromFractionalAmount(
|
|
119
|
-
const amountCurrency = __1.CurrencyAmount.fromFractionalAmount(
|
|
122
|
+
const quoteCurrency = __1.CurrencyAmount.fromFractionalAmount(tokenInCurrency, quote.numerator, quote.denominator);
|
|
123
|
+
const amountCurrency = __1.CurrencyAmount.fromFractionalAmount(tokenOutCurrency, amount.numerator, amount.denominator);
|
|
120
124
|
const ringFewRouteV2SDK = new few_v2_sdk_1.Route(route.pairs, quoteCurrency.currency, amountCurrency.currency);
|
|
121
125
|
return {
|
|
122
126
|
fewRouteV2: ringFewRouteV2SDK,
|
|
@@ -135,9 +139,16 @@ function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, fewToken
|
|
|
135
139
|
// use native currencies if specified by the user. This is so that the Trade knows to wrap/unwrap.
|
|
136
140
|
const amountCurrency = __1.CurrencyAmount.fromFractionalAmount(tokenInCurrency, amount.numerator, amount.denominator);
|
|
137
141
|
const quoteCurrency = __1.CurrencyAmount.fromFractionalAmount(tokenOutCurrency, quote.numerator, quote.denominator);
|
|
138
|
-
//
|
|
139
|
-
//
|
|
140
|
-
|
|
142
|
+
// 必须保留桥接池(retainFakePools=true)!
|
|
143
|
+
//
|
|
144
|
+
// 原因:MixedRouteSDK 构造函数默认会过滤掉 tickSpacing=0 的 V4Pool。
|
|
145
|
+
// 但桥接池承载了 token 空间转换信息(如 USDC→fwUSDC),如果被过滤掉,
|
|
146
|
+
// token 路径会断裂:V3 输出 USDC,而下一个 FewV2 池期望 fwUSDC。
|
|
147
|
+
//
|
|
148
|
+
// 在执行阶段,Universal Router 的 addMixedSwap 会识别这些桥接池,
|
|
149
|
+
// 将它们转换为 WRAP_FEW_TOKEN / UNWRAP_FEW_TOKEN 等命令。
|
|
150
|
+
const routeRaw = new router_sdk_1.MixedRouteSDK(route.pools, amountCurrency.currency, quoteCurrency.currency, true // retainFakePools — 保留桥接池,不要过滤
|
|
151
|
+
);
|
|
141
152
|
return {
|
|
142
153
|
mixedRoute: routeRaw,
|
|
143
154
|
inputAmount: amountCurrency,
|
|
@@ -157,11 +168,41 @@ function buildTrade(tokenInCurrency, fewTokenInToken, tokenOutCurrency, fewToken
|
|
|
157
168
|
return trade;
|
|
158
169
|
}
|
|
159
170
|
exports.buildTrade = buildTrade;
|
|
171
|
+
/**
|
|
172
|
+
* 判断 trade 是否需要 Universal Router(而非 SwapRouter02)来编码 calldata。
|
|
173
|
+
*
|
|
174
|
+
* SwapRouter02 不支持 V4Pool 编码。当 trade 中包含任何 V4Pool 实例时
|
|
175
|
+
* (无论是真实 V4 池还是桥接池),都必须使用 Universal Router。
|
|
176
|
+
*
|
|
177
|
+
* 常见触发场景:mixed 路由包含 fewToken 桥接池(V4Pool, tickSpacing=0)。
|
|
178
|
+
*/
|
|
179
|
+
function tradeRequiresUniversalRouter(trade) {
|
|
180
|
+
return trade.swaps.some((swap) => {
|
|
181
|
+
var _a;
|
|
182
|
+
if (swap.route.protocol === router_sdk_1.Protocol.V4)
|
|
183
|
+
return true;
|
|
184
|
+
if (swap.route.protocol === router_sdk_1.Protocol.MIXED) {
|
|
185
|
+
return (_a = swap.route.pools) === null || _a === void 0 ? void 0 : _a.some((pool) => pool instanceof v4_sdk_1.Pool);
|
|
186
|
+
}
|
|
187
|
+
return false;
|
|
188
|
+
});
|
|
189
|
+
}
|
|
160
190
|
function buildSwapMethodParameters(trade, swapConfig, chainId) {
|
|
191
|
+
// 自动切换逻辑:SwapRouter02 无法编码 V4Pool(会抛出 UNSUPPORTED_PROTOCOL)。
|
|
192
|
+
// 当 trade 包含 V4Pool 实例(包括桥接池)时,自动升级到 Universal Router。
|
|
193
|
+
const needsUniversalRouter = tradeRequiresUniversalRouter(trade);
|
|
161
194
|
if (swapConfig.type == __1.SwapType.UNIVERSAL_ROUTER) {
|
|
162
195
|
return Object.assign(Object.assign({}, universal_router_sdk_1.SwapRouter.swapCallParameters(trade, swapConfig)), { to: (0, universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS)(swapConfig.version, chainId) });
|
|
163
196
|
}
|
|
164
|
-
|
|
197
|
+
if (needsUniversalRouter) {
|
|
198
|
+
// 用户请求了 SwapRouter02,但 trade 含 V4Pool → 自动切换到 Universal Router
|
|
199
|
+
return Object.assign(Object.assign({}, universal_router_sdk_1.SwapRouter.swapCallParameters(trade, {
|
|
200
|
+
slippageTolerance: swapConfig.slippageTolerance,
|
|
201
|
+
recipient: swapConfig.recipient,
|
|
202
|
+
deadlineOrPreviousBlockhash: swapConfig.deadline,
|
|
203
|
+
})), { to: (0, universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS)(universal_router_sdk_1.UniversalRouterVersion.V1_2, chainId) });
|
|
204
|
+
}
|
|
205
|
+
if (swapConfig.type == __1.SwapType.SWAP_ROUTER_02) {
|
|
165
206
|
const { recipient, slippageTolerance, deadline, inputTokenPermit } = swapConfig;
|
|
166
207
|
return Object.assign(Object.assign({}, router_sdk_1.SwapRouter.swapCallParameters(trade, {
|
|
167
208
|
recipient,
|
|
@@ -173,4 +214,4 @@ function buildSwapMethodParameters(trade, swapConfig, chainId) {
|
|
|
173
214
|
throw new Error(`Unsupported swap type ${swapConfig}`);
|
|
174
215
|
}
|
|
175
216
|
exports.buildSwapMethodParameters = buildSwapMethodParameters;
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"methodParameters.js","sourceRoot":"","sources":["../../../src/util/methodParameters.ts"],"names":[],"mappings":"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"}
|
|
217
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"methodParameters.js","sourceRoot":"","sources":["../../../src/util/methodParameters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,23 @@
|
|
|
1
1
|
import { MixedRoute } from '../routers';
|
|
2
|
+
/**
|
|
3
|
+
* 判断路由是否包含「真实」V4 池(即 tickSpacing !== 0 的 V4Pool)。
|
|
4
|
+
*
|
|
5
|
+
* 注意区分:
|
|
6
|
+
* - 真实 V4 池:tickSpacing > 0,代表真实流动性,需要 V4 quoter 报价
|
|
7
|
+
* - 桥接池:tickSpacing === 0,只是 wrap/unwrap 的占位符(见 compute-all-routes.ts 的架构注释)
|
|
8
|
+
*
|
|
9
|
+
* 这个区分很重要,因为 mixed-quoter.ts 会用此函数决定是否过滤路由:
|
|
10
|
+
* 含真实 V4 池的路由在不支持 V4 的场景下需要被过滤,
|
|
11
|
+
* 但只含桥接池的路由应该被保留(桥接池不需要 V4 报价能力)。
|
|
12
|
+
*/
|
|
13
|
+
export declare function mixedRouteContainsRealV4Pools(route: MixedRoute): boolean;
|
|
14
|
+
/**
|
|
15
|
+
* @deprecated 使用 mixedRouteContainsRealV4Pools 代替。
|
|
16
|
+
* 此函数不区分真实 V4 池和桥接池,会误过滤含桥接池的 V3↔FewV2 路由。
|
|
17
|
+
*/
|
|
2
18
|
export declare function mixedRouteContainsV4Pools(route: MixedRoute): boolean;
|
|
19
|
+
/**
|
|
20
|
+
* 过滤掉包含真实 V4 池的路由,但保留只含桥接池的路由。
|
|
21
|
+
* 用于 mixed-quoter 在不启用 V4 协议时筛选路由。
|
|
22
|
+
*/
|
|
3
23
|
export declare function mixedRouteFilterOutV4Pools(routes: MixedRoute[]): MixedRoute[];
|
|
@@ -1,17 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mixedRouteFilterOutV4Pools = exports.mixedRouteContainsV4Pools = void 0;
|
|
3
|
+
exports.mixedRouteFilterOutV4Pools = exports.mixedRouteContainsV4Pools = exports.mixedRouteContainsRealV4Pools = void 0;
|
|
4
4
|
const v4_sdk_1 = require("@ring-protocol/v4-sdk");
|
|
5
|
+
/**
|
|
6
|
+
* 判断路由是否包含「真实」V4 池(即 tickSpacing !== 0 的 V4Pool)。
|
|
7
|
+
*
|
|
8
|
+
* 注意区分:
|
|
9
|
+
* - 真实 V4 池:tickSpacing > 0,代表真实流动性,需要 V4 quoter 报价
|
|
10
|
+
* - 桥接池:tickSpacing === 0,只是 wrap/unwrap 的占位符(见 compute-all-routes.ts 的架构注释)
|
|
11
|
+
*
|
|
12
|
+
* 这个区分很重要,因为 mixed-quoter.ts 会用此函数决定是否过滤路由:
|
|
13
|
+
* 含真实 V4 池的路由在不支持 V4 的场景下需要被过滤,
|
|
14
|
+
* 但只含桥接池的路由应该被保留(桥接池不需要 V4 报价能力)。
|
|
15
|
+
*/
|
|
16
|
+
function mixedRouteContainsRealV4Pools(route) {
|
|
17
|
+
return route.pools.some((pool) => {
|
|
18
|
+
return pool instanceof v4_sdk_1.Pool && pool.tickSpacing !== 0;
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
exports.mixedRouteContainsRealV4Pools = mixedRouteContainsRealV4Pools;
|
|
22
|
+
/**
|
|
23
|
+
* @deprecated 使用 mixedRouteContainsRealV4Pools 代替。
|
|
24
|
+
* 此函数不区分真实 V4 池和桥接池,会误过滤含桥接池的 V3↔FewV2 路由。
|
|
25
|
+
*/
|
|
5
26
|
function mixedRouteContainsV4Pools(route) {
|
|
6
27
|
return route.pools.some((pool) => {
|
|
7
28
|
return pool instanceof v4_sdk_1.Pool;
|
|
8
29
|
});
|
|
9
30
|
}
|
|
10
31
|
exports.mixedRouteContainsV4Pools = mixedRouteContainsV4Pools;
|
|
32
|
+
/**
|
|
33
|
+
* 过滤掉包含真实 V4 池的路由,但保留只含桥接池的路由。
|
|
34
|
+
* 用于 mixed-quoter 在不启用 V4 协议时筛选路由。
|
|
35
|
+
*/
|
|
11
36
|
function mixedRouteFilterOutV4Pools(routes) {
|
|
12
37
|
return routes.filter((route) => {
|
|
13
|
-
return !
|
|
38
|
+
return !mixedRouteContainsRealV4Pools(route);
|
|
14
39
|
});
|
|
15
40
|
}
|
|
16
41
|
exports.mixedRouteFilterOutV4Pools = mixedRouteFilterOutV4Pools;
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4ZWRSb3V0ZUZpbHRlck91dFY0UG9vbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbC9taXhlZFJvdXRlRmlsdGVyT3V0VjRQb29scy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxrREFBdUQ7QUFHdkQ7Ozs7Ozs7Ozs7R0FVRztBQUNILFNBQWdCLDZCQUE2QixDQUFDLEtBQWlCO0lBQzdELE9BQU8sS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUMvQixPQUFPLElBQUksWUFBWSxhQUFNLElBQUksSUFBSSxDQUFDLFdBQVcsS0FBSyxDQUFDLENBQUM7SUFDMUQsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBSkQsc0VBSUM7QUFFRDs7O0dBR0c7QUFDSCxTQUFnQix5QkFBeUIsQ0FBQyxLQUFpQjtJQUN6RCxPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDL0IsT0FBTyxJQUFJLFlBQVksYUFBTSxDQUFDO0lBQ2hDLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUpELDhEQUlDO0FBRUQ7OztHQUdHO0FBQ0gsU0FBZ0IsMEJBQTBCLENBQUMsTUFBb0I7SUFDN0QsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsT0FBTyxDQUFDLDZCQUE2QixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQy9DLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUpELGdFQUlDIn0=
|