@xspswap/smart-order-router 1.1.6 → 1.1.7
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-routes.d.ts +3 -2
- package/build/main/providers/caching/route/model/cached-routes.js +4 -4
- package/build/main/providers/caching/route/route-caching-provider.d.ts +2 -1
- package/build/main/providers/caching/route/route-caching-provider.js +6 -11
- package/build/main/providers/caching-gas-provider.d.ts +1 -1
- package/build/main/providers/caching-gas-provider.js +1 -1
- package/build/main/providers/caching-token-list-provider.d.ts +2 -1
- package/build/main/providers/caching-token-list-provider.js +2 -1
- package/build/main/providers/caching-token-provider.d.ts +2 -1
- package/build/main/providers/caching-token-provider.js +5 -6
- package/build/main/providers/eth-estimate-gas-provider.d.ts +1 -1
- package/build/main/providers/eth-estimate-gas-provider.js +1 -1
- package/build/main/providers/multicall-uniswap-provider.d.ts +1 -1
- package/build/main/providers/multicall-uniswap-provider.js +3 -3
- package/build/main/providers/on-chain-gas-price-provider.d.ts +1 -1
- package/build/main/providers/on-chain-quote-provider.d.ts +1 -1
- package/build/main/providers/on-chain-quote-provider.js +13 -24
- package/build/main/providers/simulation-provider.d.ts +2 -2
- package/build/main/providers/simulation-provider.js +6 -6
- package/build/main/providers/swap-router-provider.d.ts +2 -1
- package/build/main/providers/swap-router-provider.js +2 -3
- package/build/main/providers/tenderly-simulation-provider.d.ts +1 -1
- package/build/main/providers/tenderly-simulation-provider.js +7 -8
- package/build/main/providers/token-provider.d.ts +2 -3
- package/build/main/providers/token-provider.js +30 -32
- package/build/main/providers/token-validator-provider.d.ts +2 -1
- package/build/main/providers/token-validator-provider.js +2 -3
- package/build/main/providers/uri-subgraph-provider.d.ts +1 -1
- package/build/main/providers/uri-subgraph-provider.js +1 -1
- package/build/main/providers/v2/caching-pool-provider.d.ts +3 -5
- package/build/main/providers/v2/caching-pool-provider.js +3 -5
- package/build/main/providers/v2/caching-subgraph-provider.d.ts +1 -1
- package/build/main/providers/v2/pool-provider.d.ts +4 -13
- package/build/main/providers/v2/pool-provider.js +10 -12
- package/build/main/providers/v2/quote-provider.js +2 -2
- package/build/main/providers/v2/static-subgraph-provider.d.ts +2 -1
- package/build/main/providers/v2/static-subgraph-provider.js +7 -7
- package/build/main/providers/v2/subgraph-provider.d.ts +2 -1
- package/build/main/providers/v2/subgraph-provider.js +1 -1
- package/build/main/providers/v3/caching-pool-provider.d.ts +3 -5
- package/build/main/providers/v3/caching-pool-provider.js +3 -5
- package/build/main/providers/v3/caching-subgraph-provider.d.ts +1 -1
- package/build/main/providers/v3/pool-provider.d.ts +3 -5
- package/build/main/providers/v3/pool-provider.js +8 -14
- package/build/main/providers/v3/static-subgraph-provider.d.ts +2 -1
- package/build/main/providers/v3/static-subgraph-provider.js +25 -37
- package/build/main/providers/v3/subgraph-provider.d.ts +2 -1
- package/build/main/providers/v3/subgraph-provider.js +2 -2
- package/build/main/routers/alpha-router/alpha-router.d.ts +6 -25
- package/build/main/routers/alpha-router/alpha-router.js +38 -100
- package/build/main/routers/alpha-router/config.d.ts +1 -1
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.d.ts +7 -9
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.js +8 -8
- package/build/main/routers/alpha-router/functions/best-swap-route.d.ts +2 -1
- package/build/main/routers/alpha-router/functions/best-swap-route.js +1 -1
- package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts +3 -4
- package/build/main/routers/alpha-router/functions/compute-all-routes.js +6 -6
- package/build/main/routers/alpha-router/functions/get-candidate-pools.d.ts +5 -7
- package/build/main/routers/alpha-router/functions/get-candidate-pools.js +17 -19
- package/build/main/routers/alpha-router/gas-models/gas-model.d.ts +2 -1
- package/build/main/routers/alpha-router/gas-models/gas-model.js +4 -4
- 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/v2/v2-heuristic-gas-model.js +12 -13
- package/build/main/routers/alpha-router/gas-models/v3/gas-costs.d.ts +1 -1
- package/build/main/routers/alpha-router/gas-models/v3/gas-costs.js +11 -11
- package/build/main/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.js +5 -4
- package/build/main/routers/alpha-router/quoters/base-quoter.d.ts +3 -5
- package/build/main/routers/alpha-router/quoters/base-quoter.js +2 -3
- package/build/main/routers/alpha-router/quoters/mixed-quoter.d.ts +3 -4
- package/build/main/routers/alpha-router/quoters/mixed-quoter.js +14 -80
- package/build/main/routers/alpha-router/quoters/v2-quoter.d.ts +3 -4
- package/build/main/routers/alpha-router/quoters/v2-quoter.js +4 -9
- package/build/main/routers/alpha-router/quoters/v3-quoter.d.ts +4 -5
- package/build/main/routers/alpha-router/quoters/v3-quoter.js +10 -9
- package/build/main/routers/legacy-router/bases.d.ts +2 -1
- package/build/main/routers/legacy-router/bases.js +6 -7
- package/build/main/routers/legacy-router/legacy-router.d.ts +2 -1
- package/build/main/routers/legacy-router/legacy-router.js +5 -5
- package/build/main/routers/router.d.ts +4 -7
- package/build/main/routers/router.js +8 -8
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/addresses.d.ts +21 -0
- package/build/main/util/addresses.js +59 -6
- package/build/main/util/chains.d.ts +11 -2
- package/build/main/util/chains.js +37 -18
- package/build/main/util/gas-factory-helpers.d.ts +3 -2
- package/build/main/util/gas-factory-helpers.js +6 -10
- package/build/main/util/methodParameters.d.ts +2 -2
- package/build/main/util/methodParameters.js +5 -5
- package/build/main/util/protocols.d.ts +0 -2
- package/build/main/util/protocols.js +2 -14
- package/build/main/util/routes.js +10 -19
- package/build/module/providers/caching/route/model/cached-routes.d.ts +3 -2
- package/build/module/providers/caching/route/model/cached-routes.js +4 -4
- package/build/module/providers/caching/route/route-caching-provider.d.ts +2 -1
- package/build/module/providers/caching/route/route-caching-provider.js +7 -12
- package/build/module/providers/caching-gas-provider.d.ts +1 -1
- package/build/module/providers/caching-gas-provider.js +1 -1
- package/build/module/providers/caching-token-list-provider.d.ts +2 -1
- package/build/module/providers/caching-token-list-provider.js +2 -1
- package/build/module/providers/caching-token-provider.d.ts +2 -1
- package/build/module/providers/caching-token-provider.js +5 -6
- package/build/module/providers/eth-estimate-gas-provider.d.ts +1 -1
- package/build/module/providers/eth-estimate-gas-provider.js +1 -1
- package/build/module/providers/multicall-uniswap-provider.d.ts +1 -1
- package/build/module/providers/multicall-uniswap-provider.js +3 -3
- package/build/module/providers/on-chain-gas-price-provider.d.ts +1 -1
- package/build/module/providers/on-chain-quote-provider.d.ts +1 -1
- package/build/module/providers/on-chain-quote-provider.js +16 -27
- package/build/module/providers/simulation-provider.d.ts +2 -2
- package/build/module/providers/simulation-provider.js +6 -6
- package/build/module/providers/swap-router-provider.d.ts +2 -1
- package/build/module/providers/swap-router-provider.js +2 -3
- package/build/module/providers/tenderly-simulation-provider.d.ts +1 -1
- package/build/module/providers/tenderly-simulation-provider.js +7 -8
- package/build/module/providers/token-provider.d.ts +2 -3
- package/build/module/providers/token-provider.js +10 -12
- package/build/module/providers/token-validator-provider.d.ts +2 -1
- package/build/module/providers/token-validator-provider.js +3 -4
- package/build/module/providers/uri-subgraph-provider.d.ts +1 -1
- package/build/module/providers/uri-subgraph-provider.js +1 -1
- package/build/module/providers/v2/caching-pool-provider.d.ts +3 -5
- package/build/module/providers/v2/caching-pool-provider.js +3 -5
- package/build/module/providers/v2/caching-subgraph-provider.d.ts +1 -1
- package/build/module/providers/v2/pool-provider.d.ts +4 -13
- package/build/module/providers/v2/pool-provider.js +10 -12
- package/build/module/providers/v2/quote-provider.js +2 -2
- package/build/module/providers/v2/static-subgraph-provider.d.ts +2 -1
- package/build/module/providers/v2/static-subgraph-provider.js +5 -5
- package/build/module/providers/v2/subgraph-provider.d.ts +2 -1
- package/build/module/providers/v2/subgraph-provider.js +1 -1
- package/build/module/providers/v3/caching-pool-provider.d.ts +3 -5
- package/build/module/providers/v3/caching-pool-provider.js +3 -5
- package/build/module/providers/v3/caching-subgraph-provider.d.ts +1 -1
- package/build/module/providers/v3/pool-provider.d.ts +3 -5
- package/build/module/providers/v3/pool-provider.js +8 -14
- package/build/module/providers/v3/static-subgraph-provider.d.ts +2 -1
- package/build/module/providers/v3/static-subgraph-provider.js +24 -36
- package/build/module/providers/v3/subgraph-provider.d.ts +2 -1
- package/build/module/providers/v3/subgraph-provider.js +2 -2
- package/build/module/routers/alpha-router/alpha-router.d.ts +6 -25
- package/build/module/routers/alpha-router/alpha-router.js +40 -102
- package/build/module/routers/alpha-router/config.d.ts +1 -1
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.d.ts +7 -9
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.js +8 -8
- package/build/module/routers/alpha-router/functions/best-swap-route.d.ts +2 -1
- package/build/module/routers/alpha-router/functions/best-swap-route.js +1 -1
- package/build/module/routers/alpha-router/functions/compute-all-routes.d.ts +3 -4
- package/build/module/routers/alpha-router/functions/compute-all-routes.js +6 -6
- package/build/module/routers/alpha-router/functions/get-candidate-pools.d.ts +5 -7
- package/build/module/routers/alpha-router/functions/get-candidate-pools.js +19 -21
- package/build/module/routers/alpha-router/gas-models/gas-model.d.ts +2 -1
- package/build/module/routers/alpha-router/gas-models/gas-model.js +3 -3
- 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/v2/v2-heuristic-gas-model.js +13 -14
- package/build/module/routers/alpha-router/gas-models/v3/gas-costs.d.ts +1 -1
- package/build/module/routers/alpha-router/gas-models/v3/gas-costs.js +8 -8
- package/build/module/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.js +6 -5
- package/build/module/routers/alpha-router/quoters/base-quoter.d.ts +3 -5
- package/build/module/routers/alpha-router/quoters/base-quoter.js +2 -3
- package/build/module/routers/alpha-router/quoters/mixed-quoter.d.ts +3 -4
- package/build/module/routers/alpha-router/quoters/mixed-quoter.js +15 -81
- package/build/module/routers/alpha-router/quoters/v2-quoter.d.ts +3 -4
- package/build/module/routers/alpha-router/quoters/v2-quoter.js +4 -9
- package/build/module/routers/alpha-router/quoters/v3-quoter.d.ts +4 -5
- package/build/module/routers/alpha-router/quoters/v3-quoter.js +10 -9
- package/build/module/routers/legacy-router/bases.d.ts +2 -1
- package/build/module/routers/legacy-router/bases.js +7 -8
- package/build/module/routers/legacy-router/legacy-router.d.ts +2 -1
- package/build/module/routers/legacy-router/legacy-router.js +6 -6
- package/build/module/routers/router.d.ts +4 -7
- package/build/module/routers/router.js +8 -8
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/addresses.d.ts +21 -0
- package/build/module/util/addresses.js +66 -3
- package/build/module/util/chains.d.ts +11 -2
- package/build/module/util/chains.js +32 -13
- package/build/module/util/gas-factory-helpers.d.ts +3 -2
- package/build/module/util/gas-factory-helpers.js +8 -12
- package/build/module/util/methodParameters.d.ts +2 -2
- package/build/module/util/methodParameters.js +7 -7
- package/build/module/util/protocols.d.ts +0 -2
- package/build/module/util/protocols.js +1 -11
- package/build/module/util/routes.js +11 -20
- package/package.json +1 -1
- package/build/main/providers/v2-fathom/constants.d.ts +0 -2
- package/build/main/providers/v2-fathom/constants.js +0 -6
- package/build/main/providers/v2-fathom/static-subgraph-provider.d.ts +0 -22
- package/build/main/providers/v2-fathom/static-subgraph-provider.js +0 -169
- package/build/main/providers/v2-fathom/subgraph-provider.d.ts +0 -34
- package/build/main/providers/v2-fathom/subgraph-provider.js +0 -130
- package/build/main/providers/v2-fathom/utils.d.ts +0 -2
- package/build/main/providers/v2-fathom/utils.js +0 -14
- package/build/main/providers/v3/static-subgraph-provider-v3-uni.d.ts +0 -29
- package/build/main/providers/v3/static-subgraph-provider-v3-uni.js +0 -209
- package/build/module/providers/v2-fathom/constants.d.ts +0 -2
- package/build/module/providers/v2-fathom/constants.js +0 -3
- package/build/module/providers/v2-fathom/static-subgraph-provider.d.ts +0 -22
- package/build/module/providers/v2-fathom/static-subgraph-provider.js +0 -162
- package/build/module/providers/v2-fathom/subgraph-provider.d.ts +0 -34
- package/build/module/providers/v2-fathom/subgraph-provider.js +0 -131
- package/build/module/providers/v2-fathom/utils.d.ts +0 -2
- package/build/module/providers/v2-fathom/utils.js +0 -10
- package/build/module/providers/v3/static-subgraph-provider-v3-uni.d.ts +0 -29
- package/build/module/providers/v3/static-subgraph-provider-v3-uni.js +0 -202
|
@@ -128,4 +128,4 @@ export class V2SubgraphProvider {
|
|
|
128
128
|
return poolsSanitized;
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ViZ3JhcGgtcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3YyL3N1YmdyYXBoLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUNoQyxPQUFPLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNyRCxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFHdkIsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBK0JyQyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUM7QUFFeEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLENBQUMsK0NBQStDO0FBZ0J2RSxNQUFNLE9BQU8sa0JBQWtCO0lBRzdCLFlBQ1UsT0FBZ0IsRUFDaEIsV0FBbUIsRUFDbkIsVUFBVSxDQUFDLEVBQ1gsVUFBVSxNQUFNLEVBQ2hCLFdBQVcsSUFBSSxFQUNmLFdBQVcsU0FBUztRQUxwQixZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQ2hCLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQ25CLFlBQU8sR0FBUCxPQUFPLENBQUk7UUFDWCxZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQ2hCLGFBQVEsR0FBUixRQUFRLENBQU87UUFDZixhQUFRLEdBQVIsUUFBUSxDQUFZO1FBRTVCLElBQUksQ0FBQyxXQUFXLEVBQUU7WUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7U0FDbEU7UUFDRCxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksYUFBYSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRU0sS0FBSyxDQUFDLFFBQVEsQ0FDbkIsUUFBZ0IsRUFDaEIsU0FBaUIsRUFDakIs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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ChainId, Token } from '@x-swap-protocol/sdk-core';
|
|
1
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
3
2
|
import { FeeAmount, Pool } from '@x-swap-protocol/v3-sdk';
|
|
3
|
+
import { ChainId } from '../../util/chains';
|
|
4
4
|
import { ICache } from './../cache';
|
|
5
5
|
import { ProviderConfig } from './../provider';
|
|
6
6
|
import { IV3PoolProvider, V3PoolAccessor } from './pool-provider';
|
|
@@ -13,19 +13,17 @@ import { IV3PoolProvider, V3PoolAccessor } from './pool-provider';
|
|
|
13
13
|
* @class CachingV3PoolProvider
|
|
14
14
|
*/
|
|
15
15
|
export declare class CachingV3PoolProvider implements IV3PoolProvider {
|
|
16
|
-
protected protocol: Protocol;
|
|
17
16
|
protected chainId: ChainId;
|
|
18
17
|
protected poolProvider: IV3PoolProvider;
|
|
19
18
|
private cache;
|
|
20
19
|
private POOL_KEY;
|
|
21
20
|
/**
|
|
22
21
|
* Creates an instance of CachingV3PoolProvider.
|
|
23
|
-
* @param protocol Protocol V3 or UNI_V3
|
|
24
22
|
* @param chainId The chain id to use.
|
|
25
23
|
* @param poolProvider The provider to use to get the pools when not in the cache.
|
|
26
24
|
* @param cache Cache instance to hold cached pools.
|
|
27
25
|
*/
|
|
28
|
-
constructor(
|
|
26
|
+
constructor(chainId: ChainId, poolProvider: IV3PoolProvider, cache: ICache<Pool>);
|
|
29
27
|
getPools(tokenPairs: [Token, Token, FeeAmount][], providerConfig?: ProviderConfig): Promise<V3PoolAccessor>;
|
|
30
28
|
getPoolAddress(tokenA: Token, tokenB: Token, feeAmount: FeeAmount): {
|
|
31
29
|
poolAddress: string;
|
|
@@ -11,17 +11,15 @@ import { log } from '../../util/log';
|
|
|
11
11
|
export class CachingV3PoolProvider {
|
|
12
12
|
/**
|
|
13
13
|
* Creates an instance of CachingV3PoolProvider.
|
|
14
|
-
* @param protocol Protocol V3 or UNI_V3
|
|
15
14
|
* @param chainId The chain id to use.
|
|
16
15
|
* @param poolProvider The provider to use to get the pools when not in the cache.
|
|
17
16
|
* @param cache Cache instance to hold cached pools.
|
|
18
17
|
*/
|
|
19
|
-
constructor(
|
|
20
|
-
this.protocol = protocol;
|
|
18
|
+
constructor(chainId, poolProvider, cache) {
|
|
21
19
|
this.chainId = chainId;
|
|
22
20
|
this.poolProvider = poolProvider;
|
|
23
21
|
this.cache = cache;
|
|
24
|
-
this.POOL_KEY = (chainId, address) => `pool-${
|
|
22
|
+
this.POOL_KEY = (chainId, address) => `pool-${chainId}-${address}`;
|
|
25
23
|
}
|
|
26
24
|
async getPools(tokenPairs, providerConfig) {
|
|
27
25
|
const poolAddressSet = new Set();
|
|
@@ -69,4 +67,4 @@ export class CachingV3PoolProvider {
|
|
|
69
67
|
return this.poolProvider.getPoolAddress(tokenA, tokenB, feeAmount);
|
|
70
68
|
}
|
|
71
69
|
}
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy1wb29sLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy92My9jYWNoaW5nLXBvb2wtcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBR3ZCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQU1yQzs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxPQUFPLHFCQUFxQjtJQUloQzs7Ozs7T0FLRztJQUNILFlBQ1ksT0FBZ0IsRUFDaEIsWUFBNkIsRUFDL0IsS0FBbUI7UUFGakIsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUNoQixpQkFBWSxHQUFaLFlBQVksQ0FBaUI7UUFDL0IsVUFBSyxHQUFMLEtBQUssQ0FBYztRQVpyQixhQUFRLEdBQUcsQ0FBQyxPQUFnQixFQUFFLE9BQWUsRUFBRSxFQUFFLENBQ3ZELFFBQVEsT0FBTyxJQUFJLE9BQU8sRUFBRSxDQUFDO0lBWTVCLENBQUM7SUFFRyxLQUFLLENBQUMsUUFBUSxDQUNuQixVQUF1QyxFQUN2QyxjQUErQjtRQUUvQixNQUFNLGNBQWMsR0FBZ0IsSUFBSSxHQUFHLEVBQVUsQ0FBQztRQUN0RCxNQUFNLG9CQUFvQixHQUFxQyxFQUFFLENBQUM7UUFDbEUsTUFBTSxtQkFBbUIsR0FBYSxFQUFFLENBQUM7UUFDekMsTUFBTSxpQkFBaUIsR0FBb0MsRUFBRSxDQUFDO1FBRTlELEtBQUssTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLElBQUksVUFBVSxFQUFFO1lBQ3BELE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxjQUFjLENBQ3pELE1BQU0sRUFDTixNQUFNLEVBQ04sU0FBUyxDQUNWLENBQUM7WUFFRixJQUFJLGNBQWMsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEVBQUU7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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ChainId } from '@x-swap-protocol/sdk-core';
|
|
1
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
3
2
|
import { FeeAmount, Pool } from '@x-swap-protocol/v3-sdk';
|
|
4
3
|
import { Options as RetryOptions } from 'async-retry';
|
|
4
|
+
import { ChainId } from '../../util';
|
|
5
5
|
import { IMulticallProvider } from '../multicall-provider';
|
|
6
6
|
import { ProviderConfig } from '../provider';
|
|
7
7
|
/**
|
|
@@ -42,17 +42,15 @@ export type V3PoolRetryOptions = RetryOptions;
|
|
|
42
42
|
export declare class V3PoolProvider implements IV3PoolProvider {
|
|
43
43
|
protected chainId: ChainId;
|
|
44
44
|
protected multicall2Provider: IMulticallProvider;
|
|
45
|
-
protected factory?: FactoryConfig | undefined;
|
|
46
45
|
protected retryOptions: V3PoolRetryOptions;
|
|
47
46
|
private POOL_ADDRESS_CACHE;
|
|
48
47
|
/**
|
|
49
48
|
* Creates an instance of V3PoolProvider.
|
|
50
49
|
* @param chainId The chain id to use.
|
|
51
50
|
* @param multicall2Provider The multicall provider to use to get the pools.
|
|
52
|
-
* @param {FactoryConfig} [factory] specific factory.
|
|
53
51
|
* @param retryOptions The retry options for each call to the multicall.
|
|
54
52
|
*/
|
|
55
|
-
constructor(chainId: ChainId, multicall2Provider: IMulticallProvider,
|
|
53
|
+
constructor(chainId: ChainId, multicall2Provider: IMulticallProvider, retryOptions?: V3PoolRetryOptions);
|
|
56
54
|
getPools(tokenPairs: [Token, Token, FeeAmount][], providerConfig?: ProviderConfig): Promise<V3PoolAccessor>;
|
|
57
55
|
getPoolAddress(tokenA: Token, tokenB: Token, feeAmount: FeeAmount): {
|
|
58
56
|
poolAddress: string;
|
|
@@ -1,27 +1,25 @@
|
|
|
1
|
-
import { V3_CORE_FACTORY_ADDRESSES } from '@x-swap-protocol/sdk-core';
|
|
2
1
|
import { computePoolAddress, Pool } from '@x-swap-protocol/v3-sdk';
|
|
3
|
-
import { POOL_INIT_CODE_HASH } from '@x-swap-protocol/v3-sdk';
|
|
4
2
|
import retry from 'async-retry';
|
|
5
3
|
import _ from 'lodash';
|
|
6
4
|
import { IUniswapV3PoolState__factory } from '../../types/v3/factories/IUniswapV3PoolState__factory';
|
|
5
|
+
import { V3_CORE_FACTORY_ADDRESSES } from '../../util/addresses';
|
|
7
6
|
import { log } from '../../util/log';
|
|
8
7
|
import { poolToString } from '../../util/routes';
|
|
8
|
+
import { POOL_INIT_CODE_HASH } from '../../util/addresses';
|
|
9
9
|
export class V3PoolProvider {
|
|
10
10
|
/**
|
|
11
11
|
* Creates an instance of V3PoolProvider.
|
|
12
12
|
* @param chainId The chain id to use.
|
|
13
13
|
* @param multicall2Provider The multicall provider to use to get the pools.
|
|
14
|
-
* @param {FactoryConfig} [factory] specific factory.
|
|
15
14
|
* @param retryOptions The retry options for each call to the multicall.
|
|
16
15
|
*/
|
|
17
|
-
constructor(chainId, multicall2Provider,
|
|
16
|
+
constructor(chainId, multicall2Provider, retryOptions = {
|
|
18
17
|
retries: 2,
|
|
19
18
|
minTimeout: 50,
|
|
20
19
|
maxTimeout: 500,
|
|
21
20
|
}) {
|
|
22
21
|
this.chainId = chainId;
|
|
23
22
|
this.multicall2Provider = multicall2Provider;
|
|
24
|
-
this.factory = factory;
|
|
25
23
|
this.retryOptions = retryOptions;
|
|
26
24
|
// Computing pool addresses is slow as it requires hashing, encoding etc.
|
|
27
25
|
// Addresses never change so can always be cached.
|
|
@@ -65,7 +63,7 @@ export class V3PoolProvider {
|
|
|
65
63
|
const [token0, token1, fee] = sortedTokenPairs[i];
|
|
66
64
|
const slot0 = slot0Result.result;
|
|
67
65
|
const liquidity = liquidityResult.result[0];
|
|
68
|
-
const pool = new Pool(token0, token1, fee, slot0.sqrtPriceX96.toString(), liquidity.toString(), slot0.tick
|
|
66
|
+
const pool = new Pool(token0, token1, fee, slot0.sqrtPriceX96.toString(), liquidity.toString(), slot0.tick);
|
|
69
67
|
const poolAddress = sortedPoolAddresses[i];
|
|
70
68
|
poolAddressToPool[poolAddress] = pool;
|
|
71
69
|
}
|
|
@@ -89,21 +87,17 @@ export class V3PoolProvider {
|
|
|
89
87
|
const [token0, token1] = tokenA.sortsBefore(tokenB)
|
|
90
88
|
? [tokenA, tokenB]
|
|
91
89
|
: [tokenB, tokenA];
|
|
92
|
-
const cacheKey = `${this.chainId}/${
|
|
90
|
+
const cacheKey = `${this.chainId}/${token0.address}/${token1.address}/${feeAmount}`;
|
|
93
91
|
const cachedAddress = this.POOL_ADDRESS_CACHE[cacheKey];
|
|
94
92
|
if (cachedAddress) {
|
|
95
93
|
return { poolAddress: cachedAddress, token0, token1 };
|
|
96
94
|
}
|
|
97
95
|
const poolAddress = computePoolAddress({
|
|
98
|
-
factoryAddress: this.
|
|
99
|
-
? this.factory.address
|
|
100
|
-
: V3_CORE_FACTORY_ADDRESSES[this.chainId],
|
|
96
|
+
factoryAddress: V3_CORE_FACTORY_ADDRESSES[this.chainId],
|
|
101
97
|
tokenA: token0,
|
|
102
98
|
tokenB: token1,
|
|
103
99
|
fee: feeAmount,
|
|
104
|
-
initCodeHashManualOverride:
|
|
105
|
-
? this.factory.initCode
|
|
106
|
-
: POOL_INIT_CODE_HASH,
|
|
100
|
+
initCodeHashManualOverride: POOL_INIT_CODE_HASH
|
|
107
101
|
});
|
|
108
102
|
this.POOL_ADDRESS_CACHE[cacheKey] = poolAddress;
|
|
109
103
|
return { poolAddress, token0, token1 };
|
|
@@ -121,4 +115,4 @@ export class V3PoolProvider {
|
|
|
121
115
|
return results;
|
|
122
116
|
}
|
|
123
117
|
}
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9vbC1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvdjMvcG9vbC1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsa0JBQWtCLEVBQWEsSUFBSSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDOUUsT0FBTyxLQUFrQyxNQUFNLGFBQWEsQ0FBQztBQUM3RCxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFFckcsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDakUsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUdqRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQTREM0QsTUFBTSxPQUFPLGNBQWM7SUFLekI7Ozs7O09BS0c7SUFDSCxZQUNZLE9BQWdCLEVBQ2hCLGtCQUFzQyxFQUN0QyxlQUFtQztRQUMzQyxPQUFPLEVBQUUsQ0FBQztRQUNWLFVBQVUsRUFBRSxFQUFFO1FBQ2QsVUFBVSxFQUFFLEdBQUc7S0FDaEI7UUFOUyxZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQ2hCLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMsaUJBQVksR0FBWixZQUFZLENBSXJCO1FBakJILHlFQUF5RTtRQUN6RSxrREFBa0Q7UUFDMUMsdUJBQWtCLEdBQThCLEVBQUUsQ0FBQztJQWdCdkQsQ0FBQztJQUVFLEtBQUssQ0FBQyxRQUFRLENBQ25CLFVBQXVDLEVBQ3ZDLGNBQStCO1FBRS9CLE1BQU0sY0FBYyxHQUFnQixJQUFJLEdBQUcsRUFBVSxDQUFDO1FBQ3RELE1BQU0sZ0JBQWdCLEdBQXFDLEVBQUUsQ0FBQztRQUM5RCxN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
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
2
2
|
import { FeeAmount } from '@x-swap-protocol/v3-sdk';
|
|
3
|
+
import { ChainId } from '../../util/chains';
|
|
3
4
|
import { IV3PoolProvider } from './pool-provider';
|
|
4
5
|
import { IV3SubgraphProvider, V3SubgraphPool } from './subgraph-provider';
|
|
5
6
|
export declare const ADDITIONAL_BASES: {
|
|
@@ -1,79 +1,67 @@
|
|
|
1
|
-
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
2
|
-
import { ChainId, WETH9 } from '@x-swap-protocol/sdk-core';
|
|
3
1
|
import { FeeAmount, Pool } from '@x-swap-protocol/v3-sdk';
|
|
4
2
|
import JSBI from 'jsbi';
|
|
5
3
|
import _ from 'lodash';
|
|
6
4
|
import { unparseFeeAmount } from '../../util/amounts';
|
|
5
|
+
import { ChainId, WRAPPED_NATIVE_CURRENCY } from '../../util/chains';
|
|
7
6
|
import { log } from '../../util/log';
|
|
8
|
-
import {
|
|
7
|
+
import { BBB_XDC, CGO_XDC, CHUPAV2_XDC, DOPU_XDC, FXD_XDC, GAMA_XDC, GLL_XDC, LBT_XDC, PLI_XDC, PWM3_XDC, ROXN_XDC, SRX_XDC, USDC_XDC, USDT_XDC_APOTHEM, WBTC_XDC_APOTHEM, WXDC_XDC, XSP_XDC, } from '../token-provider';
|
|
9
8
|
const BASES_TO_CHECK_TRADES_AGAINST = {
|
|
10
|
-
[ChainId.XDC]: [
|
|
11
|
-
[ChainId.
|
|
12
|
-
|
|
9
|
+
[ChainId.XDC]: [WRAPPED_NATIVE_CURRENCY[ChainId.XDC], USDC_XDC],
|
|
10
|
+
[ChainId.XDC_APOTHEM]: [
|
|
11
|
+
WRAPPED_NATIVE_CURRENCY[ChainId.XDC_APOTHEM],
|
|
13
12
|
USDT_XDC_APOTHEM,
|
|
14
13
|
WBTC_XDC_APOTHEM,
|
|
15
14
|
],
|
|
16
15
|
};
|
|
17
16
|
export const ADDITIONAL_BASES = {
|
|
18
17
|
[ChainId.XDC]: {
|
|
19
|
-
[
|
|
20
|
-
[USDC_XDC, FeeAmount.MEDIUM],
|
|
18
|
+
[WRAPPED_NATIVE_CURRENCY[ChainId.XDC].address]: [
|
|
21
19
|
[DOPU_XDC, FeeAmount.LOWEST],
|
|
20
|
+
[USDC_XDC, FeeAmount.MEDIUM],
|
|
22
21
|
[GAMA_XDC, FeeAmount.LOWEST],
|
|
23
|
-
[
|
|
22
|
+
[LBT_XDC, FeeAmount.MEDIUM],
|
|
23
|
+
[CHUPAV2_XDC, FeeAmount.HIGH],
|
|
24
24
|
[BBB_XDC, FeeAmount.LOWEST],
|
|
25
25
|
[XSP_XDC, FeeAmount.MEDIUM],
|
|
26
|
-
[CHUPAV2_XDC, FeeAmount.HIGH],
|
|
27
|
-
[AVR_XDC, FeeAmount.MEDIUM],
|
|
28
26
|
[ROXN_XDC, FeeAmount.MEDIUM],
|
|
29
|
-
[PLI_XDC, FeeAmount.MEDIUM],
|
|
30
|
-
[LBT_XDC, FeeAmount.MEDIUM],
|
|
31
27
|
[GLL_XDC, FeeAmount.MEDIUM],
|
|
32
|
-
[
|
|
28
|
+
[PLI_XDC, FeeAmount.MEDIUM],
|
|
29
|
+
[FXD_XDC, FeeAmount.MEDIUM],
|
|
33
30
|
[PWM3_XDC, FeeAmount.HIGH],
|
|
31
|
+
[SRX_XDC, FeeAmount.MEDIUM],
|
|
32
|
+
],
|
|
33
|
+
[DOPU_XDC.address]: [
|
|
34
|
+
[WXDC_XDC, FeeAmount.LOWEST],
|
|
35
|
+
[BBB_XDC, FeeAmount.MEDIUM],
|
|
34
36
|
],
|
|
35
37
|
[USDC_XDC.address]: [
|
|
36
38
|
[WXDC_XDC, FeeAmount.MEDIUM],
|
|
37
|
-
[CGO_XDC, FeeAmount.MEDIUM],
|
|
38
39
|
[SRX_XDC, FeeAmount.MEDIUM],
|
|
39
40
|
[GAMA_XDC, FeeAmount.LOWEST],
|
|
40
|
-
[
|
|
41
|
+
[CGO_XDC, FeeAmount.MEDIUM],
|
|
42
|
+
],
|
|
43
|
+
[SRX_XDC.address]: [
|
|
44
|
+
[USDC_XDC, FeeAmount.MEDIUM],
|
|
45
|
+
[WXDC_XDC, FeeAmount.MEDIUM],
|
|
41
46
|
],
|
|
42
47
|
[GAMA_XDC.address]: [
|
|
43
48
|
[WXDC_XDC, FeeAmount.LOWEST],
|
|
44
49
|
[USDC_XDC, FeeAmount.LOWEST],
|
|
45
50
|
],
|
|
46
|
-
[EEG_XDC.address]: [[WXDC_XDC, FeeAmount.MEDIUM]],
|
|
47
51
|
[BBB_XDC.address]: [
|
|
48
52
|
[WXDC_XDC, FeeAmount.LOWEST],
|
|
49
53
|
[WXDC_XDC, FeeAmount.HIGH],
|
|
50
54
|
],
|
|
51
|
-
[DOPU_XDC.address]: [
|
|
52
|
-
[WXDC_XDC, FeeAmount.LOWEST],
|
|
53
|
-
[BBB_XDC, FeeAmount.MEDIUM],
|
|
54
|
-
],
|
|
55
55
|
[CGO_XDC.address]: [
|
|
56
56
|
[USDC_XDC, FeeAmount.MEDIUM],
|
|
57
57
|
[FXD_XDC, FeeAmount.LOW],
|
|
58
58
|
],
|
|
59
|
-
[SRX_XDC.address]: [
|
|
60
|
-
[USDC_XDC, FeeAmount.MEDIUM],
|
|
61
|
-
[WXDC_XDC, FeeAmount.MEDIUM],
|
|
62
|
-
],
|
|
63
59
|
[XSP_XDC.address]: [
|
|
64
60
|
[WXDC_XDC, FeeAmount.MEDIUM],
|
|
65
|
-
[WXDC_XDC, FeeAmount.LOWEST],
|
|
66
61
|
[USDC_XDC, FeeAmount.MEDIUM],
|
|
67
62
|
],
|
|
68
|
-
[CHUPAV2_XDC.address]: [[WXDC_XDC, FeeAmount.HIGH]],
|
|
69
|
-
[AVR_XDC.address]: [[WXDC_XDC, FeeAmount.MEDIUM]],
|
|
70
|
-
[PLI_XDC.address]: [[WXDC_XDC, FeeAmount.MEDIUM]],
|
|
71
|
-
[ROXN_XDC.address]: [[WXDC_XDC, FeeAmount.MEDIUM]],
|
|
72
|
-
[LBT_XDC.address]: [[WXDC_XDC, FeeAmount.MEDIUM]],
|
|
73
|
-
[GLL_XDC.address]: [[WXDC_XDC, FeeAmount.MEDIUM]],
|
|
74
|
-
[TIVO_XDC.address]: [[WXDC_XDC, FeeAmount.LOWEST]],
|
|
75
63
|
},
|
|
76
|
-
[ChainId.
|
|
64
|
+
[ChainId.XDC_APOTHEM]: {},
|
|
77
65
|
};
|
|
78
66
|
export const V3_XDC_ADDITIONAL_BASES = ADDITIONAL_BASES[ChainId.XDC];
|
|
79
67
|
let paths = [];
|
|
@@ -193,7 +181,7 @@ export class StaticV3SubgraphProvider {
|
|
|
193
181
|
pairs = [...Object.values(uniquePairs), ...direct];
|
|
194
182
|
}
|
|
195
183
|
}
|
|
196
|
-
log.info(`V3
|
|
184
|
+
log.info(`V3 Static subgraph provider about to get ${pairs.length} pools on-chain`);
|
|
197
185
|
const poolAccessor = await this.poolProvider.getPools(pairs);
|
|
198
186
|
const pools = poolAccessor.getAllPools();
|
|
199
187
|
const poolAddressSet = new Set();
|
|
@@ -226,4 +214,4 @@ export class StaticV3SubgraphProvider {
|
|
|
226
214
|
return subgraphPools;
|
|
227
215
|
}
|
|
228
216
|
}
|
|
229
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"static-subgraph-provider.js","sourceRoot":"","sources":["../../../../src/providers/v3/static-subgraph-provider.ts"],"names":[],"mappings":"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"}
|
|
217
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"static-subgraph-provider.js","sourceRoot":"","sources":["../../../../src/providers/v3/static-subgraph-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
2
|
+
import { ChainId } from '../../util';
|
|
2
3
|
import { ProviderConfig } from '../provider';
|
|
3
4
|
import { V2SubgraphPool } from '../v2/subgraph-provider';
|
|
4
5
|
export interface V3SubgraphPool {
|
|
@@ -27,7 +27,7 @@ export class V3SubgraphProvider {
|
|
|
27
27
|
pools(
|
|
28
28
|
first: $pageSize
|
|
29
29
|
${blockNumber ? `block: { number: ${blockNumber} }` : ``}
|
|
30
|
-
where: { id_gt: $id
|
|
30
|
+
where: { id_gt: $id }
|
|
31
31
|
) {
|
|
32
32
|
id
|
|
33
33
|
token0 {
|
|
@@ -117,4 +117,4 @@ export class V3SubgraphProvider {
|
|
|
117
117
|
return poolsSanitized;
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ViZ3JhcGgtcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3YzL3N1YmdyYXBoLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUNoQyxPQUFPLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNyRCxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFXLEdBQUcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQWtDMUMsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FDdkQsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7QUFFL0MsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FDdkQsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxDQUFDO0FBRWxDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxDQUFDLCtDQUErQztBQWdCdkUsTUFBTSxPQUFPLGtCQUFrQjtJQUc3QixZQUNVLE9BQWdCLEVBQ2hCLFdBQW1CLEVBQ25CLFVBQVUsQ0FBQyxFQUNYLFVBQVUsS0FBSyxFQUNmLFdBQVcsSUFBSTtRQUpmLFlBQU8sR0FBUCxPQUFPLENBQVM7UUFDaEIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFDbkIsWUFBTyxHQUFQLE9BQU8sQ0FBSTtRQUNYLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFDZixhQUFRLEdBQVIsUUFBUSxDQUFPO1FBRXZCLElBQUksQ0FBQyxX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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseProvider } from '@ethersproject/providers';
|
|
2
2
|
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
3
|
-
import {
|
|
3
|
+
import { Currency, TradeType } from '@x-swap-protocol/sdk-core';
|
|
4
4
|
import { Position } from '@x-swap-protocol/v3-sdk';
|
|
5
5
|
import { IOnChainQuoteProvider, IRouteCachingProvider, ISwapRouterProvider, IV2QuoteProvider, IV2SubgraphProvider, Simulator, UniswapMulticallProvider } from '../../providers';
|
|
6
6
|
import { ITokenListProvider } from '../../providers/caching-token-list-provider';
|
|
@@ -12,6 +12,7 @@ import { ArbitrumGasData, IL2GasDataProvider, OptimismGasData } from '../../prov
|
|
|
12
12
|
import { IV3PoolProvider } from '../../providers/v3/pool-provider';
|
|
13
13
|
import { IV3SubgraphProvider } from '../../providers/v3/subgraph-provider';
|
|
14
14
|
import { CurrencyAmount } from '../../util/amounts';
|
|
15
|
+
import { ChainId } from '../../util/chains';
|
|
15
16
|
import { IRouter, ISwapToRatio, SwapAndAddConfig, SwapAndAddOptions, SwapOptions, SwapRoute, SwapToRatioResponse } from '../router';
|
|
16
17
|
import { IOnChainGasModelFactory, IV2GasModelFactory } from './gas-models/gas-model';
|
|
17
18
|
import { MixedQuoter, V2Quoter, V3Quoter } from './quoters';
|
|
@@ -35,18 +36,9 @@ export type AlphaRouterParams = {
|
|
|
35
36
|
*/
|
|
36
37
|
v3SubgraphProvider?: IV3SubgraphProvider;
|
|
37
38
|
/**
|
|
38
|
-
* The provider for getting data about
|
|
39
|
+
* The provider for getting data about V3 pools.
|
|
39
40
|
*/
|
|
40
41
|
v3PoolProvider?: IV3PoolProvider;
|
|
41
|
-
/**
|
|
42
|
-
* The provider for getting all pools that exist on V3 from the Subgraph. The pools
|
|
43
|
-
* from this provider are filtered during the algorithm to a set of candidate pools.
|
|
44
|
-
*/
|
|
45
|
-
v3UniSubgraphProvider?: IV3SubgraphProvider;
|
|
46
|
-
/**
|
|
47
|
-
* The provider for getting data about Uni V3 pools.
|
|
48
|
-
*/
|
|
49
|
-
v3UniPoolProvider?: IV3PoolProvider;
|
|
50
42
|
/**
|
|
51
43
|
* The provider for getting V3 quotes.
|
|
52
44
|
*/
|
|
@@ -56,11 +48,6 @@ export type AlphaRouterParams = {
|
|
|
56
48
|
* from this provider are filtered during the algorithm to a set of candidate pools.
|
|
57
49
|
*/
|
|
58
50
|
v2SubgraphProvider?: IV2SubgraphProvider;
|
|
59
|
-
v2FathomSubgraphProvider?: IV2SubgraphProvider;
|
|
60
|
-
/**
|
|
61
|
-
* The provider for getting data about V2 pools.
|
|
62
|
-
*/
|
|
63
|
-
v2FathomPoolProvider?: IV2PoolProvider;
|
|
64
51
|
/**
|
|
65
52
|
* The provider for getting data about V2 pools.
|
|
66
53
|
*/
|
|
@@ -239,14 +226,10 @@ export declare class AlphaRouter implements IRouter<AlphaRouterConfig>, ISwapToR
|
|
|
239
226
|
protected multicall2Provider: UniswapMulticallProvider;
|
|
240
227
|
protected v3SubgraphProvider: IV3SubgraphProvider;
|
|
241
228
|
protected v3PoolProvider: IV3PoolProvider;
|
|
242
|
-
protected v3UniSubgraphProvider: IV3SubgraphProvider;
|
|
243
|
-
protected v3UniPoolProvider: IV3PoolProvider;
|
|
244
229
|
protected onChainQuoteProvider: IOnChainQuoteProvider;
|
|
245
230
|
protected v2SubgraphProvider: IV2SubgraphProvider;
|
|
246
231
|
protected v2QuoteProvider: IV2QuoteProvider;
|
|
247
232
|
protected v2PoolProvider: IV2PoolProvider;
|
|
248
|
-
protected v2FathomPoolProvider: IV2PoolProvider;
|
|
249
|
-
protected v2FathomSubgraphProvider: IV2SubgraphProvider;
|
|
250
233
|
protected tokenProvider: ITokenProvider;
|
|
251
234
|
protected gasPriceProvider: IGasPriceProvider;
|
|
252
235
|
protected swapRouterProvider: ISwapRouterProvider;
|
|
@@ -257,13 +240,11 @@ export declare class AlphaRouter implements IRouter<AlphaRouterConfig>, ISwapToR
|
|
|
257
240
|
protected blockedTokenListProvider?: ITokenListProvider;
|
|
258
241
|
protected l2GasDataProvider?: IL2GasDataProvider<OptimismGasData> | IL2GasDataProvider<ArbitrumGasData>;
|
|
259
242
|
protected simulator?: Simulator;
|
|
260
|
-
protected
|
|
261
|
-
protected
|
|
262
|
-
protected v3QuoterXSwap: V3Quoter;
|
|
263
|
-
protected v3QuoterUni: V3Quoter;
|
|
243
|
+
protected v2Quoter: V2Quoter;
|
|
244
|
+
protected v3Quoter: V3Quoter;
|
|
264
245
|
protected mixedQuoter: MixedQuoter;
|
|
265
246
|
protected routeCachingProvider?: IRouteCachingProvider;
|
|
266
|
-
constructor({ chainId, provider, multicall2Provider, v3PoolProvider,
|
|
247
|
+
constructor({ chainId, provider, multicall2Provider, v3PoolProvider, onChainQuoteProvider, v2PoolProvider, v2QuoteProvider, v2SubgraphProvider, tokenProvider, blockedTokenListProvider, v3SubgraphProvider, gasPriceProvider, v3GasModelFactory, v2GasModelFactory, mixedRouteGasModelFactory, swapRouterProvider, tokenValidatorProvider, simulator, routeCachingProvider, }: AlphaRouterParams);
|
|
267
248
|
routeToRatio(token0Balance: CurrencyAmount, token1Balance: CurrencyAmount, position: Position, swapAndAddConfig: SwapAndAddConfig, swapAndAddOptions?: SwapAndAddOptions, routingConfig?: Partial<AlphaRouterConfig>): Promise<SwapToRatioResponse>;
|
|
268
249
|
/**
|
|
269
250
|
* @inheritdoc IRouter
|