@xspswap/smart-order-router 1.1.4 → 1.1.6

package/build/main/routers/alpha-router/quoters/mixed-quoter.js

@@ -4,14 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MixedQuoter = void 0;
+const router_sdk_1 = require("@x-swap-protocol/router-sdk");
 const sdk_core_1 = require("@x-swap-protocol/sdk-core");
 const v3_sdk_1 = require("@x-swap-protocol/v3-sdk");
 const lodash_1 = __importDefault(require("lodash"));
 const providers_1 = require("../../../providers");
+const static_subgraph_provider_1 = require("../../../providers/v2-fathom/static-subgraph-provider");
+const static_subgraph_provider_v3_uni_1 = require("../../../providers/v3/static-subgraph-provider-v3-uni");
 const util_1 = require("../../../util");
 const entities_1 = require("../entities");
 const compute_all_routes_1 = require("../functions/compute-all-routes");
 const base_quoter_1 = require("./base-quoter");
+const hasUniV3Pool = (route) => route.pools.some((pool) => pool instanceof v3_sdk_1.Pool && pool.factory);
 let paths = [];
 const recFinder = (path, used, lastToken, dest, hops) => {
     const hop = path.length;
@@ -20,11 +24,37 @@ const recFinder = (path, used, lastToken, dest, hops) => {
             return;
         }
         const additionalV3 = providers_1.V3_XDC_ADDITIONAL_BASES[lastToken.address];
+        const additionalV3Uni = static_subgraph_provider_v3_uni_1.Uni_V3_XDC_ADDITIONAL_BASES[lastToken.address];
         const additionalV2 = providers_1.V2_XDC_ADDITIONAL_BASES[lastToken.address];
+        const additionalV2Fathom = static_subgraph_provider_1.FATHOM_V2_XDC_ADDITIONAL_BASES[lastToken.address];
         if (additionalV3) {
             for (const ad of additionalV3) {
                 const adToken = ad;
-                const newPair = [lastToken, ...adToken];
+                const newPair = [
+                    lastToken,
+                    ...adToken,
+                    router_sdk_1.Protocol.V3,
+                ];
+                const newPath = [...path, newPair];
+                if (adToken[0].address === dest.address) {
+                    paths.push(newPath);
+                    continue;
+                }
+                // const id = `${adToken[0].address}-${dest.address}-${adToken[1]}`
+                const id = adToken[0].address;
+                if (!used[id]) {
+                    recFinder(newPath, Object.assign(Object.assign({}, used), { [id]: true }), adToken[0], dest, hops);
+                }
+            }
+        }
+        if (additionalV3Uni) {
+            for (const ad of additionalV3Uni) {
+                const adToken = ad;
+                const newPair = [
+                    lastToken,
+                    ...adToken,
+                    router_sdk_1.Protocol.UNI_V3,
+                ];
                 const newPath = [...path, newPair];
                 if (adToken[0].address === dest.address) {
                     paths.push(newPath);
@@ -53,13 +83,30 @@ const recFinder = (path, used, lastToken, dest, hops) => {
                 }
             }
         }
+        if (additionalV2Fathom) {
+            for (const ad of additionalV2Fathom) {
+                const adToken = ad;
+                const newPair = [lastToken, adToken];
+                const newPath = [...path, newPair];
+                if (adToken.address === dest.address) {
+                    paths.push(newPath);
+                    continue;
+                }
+                // const id = `${adToken.address}-${dest.address}`
+                const id = adToken.address;
+                if (!used[id]) {
+                    recFinder(newPath, Object.assign(Object.assign({}, used), { [id]: true }), adToken, dest, hops);
+                }
+            }
+        }
     }
 };
 class MixedQuoter extends base_quoter_1.BaseQuoter {
-    constructor(v3SubgraphProvider, v3PoolProvider, v2SubgraphProvider, v2PoolProvider, onChainQuoteProvider, tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider) {
-        super(tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider);
+    constructor(v3SubgraphProvider, v3PoolProvider, v3UniPoolProvider, v2SubgraphProvider, v2PoolProvider, onChainQuoteProvider, tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider) {
+        super(tokenProvider, chainId, router_sdk_1.Protocol.MIXED, blockedTokenListProvider, tokenValidatorProvider);
         this.v3SubgraphProvider = v3SubgraphProvider;
         this.v3PoolProvider = v3PoolProvider;
+        this.v3UniPoolProvider = v3UniPoolProvider;
         this.v2SubgraphProvider = v2SubgraphProvider;
         this.v2PoolProvider = v2PoolProvider;
         this.onChainQuoteProvider = onChainQuoteProvider;
@@ -137,7 +184,8 @@ class MixedQuoter extends base_quoter_1.BaseQuoter {
         paths.forEach((path) => {
             path.forEach((pool) => {
                 if (pool[2]) {
-                    const id = `${pool[0].address}-${pool[1].address}-${pool[2]}`;
+                    const protocol = pool[3];
+                    const id = `${protocol}-${pool[0].address}-${pool[1].address}-${pool[2]}`;
                     uniquePools[id] = pool;
                 }
                 else {
@@ -148,20 +196,34 @@ class MixedQuoter extends base_quoter_1.BaseQuoter {
         });
         const directV3 = tokenIn && tokenOut
             ? [
-                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.LOWEST],
-                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.LOW],
-                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.MEDIUM],
-                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.HIGH],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.LOWEST, router_sdk_1.Protocol.V3],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.LOW, router_sdk_1.Protocol.V3],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.MEDIUM, router_sdk_1.Protocol.V3],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.HIGH, router_sdk_1.Protocol.V3],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.LOWEST, router_sdk_1.Protocol.UNI_V3],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.LOW, router_sdk_1.Protocol.UNI_V3],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.MEDIUM, router_sdk_1.Protocol.UNI_V3],
+                [tokenIn, tokenOut, v3_sdk_1.FeeAmount.HIGH, router_sdk_1.Protocol.UNI_V3],
             ]
             : [];
         const poolsPaths = [...Object.values(uniquePools), ...directV3];
