@xspswap/smart-order-router 1.1.6 → 1.1.7

package/build/main/routers/alpha-router/config.d.ts

@@ -1,4 +1,4 @@
-import { ChainId } from '@x-swap-protocol/sdk-core';
+import { ChainId } from '../../util/chains';
 import { AlphaRouterConfig } from './alpha-router';
 export declare const DEFAULT_ROUTING_CONFIG_BY_CHAIN: (chainId: ChainId) => AlphaRouterConfig;
 export declare const ETH_GAS_STATION_API_URL = "https://ethgasstation.info/api/ethgasAPI.json";

package/build/main/routers/alpha-router/entities/route-with-valid-quote.d.ts

@@ -28,10 +28,10 @@ export interface IRouteWithValidQuote<Route extends V3Route | V2Route | MixedRou
     tokenPath: Token[];
 }
 export type IV2RouteWithValidQuote = {
-    protocol: Protocol.V2 | Protocol.FATHOM;
+    protocol: Protocol.V2;
 } & IRouteWithValidQuote<V2Route>;
 export type IV3RouteWithValidQuote = {
-    protocol: Protocol.V3 | Protocol.UNI_V3;
+    protocol: Protocol.V3;
 } & IRouteWithValidQuote<V3Route>;
 export type IMixedRouteWithValidQuote = {
     protocol: Protocol.MIXED;
@@ -46,7 +46,6 @@ export type V2RouteWithValidQuoteParams = {
     quoteToken: Token;
     tradeType: TradeType;
     v2PoolProvider: IV2PoolProvider;
-    protocol: Protocol.V2 | Protocol.FATHOM;
 };
 /**
  * Represents a quote for swapping on a V2 only route. Contains all information
@@ -57,7 +56,7 @@ export type V2RouteWithValidQuoteParams = {
  * @class V2RouteWithValidQuote
  */
 export declare class V2RouteWithValidQuote implements IV2RouteWithValidQuote {
-    protocol: Protocol.V2 | Protocol.FATHOM;
+    readonly protocol = Protocol.V2;
     amount: CurrencyAmount;
     rawQuote: BigNumber;
     quote: CurrencyAmount;
@@ -73,7 +72,7 @@ export declare class V2RouteWithValidQuote implements IV2RouteWithValidQuote {
     poolAddresses: string[];
     tokenPath: Token[];
     toString(): string;
-    constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, protocol, }: V2RouteWithValidQuoteParams);
+    constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, }: V2RouteWithValidQuoteParams);
 }
 export type V3RouteWithValidQuoteParams = {
     amount: CurrencyAmount;
@@ -87,7 +86,6 @@ export type V3RouteWithValidQuoteParams = {
     quoteToken: Token;
     tradeType: TradeType;
     v3PoolProvider: IV3PoolProvider;
-    protocol: Protocol.V3 | Protocol.UNI_V3;
 };
 /**
  * Represents a quote for swapping on a V3 only route. Contains all information
@@ -98,7 +96,7 @@ export type V3RouteWithValidQuoteParams = {
  * @class V3RouteWithValidQuote
  */
 export declare class V3RouteWithValidQuote implements IV3RouteWithValidQuote {
-    protocol: Protocol.V3 | Protocol.UNI_V3;
+    readonly protocol = Protocol.V3;
     amount: CurrencyAmount;
     rawQuote: BigNumber;
     quote: CurrencyAmount;
@@ -117,7 +115,7 @@ export declare class V3RouteWithValidQuote implements IV3RouteWithValidQuote {
     poolAddresses: string[];
     tokenPath: Token[];
     toString(): string;
-    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, gasModel, quoteToken, tradeType, protocol, }: V3RouteWithValidQuoteParams);
+    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, gasModel, quoteToken, tradeType, v3PoolProvider, }: V3RouteWithValidQuoteParams);
 }
 export type MixedRouteWithValidQuoteParams = {
     amount: CurrencyAmount;
@@ -161,5 +159,5 @@ export declare class MixedRouteWithValidQuote implements IMixedRouteWithValidQuo
     poolAddresses: string[];
     tokenPath: Token[];
     toString(): string;
-    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, mixedRouteGasModel, quoteToken, tradeType, v2PoolProvider, }: MixedRouteWithValidQuoteParams);
+    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, mixedRouteGasModel, quoteToken, tradeType, v3PoolProvider, v2PoolProvider, }: MixedRouteWithValidQuoteParams);
 }

package/build/main/routers/alpha-router/entities/route-with-valid-quote.js

