@xspswap/smart-order-router 1.1.4 → 1.2.1-beta.2
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/README.md +5 -0
- package/build/main/providers/caching-token-provider.js +2 -2
- package/build/main/providers/on-chain-quote-provider.js +2 -1
- package/build/main/providers/token-provider.d.ts +7 -12
- package/build/main/providers/token-provider.js +11 -26
- package/build/main/providers/v2/caching-pool-provider.js +1 -1
- package/build/main/providers/v2/pool-provider.d.ts +12 -3
- package/build/main/providers/v2/pool-provider.js +11 -10
- package/build/main/providers/v2/quote-provider.js +2 -2
- package/build/main/providers/v2/static-subgraph-provider.js +4 -16
- package/build/main/providers/v2/subgraph-provider-with-fallback.js +2 -1
- package/build/main/providers/v2-fathom/constants.d.ts +2 -0
- package/build/main/providers/v2-fathom/constants.js +6 -0
- package/build/main/providers/v2-fathom/static-subgraph-provider.d.ts +23 -0
- package/build/main/providers/v2-fathom/static-subgraph-provider.js +170 -0
- package/build/main/providers/v2-fathom/subgraph-provider.d.ts +35 -0
- package/build/main/providers/v2-fathom/subgraph-provider.js +130 -0
- package/build/main/providers/v2-fathom/utils.d.ts +2 -0
- package/build/main/providers/v2-fathom/utils.js +14 -0
- package/build/main/providers/v3/pool-provider.js +3 -2
- package/build/main/providers/v3/static-subgraph-provider.js +33 -82
- package/build/main/routers/alpha-router/alpha-router.d.ts +10 -2
- package/build/main/routers/alpha-router/alpha-router.js +43 -14
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.d.ts +4 -3
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.js +3 -3
- package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts +2 -1
- package/build/main/routers/alpha-router/functions/compute-all-routes.js +3 -3
- package/build/main/routers/alpha-router/functions/get-candidate-pools.d.ts +2 -1
- package/build/main/routers/alpha-router/functions/get-candidate-pools.js +11 -3
- package/build/main/routers/alpha-router/quoters/base-quoter.d.ts +3 -1
- package/build/main/routers/alpha-router/quoters/base-quoter.js +3 -2
- package/build/main/routers/alpha-router/quoters/mixed-quoter.js +3 -2
- package/build/main/routers/alpha-router/quoters/v2-quoter.d.ts +2 -1
- package/build/main/routers/alpha-router/quoters/v2-quoter.js +10 -4
- package/build/main/routers/alpha-router/quoters/v3-quoter.js +3 -2
- package/build/main/routers/legacy-router/legacy-router.js +1 -1
- package/build/main/routers/router.d.ts +5 -3
- package/build/main/routers/router.js +5 -5
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/gas-factory-helpers.d.ts +1 -1
- package/build/main/util/gas-factory-helpers.js +4 -2
- package/build/main/util/methodParameters.js +3 -2
- package/build/main/util/protocols.js +3 -1
- package/build/main/util/routes.js +5 -2
- package/build/module/providers/caching-token-provider.js +3 -3
- package/build/module/providers/on-chain-quote-provider.js +2 -1
- package/build/module/providers/token-provider.d.ts +7 -12
- package/build/module/providers/token-provider.js +10 -24
- package/build/module/providers/v2/caching-pool-provider.js +1 -1
- package/build/module/providers/v2/pool-provider.d.ts +12 -3
- package/build/module/providers/v2/pool-provider.js +11 -10
- package/build/module/providers/v2/quote-provider.js +2 -2
- package/build/module/providers/v2/static-subgraph-provider.js +5 -17
- package/build/module/providers/v2/subgraph-provider-with-fallback.js +2 -1
- package/build/module/providers/v2-fathom/constants.d.ts +2 -0
- package/build/module/providers/v2-fathom/constants.js +3 -0
- package/build/module/providers/v2-fathom/static-subgraph-provider.d.ts +23 -0
- package/build/module/providers/v2-fathom/static-subgraph-provider.js +163 -0
- package/build/module/providers/v2-fathom/subgraph-provider.d.ts +35 -0
- package/build/module/providers/v2-fathom/subgraph-provider.js +131 -0
- package/build/module/providers/v2-fathom/utils.d.ts +2 -0
- package/build/module/providers/v2-fathom/utils.js +10 -0
- package/build/module/providers/v3/pool-provider.js +3 -2
- package/build/module/providers/v3/static-subgraph-provider.js +34 -83
- package/build/module/routers/alpha-router/alpha-router.d.ts +10 -2
- package/build/module/routers/alpha-router/alpha-router.js +43 -14
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.d.ts +4 -3
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.js +3 -3
- package/build/module/routers/alpha-router/functions/compute-all-routes.d.ts +2 -1
- package/build/module/routers/alpha-router/functions/compute-all-routes.js +3 -3
- package/build/module/routers/alpha-router/functions/get-candidate-pools.d.ts +2 -1
- package/build/module/routers/alpha-router/functions/get-candidate-pools.js +11 -3
- package/build/module/routers/alpha-router/quoters/base-quoter.d.ts +3 -1
- package/build/module/routers/alpha-router/quoters/base-quoter.js +3 -2
- package/build/module/routers/alpha-router/quoters/mixed-quoter.js +3 -2
- package/build/module/routers/alpha-router/quoters/v2-quoter.d.ts +2 -1
- package/build/module/routers/alpha-router/quoters/v2-quoter.js +10 -4
- package/build/module/routers/alpha-router/quoters/v3-quoter.js +3 -2
- package/build/module/routers/legacy-router/legacy-router.js +2 -2
- package/build/module/routers/router.d.ts +5 -3
- package/build/module/routers/router.js +5 -5
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/gas-factory-helpers.d.ts +1 -1
- package/build/module/util/gas-factory-helpers.js +5 -3
- package/build/module/util/methodParameters.js +5 -4
- package/build/module/util/protocols.js +3 -1
- package/build/module/util/routes.js +5 -2
- package/package.json +7 -7
|
@@ -28,7 +28,7 @@ export interface IRouteWithValidQuote<Route extends V3Route | V2Route | MixedRou
|
|
|
28
28
|
tokenPath: Token[];
|
|
29
29
|
}
|
|
30
30
|
export type IV2RouteWithValidQuote = {
|
|
31
|
-
protocol: Protocol.V2;
|
|
31
|
+
protocol: Protocol.V2 | Protocol.FATHOM;
|
|
32
32
|
} & IRouteWithValidQuote<V2Route>;
|
|
33
33
|
export type IV3RouteWithValidQuote = {
|
|
34
34
|
protocol: Protocol.V3;
|
|
@@ -46,6 +46,7 @@ export type V2RouteWithValidQuoteParams = {
|
|
|
46
46
|
quoteToken: Token;
|
|
47
47
|
tradeType: TradeType;
|
|
48
48
|
v2PoolProvider: IV2PoolProvider;
|
|
49
|
+
protocol: Protocol.V2 | Protocol.FATHOM;
|
|
49
50
|
};
|
|
50
51
|
/**
|
|
51
52
|
* Represents a quote for swapping on a V2 only route. Contains all information
|
|
@@ -56,7 +57,7 @@ export type V2RouteWithValidQuoteParams = {
|
|
|
56
57
|
* @class V2RouteWithValidQuote
|
|
57
58
|
*/
|
|
58
59
|
export declare class V2RouteWithValidQuote implements IV2RouteWithValidQuote {
|
|
59
|
-
|
|
60
|
+
protocol: Protocol.V2 | Protocol.FATHOM;
|
|
60
61
|
amount: CurrencyAmount;
|
|
61
62
|
rawQuote: BigNumber;
|
|
62
63
|
quote: CurrencyAmount;
|
|
@@ -72,7 +73,7 @@ export declare class V2RouteWithValidQuote implements IV2RouteWithValidQuote {
|
|
|
72
73
|
poolAddresses: string[];
|
|
73
74
|
tokenPath: Token[];
|
|
74
75
|
toString(): string;
|
|
75
|
-
constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, }: V2RouteWithValidQuoteParams);
|
|
76
|
+
constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, protocol, }: V2RouteWithValidQuoteParams);
|
|
76
77
|
}
|
|
77
78
|
export type V3RouteWithValidQuoteParams = {
|
|
78
79
|
amount: CurrencyAmount;
|
|
@@ -22,8 +22,8 @@ class V2RouteWithValidQuote {
|
|
|
22
22
|
toString() {
|
|
23
23
|
return `${this.percent.toFixed(2)}% QuoteGasAdj[${this.quoteAdjustedForGas.toExact()}] Quote[${this.quote.toExact()}] Gas[${this.gasEstimate.toString()}] = ${(0, routes_1.routeToString)(this.route)}`;
|
|
24
24
|
}
|
|
25
|
-
constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, }) {
|
|
26
|
-
this.protocol =
|
|
25
|
+
constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, protocol, }) {
|
|
26
|
+
this.protocol = protocol;
|
|
27
27
|
this.amount = amount;
|
|
28
28
|
this.rawQuote = rawQuote;
|
|
29
29
|
this.quote = amounts_1.CurrencyAmount.fromRawAmount(quoteToken, rawQuote.toString());
|
|
@@ -140,4 +140,4 @@ class MixedRouteWithValidQuote {
|
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
142
|
exports.MixedRouteWithValidQuote = MixedRouteWithValidQuote;
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
143
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtd2l0aC12YWxpZC1xdW90ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9lbnRpdGllcy9yb3V0ZS13aXRoLXZhbGlkLXF1b3RlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDREQUF1RDtBQUN2RCx3REFBNkQ7QUFDN0Qsb0RBQStDO0FBQy9DLG9EQUF1QjtBQUl2QixtREFBdUQ7QUFDdkQsaURBQXFEO0FBMkRyRDs7Ozs7OztHQU9HO0FBQ0gsTUFBYSxxQkFBcUI7SUFrQnpCLFFBQVE7UUFDYixPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQzVCLENBQUMsQ0FDRixpQkFBaUIsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxXQUFXLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLFNBQVMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsT0FBTyxJQUFBLHNCQUFhLEVBQ3pJLElBQUksQ0FBQyxLQUFLLENBQ1gsRUFBRSxDQUFDO0lBQ04sQ0FBQztJQUVELFlBQVksRUFDVixNQUFNLEVBQ04sUUFBUSxFQUNSLE9BQU8sRUFDUCxLQUFLLEVBQ0wsUUFBUSxFQUNSLFVBQVUsRUFDVixTQUFTLEVBQ1QsY0FBYyxFQUNkLFFBQVEsR0FDb0I7UUFDNUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7UUFDekIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7UUFDekIsSUFBSSxDQUFDLEtBQUssR0FBRyx3QkFBYyxDQUFDLGFBQWEsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFL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
|
|
@@ -2,7 +2,8 @@ import { Token } from '@x-swap-protocol/sdk-core';
|
|
|
2
2
|
import { Pool } from '@x-swap-protocol/v3-sdk';
|
|
3
3
|
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
4
4
|
import { MixedRoute, V2Route, V3Route } from '../../router';
|
|
5
|
+
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
5
6
|
export declare function computeAllV3Routes(tokenIn: Token, tokenOut: Token, pools: Pool[], maxHops: number): V3Route[];
|
|
6
|
-
export declare function computeAllV2Routes(tokenIn: Token, tokenOut: Token, pools: Pair[], maxHops: number): V2Route[];
|
|
7
|
+
export declare function computeAllV2Routes(tokenIn: Token, tokenOut: Token, pools: Pair[], maxHops: number, protocol: Protocol.V2 | Protocol.FATHOM): V2Route[];
|
|
7
8
|
export declare function computeAllMixedRoutes(tokenIn: Token, tokenOut: Token, parts: (Pool | Pair)[], maxHops: number): MixedRoute[];
|
|
8
9
|
export declare function computeAllRoutes<TPool extends Pair | Pool, TRoute extends V3Route | V2Route | MixedRoute>(tokenIn: Token, tokenOut: Token, buildRoute: (route: TPool[], tokenIn: Token, tokenOut: Token) => TRoute, pools: TPool[], maxHops: number): TRoute[];
|
|
@@ -12,9 +12,9 @@ function computeAllV3Routes(tokenIn, tokenOut, pools, maxHops) {
|
|
|
12
12
|
}, pools, maxHops);
|
|
13
13
|
}
|
|
14
14
|
exports.computeAllV3Routes = computeAllV3Routes;
|
|
15
|
-
function computeAllV2Routes(tokenIn, tokenOut, pools, maxHops) {
|
|
15
|
+
function computeAllV2Routes(tokenIn, tokenOut, pools, maxHops, protocol) {
|
|
16
16
|
return computeAllRoutes(tokenIn, tokenOut, (route, tokenIn, tokenOut) => {
|
|
17
|
-
return new router_1.V2Route(route, tokenIn, tokenOut);
|
|
17
|
+
return new router_1.V2Route(route, tokenIn, tokenOut, protocol);
|
|
18
18
|
}, pools, maxHops);
|
|
19
19
|
}
|
|
20
20
|
exports.computeAllV2Routes = computeAllV2Routes;
|
|
@@ -69,4 +69,4 @@ function computeAllRoutes(tokenIn, tokenOut, buildRoute, pools, maxHops) {
|
|
|
69
69
|
return routes;
|
|
70
70
|
}
|
|
71
71
|
exports.computeAllRoutes = computeAllRoutes;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZS1hbGwtcm91dGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL2Z1bmN0aW9ucy9jb21wdXRlLWFsbC1yb3V0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0Esb0RBQStDO0FBQy9DLG9EQUErQztBQUUvQywyQ0FBd0M7QUFDeEMsaURBQW1FO0FBQ25FLHlDQUE0RDtBQUc1RCxTQUFnQixrQkFBa0IsQ0FDaEMsT0FBYyxFQUNkLFFBQWUsRUFDZixLQUFhLEVBQ2IsT0FBZTtJQUVmLE9BQU8sZ0JBQWdCLENBQ3JCLE9BQU8sRUFDUCxRQUFRLEVBQ1IsQ0FBQyxLQUFhLEVBQUUsT0FBYyxFQUFFLFFBQWUsRUFBRSxFQUFFO1FBQ2pELE9BQU8sSUFBSSxnQkFBTyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDL0MsQ0FBQyxFQUNELEtBQUssRUFDTCxPQUFPLENBQ1IsQ0FBQztBQUNKLENBQUM7QUFmRCxnREFlQztBQUVELFNBQWdCLGtCQUFrQixDQUNoQyxPQUFjLEVBQ2QsUUFBZSxFQUNmLEtBQWEsRUFDYixPQUFlLEVBQ2YsUUFBdUM7SUFFdkMsT0FBTyxnQkFBZ0IsQ0FDckIsT0FBTyxFQUNQLFFBQVEsRUFDUixDQUFDLEtBQWEsRUFBRSxPQUFjLEVBQUUsUUFBZSxFQUFFLEVBQUU7UUFDakQsT0FBTyxJQUFJLGdCQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDekQsQ0FBQyxFQUNELEtBQUssRUFDTCxPQUFPLENBQ1IsQ0FBQztBQUNKLENBQUM7QUFoQkQsZ0RBZ0JDO0FBRUQsU0FBZ0IscUJBQXFCLENBQ25DLE9BQWMsRUFDZCxRQUFlLEVBQ2YsS0FBc0IsRUFDdEIsT0FBZTtJQUVmLE1BQU0sU0FBUyxHQUFHLGdCQUFnQixDQUNoQyxPQUFPLEVBQ1AsUUFB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
|
|
@@ -46,6 +46,7 @@ export type V2GetCandidatePoolsParams = {
|
|
|
46
46
|
poolProvider: IV2PoolProvider;
|
|
47
47
|
blockedTokenListProvider?: ITokenListProvider;
|
|
48
48
|
chainId: ChainId;
|
|
49
|
+
protocol: Protocol;
|
|
49
50
|
};
|
|
50
51
|
export type MixedRouteGetCandidatePoolsParams = {
|
|
51
52
|
tokenIn: Token;
|
|
@@ -65,7 +66,7 @@ export declare function getV3CandidatePools({ tokenIn, tokenOut, routeType, rout
|
|
|
65
66
|
candidatePools: CandidatePoolsBySelectionCriteria;
|
|
66
67
|
subgraphPools: V3SubgraphPool[];
|
|
67
68
|
}>;
|
|
68
|
-
export declare function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, }: V2GetCandidatePoolsParams): Promise<{
|
|
69
|
+
export declare function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, protocol, }: V2GetCandidatePoolsParams): Promise<{
|
|
69
70
|
poolAccessor: V2PoolAccessor;
|
|
70
71
|
candidatePools: CandidatePoolsBySelectionCriteria;
|
|
71
72
|
subgraphPools: V2SubgraphPool[];
|
|
@@ -295,7 +295,7 @@ async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
295
295
|
return { poolAccessor, candidatePools: poolsBySelection, subgraphPools };
|
|
296
296
|
}
|
|
297
297
|
exports.getV3CandidatePools = getV3CandidatePools;
|
|
298
|
-
async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, }) {
|
|
298
|
+
async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, protocol, }) {
|
|
299
299
|
var _a;
|
|
300
300
|
const { blockNumber, v2PoolSelection: { topN, topNDirectSwaps, topNTokenInOut, topNSecondHop, topNWithEachBaseToken, topNWithBaseToken, }, } = routingConfig;
|
|
301
301
|
const tokenInAddress = tokenIn.address.toLowerCase();
|
|
@@ -304,6 +304,10 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
304
304
|
const allPoolsRaw = await subgraphProvider.getPools(tokenIn, tokenOut, {
|
|
305
305
|
blockNumber,
|
|
306
306
|
});
|
|
307
|
+
// console.log(
|
|
308
|
+
// allPoolsRaw.map((p) => p.id),
|
|
309
|
+
// 'allPoolsRaw.map((p) => p.id)'
|
|
310
|
+
// );
|
|
307
311
|
const allPools = lodash_1.default.map(allPoolsRaw, (pool) => {
|
|
308
312
|
return Object.assign(Object.assign({}, pool), { token0: Object.assign(Object.assign({}, pool.token0), { id: pool.token0.id.toLowerCase() }), token1: Object.assign(Object.assign({}, pool.token1), { id: pool.token1.id.toLowerCase() }) });
|
|
309
313
|
});
|
|
@@ -396,6 +400,8 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
396
400
|
let topByEthQuoteTokenPool = [];
|
|
397
401
|
if (tokenOut.symbol != 'WETH' &&
|
|
398
402
|
tokenOut.symbol != 'WETH9' &&
|
|
403
|
+
tokenOut.symbol != 'XDC' &&
|
|
404
|
+
tokenOut.symbol != 'WXDC' &&
|
|
399
405
|
tokenOut.symbol != 'ETH') {
|
|
400
406
|
topByEthQuoteTokenPool = (0, lodash_1.default)(subgraphPoolsSorted)
|
|
401
407
|
.filter((subgraphPool) => {
|
|
@@ -498,6 +504,7 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
498
504
|
.compact()
|
|
499
505
|
.uniq()
|
|
500
506
|
.value();
|
|
507
|
+
console.log(tokenAddresses, 'tokenAddresses');
|
|
501
508
|
log_1.log.info(`Getting the ${tokenAddresses.length} tokens within the ${subgraphPools.length} V2 pools we are considering`);
|
|
502
509
|
const tokenAccessor = await tokenProvider.getTokens(tokenAddresses, {
|
|
503
510
|
blockNumber,
|
|
@@ -531,7 +538,7 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
531
538
|
const poolAccessor = await poolProvider.getPools(tokenPairs, { blockNumber });
|
|
532
539
|
metric_1.metric.putMetric('V2PoolsLoad', Date.now() - beforePoolsLoad, metric_1.MetricLoggerUnit.Milliseconds);
|
|
533
540
|
const poolsBySelection = {
|
|
534
|
-
protocol
|
|
541
|
+
protocol,
|
|
535
542
|
selections: {
|
|
536
543
|
topByBaseWithTokenIn,
|
|
537
544
|
topByBaseWithTokenOut,
|
|
@@ -570,6 +577,7 @@ async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routi
|
|
|
570
577
|
subgraphProvider: v2subgraphProvider,
|
|
571
578
|
routingConfig,
|
|
572
579
|
chainId,
|
|
580
|
+
protocol: router_sdk_1.Protocol.FATHOM, //todo: Is it ok
|
|
573
581
|
});
|
|
574
582
|
/**
|
|
575
583
|
* Main heuristic for pruning mixedRoutes:
|
|
@@ -700,4 +708,4 @@ async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routi
|
|
|
700
708
|
};
|
|
701
709
|
}
|
|
702
710
|
exports.getMixedRouteCandidatePools = getMixedRouteCandidatePools;
|
|
703
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"get-candidate-pools.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/functions/get-candidate-pools.ts"],"names":[],"mappings":"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"}
|
|
711
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"get-candidate-pools.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/functions/get-candidate-pools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
+
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
2
3
|
import { Currency, Token, TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
4
|
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
4
5
|
import { Pool } from '@x-swap-protocol/v3-sdk';
|
|
@@ -22,7 +23,8 @@ export declare abstract class BaseQuoter<Route extends V2Route | V3Route | Mixed
|
|
|
22
23
|
protected chainId: ChainId;
|
|
23
24
|
protected blockedTokenListProvider?: ITokenListProvider;
|
|
24
25
|
protected tokenValidatorProvider?: ITokenValidatorProvider;
|
|
25
|
-
|
|
26
|
+
protected protocol: Protocol;
|
|
27
|
+
constructor(tokenProvider: ITokenProvider, chainId: ChainId, protocol: Protocol, blockedTokenListProvider?: ITokenListProvider, tokenValidatorProvider?: ITokenValidatorProvider);
|
|
26
28
|
/**
|
|
27
29
|
* Protected method in charge of fetching the routes for the tokenIn/tokenOut pair.
|
|
28
30
|
*
|
|
@@ -14,9 +14,10 @@ const util_1 = require("../../../util");
|
|
|
14
14
|
* @template Route
|
|
15
15
|
*/
|
|
16
16
|
class BaseQuoter {
|
|
17
|
-
constructor(tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider) {
|
|
17
|
+
constructor(tokenProvider, chainId, protocol, blockedTokenListProvider, tokenValidatorProvider) {
|
|
18
18
|
this.tokenProvider = tokenProvider;
|
|
19
19
|
this.chainId = chainId;
|
|
20
|
+
this.protocol = protocol;
|
|
20
21
|
this.blockedTokenListProvider = blockedTokenListProvider;
|
|
21
22
|
this.tokenValidatorProvider = tokenValidatorProvider;
|
|
22
23
|
}
|
|
@@ -59,4 +60,4 @@ class BaseQuoter {
|
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
62
|
exports.BaseQuoter = BaseQuoter;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1xdW90ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvcm91dGVycy9hbHBoYS1yb3V0ZXIvcXVvdGVycy9iYXNlLXF1b3Rlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFLQSxvREFBdUI7QUFRdkIsd0NBQTJFO0FBUzNFOzs7Ozs7R0FNRztBQUNILE1BQXNCLFVBQVU7SUFPOUIsWUFDRSxhQUE2QixFQUM3QixPQUFnQixFQUNoQixRQUFrQixFQUNsQix3QkFBNkMsRUFDN0Msc0JBQWdEO1FBRWhELElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyx3QkFBd0IsR0FBRyx3QkFBd0IsQ0FBQztRQUN6RCxJQUFJLENBQUMsc0JBQXNCLEdBQUcsc0JBQXNCLENBQUM7SUFDdkQsQ0FBQztJQThDRDs7Ozs7Ozs7Ozs7O09BWUc7SUFDSSxtQkFBbUIsQ0FDeEIsT0FBYyxFQUNkLFFBQWUsRUFDZixPQUF5QixFQUN6QixRQUFrQixFQUNsQixVQUFpQixFQUNqQixTQUFvQixFQUNwQixhQUFnQyxFQUNoQyxRQUF5QyxFQUN6QyxXQUF1QjtRQUV2QixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsYUFBYSxDQUFDLENBQUMsSUFBSSxDQUNyRSxDQUFDLFlBQVksRUFBRSxFQUFFO1lBQ2YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUNuQixZQUFZLENBQUMsTUFBTSxFQUNuQixPQUFPLEVBQ1AsUUFBUSxFQUNSLFVBQVUsRUFDVixTQUFTLEVBQ1QsYUFBYSxFQUNiLFlBQVksQ0FBQyxjQUFjLEVBQzNCLFFBQVEsRUFDUixXQUFXLENBQ1osQ0FBQztRQUNKLENBQUMsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVTLEtBQUssQ0FBQywwQkFBMEIsQ0FDeEMsS0FBVSxFQUNWLFdBR1k7UUFFWixJQUFJLENBQUMsSUFBSSxDQUFDLHNCQUFzQixFQUFFO1lBQ2hDLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFFRCxVQUFHLENBQUMsSUFBSSxDQUFDLDhCQUE4QixLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsQ0FBQztRQUU3RCxNQUFNLE1BQU0sR0FBRyxnQkFBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUV0RSxNQUFNLHNCQUFzQixHQUMxQixNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFM0QsTUFBTSxhQUFhLEdBQUcsZ0JBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBTyxFQUFFLEVBQUU7WUFDaEQsTUFBTSxnQkFBZ0IsR0FBRyxzQkFBc0IsQ0FBQyxvQkFBb0IsQ0FDbEUsSUFBSSxDQUFDLE1BQU0sQ0FDWixDQUFDO1lBQ0YsTUFBTSxnQkFBZ0IsR0FBRyxzQkFBc0IsQ0FBQyxvQkFBb0IsQ0FDbEUsSUFBSSxDQUFDLE1BQU0sQ0FDWixDQUFDO1lBRUYsTUFBTSxhQUFhLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztZQUNqRSxNQUFNLGFBQWEsR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1lBRWpFLElBQUksYUFBYSxJQUFJLGFBQWEsRUFBRTtnQkFDbEMsVUFBRyxDQUFDLElBQUksQ0FDTixpQkFBaUIsSUFBQSxtQkFBWSxFQUFDLElBQUksQ0FBQyw4QkFDakMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUNkLEtBQUssZ0JBQWdCLEtBQUssSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEtBQUssZ0JBQWdCLEVBQUUsQ0FDcEUsQ0FBQzthQUNIO1lBRUQsT0FBTyxDQUFDLGFBQWEsSUFBSSxDQUFDLGFBQWEsQ0FBQztRQUMxQyxDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sYUFBYSxDQUFDO0lBQ3ZCLENBQUM7Q0FDRjtBQXBKRCxnQ0FvSkMifQ==
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MixedQuoter = void 0;
|
|
7
|
+
const router_sdk_1 = require("@x-swap-protocol/router-sdk");
|
|
7
8
|
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
8
9
|
const v3_sdk_1 = require("@x-swap-protocol/v3-sdk");
|
|
9
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
@@ -57,7 +58,7 @@ const recFinder = (path, used, lastToken, dest, hops) => {
|
|
|
57
58
|
};
|
|
58
59
|
class MixedQuoter extends base_quoter_1.BaseQuoter {
|
|
59
60
|
constructor(v3SubgraphProvider, v3PoolProvider, v2SubgraphProvider, v2PoolProvider, onChainQuoteProvider, tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider) {
|
|
60
|
-
super(tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider);
|
|
61
|
+
super(tokenProvider, chainId, router_sdk_1.Protocol.MIXED, blockedTokenListProvider, tokenValidatorProvider);
|
|
61
62
|
this.v3SubgraphProvider = v3SubgraphProvider;
|
|
62
63
|
this.v3PoolProvider = v3PoolProvider;
|
|
63
64
|
this.v2SubgraphProvider = v2SubgraphProvider;
|
|
@@ -230,4 +231,4 @@ class MixedQuoter extends base_quoter_1.BaseQuoter {
|
|
|
230
231
|
}
|
|
231
232
|
}
|
|
232
233
|
exports.MixedQuoter = MixedQuoter;
|
|
233
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
234
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mixed-quoter.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/quoters/mixed-quoter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
+
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
2
3
|
import { Token, TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
4
|
import { ITokenListProvider, ITokenProvider, ITokenValidatorProvider, IV2PoolProvider, IV2QuoteProvider, IV2SubgraphProvider } from '../../../providers';
|
|
4
5
|
import { ChainId, CurrencyAmount } from '../../../util';
|
|
@@ -15,7 +16,7 @@ export declare class V2Quoter extends BaseQuoter<V2Route> {
|
|
|
15
16
|
protected v2PoolProvider: IV2PoolProvider;
|
|
16
17
|
protected v2QuoteProvider: IV2QuoteProvider;
|
|
17
18
|
protected v2GasModelFactory: IV2GasModelFactory;
|
|
18
|
-
constructor(v2SubgraphProvider: IV2SubgraphProvider, v2PoolProvider: IV2PoolProvider, v2QuoteProvider: IV2QuoteProvider, v2GasModelFactory: IV2GasModelFactory, tokenProvider: ITokenProvider, chainId: ChainId, blockedTokenListProvider?: ITokenListProvider, tokenValidatorProvider?: ITokenValidatorProvider);
|
|
19
|
+
constructor(v2SubgraphProvider: IV2SubgraphProvider, v2PoolProvider: IV2PoolProvider, v2QuoteProvider: IV2QuoteProvider, v2GasModelFactory: IV2GasModelFactory, tokenProvider: ITokenProvider, chainId: ChainId, protocol: Protocol, blockedTokenListProvider?: ITokenListProvider, tokenValidatorProvider?: ITokenValidatorProvider);
|
|
19
20
|
protected getRoutes(tokenIn: Token, tokenOut: Token, tradeType: TradeType, routingConfig: AlphaRouterConfig): Promise<GetRoutesResult<V2Route>>;
|
|
20
21
|
getQuotes(routes: V2Route[], amounts: CurrencyAmount[], percents: number[], quoteToken: Token, tradeType: TradeType, _routingConfig: AlphaRouterConfig, candidatePools?: CandidatePoolsBySelectionCriteria, _gasModel?: IGasModel<V2RouteWithValidQuote>, gasPriceWei?: BigNumber): Promise<GetQuotesResult>;
|
|
21
22
|
}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.V2Quoter = void 0;
|
|
7
|
+
const router_sdk_1 = require("@x-swap-protocol/router-sdk");
|
|
7
8
|
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
8
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
10
|
const providers_1 = require("../../../providers");
|
|
@@ -13,12 +14,13 @@ const compute_all_routes_1 = require("../functions/compute-all-routes");
|
|
|
13
14
|
const get_candidate_pools_1 = require("../functions/get-candidate-pools");
|
|
14
15
|
const base_quoter_1 = require("./base-quoter");
|
|
15
16
|
class V2Quoter extends base_quoter_1.BaseQuoter {
|
|
16
|
-
constructor(v2SubgraphProvider, v2PoolProvider, v2QuoteProvider, v2GasModelFactory, tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider) {
|
|
17
|
-
super(tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider);
|
|
17
|
+
constructor(v2SubgraphProvider, v2PoolProvider, v2QuoteProvider, v2GasModelFactory, tokenProvider, chainId, protocol, blockedTokenListProvider, tokenValidatorProvider) {
|
|
18
|
+
super(tokenProvider, chainId, protocol, blockedTokenListProvider, tokenValidatorProvider);
|
|
18
19
|
this.v2SubgraphProvider = v2SubgraphProvider;
|
|
19
20
|
this.v2PoolProvider = v2PoolProvider;
|
|
20
21
|
this.v2QuoteProvider = v2QuoteProvider;
|
|
21
22
|
this.v2GasModelFactory = v2GasModelFactory;
|
|
23
|
+
this.protocol = protocol;
|
|
22
24
|
}
|
|
23
25
|
async getRoutes(tokenIn, tokenOut, tradeType, routingConfig) {
|
|
24
26
|
// Fetch all the pools that we will consider routing via. There are thousands
|
|
@@ -34,7 +36,9 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
|
|
|
34
36
|
subgraphProvider: this.v2SubgraphProvider,
|
|
35
37
|
routingConfig,
|
|
36
38
|
chainId: this.chainId,
|
|
39
|
+
protocol: this.protocol,
|
|
37
40
|
});
|
|
41
|
+
// Returns xswap or fathom
|
|
38
42
|
const poolsRaw = poolAccessor.getAllPools();
|
|
39
43
|
// Drop any pools that contain tokens that can not be transferred according to the token validator.
|
|
40
44
|
const pools = await this.applyTokenValidatorToPools(poolsRaw, (token, tokenValidation) => {
|
|
@@ -52,9 +56,10 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
|
|
|
52
56
|
}
|
|
53
57
|
return tokenValidation == providers_1.TokenValidationResult.STF;
|
|
54
58
|
});
|
|
59
|
+
console.log(pools, 'pools__');
|
|
55
60
|
// Given all our candidate pools, compute all the possible ways to route from tokenIn to tokenOut.
|
|
56
61
|
const { maxSwapsPerPath } = routingConfig;
|
|
57
|
-
const routes = (0, compute_all_routes_1.computeAllV2Routes)(tokenIn, tokenOut, pools, maxSwapsPerPath);
|
|
62
|
+
const routes = (0, compute_all_routes_1.computeAllV2Routes)(tokenIn, tokenOut, pools, maxSwapsPerPath, this.protocol === router_sdk_1.Protocol.FATHOM ? router_sdk_1.Protocol.FATHOM : router_sdk_1.Protocol.V2);
|
|
58
63
|
return {
|
|
59
64
|
routes,
|
|
60
65
|
candidatePools,
|
|
@@ -108,6 +113,7 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
|
|
|
108
113
|
quoteToken,
|
|
109
114
|
tradeType,
|
|
110
115
|
v2PoolProvider: this.v2PoolProvider,
|
|
116
|
+
protocol: this.protocol === router_sdk_1.Protocol.FATHOM ? router_sdk_1.Protocol.FATHOM : router_sdk_1.Protocol.V2,
|
|
111
117
|
});
|
|
112
118
|
routesWithValidQuotes.push(routeWithValidQuote);
|
|
113
119
|
}
|
|
@@ -119,4 +125,4 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
|
|
|
119
125
|
}
|
|
120
126
|
}
|
|
121
127
|
exports.V2Quoter = V2Quoter;
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjItcXVvdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL3F1b3RlcnMvdjItcXVvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDREQUF1RDtBQUN2RCx3REFBdUU7QUFDdkUsb0RBQXVCO0FBRXZCLGtEQVE0QjtBQUM1Qix3Q0FPdUI7QUFHdkIsMENBQW9EO0FBQ3BELHdFQUFxRTtBQUNyRSwwRUFHMEM7QUFHMUMsK0NBQTJDO0FBSTNDLE1BQWEsUUFBUyxTQUFRLHdCQUFtQjtJQU0vQyxZQUNFLGtCQUF1QyxFQUN2QyxjQUErQixFQUMvQixlQUFpQyxFQUNqQyxpQkFBcUMsRUFDckMsYUFBNkIsRUFDN0IsT0FBZ0IsRUFDaEIsUUFBa0IsRUFDbEIsd0JBQTZDLEVBQzdDLHNCQUFnRDtRQUVoRCxLQUFLLENBQ0gsYUFBYSxFQUNiLE9BQU8sRUFDUCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLHNCQUFzQixDQUN2QixDQUFDO1FBQ0YsSUFBSSxDQUFDLGtCQUFrQixHQUFHLGtCQUFrQixDQUFDO1FBQzdDLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxlQUFlLEdBQUcsZUFBZSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQztRQUMzQyxJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztJQUMzQixDQUFDO0lBRVMsS0FBSyxDQUFDLFNBQVMsQ0FDdkIsT0FBYyxFQUNkLFFBQWUsRUFDZixTQUFvQixFQUNwQixhQUFnQztRQUVoQyw2RUFBNkU7UUFDN0UsOEVBQThFO1FBQzlFLHlCQUF5QjtRQUN6QixNQUFNLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sSUFBQSx5Q0FBbUIsRUFBQztZQUNqRSxPQUFPO1lBQ1AsUUFBUTtZQUNSLGFBQWEsRUFBRSxJQUFJLENB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
|