@xspswap/smart-order-router 1.0.16 → 1.1.0-beta
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.d.ts +1 -1
- package/build/main/providers/caching/route/model/cached-routes.d.ts +2 -2
- package/build/main/providers/caching/route/route-caching-provider.d.ts +2 -2
- package/build/main/providers/caching/route/route-caching-provider.js +2 -2
- package/build/main/providers/caching-token-list-provider.d.ts +1 -1
- package/build/main/providers/caching-token-list-provider.js +2 -2
- package/build/main/providers/caching-token-provider.d.ts +1 -1
- package/build/main/providers/on-chain-quote-provider.js +3 -3
- package/build/main/providers/simulation-provider.d.ts +1 -1
- package/build/main/providers/simulation-provider.js +2 -2
- package/build/main/providers/swap-router-provider.d.ts +2 -2
- package/build/main/providers/token-provider.d.ts +1 -1
- package/build/main/providers/token-provider.js +2 -2
- package/build/main/providers/token-validator-provider.d.ts +1 -1
- package/build/main/providers/v2/caching-pool-provider.d.ts +2 -2
- package/build/main/providers/v2/pool-provider.d.ts +2 -2
- package/build/main/providers/v2/pool-provider.js +2 -2
- package/build/main/providers/v2/quote-provider.js +3 -3
- package/build/main/providers/v2/static-subgraph-provider.d.ts +1 -1
- package/build/main/providers/v2/static-subgraph-provider.js +2 -2
- package/build/main/providers/v2/subgraph-provider-with-fallback.d.ts +1 -1
- package/build/main/providers/v2/subgraph-provider.d.ts +1 -1
- package/build/main/providers/v3/caching-pool-provider.d.ts +2 -2
- package/build/main/providers/v3/pool-provider.d.ts +2 -2
- package/build/main/providers/v3/pool-provider.js +2 -2
- package/build/main/providers/v3/static-subgraph-provider.d.ts +2 -2
- package/build/main/providers/v3/static-subgraph-provider.js +2 -2
- package/build/main/providers/v3/subgraph-provider-with-fallback.d.ts +1 -1
- package/build/main/providers/v3/subgraph-provider.d.ts +1 -1
- package/build/main/routers/alpha-router/alpha-router.d.ts +3 -3
- package/build/main/routers/alpha-router/alpha-router.js +4 -4
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.d.ts +2 -2
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.js +4 -4
- package/build/main/routers/alpha-router/functions/best-swap-route.d.ts +1 -1
- package/build/main/routers/alpha-router/functions/best-swap-route.js +3 -3
- package/build/main/routers/alpha-router/functions/calculate-ratio-amount-in.d.ts +1 -1
- package/build/main/routers/alpha-router/functions/calculate-ratio-amount-in.js +2 -2
- package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts +3 -3
- 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 -2
- package/build/main/routers/alpha-router/functions/get-candidate-pools.js +4 -4
- package/build/main/routers/alpha-router/gas-models/gas-model.d.ts +1 -1
- package/build/main/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js +4 -4
- package/build/main/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.js +2 -2
- package/build/main/routers/alpha-router/quoters/base-quoter.d.ts +3 -3
- package/build/main/routers/alpha-router/quoters/mixed-quoter.d.ts +1 -1
- package/build/main/routers/alpha-router/quoters/mixed-quoter.js +3 -3
- package/build/main/routers/alpha-router/quoters/v2-quoter.d.ts +1 -1
- package/build/main/routers/alpha-router/quoters/v2-quoter.js +2 -2
- package/build/main/routers/alpha-router/quoters/v3-quoter.d.ts +1 -1
- package/build/main/routers/alpha-router/quoters/v3-quoter.js +2 -2
- package/build/main/routers/legacy-router/bases.d.ts +1 -1
- package/build/main/routers/legacy-router/legacy-router.d.ts +1 -1
- package/build/main/routers/legacy-router/legacy-router.js +4 -4
- package/build/main/routers/router.d.ts +5 -5
- package/build/main/routers/router.js +4 -4
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/addresses.d.ts +1 -1
- package/build/main/util/amounts.d.ts +2 -2
- package/build/main/util/amounts.js +3 -3
- package/build/main/util/chains.d.ts +1 -1
- package/build/main/util/chains.js +2 -2
- package/build/main/util/gas-factory-helpers.d.ts +3 -3
- package/build/main/util/gas-factory-helpers.js +4 -4
- package/build/main/util/methodParameters.d.ts +2 -2
- package/build/main/util/methodParameters.js +6 -6
- package/build/main/util/protocols.d.ts +1 -1
- package/build/main/util/protocols.js +2 -2
- package/build/main/util/routes.d.ts +2 -2
- package/build/main/util/routes.js +5 -5
- package/build/module/providers/caching/route/model/cached-route.d.ts +1 -1
- package/build/module/providers/caching/route/model/cached-routes.d.ts +2 -2
- package/build/module/providers/caching/route/route-caching-provider.d.ts +2 -2
- package/build/module/providers/caching/route/route-caching-provider.js +2 -2
- package/build/module/providers/caching-token-list-provider.d.ts +1 -1
- package/build/module/providers/caching-token-list-provider.js +2 -2
- package/build/module/providers/caching-token-provider.d.ts +1 -1
- package/build/module/providers/on-chain-quote-provider.js +3 -3
- package/build/module/providers/simulation-provider.d.ts +1 -1
- package/build/module/providers/simulation-provider.js +2 -2
- package/build/module/providers/swap-router-provider.d.ts +2 -2
- package/build/module/providers/token-provider.d.ts +1 -1
- package/build/module/providers/token-provider.js +2 -2
- package/build/module/providers/token-validator-provider.d.ts +1 -1
- package/build/module/providers/v2/caching-pool-provider.d.ts +2 -2
- package/build/module/providers/v2/pool-provider.d.ts +2 -2
- package/build/module/providers/v2/pool-provider.js +2 -2
- package/build/module/providers/v2/quote-provider.js +3 -3
- package/build/module/providers/v2/static-subgraph-provider.d.ts +1 -1
- package/build/module/providers/v2/static-subgraph-provider.js +2 -2
- package/build/module/providers/v2/subgraph-provider-with-fallback.d.ts +1 -1
- package/build/module/providers/v2/subgraph-provider.d.ts +1 -1
- package/build/module/providers/v3/caching-pool-provider.d.ts +2 -2
- package/build/module/providers/v3/pool-provider.d.ts +2 -2
- package/build/module/providers/v3/pool-provider.js +2 -2
- package/build/module/providers/v3/static-subgraph-provider.d.ts +2 -2
- package/build/module/providers/v3/static-subgraph-provider.js +2 -2
- package/build/module/providers/v3/subgraph-provider-with-fallback.d.ts +1 -1
- package/build/module/providers/v3/subgraph-provider.d.ts +1 -1
- package/build/module/routers/alpha-router/alpha-router.d.ts +3 -3
- package/build/module/routers/alpha-router/alpha-router.js +4 -4
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.d.ts +2 -2
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.js +4 -4
- package/build/module/routers/alpha-router/functions/best-swap-route.d.ts +1 -1
- package/build/module/routers/alpha-router/functions/best-swap-route.js +3 -3
- package/build/module/routers/alpha-router/functions/calculate-ratio-amount-in.d.ts +1 -1
- package/build/module/routers/alpha-router/functions/calculate-ratio-amount-in.js +2 -2
- package/build/module/routers/alpha-router/functions/compute-all-routes.d.ts +3 -3
- 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 -2
- package/build/module/routers/alpha-router/functions/get-candidate-pools.js +5 -5
- package/build/module/routers/alpha-router/gas-models/gas-model.d.ts +1 -1
- package/build/module/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js +4 -4
- package/build/module/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.js +2 -2
- package/build/module/routers/alpha-router/quoters/base-quoter.d.ts +3 -3
- package/build/module/routers/alpha-router/quoters/mixed-quoter.d.ts +1 -1
- package/build/module/routers/alpha-router/quoters/mixed-quoter.js +3 -3
- package/build/module/routers/alpha-router/quoters/v2-quoter.d.ts +1 -1
- package/build/module/routers/alpha-router/quoters/v2-quoter.js +2 -2
- package/build/module/routers/alpha-router/quoters/v3-quoter.d.ts +1 -1
- package/build/module/routers/alpha-router/quoters/v3-quoter.js +2 -2
- package/build/module/routers/legacy-router/bases.d.ts +1 -1
- package/build/module/routers/legacy-router/legacy-router.d.ts +1 -1
- package/build/module/routers/legacy-router/legacy-router.js +4 -4
- package/build/module/routers/router.d.ts +5 -5
- package/build/module/routers/router.js +4 -4
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/addresses.d.ts +1 -1
- package/build/module/util/amounts.d.ts +2 -2
- package/build/module/util/amounts.js +3 -3
- package/build/module/util/chains.d.ts +1 -1
- package/build/module/util/chains.js +2 -2
- package/build/module/util/gas-factory-helpers.d.ts +3 -3
- package/build/module/util/gas-factory-helpers.js +4 -4
- package/build/module/util/methodParameters.d.ts +2 -2
- package/build/module/util/methodParameters.js +6 -6
- package/build/module/util/protocols.d.ts +1 -1
- package/build/module/util/protocols.js +2 -2
- package/build/module/util/routes.d.ts +2 -2
- package/build/module/util/routes.js +5 -5
- package/package.json +6 -8
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import { Protocol } from '@
|
|
3
|
-
import { TradeType } from '@
|
|
2
|
+
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
3
|
+
import { TradeType } from '@x-swap-protocol/sdk-core';
|
|
4
4
|
import JSBI from 'jsbi';
|
|
5
5
|
import _ from 'lodash';
|
|
6
6
|
import FixedReverseHeap from 'mnemonist/fixed-reverse-heap';
|
|
@@ -333,4 +333,4 @@ const findFirstRouteNotUsingUsedPools = (usedRoutes, candidateRouteQuotes, force
|
|
|
333
333
|
}
|
|
334
334
|
return null;
|
|
335
335
|
};
|
|
336
|
-
//# 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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"}
|
|
336
|
+
//# 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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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { Fraction } from '@
|
|
1
|
+
import { Fraction } from '@x-swap-protocol/sdk-core';
|
|
2
2
|
import { CurrencyAmount } from '../../../util/amounts';
|
|
3
3
|
export declare function calculateRatioAmountIn(optimalRatio: Fraction, inputTokenPrice: Fraction, inputBalance: CurrencyAmount, outputBalance: CurrencyAmount): CurrencyAmount;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Fraction } from '@
|
|
1
|
+
import { Fraction } from '@x-swap-protocol/sdk-core';
|
|
2
2
|
import { CurrencyAmount } from '../../../util/amounts';
|
|
3
3
|
export function calculateRatioAmountIn(optimalRatio, inputTokenPrice, inputBalance, outputBalance) {
|
|
4
4
|
// formula: amountToSwap = (inputBalance - (optimalRatio * outputBalance)) / ((optimalRatio * inputTokenPrice) + 1))
|
|
@@ -11,4 +11,4 @@ export function calculateRatioAmountIn(optimalRatio, inputTokenPrice, inputBalan
|
|
|
11
11
|
}
|
|
12
12
|
return CurrencyAmount.fromRawAmount(inputBalance.currency, amountToSwapRaw.quotient);
|
|
13
13
|
}
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsY3VsYXRlLXJhdGlvLWFtb3VudC1pbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9mdW5jdGlvbnMvY2FsY3VsYXRlLXJhdGlvLWFtb3VudC1pbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXZELE1BQU0sVUFBVSxzQkFBc0IsQ0FDcEMsWUFBc0IsRUFDdEIsZUFBeUIsRUFDekIsWUFBNEIsRUFDNUIsYUFBNkI7SUFFN0Isb0hBQW9IO0lBQ3BILE1BQU0sZUFBZSxHQUFHLElBQUksUUFBUSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUM7U0FDeEQsUUFBUSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQ3ZELE1BQU0sQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXpELElBQUksZUFBZSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRTtRQUMvQiwyREFBMkQ7UUFDM0QsTUFBTSxJQUFJLEtBQUssQ0FBQywrQ0FBK0MsQ0FBQyxDQUFDO0tBQ2xFO0lBRUQsT0FBTyxjQUFjLENBQUMsYUFBYSxDQUNqQyxZQUFZLENBQUMsUUFBUSxFQUNyQixlQUFlLENBQUMsUUFBUSxDQUN6QixDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Token } from '@
|
|
2
|
-
import { Pool } from '@
|
|
3
|
-
import { Pair } from '@
|
|
1
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
2
|
+
import { Pool } from '@x-swap-protocol/v3-sdk';
|
|
3
|
+
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
4
4
|
import { MixedRoute, V2Route, V3Route } from '../../router';
|
|
5
5
|
export declare function computeAllV3Routes(tokenIn: Token, tokenOut: Token, pools: Pool[], maxHops: number): V3Route[];
|
|
6
6
|
export declare function computeAllV2Routes(tokenIn: Token, tokenOut: Token, pools: Pair[], maxHops: number): V2Route[];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Pool } from '@
|
|
2
|
-
import { Pair } from '@
|
|
1
|
+
import { Pool } from '@x-swap-protocol/v3-sdk';
|
|
2
|
+
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
3
3
|
import { log } from '../../../util/log';
|
|
4
4
|
import { poolToString, routeToString } from '../../../util/routes';
|
|
5
5
|
import { MixedRoute, V2Route, V3Route } from '../../router';
|
|
@@ -62,4 +62,4 @@ export function computeAllRoutes(tokenIn, tokenOut, buildRoute, pools, maxHops)
|
|
|
62
62
|
}, `Computed ${routes.length} possible routes for type ${(_a = routes[0]) === null || _a === void 0 ? void 0 : _a.protocol}.`);
|
|
63
63
|
return routes;
|
|
64
64
|
}
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZS1hbGwtcm91dGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL2Z1bmN0aW9ucy9jb21wdXRlLWFsbC1yb3V0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9DLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUvQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEMsT0FBTyxFQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNuRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFNUQsTUFBTSxVQUFVLGtCQUFrQixDQUNoQyxPQUFjLEVBQ2QsUUFBZSxFQUNmLEtBQWEsRUFDYixPQUFlO0lBRWYsT0FBTyxnQkFBZ0IsQ0FDckIsT0FBTyxFQUNQLFFBQVEsRUFDUixDQUFDLEtBQWEsRUFBRSxPQUFjLEVBQUUsUUFBZSxFQUFFLEVBQUU7UUFDakQsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQy9DLENBQUMsRUFDRCxLQUFLLEVBQ0wsT0FBTyxDQUNSLENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLGtCQUFrQixDQUNoQyxPQUFjLEVBQ2QsUUFBZSxFQUNmLEtBQWEsRUFDYixPQUFlO0lBRWYsT0FBTyxnQkFBZ0IsQ0FDckIsT0FBTyxFQUNQLFFBQVEsRUFDUixDQUFDLEtBQWEsRUFBRSxPQUFjLEVBQUUsUUFBZSxFQUFFLEVBQUU7UUFDakQsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQy9DLENBQUMsRUFDRCxLQUFLLEVB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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Protocol } from '@
|
|
2
|
-
import { Token, TradeType } from '@
|
|
1
|
+
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
2
|
+
import { Token, TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
3
|
import { ITokenListProvider, IV2SubgraphProvider, V2SubgraphPool } from '../../../providers';
|
|
4
4
|
import { ITokenProvider } from '../../../providers/token-provider';
|
|
5
5
|
import { IV2PoolProvider, V2PoolAccessor } from '../../../providers/v2/pool-provider';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Protocol } from '@
|
|
2
|
-
import { TradeType } from '@
|
|
3
|
-
import { FeeAmount } from '@
|
|
1
|
+
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
2
|
+
import { TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
|
+
import { FeeAmount } from '@x-swap-protocol/v3-sdk';
|
|
4
4
|
import _ from 'lodash';
|
|
5
|
-
import { DAI_XDC_APOTHEM, USDC_XDC_APOTHEM, USDT_XDC,
|
|
5
|
+
import { DAI_XDC_APOTHEM, USDC_XDC_APOTHEM, USDT_XDC, USDT_XDC_APOTHEM, WBTC_XDC_APOTHEM, WXDC_XDC, } from '../../../providers/token-provider';
|
|
6
6
|
import { ChainId, WRAPPED_NATIVE_CURRENCY } from '../../../util';
|
|
7
7
|
import { parseFeeAmount, unparseFeeAmount } from '../../../util/amounts';
|
|
8
8
|
import { log } from '../../../util/log';
|
|
@@ -711,4 +711,4 @@ export async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType
|
|
|
711
711
|
subgraphPools,
|
|
712
712
|
};
|
|
713
713
|
}
|
|
714
|
-
//# 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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"}
|
|
714
|
+
//# 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,5 +1,5 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import { Token } from '@
|
|
2
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
3
3
|
import { IV2PoolProvider } from '../../../providers/v2/pool-provider';
|
|
4
4
|
import { ArbitrumGasData, IL2GasDataProvider, OptimismGasData } from '../../../providers/v3/gas-data-provider';
|
|
5
5
|
import { IV3PoolProvider } from '../../../providers/v3/pool-provider';
|
package/build/module/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import { partitionMixedRouteByProtocol } from '@
|
|
3
|
-
import { Pair } from '@
|
|
4
|
-
import { Pool } from '@
|
|
2
|
+
import { partitionMixedRouteByProtocol } from '@x-swap-protocol/router-sdk';
|
|
3
|
+
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
4
|
+
import { Pool } from '@x-swap-protocol/v3-sdk';
|
|
5
5
|
import _ from 'lodash';
|
|
6
6
|
import { WRAPPED_NATIVE_CURRENCY } from '../../../..';
|
|
7
7
|
import { log } from '../../../../util';
|
|
@@ -161,4 +161,4 @@ export class MixedRouteHeuristicGasModelFactory extends IOnChainGasModelFactory
|
|
|
161
161
|
};
|
|
162
162
|
}
|
|
163
163
|
}
|
|
164
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4ZWQtcm91dGUtaGV1cmlzdGljLWdhcy1tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9nYXMtbW9kZWxzL21peGVkUm91dGUvbWl4ZWQtcm91dGUtaGV1cmlzdGljLWdhcy1tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDckQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDNUUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9DLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvQyxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RELE9BQU8sRUFBVyxHQUFHLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUNMLCtCQUErQixFQUMvQiw0QkFBNEIsRUFDNUIsZUFBZSxHQUNoQixNQUFNLHNDQUFzQyxDQUFDO0FBRTlDLE9BQU8sRUFHTCx1QkFBdUIsR0FDeEIsTUFBTSxjQUFjLENBQUM7QUFDdEIsT0FBTyxFQUNMLGNBQWMsSUFBSSxpQkFBaUIsRUFDbkMsa0JBQWtCLElBQUkscUJBQXFCLEdBQzVDLE1BQU0sOEJBQThCLENBQUM7QUFDdEMsT0FBTyxFQUNMLGNBQWMsRUFDZCxZQUFZLEVBQ1osa0JBQWtCLEVBQ2xCLG9CQUFvQixHQUNyQixNQUFNLGlCQUFpQixDQUFDO0FBRXpCOzs7Ozs7Ozs7Ozs7Ozs7OztHQWlCRztBQUNILE1BQU0sT0FBTyxrQ0FBbUMsU0FBUSx1QkFBdUI7SUFDN0U7UUFDRSxLQUFLLEVBQUUs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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import { Price } from '@
|
|
2
|
+
import { Price } from '@x-swap-protocol/sdk-core';
|
|
3
3
|
import _ from 'lodash';
|
|
4
4
|
import { WRAPPED_NATIVE_CURRENCY } from '../../../..';
|
|
5
5
|
import { CurrencyAmount } from '../../../../util/amounts';
|
|
@@ -213,4 +213,4 @@ export class V3HeuristicGasModelFactory extends IOnChainGasModelFactory {
|
|
|
213
213
|
};
|
|
214
214
|
}
|
|
215
215
|
}
|
|
216
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"v3-heuristic-gas-model.js","sourceRoot":"","sources":["../../../../../../src/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import { Currency, Token, TradeType } from '@
|
|
3
|
-
import { Pair } from '@
|
|
4
|
-
import { Pool } from '@
|
|
2
|
+
import { Currency, Token, TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
|
+
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
4
|
+
import { Pool } from '@x-swap-protocol/v3-sdk';
|
|
5
5
|
import { ITokenListProvider, ITokenProvider, ITokenValidatorProvider, TokenValidationResult } from '../../../providers';
|
|
6
6
|
import { ChainId, CurrencyAmount } from '../../../util';
|
|
7
7
|
import { MixedRoute, V2Route, V3Route } from '../../router';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Token, TradeType } from '@
|
|
1
|
+
import { Token, TradeType } from '@x-swap-protocol/sdk-core';
|
|
2
2
|
import { IOnChainQuoteProvider, ITokenListProvider, ITokenProvider, ITokenValidatorProvider, IV2PoolProvider, IV2SubgraphProvider, IV3PoolProvider, IV3SubgraphProvider } from '../../../providers';
|
|
3
3
|
import { ChainId, CurrencyAmount } from '../../../util';
|
|
4
4
|
import { MixedRoute } from '../../router';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { TradeType } from '@
|
|
2
|
-
import { FeeAmount } from '@
|
|
1
|
+
import { TradeType } from '@x-swap-protocol/sdk-core';
|
|
2
|
+
import { FeeAmount } from '@x-swap-protocol/v3-sdk';
|
|
3
3
|
import _ from 'lodash';
|
|
4
4
|
import { V2_XDC_ADDITIONAL_BASES, V3_XDC_ADDITIONAL_BASES, } from '../../../providers';
|
|
5
5
|
import { log, metric, MetricLoggerUnit, routeToString, } from '../../../util';
|
|
@@ -223,4 +223,4 @@ export class MixedQuoter extends BaseQuoter {
|
|
|
223
223
|
};
|
|
224
224
|
}
|
|
225
225
|
}
|
|
226
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
226
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mixed-quoter.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/quoters/mixed-quoter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAQ,MAAM,yBAAyB,CAAC;AAE1D,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,EASL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGL,GAAG,EACH,MAAM,EACN,gBAAgB,EAChB,aAAa,GACd,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAIxE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,IAAI,KAAK,GAAqD,EAAE,CAAC;AAEjE,MAAM,SAAS,GAAG,CAChB,IAAoD,EACpD,IAAoC,EACpC,SAAgB,EAChB,IAAW,EACX,IAAY,EACZ,EAAE;IACF,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IAExB,IAAI,GAAG,GAAG,IAAI,EAAE;QACd,IAAI,CAAC,SAAS,EAAE;YACd,OAAO;SACR;QACD,MAAM,YAAY,GAAG,uBAAuB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,uBAAuB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,YAAY,EAAE;YAChB,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE;gBAC7B,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,OAAO,GAA8B,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC;gBACnE,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;gBACnC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;oBACvC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACpB,SAAS;iBACV;gBACD,mEAAmE;gBACnE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC9B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBACb,SAAS,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;iBACrE;aACF;SACF;QACD,IAAI,YAAY,EAAE;YAChB,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE;gBAC7B,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,OAAO,GAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACrD,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;gBACnC,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;oBACpC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACpB,SAAS;iBACV;gBACD,kDAAkD;gBAClD,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBACb,SAAS,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;iBAClE;aACF;SACF;KACF;AACH,CAAC,CAAC;AAEF,MAAM,OAAO,WAAY,SAAQ,UAAsB;IAOrD,YACE,kBAAuC,EACvC,cAA+B,EAC/B,kBAAuC,EACvC,cAA+B,EAC/B,oBAA2C,EAC3C,aAA6B,EAC7B,OAAgB,EAChB,wBAA6C,EAC7C,sBAAgD;QAEhD,KAAK,CACH,aAAa,EACb,OAAO,EACP,wBAAwB,EACxB,sBAAsB,CACvB,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,CAAC;IAES,KAAK,CAAC,SAAS,CACvB,OAAc,EACd,QAAe,EACf,SAAoB,EACpB,aAAgC;QAEhC,KAAK,GAAG,EAAE,CAAC;QACX,IAAI,SAAS,IAAI,SAAS,CAAC,WAAW,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,UAAU;QACV,oBAAoB;QACpB,oBAAoB;QACpB,8CAA8C;QAC9C,0CAA0C;QAC1C,aAAa;QACb,cAAc;QACd,uCAAuC;QACvC,6DAA6D;QAC7D,yCAAyC;QACzC,yCAAyC;QACzC,0BAA0B;QAC1B,iDAAiD;QACjD,iDAAiD;QACjD,mBAAmB;QACnB,2BAA2B;QAC3B,MAAM;QAEN,mDAAmD;QACnD,mDAAmD;QACnD,EAAE;QACF,mDAAmD;QAEnD,mDAAmD;QAEnD,kHAAkH;QAClH,uDAAuD;QACvD,cAAc;QACd,MAAM;QACN,uBAAuB;QACvB,yDAAyD;QACzD,oBAAoB;QACpB,iFAAiF;QACjF,8BAA8B;QAC9B,sBAAsB;QACtB,QAAQ;QACR,EAAE;QACF,kFAAkF;QAClF,uFAAuF;QACvF,mFAAmF;QACnF,kBAAkB;QAClB,SAAS;QACT,WAAW;QACX,wDAAwD;QACxD,0DAA0D;QAC1D,UAAU;QACV,sBAAsB;QACtB,QAAQ;QACR,EAAE;QACF,eAAe;QACf,wDAAwD;QACxD,qDAAqD;QACrD,SAAS;QACT,MAAM;QACN,KAAK;QAEL,yDAAyD;QACzD,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEjE,eAAe;QACf,wBAAwB;QACxB,WAAW;QACX,cAAc;QACd,0GAA0G;QAC1G,UAAU;QACV,uBAAuB;QACvB,MAAM;QACN,KAAK;QAEL,MAAM,WAAW,GAAgD,EAAE,CAAC;QACpE,MAAM,WAAW,GAAqC,EAAE,CAAC;QACzD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;oBACX,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC9D,WAAW,CAAC,EAAE,CAAC,GAAG,IAAiC,CAAC;iBACrD;qBAAM;oBACL,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;oBACnD,WAAW,CAAC,EAAE,CAAC,GAAG,IAAsB,CAAC;iBAC1C;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GACZ,OAAO,IAAI,QAAQ;YACjB,CAAC,CAAC;gBACE,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC;gBACrC,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC;gBAClC,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC;gBACrC,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC;aACpC;YACH,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC;QAEhE,MAAM,QAAQ,GACZ,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC;QAEhE,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC;YACxC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC;SACzC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAEzC,MAAM,aAAa,GAAoB,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC;QAC5D,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC;QAE1C,MAAM,MAAM,GAAiB,qBAAqB,CAChD,OAAO,EACP,QAAQ,EACR,aAAa,EACb,eAAe,CAChB,CAAC;QAEF,OAAO;YACL,MAAM;SACP,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,SAAS,CACpB,MAAoB,EACpB,OAAyB,EACzB,QAAkB,EAClB,UAAiB,EACjB,SAAoB,EACpB,aAAgC,EAChC,cAAkD,EAClD,QAA8C;QAE9C,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QACzC,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;SACH;QACD,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;YACtB,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC;SACtD;QAED,6EAA6E;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,IAAI,CACjE,IAAI,CAAC,oBAAoB,CAC1B,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,GAAG,CAAC,IAAI,CACN,gCAAgC,MAAM,CAAC,MAAM,gBAAgB,OAAO,CAAC,MAAM,qBAAqB,CACjG,CAAC;QAEF,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAa,OAAO,EAAE,MAAM,EAAE;YACtE,WAAW,EAAE,aAAa,CAAC,WAAW;SACvC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CACd,iBAAiB,EACjB,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,EACzB,gBAAgB,CAAC,YAAY,CAC9B,CAAC;QAEF,MAAM,CAAC,SAAS,CACd,oBAAoB,EACpB,CAAC,CAAC,gBAAgB,CAAC;aAChB,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;aAClC,GAAG,EAAE,EACR,gBAAgB,CAAC,KAAK,CACvB,CAAC;QAEF,MAAM,qBAAqB,GAAG,EAAE,CAAC;QAEjC,KAAK,MAAM,cAAc,IAAI,gBAAgB,EAAE;YAC7C,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,cAAc,CAAC;YAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;gBAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;gBAC/B,MAAM,EACJ,KAAK,EACL,MAAM,EACN,qBAAqB,EACrB,2BAA2B,EAC3B,WAAW,GACZ,GAAG,WAAW,CAAC;gBAEhB,IACE,CAAC,KAAK;oBACN,CAAC,qBAAqB;oBACtB,CAAC,2BAA2B;oBAC5B,CAAC,WAAW,EACZ;oBACA,GAAG,CAAC,KAAK,CACP;wBACE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;wBAC3B,WAAW;qBACZ,EACD,wCAAwC,CACzC,CAAC;oBACF,SAAS;iBACV;gBAED,MAAM,mBAAmB,GAAG,IAAI,wBAAwB,CAAC;oBACvD,KAAK;oBACL,QAAQ,EAAE,KAAK;oBACf,MAAM;oBACN,OAAO;oBACP,qBAAqB;oBACrB,2BAA2B;oBAC3B,iBAAiB,EAAE,WAAW;oBAC9B,kBAAkB,EAAE,QAAQ;oBAC5B,UAAU;oBACV,SAAS;oBACT,cAAc,EAAE,IAAI,CAAC,cAAc;oBACnC,cAAc,EAAE,IAAI,CAAC,cAAc;iBACpC,CAAC,CAAC;gBAEH,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;aACjD;SACF;QAED,OAAO;YACL,qBAAqB;YACrB,cAAc;SACf,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import { Token, TradeType } from '@
|
|
2
|
+
import { Token, TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
3
|
import { ITokenListProvider, ITokenProvider, ITokenValidatorProvider, IV2PoolProvider, IV2QuoteProvider, IV2SubgraphProvider } from '../../../providers';
|
|
4
4
|
import { ChainId, CurrencyAmount } from '../../../util';
|
|
5
5
|
import { V2Route } from '../../router';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TradeType } from '@
|
|
1
|
+
import { TradeType } from '@x-swap-protocol/sdk-core';
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import { TokenValidationResult, } from '../../../providers';
|
|
4
4
|
import { log, metric, MetricLoggerUnit, routeToString, } from '../../../util';
|
|
@@ -112,4 +112,4 @@ export class V2Quoter extends BaseQuoter {
|
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjItcXVvdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL3F1b3RlcnMvdjItcXVvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBbUIsU0FBUyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkUsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBRXZCLE9BQU8sRUFPTCxxQkFBcUIsR0FDdEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBR0wsR0FBRyxFQUNILE1BQU0sRUFDTixnQkFBZ0IsRUFDaEIsYUFBYSxHQUNkLE1BQU0sZUFBZSxDQUFDO0FBR3ZCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRSxPQUFPLEVBRUwsbUJBQW1CLEdBQ3BCLE1BQU0sa0NBQWtDLENBQUM7QUFHMUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUkzQyxNQUFNLE9BQU8sUUFBUyxTQUFRLFVBQW1CO0lBTS9DLFlBQ0Usa0JBQXVDLEVBQ3ZDLGNBQStCLEVBQy9CLGVBQWlDLEVBQ2pDLGlCQUFxQyxFQUNyQyxhQUE2QixFQUM3QixPQUFnQixFQUNoQix3QkFBNkMsRUFDN0Msc0JBQWdEO1FBRWhELEtBQUssQ0FDSCxhQUFhLEVBQ2IsT0FBTyxFQUNQLHdCQUF3QixFQUN4QixzQkFBc0IsQ0FDdkIsQ0FBQztRQUNGLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsY0FBYyxHQUFHLGNBQWMsQ0FBQztRQUNyQyxJQUFJLENBQUMsZUFBZSxHQUFHLGVBQWUsQ0FBQztRQUN2QyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7SUFDN0MsQ0FBQztJQUVTLEtBQUssQ0FBQyxT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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Token, TradeType } from '@
|
|
1
|
+
import { Token, TradeType } from '@x-swap-protocol/sdk-core';
|
|
2
2
|
import { IOnChainQuoteProvider, ITokenListProvider, ITokenProvider, ITokenValidatorProvider, IV3PoolProvider, IV3SubgraphProvider } from '../../../providers';
|
|
3
3
|
import { ChainId, CurrencyAmount } from '../../../util';
|
|
4
4
|
import { V3Route } from '../../router';
|