@@ -22,8 +22,8 @@ class V2RouteWithValidQuote {
     toString() {
         return `${this.percent.toFixed(2)}% QuoteGasAdj[${this.quoteAdjustedForGas.toExact()}] Quote[${this.quote.toExact()}] Gas[${this.gasEstimate.toString()}] = ${(0, routes_1.routeToString)(this.route)}`;
     }
-    constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, protocol, }) {
-        this.protocol = protocol;
+    constructor({ amount, rawQuote, percent, route, gasModel, quoteToken, tradeType, v2PoolProvider, }) {
+        this.protocol = router_sdk_1.Protocol.V2;
         this.amount = amount;
         this.rawQuote = rawQuote;
         this.quote = amounts_1.CurrencyAmount.fromRawAmount(quoteToken, rawQuote.toString());
@@ -62,8 +62,8 @@ class V3RouteWithValidQuote {
     toString() {
         return `${this.percent.toFixed(2)}% QuoteGasAdj[${this.quoteAdjustedForGas.toExact()}] Quote[${this.quote.toExact()}] Gas[${this.gasEstimate.toString()}] = ${(0, routes_1.routeToString)(this.route)}`;
     }
-    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, gasModel, quoteToken, tradeType, protocol, }) {
-        this.protocol = protocol;
+    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, gasModel, quoteToken, tradeType, v3PoolProvider, }) {
+        this.protocol = router_sdk_1.Protocol.V3;
         this.amount = amount;
         this.rawQuote = rawQuote;
         this.sqrtPriceX96AfterList = sqrtPriceX96AfterList;
@@ -88,7 +88,7 @@ class V3RouteWithValidQuote {
             const quoteGasAdjusted = this.quote.add(gasCostInToken);
             this.quoteAdjustedForGas = quoteGasAdjusted;
         }
-        this.poolAddresses = lodash_1.default.map(route.pools, (p) => v3_sdk_1.Pool.getAddress(p.token0, p.token1, p.fee, p.factory));
+        this.poolAddresses = lodash_1.default.map(route.pools, (p) => v3PoolProvider.getPoolAddress(p.token0, p.token1, p.fee).poolAddress);
         this.tokenPath = this.route.tokenPath;
     }
 }
@@ -105,7 +105,7 @@ class MixedRouteWithValidQuote {
     toString() {
         return `${this.percent.toFixed(2)}% QuoteGasAdj[${this.quoteAdjustedForGas.toExact()}] Quote[${this.quote.toExact()}] Gas[${this.gasEstimate.toString()}] = ${(0, routes_1.routeToString)(this.route)}`;
     }
-    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, mixedRouteGasModel, quoteToken, tradeType, v2PoolProvider, }) {
+    constructor({ amount, rawQuote, sqrtPriceX96AfterList, initializedTicksCrossedList, quoterGasEstimate, percent, route, mixedRouteGasModel, quoteToken, tradeType, v3PoolProvider, v2PoolProvider, }) {
         this.protocol = router_sdk_1.Protocol.MIXED;
         this.amount = amount;
         this.rawQuote = rawQuote;
@@ -133,11 +133,11 @@ class MixedRouteWithValidQuote {
         }
         this.poolAddresses = lodash_1.default.map(route.pools, (p) => {
             return p instanceof v3_sdk_1.Pool
-                ? v3_sdk_1.Pool.getAddress(p.token0, p.token1, p.fee, p.factory)
+                ? v3PoolProvider.getPoolAddress(p.token0, p.token1, p.fee).poolAddress
                 : v2PoolProvider.getPoolAddress(p.token0, p.token1).poolAddress;
         });
         this.tokenPath = this.route.path;
     }
 }
 exports.MixedRouteWithValidQuote = MixedRouteWithValidQuote;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtd2l0aC12YWxpZC1xdW90ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9lbnRpdGllcy9yb3V0ZS13aXRoLXZhbGlkLXF1b3RlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDREQUF1RDtBQUN2RCx3REFBNkQ7QUFDN0Qsb0RBQStDO0FBQy9DLG9EQUF1QjtBQUl2QixtREFBdUQ7QUFDdkQsaURBQXFEO0FBMkRyRDs7Ozs7OztHQU9HO0FBQ0gsTUFBYSxxQkFBcUI7SUFrQnpCLFFBQVE7UUFDYixPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQzVCLENBQUMsQ0FDRixpQkFBaUIsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxXQUFXLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLFNBQVMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsT0FBTyxJQUFBLHNCQUFhLEVBQ3pJLElBQUksQ0FBQyxLQUFLLENBQ1gsRUFBRSxDQUFDO0lBQ04sQ0FBQztJQUVELFlBQVksRUFDVixNQUFNLEVBQ04sUUFBUSxFQUNSLE9BQU8sRUFDUCxLQUFLLEVBQ0wsUUFBUSxFQUNSLFVBQVUsRUFDVixTQUFTLEVBQ1QsY0FBYyxFQUNkLFFBQVEsR0FDb0I7UUFDNUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7UUFDekIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7UUFDekIsSUFBSSxDQUFDLEtBQUssR0FBRyx3QkFBYyxDQUFDLGFBQWEsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFL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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtd2l0aC12YWxpZC1xdW90ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9lbnRpdGllcy9yb3V0ZS13aXRoLXZhbGlkLXF1b3RlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDREQUF1RDtBQUN2RCx3REFBNkQ7QUFDN0Qsb0RBQStDO0FBQy9DLG9EQUF1QjtBQUl2QixtREFBdUQ7QUFDdkQsaURBQXFEO0FBMERyRDs7Ozs7OztHQU9HO0FBQ0gsTUFBYSxxQkFBcUI7SUFrQnpCLFFBQVE7UUFDYixPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQzVCLENBQUMsQ0FDRixpQkFBaUIsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxXQUFXLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLFNBQVMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsT0FBTyxJQUFBLHNCQUFhLEVBQ3pJLElBQUksQ0FBQyxLQUFLLENBQ1gsRUFBRSxDQUFDO0lBQ04sQ0FBQztJQUVELFlBQVksRUFDVixNQUFNLEVBQ04sUUFBUSxFQUNSLE9BQU8sRUFDUCxLQUFLLEVBQ0wsUUFBUSxFQUNSLFVBQVUsRUFDVixTQUFTLEVBQ1QsY0FBYyxHQUNjO1FBbENkLGFBQVEsR0FBRyxxQkFBUSxDQUFDLEVBQUUsQ0FBQztRQW1DckMsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7UUFDekIsSUFBSSxDQUFDLEtBQUssR0FBRyx3QkFBYyxDQUFDLGFBQWEsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFD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

