@ring-protocol/smart-order-router 0.5.4 → 0.5.6
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 +16 -29
- 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 +21 -34
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CachedRoute = void 0;
|
|
4
|
+
const few_v2_sdk_1 = require("@ring-protocol/few-v2-sdk");
|
|
4
5
|
const router_sdk_1 = require("@ring-protocol/router-sdk");
|
|
5
6
|
const v2_sdk_1 = require("@ring-protocol/v2-sdk");
|
|
6
7
|
const v3_sdk_1 = require("@ring-protocol/v3-sdk");
|
|
@@ -47,6 +48,10 @@ class CachedRoute {
|
|
|
47
48
|
return this.route.pairs
|
|
48
49
|
.map((pair) => `[V2]${pair.token0.address}/${pair.token1.address}`)
|
|
49
50
|
.join('->');
|
|
51
|
+
case router_sdk_1.Protocol.FEWV2:
|
|
52
|
+
return this.route.pairs
|
|
53
|
+
.map((pair) => `[FEWV2]${pair.token0.address}/${pair.token1.address}`)
|
|
54
|
+
.join('->');
|
|
50
55
|
case router_sdk_1.Protocol.MIXED:
|
|
51
56
|
return this.route.pools
|
|
52
57
|
.map((pool) => {
|
|
@@ -60,6 +65,9 @@ class CachedRoute {
|
|
|
60
65
|
else if (pool instanceof v2_sdk_1.Pair) {
|
|
61
66
|
return `[V2]${pool.token0.address}/${pool.token1.address}`;
|
|
62
67
|
}
|
|
68
|
+
else if (pool instanceof few_v2_sdk_1.Pair) {
|
|
69
|
+
return `[FEWV2]${pool.token0.address}/${pool.token1.address}`;
|
|
70
|
+
}
|
|
63
71
|
else {
|
|
64
72
|
throw new Error(`Unsupported pool type ${JSON.stringify(pool)}`);
|
|
65
73
|
}
|
|
@@ -74,4 +82,4 @@ class CachedRoute {
|
|
|
74
82
|
}
|
|
75
83
|
}
|
|
76
84
|
exports.CachedRoute = CachedRoute;
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkLXJvdXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy9jYWNoaW5nL3JvdXRlL21vZGVsL2NhY2hlZC1yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwwREFBOEQ7QUFDOUQsMERBQXFEO0FBRXJELGtEQUE2QztBQUM3QyxrREFBdUQ7QUFDdkQsa0RBQXVEO0FBVXZELDJDQUE4QztBQU85Qzs7Ozs7R0FLRztBQUNILE1BQWEsV0FBVztJQVF0Qjs7O09BR0c7SUFDSCxZQUFZLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBNEI7UUFUeEQsd0VBQXdFO1FBQ3hFLG9JQUFvSTtRQUM1SCxhQUFRLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUNqQyxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBT3ZFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxJQUFXLFFBQVE7UUFDakIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQztJQUM3QixDQUFDO0lBRUQsSUFBVyxVQUFVO1FBQ25CLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUM7SUFDMUIsQ0FBQztJQUVELElBQVcsV0FBVztRQUNwQixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFXLFNBQVM7UUFDbEIsUUFBUSxJQUFJLENBQUMsUUFBUSxFQUFF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
|
|
@@ -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[];
|
|
@@ -7,7 +7,7 @@ const v3_sdk_1 = require("@ring-protocol/v3-sdk");
|
|
|
7
7
|
const v4_sdk_1 = require("@ring-protocol/v4-sdk");
|
|
8
8
|
const util_1 = require("../../../util");
|
|
9
9
|
const hooksOptions_1 = require("../../../util/hooksOptions");
|
|
10
|
-
|
|
10
|
+
// import { log } from '../../../util/log';
|
|
11
11
|
const routes_1 = require("../../../util/routes");
|
|
12
12
|
const router_1 = require("../../router");
|
|
13
13
|
function computeAllV4Routes(currencyIn, currencyOut, pools, maxHops, hooksOptions) {
|
|
@@ -148,11 +148,11 @@ function computeAllRoutes(tokenIn, tokenOut, buildRoute, involvesToken, pools, m
|
|
|
148
148
|
}
|
|
149
149
|
};
|
|
150
150
|
computeRoutes(tokenIn, tokenOut, [], poolsUsed, new Set([(0, util_1.getAddressLowerCase)(tokenIn)]));
|
|
151
|
-
|
|
151
|
+
console.log({
|
|
152
152
|
routes: routes.map(routes_1.routeToString),
|
|
153
153
|
pools: pools.map(routes_1.poolToString),
|
|
154
154
|
}, `Computed ${routes.length} possible routes for type ${(_a = routes[0]) === null || _a === void 0 ? void 0 : _a.protocol}.`);
|
|
155
155
|
return routes;
|
|
156
156
|
}
|
|
157
157
|
exports.computeAllRoutes = computeAllRoutes;
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
158
|
+
//# 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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"}
|