@ring-protocol/smart-order-router 0.5.5 → 0.5.7
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/providers/caching/route/model/cached-route.js +9 -1
- package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts +1 -1
- package/build/main/routers/alpha-router/functions/compute-all-routes.js +3 -3
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/routes.js +10 -28
- package/build/module/providers/caching/route/model/cached-route.js +9 -1
- package/build/module/routers/alpha-router/functions/compute-all-routes.d.ts +1 -1
- package/build/module/routers/alpha-router/functions/compute-all-routes.js +3 -3
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/routes.js +15 -33
- package/package.json +1 -1
|
@@ -13,6 +13,7 @@ const v4_sdk_1 = require("@ring-protocol/v4-sdk");
|
|
|
13
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
14
14
|
const best_swap_route_1 = require("../routers/alpha-router/functions/best-swap-route");
|
|
15
15
|
const addresses_1 = require("./addresses");
|
|
16
|
+
const log_1 = require("./log");
|
|
16
17
|
const _1 = require(".");
|
|
17
18
|
const routeToTokens = (route) => {
|
|
18
19
|
switch (route.protocol) {
|
|
@@ -45,7 +46,6 @@ const routeToPools = (route) => {
|
|
|
45
46
|
};
|
|
46
47
|
exports.routeToPools = routeToPools;
|
|
47
48
|
const poolToString = (pool) => {
|
|
48
|
-
var _a, _b;
|
|
49
49
|
if (pool instanceof v4_sdk_1.Pool) {
|
|
50
50
|
return ` -- ${pool.fee / 10000}% [${v4_sdk_1.Pool.getPoolId(pool.token0, pool.token1, pool.fee, pool.tickSpacing, pool.hooks)}]`;
|
|
51
51
|
}
|
|
@@ -59,31 +59,10 @@ const poolToString = (pool) => {
|
|
|
59
59
|
return ` -- [${few_v2_sdk_1.Pair.getAddress(pool.token0, pool.token1)}]`;
|
|
60
60
|
}
|
|
61
61
|
else {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
//
|
|
66
|
-
if (pool &&
|
|
67
|
-
typeof pool === 'object' &&
|
|
68
|
-
('liquidityToken' in pool || 'tokenAmounts' in pool)) {
|
|
69
|
-
const poolObj = pool;
|
|
70
|
-
let token0Address;
|
|
71
|
-
let token1Address;
|
|
72
|
-
if (poolObj.tokenAmounts && Array.isArray(poolObj.tokenAmounts)) {
|
|
73
|
-
const token0 = (_a = poolObj.tokenAmounts[0]) === null || _a === void 0 ? void 0 : _a.currency;
|
|
74
|
-
const token1 = (_b = poolObj.tokenAmounts[1]) === null || _b === void 0 ? void 0 : _b.currency;
|
|
75
|
-
token0Address = (token0 === null || token0 === void 0 ? void 0 : token0.address) || (token0 === null || token0 === void 0 ? void 0 : token0.id);
|
|
76
|
-
token1Address = (token1 === null || token1 === void 0 ? void 0 : token1.address) || (token1 === null || token1 === void 0 ? void 0 : token1.id);
|
|
77
|
-
}
|
|
78
|
-
if (token0Address && token1Address) {
|
|
79
|
-
// For logging purposes we just show the two addresses. This avoids
|
|
80
|
-
// throwing while still giving useful debug information.
|
|
81
|
-
return ` -- [${token0Address}/${token1Address}]`;
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
// As a last resort, avoid throwing – just show an opaque placeholder so
|
|
85
|
-
// route logging never breaks the main quote flow.
|
|
86
|
-
return ' -- [UnknownPool]';
|
|
62
|
+
log_1.log.info('2025-12-16-15-30');
|
|
63
|
+
log_1.log.info(`Unsupported pool ${JSON.stringify(pool)}`);
|
|
64
|
+
return `-- [UnknownPool] ${JSON.stringify(pool)}`;
|
|
65
|
+
// throw new Error(`Unsupported pool ${JSON.stringify(pool)}`);
|
|
87
66
|
}
|
|
88
67
|
};
|
|
89
68
|
exports.poolToString = poolToString;
|
|
@@ -187,7 +166,7 @@ function shouldWipeoutCachedRoutes(cachedRoutes, routingConfig) {
|
|
|
187
166
|
}
|
|
188
167
|
exports.shouldWipeoutCachedRoutes = shouldWipeoutCachedRoutes;
|
|
189
168
|
function poolIsInExcludedProtocols(pool, excludedProtocolsFromMixed) {
|
|
190
|
-
var _a, _b, _c;
|
|
169
|
+
var _a, _b, _c, _d;
|
|
191
170
|
if (pool instanceof v4_sdk_1.Pool) {
|
|
192
171
|
return (_a = excludedProtocolsFromMixed === null || excludedProtocolsFromMixed === void 0 ? void 0 : excludedProtocolsFromMixed.includes(router_sdk_1.Protocol.V4)) !== null && _a !== void 0 ? _a : false;
|
|
193
172
|
}
|
|
@@ -197,8 +176,11 @@ function poolIsInExcludedProtocols(pool, excludedProtocolsFromMixed) {
|
|
|
197
176
|
else if (pool instanceof v2_sdk_1.Pair) {
|
|
198
177
|
return (_c = excludedProtocolsFromMixed === null || excludedProtocolsFromMixed === void 0 ? void 0 : excludedProtocolsFromMixed.includes(router_sdk_1.Protocol.V2)) !== null && _c !== void 0 ? _c : false;
|
|
199
178
|
}
|
|
179
|
+
else if (pool instanceof few_v2_sdk_1.Pair) {
|
|
180
|
+
return (_d = excludedProtocolsFromMixed === null || excludedProtocolsFromMixed === void 0 ? void 0 : excludedProtocolsFromMixed.includes(router_sdk_1.Protocol.FEWV2)) !== null && _d !== void 0 ? _d : false;
|
|
181
|
+
}
|
|
200
182
|
else {
|
|
201
183
|
return false;
|
|
202
184
|
}
|
|
203
185
|
}
|
|
204
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
186
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/util/routes.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA8D;AAC9D,0DAAqD;AAErD,sDAAqE;AACrE,kDAA6C;AAC7C,kDAAuD;AACvD,kDAAuD;AACvD,oDAAuB;AAOvB,uFAA0E;AAG1E,2CAAwD;AACxD,+BAA4B;AAE5B,wBAA0D;AAEnD,MAAM,aAAa,GAAG,CAAC,KAAsB,EAAc,EAAE;IAClE,QAAQ,KAAK,CAAC,QAAQ,EAAE;QACtB,KAAK,qBAAQ,CAAC,EAAE;YACd,OAAO,KAAK,CAAC,YAAY,CAAC;QAC5B,KAAK,qBAAQ,CAAC,EAAE;YACd,OAAO,KAAK,CAAC,SAAS,CAAC;QACzB,KAAK,qBAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,qBAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,qBAAQ,CAAC,KAAK;YACjB,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACjE;AACH,CAAC,CAAC;AAbW,QAAA,aAAa,iBAaxB;AAEK,MAAM,YAAY,GAAG,CAAC,KAAsB,EAAW,EAAE;IAC9D,QAAQ,KAAK,CAAC,QAAQ,EAAE;QACtB,KAAK,qBAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,qBAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,qBAAQ,CAAC,KAAK;YACjB,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,KAAK,qBAAQ,CAAC,EAAE;YACd,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,KAAK,qBAAQ,CAAC,KAAK;YACjB,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACjE;AACH,CAAC,CAAC;AAbW,QAAA,YAAY,gBAavB;AAEK,MAAM,YAAY,GAAG,CAAC,IAAW,EAAU,EAAE;IAClD,IAAI,IAAI,YAAY,aAAM,EAAE;QAC1B,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,aAAM,CAAC,SAAS,CAClD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,KAAK,CACX,GAAG,CAAC;KACN;SAAM,IAAI,IAAI,YAAY,aAAM,EAAE;QACjC,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,aAAM,CAAC,UAAU,CACnD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,SAAS,EACT,qCAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CACxC,GAAG,CAAC;KACN;SAAM,IAAI,IAAI,YAAY,aAAI,EAAE;QAC/B,OAAO,QAAQ,aAAI,CAAC,UAAU,CAC3B,IAAa,CAAC,MAAM,EACpB,IAAa,CAAC,MAAM,CACtB,GAAG,CAAC;KACN;SAAM,IAAI,IAAI,YAAY,iBAAS,EAAE;QACpC,OAAO,QAAQ,iBAAS,CAAC,UAAU,CAChC,IAAkB,CAAC,MAAM,EACzB,IAAkB,CAAC,MAAM,CAC3B,GAAG,CAAC;KACN;SAAM;QACL,SAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7B,SAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrD,OAAO,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QAClD,+DAA+D;KAChE;AACH,CAAC,CAAC;AAjCW,QAAA,YAAY,gBAiCvB;AAEK,MAAM,aAAa,GAAG,CAAC,KAAsB,EAAU,EAAE;IAC9D,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;;QACxC,IAAI,IAAI,YAAY,aAAI,EAAE;YACxB,OAAO,QAAQ,aAAI,CAAC,UAAU,CAC3B,IAAa,CAAC,MAAM,EACpB,IAAa,CAAC,MAAM,CACtB,GAAG,CAAC;SACN;aAAM,IAAI,IAAI,YAAY,iBAAS,EAAE;YACpC,OAAO,QAAQ,iBAAS,CAAC,UAAU,CAChC,IAAkB,CAAC,MAAM,EACzB,IAAkB,CAAC,MAAM,CAC3B,GAAG,CAAC;SACN;aAAM,IAAI,IAAI,YAAY,aAAM,EAAE;YACjC,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,aAAM,CAAC,UAAU,CACnD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,SAAS,EACT,qCAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CACxC,GAAG,CAAC;SACN;aAAM,IAAI,IAAI,YAAY,aAAM,EAAE;YACjC,iDAAiD;YACjD,4FAA4F;YAC5F,IACE,IAAI,CAAC,WAAW;gBAChB,wBAAqB,CAAC,IAAI,CAAC,OAAkB,CAAC,CAAC,WAAW,EAC1D;gBACA,OAAO,OAAO,CAAC;aAChB;YAED,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,aAAM,CAAC,SAAS,CAClD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,KAAK,CACX,GAAG,CAAC;SACN;aAAM;YACL,0EAA0E;YAC1E,wDAAwD;YACxD,IACE,IAAI;gBACJ,OAAO,IAAI,KAAK,QAAQ;gBACxB,CAAC,gBAAgB,IAAI,IAAI,IAAI,cAAc,IAAI,IAAI,CAAC,EACpD;gBACA,MAAM,OAAO,GAAG,IAKf,CAAC;gBAEF,IAAI,aAAiC,CAAC;gBACtC,IAAI,aAAiC,CAAC;gBAEtC,IAAI,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;oBAC/D,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,0CAAE,QAAQ,CAAC;oBACjD,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,0CAAE,QAAQ,CAAC;oBACjD,aAAa,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,MAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAA,CAAC;oBAC9C,aAAa,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,MAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAA,CAAC;iBAC/C;gBAED,IAAI,aAAa,IAAI,aAAa,EAAE;oBAClC,OAAO,QAAQ,aAAa,IAAI,aAAa,GAAG,CAAC;iBAClD;aACF;YAED,mEAAmE;YACnE,iCAAiC;YACjC,OAAO,mBAAmB,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE;YAC1B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/B;KACF;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3B,CAAC,CAAC;AArFW,QAAA,aAAa,iBAqFxB;AAEK,MAAM,oBAAoB,GAAG,CAClC,YAAmC,EAC3B,EAAE;IACV,MAAM,KAAK,GAAG,gBAAC,CAAC,MAAM,CACpB,YAAY,EACZ,CAAC,KAAqB,EAAE,GAAwB,EAAE,EAAE;QAClD,OAAO,IAAA,uBAAK,EAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,EACD,iBAAc,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAClE,CAAC;IAEF,MAAM,YAAY,GAAG,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE;QACvE,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,kBAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,kFAAkF;QAClF,OAAO,IAAI,QAAQ,IAAI,qBAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QACvD,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,OAAO,gBAAC,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B;AAEF,SAAgB,yBAAyB,CACvC,YAA2B,EAC3B,aAAiC;IAEjC,yEAAyE;IACzE,qGAAqG;IACrG,IACE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,yBAAyB;;QACxC,yEAAyE;QACzE,wGAAwG;QACxG,mDAAmD;QACnD,0BAA0B;QAC1B,sIAAsI;QACtI,iIAAiI;QACjI,sGAAsG;QACtG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,sBAAsB,CAAA,EACrC;QACA,OAAO,KAAK,CAAC;KACd;IAED,MAAM,6BAA6B,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACxE,QAAQ,KAAK,CAAC,QAAQ,EAAE;YACtB,KAAK,qBAAQ,CAAC,KAAK;gBACjB,OAAO,CACJ,KAAK,CAAC,KAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;oBAChD,OAAO,yBAAyB,CAC9B,IAAI,EACJ,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,0BAA0B,CAC1C,CAAC;gBACJ,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CACd,CAAC;YACJ;gBACE,OAAO,KAAK,CAAC;SAChB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,6BAA6B,KAAK,SAAS,CAAC;AACrD,CAAC;AArCD,8DAqCC;AAED,SAAS,yBAAyB,CAChC,IAAW,EACX,0BAAuC;;IAEvC,IAAI,IAAI,YAAY,aAAM,EAAE;QAC1B,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,qBAAQ,CAAC,EAAE,CAAC,mCAAI,KAAK,CAAC;KACnE;SAAM,IAAI,IAAI,YAAY,aAAM,EAAE;QACjC,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,qBAAQ,CAAC,EAAE,CAAC,mCAAI,KAAK,CAAC;KACnE;SAAM,IAAI,IAAI,YAAY,aAAI,EAAE;QAC/B,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,qBAAQ,CAAC,EAAE,CAAC,mCAAI,KAAK,CAAC;KACnE;SAAM,IAAI,IAAI,YAAY,iBAAS,EAAE;QACpC,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,qBAAQ,CAAC,KAAK,CAAC,mCAAI,KAAK,CAAC;KACtE;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Pair as FewV2Pair } from '@ring-protocol/few-v2-sdk';
|
|
1
2
|
import { Protocol } from '@ring-protocol/router-sdk';
|
|
2
3
|
import { Pair } from '@ring-protocol/v2-sdk';
|
|
3
4
|
import { Pool as V3Pool } from '@ring-protocol/v3-sdk';
|
|
@@ -44,6 +45,10 @@ export class CachedRoute {
|
|
|
44
45
|
return this.route.pairs
|
|
45
46
|
.map((pair) => `[V2]${pair.token0.address}/${pair.token1.address}`)
|
|
46
47
|
.join('->');
|
|
48
|
+
case Protocol.FEWV2:
|
|
49
|
+
return this.route.pairs
|
|
50
|
+
.map((pair) => `[FEWV2]${pair.token0.address}/${pair.token1.address}`)
|
|
51
|
+
.join('->');
|
|
47
52
|
case Protocol.MIXED:
|
|
48
53
|
return this.route.pools
|
|
49
54
|
.map((pool) => {
|
|
@@ -57,6 +62,9 @@ export class CachedRoute {
|
|
|
57
62
|
else if (pool instanceof Pair) {
|
|
58
63
|
return `[V2]${pool.token0.address}/${pool.token1.address}`;
|
|
59
64
|
}
|
|
65
|
+
else if (pool instanceof FewV2Pair) {
|
|
66
|
+
return `[FEWV2]${pool.token0.address}/${pool.token1.address}`;
|
|
67
|
+
}
|
|
60
68
|
else {
|
|
61
69
|
throw new Error(`Unsupported pool type ${JSON.stringify(pool)}`);
|
|
62
70
|
}
|
|
@@ -70,4 +78,4 @@ export class CachedRoute {
|
|
|
70
78
|
return this.hashCode(this.routePath);
|
|
71
79
|
}
|
|
72
80
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkLXJvdXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy9jYWNoaW5nL3JvdXRlL21vZGVsL2NhY2hlZC1yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxJQUFJLFNBQVMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0MsT0FBTyxFQUFFLElBQUksSUFBSSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsSUFBSSxJQUFJLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBVXZELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU85Qzs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxXQUFXO0lBUXRCOzs7T0FHRztJQUNILFlBQVksRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUE0QjtRQVR4RCx3RUFBd0U7UUFDeEUsb0lBQW9JO1FBQzVILGFBQVEsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQ2pDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFPdkUsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFDbkIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDekIsQ0FBQztJQUVELElBQVcsUUFBUTtRQUNqQixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDO0lBQzdCLENBQUM7SUFFRCxJQUFXLFVBQVU7UUFDbkIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQztJQUMxQixDQUFDO0lBRUQsSUFBVyxXQUFXO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUM7SUFDM0IsQ0FBQztJQUVELElBQVcsU0FBUztRQUNsQixRQUFRLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDckIsS0FBSyxRQUFRLENBQUMsRUFBRTtnQkFDZCxPQUFRLElBQUksQ0FBQyxLQUFpQixDQUFDLEtBQUs7cUJBQ2pDLEdBQUcsQ0FDRixDQUFDLElBQUksRUFBRSxFQUFFLENBQ1AsT0FBTyxVQUFVLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksSUFBSSxDQUFDLEdBQ2xFLElBQUksSUFBSSxDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQ3ZDO3FCQUNBLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNoQixLQUFLLFFBQVEsQ0FBQyxFQUFFO2dCQUNkLE9BQVEsSUFBSSxDQUFDLEtBQWlCLENBQUMsS0FBSztxQkFDakMsR0FBRyxDQUNGLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FDUCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FDbEU7cUJBQ0EsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2hCLEtBQUssUUFBUSxDQUFDLEVBQUU7Z0JBQ2QsT0FBUSxJQUFJLENBQUMsS0FBaUIsQ0FBQyxLQUFLO3FCQUNqQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztxQkFDbEUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2hCLEtBQUssUUFBUSxDQUFDLEtBQUs7Z0JBQ2pCLE9BQVEsSUFBSSxDQUFDLEtBQXdCLENBQUMsS0FBSztxQkFDeEMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxVQUFVLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7cUJBQ3JFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNoQixLQUFLLFFBQVEsQ0FBQyxLQUFLO2dCQUNqQixPQUFRLElBQUksQ0FBQyxLQUFvQixDQUFDLEtBQUs7cUJBQ3BDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO29CQUNaLElBQUksSUFBSSxZQUFZLE1BQU0sRUFBRTt3QkFDMUIsMERBQTBEO3dCQUMxRCxPQUFPLE9BQU8sVUFBVSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxVQUFVLENBQ2pELElBQUksQ0FBQyxNQUFNLENBQ1osSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLElBQUksQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO3FCQUNuRDt5QkFBTSxJQUFJLElBQUksWUFBWSxNQUFNLEVBQUU7d0JBQ2pDLE9BQU8sT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7cUJBQ3hFO3lCQUFNLElBQUksSUFBSSxZQUFZLElBQUksRUFBRTt3QkFDL0IsT0FBTyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7cUJBQzVEO3lCQUFNLElBQUksSUFBSSxZQUFZLFNBQVMsRUFBRTt3QkFDcEMsT0FBTyxVQUFVLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7cUJBQy9EO3lCQUFNO3dCQUNMLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO3FCQUNsRTtnQkFDSCxDQUFDLENBQUM7cUJBQ0QsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2hCO2dCQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1NBQzVEO0lBQ0gsQ0FBQztJQUVELElBQVcsT0FBTztRQUNoQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7Q0FDRiJ9
|
|
@@ -5,7 +5,7 @@ import { Pool as V3Pool } from '@ring-protocol/v3-sdk';
|
|
|
5
5
|
import { Pool as V4Pool } from '@ring-protocol/v4-sdk';
|
|
6
6
|
import { Pair as RingFewV2Pair } from '@ring-protocol/few-v2-sdk';
|
|
7
7
|
import { HooksOptions } from '../../../util/hooksOptions';
|
|
8
|
-
import { MixedRoute,
|
|
8
|
+
import { MixedRoute, RingFewV2Route, SupportedRoutes, V2Route, V3Route, V4Route } from '../../router';
|
|
9
9
|
export declare function computeAllV4Routes(currencyIn: Currency, currencyOut: Currency, pools: V4Pool[], maxHops: number, hooksOptions?: HooksOptions): V4Route[];
|
|
10
10
|
export declare function computeAllUniswapFewV4Routes(currencyIn: Currency, currencyOut: Currency, pools: V4Pool[], maxHops: number, hooksOptions?: HooksOptions): V4Route[];
|
|
11
11
|
export declare function computeAllV3Routes(tokenIn: Token, tokenOut: Token, pools: V3Pool[], maxHops: number): V3Route[];
|
|
@@ -4,7 +4,7 @@ import { Pool as V3Pool } from '@ring-protocol/v3-sdk';
|
|
|
4
4
|
import { Pool as V4Pool } from '@ring-protocol/v4-sdk';
|
|
5
5
|
import { getAddressLowerCase, nativeOnChain, V4_ETH_WETH_FAKE_POOL, } from '../../../util';
|
|
6
6
|
import { HooksOptions } from '../../../util/hooksOptions';
|
|
7
|
-
import { log } from '../../../util/log';
|
|
7
|
+
// import { log } from '../../../util/log';
|
|
8
8
|
import { poolToString, routeToString } from '../../../util/routes';
|
|
9
9
|
import { MixedRoute, RingFewV2Route, V2Route, V3Route, V4Route, } from '../../router';
|
|
10
10
|
export function computeAllV4Routes(currencyIn, currencyOut, pools, maxHops, hooksOptions) {
|
|
@@ -138,10 +138,10 @@ export function computeAllRoutes(tokenIn, tokenOut, buildRoute, involvesToken, p
|
|
|
138
138
|
}
|
|
139
139
|
};
|
|
140
140
|
computeRoutes(tokenIn, tokenOut, [], poolsUsed, new Set([getAddressLowerCase(tokenIn)]));
|
|
141
|
-
log
|
|
141
|
+
console.log({
|
|
142
142
|
routes: routes.map(routeToString),
|
|
143
143
|
pools: pools.map(poolToString),
|
|
144
144
|
}, `Computed ${routes.length} possible routes for type ${(_a = routes[0]) === null || _a === void 0 ? void 0 : _a.protocol}.`);
|
|
145
145
|
return routes;
|
|
146
146
|
}
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compute-all-routes.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/functions/compute-all-routes.ts"],"names":[],"mappings":"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"}
|