package/build/main/routers/alpha-router/functions/best-swap-route.d.ts

@@ -1,5 +1,6 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { ChainId, TradeType } from '@x-swap-protocol/sdk-core';
+import { TradeType } from '@x-swap-protocol/sdk-core';
+import { ChainId } from '../../../util';
 import { CurrencyAmount } from '../../../util/amounts';
 import { AlphaRouterConfig } from '../alpha-router';
 import { IGasModel } from '../gas-models';

package/build/main/routers/alpha-router/functions/best-swap-route.js

@@ -341,4 +341,4 @@ const findFirstRouteNotUsingUsedPools = (usedRoutes, candidateRouteQuotes, force
     }
     return null;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"best-swap-route.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/functions/best-swap-route.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"best-swap-route.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/functions/best-swap-route.ts"],"names":[],"mappings":"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"}

package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts

@@ -1,9 +1,8 @@
-import { Protocol } from '@x-swap-protocol/router-sdk';
 import { Token } from '@x-swap-protocol/sdk-core';
-import { Pair } from '@x-swap-protocol/v2-sdk';
 import { Pool } from '@x-swap-protocol/v3-sdk';
+import { Pair } from '@x-swap-protocol/v2-sdk';
 import { MixedRoute, V2Route, V3Route } from '../../router';
-export declare function computeAllV3Routes(tokenIn: Token, tokenOut: Token, pools: Pool[], maxHops: number, protocol: Protocol.V3 | Protocol.UNI_V3): V3Route[];
-export declare function computeAllV2Routes(tokenIn: Token, tokenOut: Token, pools: Pair[], maxHops: number, protocol: Protocol.V2 | Protocol.FATHOM): V2Route[];
+export declare function computeAllV3Routes(tokenIn: Token, tokenOut: Token, pools: Pool[], maxHops: number): V3Route[];
+export declare function computeAllV2Routes(tokenIn: Token, tokenOut: Token, pools: Pair[], maxHops: number): V2Route[];
 export declare function computeAllMixedRoutes(tokenIn: Token, tokenOut: Token, parts: (Pool | Pair)[], maxHops: number): MixedRoute[];
 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[];

package/build/main/routers/alpha-router/functions/compute-all-routes.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computeAllRoutes = exports.computeAllMixedRoutes = exports.computeAllV2Routes = exports.computeAllV3Routes = void 0;
-const v2_sdk_1 = require("@x-swap-protocol/v2-sdk");
 const v3_sdk_1 = require("@x-swap-protocol/v3-sdk");