+        const xswapV3PoolsPaths = poolsPaths
+            .filter((pool) => pool[3] === router_sdk_1.Protocol.V3)
+            .map((pool) => [pool[0], pool[1], pool[2]]);
+        const uniV3PoolsPaths = poolsPaths
+            .filter((pool) => pool[3] === router_sdk_1.Protocol.UNI_V3)
+            .map((pool) => [pool[0], pool[1], pool[2]]);
         const directV2 = tokenIn && tokenOut ? [[tokenIn, tokenOut]] : [];
         const pairsPaths = [...Object.values(uniquePairs), ...directV2];
-        const [poolAccessor, pairAccessor] = await Promise.all([
-            this.v3PoolProvider.getPools(poolsPaths),
+        const [xswapPoolAccessor, uniPoolAccessor, pairAccessor] = await Promise.all([
+            this.v3PoolProvider.getPools(xswapV3PoolsPaths),
+            this.v3UniPoolProvider.getPools(uniV3PoolsPaths),
             this.v2PoolProvider.getPools(pairsPaths),
         ]);
-        const pools = poolAccessor.getAllPools();
+        const pools = [
+            ...xswapPoolAccessor.getAllPools(),
+            ...uniPoolAccessor.getAllPools(),
+        ];
         const pairs = pairAccessor.getAllPools();
         const poolsAndPairs = [...pairs, ...pools];
         const { maxSwapsPerPath } = routingConfig;
@@ -182,9 +244,13 @@ class MixedQuoter extends base_quoter_1.BaseQuoter {
         const quoteFn = this.onChainQuoteProvider.getQuotesManyExactIn.bind(this.onChainQuoteProvider);
         const beforeQuotes = Date.now();
         util_1.log.info(`Getting quotes for mixed for ${routes.length} routes with ${amounts.length} amounts per route.`);
-        const { routesWithQuotes } = await quoteFn(amounts, routes, {
+        const routeGroups = lodash_1.default.partition(routes, hasUniV3Pool);
+        const quoteResults = await Promise.all(routeGroups
+            .filter((routeGroup) => routeGroup.length > 0)
+            .map((routeGroup) => quoteFn(amounts, routeGroup, {
             blockNumber: routingConfig.blockNumber,
-        });
+        })));
+        const routesWithQuotes = lodash_1.default.flatMap(quoteResults, (quoteResult) => quoteResult.routesWithQuotes);
         util_1.metric.putMetric('MixedQuotesLoad', Date.now() - beforeQuotes, util_1.MetricLoggerUnit.Milliseconds);
         util_1.metric.putMetric('MixedQuotesFetched', (0, lodash_1.default)(routesWithQuotes)
             .map(([, quotes]) => quotes.length)
@@ -230,4 +296,4 @@ class MixedQuoter extends base_quoter_1.BaseQuoter {
     }
 }
 exports.MixedQuoter = MixedQuoter;
-//# 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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"}
+//# 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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"}

package/build/main/routers/alpha-router/quoters/v2-quoter.d.ts

@@ -1,7 +1,8 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { Token, TradeType } from '@x-swap-protocol/sdk-core';
+import { Protocol } from '@x-swap-protocol/router-sdk';
+import { ChainId, Token, TradeType } from '@x-swap-protocol/sdk-core';
 import { ITokenListProvider, ITokenProvider, ITokenValidatorProvider, IV2PoolProvider, IV2QuoteProvider, IV2SubgraphProvider } from '../../../providers';
-import { ChainId, CurrencyAmount } from '../../../util';
+import { CurrencyAmount } from '../../../util';
 import { V2Route } from '../../router';
 import { AlphaRouterConfig } from '../alpha-router';
 import { V2RouteWithValidQuote } from '../entities';
@@ -15,7 +16,7 @@ export declare class V2Quoter extends BaseQuoter<V2Route> {
     protected v2PoolProvider: IV2PoolProvider;
     protected v2QuoteProvider: IV2QuoteProvider;
     protected v2GasModelFactory: IV2GasModelFactory;
-    constructor(v2SubgraphProvider: IV2SubgraphProvider, v2PoolProvider: IV2PoolProvider, v2QuoteProvider: IV2QuoteProvider, v2GasModelFactory: IV2GasModelFactory, tokenProvider: ITokenProvider, chainId: ChainId, blockedTokenListProvider?: ITokenListProvider, tokenValidatorProvider?: ITokenValidatorProvider);
+    constructor(v2SubgraphProvider: IV2SubgraphProvider, v2PoolProvider: IV2PoolProvider, v2QuoteProvider: IV2QuoteProvider, v2GasModelFactory: IV2GasModelFactory, tokenProvider: ITokenProvider, chainId: ChainId, protocol: Protocol.V2 | Protocol.FATHOM, blockedTokenListProvider?: ITokenListProvider, tokenValidatorProvider?: ITokenValidatorProvider);
     protected getRoutes(tokenIn: Token, tokenOut: Token, tradeType: TradeType, routingConfig: AlphaRouterConfig): Promise<GetRoutesResult<V2Route>>;
     getQuotes(routes: V2Route[], amounts: CurrencyAmount[], percents: number[], quoteToken: Token, tradeType: TradeType, _routingConfig: AlphaRouterConfig, candidatePools?: CandidatePoolsBySelectionCriteria, _gasModel?: IGasModel<V2RouteWithValidQuote>, gasPriceWei?: BigNumber): Promise<GetQuotesResult>;
 }

package/build/main/routers/alpha-router/quoters/v2-quoter.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V2Quoter = void 0;
+const router_sdk_1 = require("@x-swap-protocol/router-sdk");
 const sdk_core_1 = require("@x-swap-protocol/sdk-core");
 const lodash_1 = __importDefault(require("lodash"));
 const providers_1 = require("../../../providers");
@@ -13,12 +14,13 @@ const compute_all_routes_1 = require("../functions/compute-all-routes");
 const get_candidate_pools_1 = require("../functions/get-candidate-pools");
 const base_quoter_1 = require("./base-quoter");
 class V2Quoter extends base_quoter_1.BaseQuoter {
-    constructor(v2SubgraphProvider, v2PoolProvider, v2QuoteProvider, v2GasModelFactory, tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider) {
-        super(tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider);
+    constructor(v2SubgraphProvider, v2PoolProvider, v2QuoteProvider, v2GasModelFactory, tokenProvider, chainId, protocol, blockedTokenListProvider, tokenValidatorProvider) {
+        super(tokenProvider, chainId, protocol, blockedTokenListProvider, tokenValidatorProvider);
         this.v2SubgraphProvider = v2SubgraphProvider;
         this.v2PoolProvider = v2PoolProvider;
         this.v2QuoteProvider = v2QuoteProvider;
         this.v2GasModelFactory = v2GasModelFactory;
+        this.protocol = protocol;
     }
     async getRoutes(tokenIn, tokenOut, tradeType, routingConfig) {
         // Fetch all the pools that we will consider routing via. There are thousands
@@ -34,7 +36,9 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
             subgraphProvider: this.v2SubgraphProvider,
             routingConfig,
             chainId: this.chainId,
+            protocol: this.protocol,
         });
+        // Returns xswap or fathom
         const poolsRaw = poolAccessor.getAllPools();
         // Drop any pools that contain tokens that can not be transferred according to the token validator.
         const pools = await this.applyTokenValidatorToPools(poolsRaw, (token, tokenValidation) => {
@@ -54,7 +58,7 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
         });
         // Given all our candidate pools, compute all the possible ways to route from tokenIn to tokenOut.
         const { maxSwapsPerPath } = routingConfig;
-        const routes = (0, compute_all_routes_1.computeAllV2Routes)(tokenIn, tokenOut, pools, maxSwapsPerPath);
+        const routes = (0, compute_all_routes_1.computeAllV2Routes)(tokenIn, tokenOut, pools, maxSwapsPerPath, this.protocol === router_sdk_1.Protocol.V2 ? router_sdk_1.Protocol.V2 : router_sdk_1.Protocol.FATHOM);
         return {
             routes,
             candidatePools,
@@ -108,6 +112,7 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
                     quoteToken,
                     tradeType,
                     v2PoolProvider: this.v2PoolProvider,
+                    protocol: this.protocol === router_sdk_1.Protocol.V2 ? router_sdk_1.Protocol.V2 : router_sdk_1.Protocol.FATHOM,
                 });
                 routesWithValidQuotes.push(routeWithValidQuote);
             }
@@ -119,4 +124,4 @@ class V2Quoter extends base_quoter_1.BaseQuoter {
     }
 }
 exports.V2Quoter = V2Quoter;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjItcXVvdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL3F1b3RlcnMvdjItcXVvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLHdEQUF1RTtBQUN2RSxvREFBdUI7QUFFdkIsa0RBUTRCO0FBQzVCLHdDQU91QjtBQUd2QiwwQ0FBb0Q7QUFDcEQsd0VBQXFFO0FBQ3JFLDBFQUcwQztBQUcxQywrQ0FBMkM7QUFJM0MsTUFBYSxRQUFTLFNBQVEsd0JBQW1CO0lBTS9DLFlBQ0Usa0JBQXVDLEVBQ3ZDLGNBQStCLEVBQy9CLGVBQWlDLEVBQ2pDLGlCQUFxQyxFQUNyQyxhQUE2QixFQUM3QixPQUFnQixFQUNoQix3QkFBNkMsRUFDN0Msc0JBQWdEO1FBRWhELEtBQUssQ0FDSCxhQUFhLEVBQ2IsT0FBTyxFQUNQLHdCQUF3QixFQUN4QixzQkFBc0IsQ0FDdkIsQ0FBQztRQUNGLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsY0FBYyxHQUFHLGNBQWMsQ0FBQztRQUNyQyxJQUFJLENBQUMsZUFBZSxHQUFHLGVBQWUsQ0FBQztRQUN2QyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7SUFDN0MsQ0FBQztJQUVTLEtBQUssQ0FBQyxTQUFTLENBQ3ZCLE9BQWMsRUFDZCxRQUFlLEVBQ2YsU0FBb0IsRUFDcEIsYUFBZ0M7UUFFaEMsNkVBQTZFO1FBQzdFLDhFQUE4RTtRQUM5RSx5QkFBeUI7UUFDekIsTUFBTSxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsR0FBRyxNQUFNLElBQUEseUNBQW1CLEVBQUM7WUFDakUsT0FBTztZQUNQLFFBQVE7WUFDUixhQUFhLEVBQUUsSUFBSSxDQUFDLGFBQWE7WUFDakMsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLHdCQUF3QjtZQUN2RCxZQUFZLEVBQUUsSUFBSSxDQUFDLGNB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjItcXVvdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL3F1b3RlcnMvdjItcXVvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDREQUF1RDtBQUN2RCx3REFBZ0Y7QUFDaEYsb0RBQXVCO0FBRXZCLGtEQVE0QjtBQUM1Qix3Q0FNdUI7QUFHdkIsMENBQW9EO0FBQ3BELHdFQUFxRTtBQUNyRSwwRUFHMEM7QUFHMUMsK0NBQTJDO0FBSTNDLE1BQWEsUUFBUyxTQUFRLHdCQUFtQjtJQU0vQyxZQUNFLGtCQUF1QyxFQUN2QyxjQUErQixFQUMvQixlQUFpQyxFQUNqQyxpQkFBcUMsRUFDckMsYUFBNkIsRUFDN0IsT0FBZ0IsRUFDaEIsUUFBdUMsRUFDdkMsd0JBQTZDLEVBQzdDLHNCQUFnRDtRQUVoRCxLQUFLLENBQ0gsYUFBYSxFQUNiLE9BQU8sRUFDUCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLHNCQUFzQixDQUN2QixDQUFDO1FBQ0YsSUFBSSxDQUFDLGtCQUFrQixHQUFHLGtCQUFrQixDQUFDO1FBQzdDLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxlQUFlLEdBQUcsZUFBZSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQztRQUMzQyxJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztJQUMzQixDQUFDO0lBRVMsS0FBSyxDQUFDLFNBQVMsQ0FDdkIsT0FBYyxFQUNkLFFBQWUsRUFDZixTQUFvQixFQUNwQixhQUFnQztRQUVoQyw2RUFBNkU7UUFDN0UsOEVBQThFO1FBQzlFLHlCQUF5QjtRQUN6QixNQUFNLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sSUFBQSx5Q0FBbUIsRUFBQztZQUNqRSxPQUFPO1lBQ1AsUUFBUTtZQUNSLGFBQWEsRUFBRSxJQUFJLENB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

package/build/main/routers/alpha-router/quoters/v3-quoter.d.ts

@@ -1,6 +1,7 @@
-import { Token, TradeType } from '@x-swap-protocol/sdk-core';
+import { Protocol } from '@x-swap-protocol/router-sdk';
+import { ChainId, Token, TradeType } from '@x-swap-protocol/sdk-core';
 import { IOnChainQuoteProvider, ITokenListProvider, ITokenProvider, ITokenValidatorProvider, IV3PoolProvider, IV3SubgraphProvider } from '../../../providers';
-import { ChainId, CurrencyAmount } from '../../../util';
+import { CurrencyAmount } from '../../../util';
 import { V3Route } from '../../router';
 import { AlphaRouterConfig } from '../alpha-router';
 import { V3RouteWithValidQuote } from '../entities';
@@ -13,7 +14,7 @@ export declare class V3Quoter extends BaseQuoter<V3Route> {
     protected v3SubgraphProvider: IV3SubgraphProvider;
     protected v3PoolProvider: IV3PoolProvider;
     protected onChainQuoteProvider: IOnChainQuoteProvider;
-    constructor(v3SubgraphProvider: IV3SubgraphProvider, v3PoolProvider: IV3PoolProvider, onChainQuoteProvider: IOnChainQuoteProvider, tokenProvider: ITokenProvider, chainId: ChainId, blockedTokenListProvider?: ITokenListProvider, tokenValidatorProvider?: ITokenValidatorProvider);
+    constructor(v3SubgraphProvider: IV3SubgraphProvider, v3PoolProvider: IV3PoolProvider, onChainQuoteProvider: IOnChainQuoteProvider, tokenProvider: ITokenProvider, chainId: ChainId, protocol: Protocol.V3 | Protocol.UNI_V3, blockedTokenListProvider?: ITokenListProvider, tokenValidatorProvider?: ITokenValidatorProvider);
     protected getRoutes(tokenIn: Token, tokenOut: Token, tradeType: TradeType, routingConfig: AlphaRouterConfig): Promise<GetRoutesResult<V3Route>>;
-    getQuotes(routes: V3Route[], amounts: CurrencyAmount[], percents: number[], quoteToken: Token, tradeType: TradeType, routingConfig: AlphaRouterConfig, candidatePools?: CandidatePoolsBySelectionCriteria, gasModel?: IGasModel<V3RouteWithValidQuote>): Promise<GetQuotesResult>;
+    getQuotes(_routes: V3Route[], amounts: CurrencyAmount[], percents: number[], quoteToken: Token, tradeType: TradeType, routingConfig: AlphaRouterConfig, candidatePools?: CandidatePoolsBySelectionCriteria, gasModel?: IGasModel<V3RouteWithValidQuote>): Promise<GetQuotesResult>;
 }

package/build/main/routers/alpha-router/quoters/v3-quoter.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V3Quoter = void 0;
+const router_sdk_1 = require("@x-swap-protocol/router-sdk");
 const sdk_core_1 = require("@x-swap-protocol/sdk-core");
 const lodash_1 = __importDefault(require("lodash"));
 const providers_1 = require("../../../providers");
@@ -13,8 +14,8 @@ const compute_all_routes_1 = require("../functions/compute-all-routes");
 const get_candidate_pools_1 = require("../functions/get-candidate-pools");
 const base_quoter_1 = require("./base-quoter");
 class V3Quoter extends base_quoter_1.BaseQuoter {
-    constructor(v3SubgraphProvider, v3PoolProvider, onChainQuoteProvider, tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider) {
-        super(tokenProvider, chainId, blockedTokenListProvider, tokenValidatorProvider);
+    constructor(v3SubgraphProvider, v3PoolProvider, onChainQuoteProvider, tokenProvider, chainId, protocol, blockedTokenListProvider, tokenValidatorProvider) {
+        super(tokenProvider, chainId, protocol, blockedTokenListProvider, tokenValidatorProvider);
         this.v3SubgraphProvider = v3SubgraphProvider;
         this.v3PoolProvider = v3PoolProvider;
         this.onChainQuoteProvider = onChainQuoteProvider;
@@ -33,12 +34,8 @@ class V3Quoter extends base_quoter_1.BaseQuoter {
             subgraphProvider: this.v3SubgraphProvider,
             routingConfig,
             chainId: this.chainId,
+            protocol: this.protocol === router_sdk_1.Protocol.V3 ? router_sdk_1.Protocol.V3 : router_sdk_1.Protocol.UNI_V3,
         });
-        // console.log(
-        //   poolAccessor,
-        //   '-------',
-        //   JSON.stringify(candidatePools.selections, null, 2)
-        // );
         const poolsRaw = poolAccessor.getAllPools();
         // Drop any pools that contain fee on transfer tokens (not supported by v3) or have issues with being transferred.
         const pools = await this.applyTokenValidatorToPools(poolsRaw, (token, tokenValidation) => {
@@ -60,13 +57,14 @@ class V3Quoter extends base_quoter_1.BaseQuoter {
         });
         // Given all our candidate pools, compute all the possible ways to route from tokenIn to tokenOut.
         const { maxSwapsPerPath } = routingConfig;
-        const routes = (0, compute_all_routes_1.computeAllV3Routes)(tokenIn, tokenOut, pools, maxSwapsPerPath);
+        const routes = (0, compute_all_routes_1.computeAllV3Routes)(tokenIn, tokenOut, pools, maxSwapsPerPath, this.protocol === router_sdk_1.Protocol.V3 ? router_sdk_1.Protocol.V3 : router_sdk_1.Protocol.UNI_V3);
         return {
             routes,
             candidatePools,
         };
     }
-    async getQuotes(routes, amounts, percents, quoteToken, tradeType, routingConfig, candidatePools, gasModel) {
+    async getQuotes(_routes, amounts, percents, quoteToken, tradeType, routingConfig, candidatePools, gasModel) {
+        const routes = _routes.filter((route) => route.protocol === this.protocol);
         util_1.log.info('Starting to get V3 quotes');
         if (gasModel === undefined) {
             throw new Error('GasModel for V3RouteWithValidQuote is required to getQuotes');
@@ -116,6 +114,7 @@ class V3Quoter extends base_quoter_1.BaseQuoter {
                     quoteToken,
                     tradeType,
                     v3PoolProvider: this.v3PoolProvider,
+                    protocol: this.protocol === router_sdk_1.Protocol.V3 ? router_sdk_1.Protocol.V3 : router_sdk_1.Protocol.UNI_V3,
                 });
                 routesWithValidQuotes.push(routeWithValidQuote);
             }
@@ -127,4 +126,4 @@ class V3Quoter extends base_quoter_1.BaseQuoter {
     }
 }
 exports.V3Quoter = V3Quoter;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjMtcXVvdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL3F1b3RlcnMvdjMtcXVvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHdEQUF1RTtBQUN2RSxvREFBdUI7QUFFdkIsa0RBUTRCO0FBQzVCLHdDQU91QjtBQUd2QiwwQ0FBb0Q7QUFDcEQsd0VBQXFFO0FBQ3JFLDBFQUcwQztBQUcxQywrQ0FBMkM7QUFJM0MsTUFBYSxRQUFTLFNBQVEsd0JBQW1CO0lBSy9DLFlBQ0Usa0JBQXVDLEVBQ3ZDLGNBQStCLEVBQy9CLG9CQUEyQyxFQUMzQyxhQUE2QixFQUM3QixPQUFnQixFQUNoQix3QkFBNkMsRUFDN0Msc0JBQWdEO1FBRWhELEtBQUssQ0FDSCxhQUFhLEVBQ2IsT0FBTyxFQUNQLHdCQUF3QixFQUN4QixzQkFBc0IsQ0FDdkIsQ0FBQztRQUNGLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsY0FBYyxHQUFHLGNBQWMsQ0FBQztRQUNyQyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsb0JBQW9CLENBQUM7SUFDbkQsQ0FBQztJQUVTLEtBQUssQ0FBQyxTQUFTLENBQ3ZCLE9BQWMsRUFDZCxRQUFlLEVBQ2YsU0FBb0IsRUFDcEIsYUFBZ0M7UUFFaEMsNkVBQTZFO1FBQzdFLDhFQUE4RTtRQUM5RSx5QkFBeUI7UUFDekIsTUFBTSxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsR0FBRyxNQUFNLElBQUEseUNBQW1CLEVBQUM7WUFDakUsT0FBTztZQUNQLFFBQVE7WUFDUixhQUFhLEVBQUUsSUFBSSxDQUFDLGFBQWE7WUFDakMsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLHdCQUF3QjtZQUN2RCxZQUFZLEVBQUUsSUFBSSxDQUFDLGNBQWM7WUFDakMsU0FBUyxFQUFFLFNBQVM7WUFDcEIsZ0JBQWdCLEVBQUUsSUFBSSxD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjMtcXVvdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL3F1b3RlcnMvdjMtcXVvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDREQUF1RDtBQUN2RCx3REFBZ0Y7QUFDaEYsb0RBQXVCO0FBRXZCLGtEQVE0QjtBQUM1Qix3Q0FNdUI7QUFHdkIsMENBQW9EO0FBQ3BELHdFQUFxRTtBQUNyRSwwRUFHMEM7QUFHMUMsK0NBQTJDO0FBSTNDLE1BQWEsUUFBUyxTQUFRLHdCQUFtQjtJQUsvQyxZQUNFLGtCQUF1QyxFQUN2QyxjQUErQixFQUMvQixvQkFBMkMsRUFDM0MsYUFBNkIsRUFDN0IsT0FBZ0IsRUFDaEIsUUFBdUMsRUFDdkMsd0JBQTZDLEVBQzdDLHNCQUFnRDtRQUVoRCxLQUFLLENBQ0gsYUFBYSxFQUNiLE9BQU8sRUFDUCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLHNCQUFzQixDQUN2QixDQUFDO1FBQ0YsSUFBSSxDQUFDLGtCQUFrQixHQUFHLGtCQUFrQixDQUFDO1FBQzdDLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxvQkFBb0IsQ0FBQztJQUNuRCxDQUFDO0lBRVMsS0FBSyxDQUFDLFNBQVMsQ0FDdkIsT0FBYyxFQUNkLFFBQWUsRUFDZixTQUFvQixFQUNwQixhQUFnQztRQUVoQyw2RUFBNkU7UUFDN0UsOEVBQThFO1FBQzlFLHlCQUF5QjtRQUN6QixNQUFNLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sSUFBQSx5Q0FBbUIsRUFBQztZQUNqRSxPQUFPO1lBQ1AsUUFBUTtZQUNSLGFBQWEsRUFBRSxJQUFJLENBQUMsYUFBYTtZQUNqQyx3QkFBd0IsRUFBRSxJQUFJLENBQUMsd0JBQXdCO1lBQ3ZELFlBQVksRUFBRSxJQUFJLENBQUMsY0FBYztZQUNqQyxTQUFT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

package/build/main/routers/legacy-router/bases.d.ts

@@ -1,6 +1,5 @@
-import { Token } from '@x-swap-protocol/sdk-core';
+import { ChainId, Token } from '@x-swap-protocol/sdk-core';
 import { ITokenProvider } from '../../providers/token-provider';
-import { ChainId } from '../../util/chains';
 type ChainTokenList = {
     readonly [chainId in ChainId]: Token[];
 };

package/build/main/routers/legacy-router/bases.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CUSTOM_BASES = exports.ADDITIONAL_BASES = exports.BASES_TO_CHECK_TRADES_AGAINST = void 0;
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+const sdk_core_1 = require("@x-swap-protocol/sdk-core");
 const token_provider_1 = require("../../providers/token-provider");
-const chains_1 = require("../../util/chains");
 const BASES_TO_CHECK_TRADES_AGAINST = (_tokenProvider) => {
     return {
-        [chains_1.ChainId.XDC]: [chains_1.WRAPPED_NATIVE_CURRENCY[chains_1.ChainId.XDC], token_provider_1.USDT_XDC, token_provider_1.USDC_XDC],
-        [chains_1.ChainId.XDC_APOTHEM]: [
-            chains_1.WRAPPED_NATIVE_CURRENCY[chains_1.ChainId.XDC_APOTHEM],
+        [sdk_core_1.ChainId.XDC]: [sdk_core_1.WETH9[sdk_core_1.ChainId.XDC], token_provider_1.USDT_XDC, token_provider_1.USDC_XDC],
+        [sdk_core_1.ChainId.APOTHEM]: [
+            sdk_core_1.WETH9[sdk_core_1.ChainId.APOTHEM],
             token_provider_1.DAI_XDC_APOTHEM,
             token_provider_1.USDC_XDC_APOTHEM,
             token_provider_1.USDT_XDC_APOTHEM,
@@ -26,7 +27,7 @@ const getBasePairByAddress = async (tokenProvider, _chainId, fromAddress, toAddr
 };
 const ADDITIONAL_BASES = async (tokenProvider) => {
     return {
-        [chains_1.ChainId.XDC_APOTHEM]: Object.assign({}, (await getBasePairByAddress(tokenProvider, chains_1.ChainId.XDC_APOTHEM, '0xeb4c2781e4eba804ce9a9803c67d0893436bb27d', '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599'))),
+        [sdk_core_1.ChainId.APOTHEM]: Object.assign({}, (await getBasePairByAddress(tokenProvider, sdk_core_1.ChainId.APOTHEM, '0xeb4c2781e4eba804ce9a9803c67d0893436bb27d', '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599'))),
     };
 };
 exports.ADDITIONAL_BASES = ADDITIONAL_BASES;
@@ -55,4 +56,4 @@ tokenProvider) => {
     };
 };
 exports.CUSTOM_BASES = CUSTOM_BASES;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcm91dGVycy9sZWdhY3ktcm91dGVyL2Jhc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLG1FQU93QztBQUN4Qyw4Q0FBcUU7QUFNOUQsTUFBTSw2QkFBNkIsR0FBRyxDQUMzQyxjQUE4QixFQUNkLEVBQUU7SUFDbEIsT0FBTztRQUNMLENBQUMsZ0JBQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLGdDQUF1QixDQUFDLGdCQUFPLENBQUMsR0FBRyxDQUFFLEVBQUUseUJBQVEsRUFBRSx5QkFBUSxDQUFDO1FBQzFFLENBQUMsZ0JBQU8sQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUNyQixnQ0FBdUIsQ0FBQyxnQkFBTyxDQUFDLFdBQVcsQ0FBRTtZQUM3QyxnQ0FBZTtZQUNmLGlDQUFnQjtZQUNoQixpQ0FBZ0I7U0FDakI7S0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBWlcsUUFBQSw2QkFBNkIsaUNBWXhDO0FBRUYsTUFBTSxvQkFBb0IsR0FBRyxLQUFLLEVBQ2hDLGFBQTZCLEVBQzdCLFFBQWlCLEVBQ2pCLFdBQW1CLEVBQ25CLFNBQWlCLEVBQzZCLEVBQUU7SUFDaEQsTUFBTSxRQUFRLEdBQUcsTUFBTSxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUM1RCxNQUFNLE9BQU8sR0FBc0IsUUFBUSxDQUFDLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBRXpFLElBQUksQ0FBQyxPQUFPO1FBQUUsT0FBTyxFQUFFLENBQUM7SUFFeEIsT0FBTztRQUNMLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUM7S0FDekIsQ0FBQztBQUNKLENBQUMsQ0FBQztBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxFQUNuQyxhQUE2QixFQUc1QixFQUFFO0lBQ0gsT0FBTztRQUNMLENBQUMsZ0JBQU8sQ0FBQyxXQUFXLENBQUMsb0JBQ2hCLENBQUMsTUFBTSxvQkFBb0IsQ0FDNUIsYUFBYSxFQUNiLGdCQUFPLENBQUMsV0FBVyxFQUNuQiw0Q0FBNEMsRUFDNUMsNENBQTRDLENBQzdDLENBQUMsQ0FDSDtLQUNGLENBQUM7QUFDSixDQUFDLENBQUM7QUFmVyxRQUFBLGdCQUFnQixvQkFlM0I7QUFFRjs7O0dBR0c7QUFDSSxNQUFNLFlBQVksR0FBRyxLQUFLO0FBQy9CLGFBQWE7QUFDYixhQUE2QixFQUc1QixFQUFFO0lBQ0gsT0FBTztJQUNMLHVCQUF1QjtJQUN2QixvQ0FBb0M7SUFDcEMscUJBQXFCO0lBQ3JCLHVCQUF1QjtJQUN2QixvREFBb0Q7SUFDcEQsMEJBQTBCO0lBQzFCLFFBQVE7SUFDUixvQ0FBb0M7SUFDcEMscUJBQXFCO0lBQ3JCLHVCQUF1QjtJQUN2QixvREFBb0Q7SUFDcEQsMENBQTBDO0lBQzFDLFFBQVE7SUFDUixLQUFLO0tBQ04sQ0FBQztBQUNKLENBQUMsQ0FBQztBQXRCVyxRQUFBLFlBQVksZ0JBc0J2QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcm91dGVycy9sZWdhY3ktcm91dGVyL2Jhc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZEQUE2RDtBQUM3RCx3REFBa0U7QUFFbEUsbUVBT3dDO0FBTWpDLE1BQU0sNkJBQTZCLEdBQUcsQ0FDM0MsY0FBOEIsRUFDZCxFQUFFO0lBQ2xCLE9BQU87UUFDTCxDQUFDLGtCQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxnQkFBSyxDQUFDLGtCQUFPLENBQUMsR0FBRyxDQUFFLEVBQUUseUJBQVEsRUFBRSx5QkFBUSxDQUFDO1FBQ3hELENBQUMsa0JBQU8sQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNqQixnQkFBSyxDQUFDLGtCQUFPLENBQUMsT0FBTyxDQUFFO1lBQ3ZCLGdDQUFlO1lBQ2YsaUNBQWdCO1lBQ2hCLGlDQUFnQjtTQUNqQjtLQUNGLENBQUM7QUFDSixDQUFDLENBQUM7QUFaVyxRQUFBLDZCQUE2QixpQ0FZeEM7QUFFRixNQUFNLG9CQUFvQixHQUFHLEtBQUssRUFDaEMsYUFBNkIsRUFDN0IsUUFBaUIsRUFDakIsV0FBbUIsRUFDbkIsU0FBaUIsRUFDNkIsRUFBRTtJQUNoRCxNQUFNLFFBQVEsR0FBRyxNQUFNLGFBQWEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQzVELE1BQU0sT0FBTyxHQUFzQixRQUFRLENBQUMsaUJBQWlCLENBQUMsU0FBUyxDQUFDLENBQUM7SUFFekUsSUFBSSxDQUFDLE9BQU87UUFBRSxPQUFPLEVBQUUsQ0FBQztJQUV4QixPQUFPO1FBQ0wsQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQztLQUN6QixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBRUssTUFBTSxnQkFBZ0IsR0FBRyxLQUFLLEVBQ25DLGFBQTZCLEVBRzVCLEVBQUU7SUFDSCxPQUFPO1FBQ0wsQ0FBQyxrQkFBTyxDQUFDLE9BQU8sQ0FBQyxvQkFDWixDQUFDLE1BQU0sb0JBQW9CLENBQzVCLGFBQWEsRUFDYixrQkFBTyxDQUFDLE9BQU8sRUFDZiw0Q0FBNEMsRUFDNUMsNENBQTRDLENBQzdDLENBQUMsQ0FDSDtLQUNGLENBQUM7QUFDSixDQUFDLENBQUM7QUFmVyxRQUFBLGdCQUFnQixvQkFlM0I7QUFFRjs7O0dBR0c7QUFDSSxNQUFNLFlBQVksR0FBRyxLQUFLO0FBQy9CLGFBQWE7QUFDYixhQUE2QixFQUc1QixFQUFFO0lBQ0gsT0FBTztJQUNMLHVCQUF1QjtJQUN2QixvQ0FBb0M7SUFDcEMscUJBQXFCO0lBQ3JCLHVCQUF1QjtJQUN2QixvREFBb0Q7SUFDcEQsMEJBQTBCO0lBQzFCLFFBQVE7SUFDUixvQ0FBb0M7SUFDcEMscUJBQXFCO0lBQ3JCLHVCQUF1QjtJQUN2QixvREFBb0Q7SUFDcEQsMENBQTBDO0lBQzFDLFFBQVE7SUFDUixLQUFLO0tBQ04sQ0FBQztBQUNKLENBQUMsQ0FBQztBQXRCVyxRQUFBLFlBQVksZ0JBc0J2QiJ9

package/build/main/routers/legacy-router/legacy-router.d.ts

@@ -1,10 +1,9 @@
-import { Currency, TradeType } from '@x-swap-protocol/sdk-core';
+import { ChainId, Currency, TradeType } from '@x-swap-protocol/sdk-core';
 import { IOnChainQuoteProvider } from '../../providers';
 import { IMulticallProvider } from '../../providers/multicall-provider';
 import { ITokenProvider } from '../../providers/token-provider';
 import { IV3PoolProvider } from '../../providers/v3/pool-provider';
 import { CurrencyAmount } from '../../util/amounts';
-import { ChainId } from '../../util/chains';
 import { SwapOptionsSwapRouter02, SwapRoute } from '../router';
 export type LegacyRouterParams = {
     chainId: ChainId;

package/build/main/routers/legacy-router/legacy-router.js

@@ -11,7 +11,6 @@ const sdk_core_1 = require("@x-swap-protocol/sdk-core");
 const v3_sdk_1 = require("@x-swap-protocol/v3-sdk");
 const lodash_1 = __importDefault(require("lodash"));
 const providers_1 = require("../../providers");
-const util_1 = require("../../util");
 const amounts_1 = require("../../util/amounts");
 const log_1 = require("../../util/log");
 const routes_1 = require("../../util/routes");
@@ -58,7 +57,7 @@ class LegacyRouter {
             gasPriceWei: bignumber_1.BigNumber.from(0),
             trade,
             methodParameters: swapConfig
-                ? Object.assign(Object.assign({}, this.buildMethodParameters(trade, swapConfig)), { to: (0, util_1.SWAP_ROUTER_02_ADDRESSES)(this.chainId) }) : undefined,
+                ? Object.assign(Object.assign({}, this.buildMethodParameters(trade, swapConfig)), { to: (0, sdk_core_1.SWAP_ROUTER_02_ADDRESSES)(this.chainId) }) : undefined,
             blockNumber: bignumber_1.BigNumber.from(0),
         };
     }
@@ -81,7 +80,7 @@ class LegacyRouter {
             gasPriceWei: bignumber_1.BigNumber.from(0),
             trade,
             methodParameters: swapConfig
-                ? Object.assign(Object.assign({}, this.buildMethodParameters(trade, swapConfig)), { to: (0, util_1.SWAP_ROUTER_02_ADDRESSES)(this.chainId) }) : undefined,
+                ? Object.assign(Object.assign({}, this.buildMethodParameters(trade, swapConfig)), { to: (0, sdk_core_1.SWAP_ROUTER_02_ADDRESSES)(this.chainId) }) : undefined,
             blockNumber: bignumber_1.BigNumber.from(0),
         };
     }
@@ -143,6 +142,7 @@ class LegacyRouter {
                 tradeType: routeType,
                 quoteToken,
                 v3PoolProvider: this.poolProvider,
+                protocol: router_sdk_1.Protocol.V3,
             });
         });
         for (const rq of routeQuotes) {
@@ -209,7 +209,7 @@ class LegacyRouter {
                 ? pool.token1
                 : pool.token0;
             if (outputToken.equals(tokenOut)) {
-                allPaths.push(new router_1.V3Route([...currentPath, pool], startTokenIn, tokenOut));
+                allPaths.push(new router_1.V3Route([...currentPath, pool], startTokenIn, tokenOut, router_sdk_1.Protocol.V3));
             }
             else if (maxHops > 1) {
                 this.computeAllRoutes(outputToken, tokenOut, pools, chainId, [...currentPath, pool], allPaths, startTokenIn, maxHops - 1);
@@ -286,4 +286,4 @@ class LegacyRouter {
     }
 }
 exports.LegacyRouter = LegacyRouter;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"legacy-router.js","sourceRoot":"","sources":["../../../../src/routers/legacy-router/legacy-router.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"legacy-router.js","sourceRoot":"","sources":["../../../../src/routers/legacy-router/legacy-router.ts"],"names":[],"mappings":"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"}