+const v2_sdk_1 = require("@x-swap-protocol/v2-sdk");
 const log_1 = require("../../../util/log");
 const routes_1 = require("../../../util/routes");
 const router_1 = require("../../router");
-function computeAllV3Routes(tokenIn, tokenOut, pools, maxHops, protocol) {
+function computeAllV3Routes(tokenIn, tokenOut, pools, maxHops) {
     return computeAllRoutes(tokenIn, tokenOut, (route, tokenIn, tokenOut) => {
-        return new router_1.V3Route(route, tokenIn, tokenOut, protocol);
+        return new router_1.V3Route(route, tokenIn, tokenOut);
     }, pools, maxHops);
 }
 exports.computeAllV3Routes = computeAllV3Routes;
-function computeAllV2Routes(tokenIn, tokenOut, pools, maxHops, protocol) {
+function computeAllV2Routes(tokenIn, tokenOut, pools, maxHops) {
     return computeAllRoutes(tokenIn, tokenOut, (route, tokenIn, tokenOut) => {
-        return new router_1.V2Route(route, tokenIn, tokenOut, protocol);
+        return new router_1.V2Route(route, tokenIn, tokenOut);
     }, pools, maxHops);
 }
 exports.computeAllV2Routes = computeAllV2Routes;
@@ -69,4 +69,4 @@ function computeAllRoutes(tokenIn, tokenOut, buildRoute, pools, maxHops) {
     return routes;
 }
 exports.computeAllRoutes = computeAllRoutes;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZS1hbGwtcm91dGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL2Z1bmN0aW9ucy9jb21wdXRlLWFsbC1yb3V0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsb0RBQStDO0FBQy9DLG9EQUErQztBQUUvQywyQ0FBd0M7QUFDeEMsaURBQW1FO0FBQ25FLHlDQUE0RDtBQUU1RCxTQUFnQixrQkFBa0IsQ0FDaEMsT0FBYyxFQUNkLFFBQWUsRUFDZixLQUFhLEVBQ2IsT0FBZSxFQUNmLFFBQXVDO0lBRXZDLE9BQU8sZ0JBQWdCLENBQ3JCLE9BQU8sRUFDUCxRQUFRLEVBQ1IsQ0FBQyxLQUFhLEVBQUUsT0FBYyxFQUFFLFFBQWUsRUFBRSxFQUFFO1FBQ2pELE9BQU8sSUFBSSxnQkFBTyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ3pELENBQUMsRUFDRCxLQUFLLEVBQ0wsT0FBTyxDQUNSLENBQUM7QUFDSixDQUFDO0FBaEJELGdEQWdCQztBQUVELFNBQWdCLGtCQUFrQixDQUNoQyxPQUFjLEVBQ2QsUUFBZSxFQUNmLEtBQWEsRUFDYixPQUFlLEVBQ2YsUUFBdUM7SUFFdkMsT0FBTyxnQkFBZ0IsQ0FDckIsT0FBTyxFQUNQLFFBQVEsRUFDUixDQUFDLEtBQWEsRUFBRSxPQUFjLEVBQUUsUUFBZSxFQUFFLEVBQUU7UUFDakQsT0FBTyxJQUFJLGdCQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDekQsQ0FBQyxFQUNELEtBQUssRUFDTCxPQUFPLENBQ1IsQ0FBQztBQUNKLENBQUM7QUFoQkQsZ0RBZ0JDO0FBRUQsU0FBZ0IscUJBQXFCLENBQ25DLE9BQWMsRUFDZCxRQUFlLEVBQ2YsS0FBc0IsRUFDdEIsT0FBZTtJQUVmLE1BQU0sU0FBUyxHQUFHLGdC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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZS1hbGwtcm91dGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL2Z1bmN0aW9ucy9jb21wdXRlLWFsbC1yb3V0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0Esb0RBQStDO0FBQy9DLG9EQUErQztBQUUvQywyQ0FBd0M7QUFDeEMsaURBQW1FO0FBQ25FLHlDQUE0RDtBQUU1RCxTQUFnQixrQkFBa0IsQ0FDaEMsT0FBYyxFQUNkLFFBQWUsRUFDZixLQUFhLEVBQ2IsT0FBZTtJQUVmLE9BQU8sZ0JBQWdCLENBQ3JCLE9BQU8sRUFDUCxRQUFRLEVBQ1IsQ0FBQyxLQUFhLEVBQUUsT0FBYyxFQUFFLFFBQWUsRUFBRSxFQUFFO1FBQ2pELE9BQU8sSUFBSSxnQkFBTyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDL0MsQ0FBQyxFQUNELEtBQUssRUFDTCxPQUFPLENBQ1IsQ0FBQztBQUNKLENBQUM7QUFmRCxnREFlQztBQUVELFNBQWdCLGtCQUFrQixDQUNoQyxPQUFjLEVBQ2QsUUFBZSxFQUNmLEtBQWEsRUFDYixPQUFlO0lBRWYsT0FBTyxnQkFBZ0IsQ0FDckIsT0FBTyxFQUNQLFFBQVEsRUFDUixDQUFDLEtBQWEsRUFBRSxPQUFjLEVBQUUsUUFBZSxFQUFFLEVBQUU7UUFDakQsT0FBTyxJQUFJLGdCQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztJQUMvQyxDQUFDLEVBQ0QsS0FBSyxFQUNMLE9BQU8sQ0FDUixDQUFDO0FBQ0osQ0FBQztBQWZELGdEQWVDO0FBRUQsU0FBZ0IscUJBQXFCLENBQ25DLE9BQWMsRUFDZCxRQUFlLEVBQ2YsS0FBc0IsRUFDdEIsT0FBZTtJQUVmLE1BQU0sU0FBUyxHQUFHLGdCQUFnQixDQUNoQyxPQUFPLEVBQ1AsUUFBUSxFQUNSLENBQUMsS0FBc0IsRUFBRSxP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

package/build/main/routers/alpha-router/functions/get-candidate-pools.d.ts

@@ -1,10 +1,11 @@
 import { Protocol } from '@x-swap-protocol/router-sdk';
-import { ChainId, Token, TradeType } from '@x-swap-protocol/sdk-core';
+import { Token, TradeType } from '@x-swap-protocol/sdk-core';
 import { ITokenListProvider, IV2SubgraphProvider, V2SubgraphPool } from '../../../providers';
 import { ITokenProvider } from '../../../providers/token-provider';
 import { IV2PoolProvider, V2PoolAccessor } from '../../../providers/v2/pool-provider';
 import { IV3PoolProvider, V3PoolAccessor } from '../../../providers/v3/pool-provider';
 import { IV3SubgraphProvider, V3SubgraphPool } from '../../../providers/v3/subgraph-provider';
+import { ChainId } from '../../../util';
 import { AlphaRouterConfig } from '../alpha-router';
 export type PoolId = {
     id: string;
@@ -34,7 +35,6 @@ export type V3GetCandidatePoolsParams = {
     poolProvider: IV3PoolProvider;
     blockedTokenListProvider?: ITokenListProvider;
     chainId: ChainId;
-    protocol: Protocol.V3 | Protocol.UNI_V3;
 };
 export type V2GetCandidatePoolsParams = {
     tokenIn: Token;
@@ -46,7 +46,6 @@ export type V2GetCandidatePoolsParams = {
     poolProvider: IV2PoolProvider;
     blockedTokenListProvider?: ITokenListProvider;
     chainId: ChainId;
-    protocol: Protocol;
 };
 export type MixedRouteGetCandidatePoolsParams = {
     tokenIn: Token;
@@ -60,19 +59,18 @@ export type MixedRouteGetCandidatePoolsParams = {
     v3poolProvider: IV3PoolProvider;
     blockedTokenListProvider?: ITokenListProvider;
     chainId: ChainId;
-    protocol: Protocol;
 };
-export declare function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, protocol, }: V3GetCandidatePoolsParams): Promise<{
+export declare function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, }: V3GetCandidatePoolsParams): Promise<{
     poolAccessor: V3PoolAccessor;
     candidatePools: CandidatePoolsBySelectionCriteria;
     subgraphPools: V3SubgraphPool[];
 }>;
-export declare function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, protocol, }: V2GetCandidatePoolsParams): Promise<{
+export declare function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, }: V2GetCandidatePoolsParams): Promise<{
     poolAccessor: V2PoolAccessor;
     candidatePools: CandidatePoolsBySelectionCriteria;
     subgraphPools: V2SubgraphPool[];
 }>;
-export declare function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routingConfig, v3subgraphProvider, v2subgraphProvider, tokenProvider, v3poolProvider, v2poolProvider, blockedTokenListProvider, chainId, protocol, }: MixedRouteGetCandidatePoolsParams): Promise<{
+export declare function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routingConfig, v3subgraphProvider, v2subgraphProvider, tokenProvider, v3poolProvider, v2poolProvider, blockedTokenListProvider, chainId, }: MixedRouteGetCandidatePoolsParams): Promise<{
     V2poolAccessor: V2PoolAccessor;
     V3poolAccessor: V3PoolAccessor;
     candidatePools: CandidatePoolsBySelectionCriteria;