@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
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
1
2
|
import { TokenList } from '@uniswap/token-lists';
|
|
2
|
-
import { ChainId
|
|
3
|
+
import { ChainId } from '../util/chains';
|
|
3
4
|
import { ICache } from './cache';
|
|
4
5
|
import { ITokenProvider, TokenAccessor } from './token-provider';
|
|
5
6
|
/**
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
1
2
|
import { Token } from '@x-swap-protocol/sdk-core';
|
|
2
3
|
import axios from 'axios';
|
|
3
4
|
import _ from 'lodash';
|
|
@@ -112,4 +113,4 @@ export class CachingTokenListProvider {
|
|
|
112
113
|
return token;
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy10b2tlbi1saXN0LXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy9jYWNoaW5nLXRva2VuLWxpc3QtcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNkRBQTZEO0FBQzdELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVsRCxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBR3ZCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBc0IxRCxNQUFNLE9BQU8sd0JBQXdCO0lBZ0JuQzs7Ozs7OztPQU9HO0lBQ0gsWUFDRSxPQUF5QixFQUN6QixTQUFvQixFQUNaLFVBQXlCO1FBQXpCLGVBQVUsR0FBVixVQUFVLENBQWU7UUF4QjNCLGNBQVMsR0FBRyxDQUFDLFNBQW9CLEVBQUUsRUFBRSxDQUMzQyxvQkFBb0IsSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksSUFDckQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUNqQixJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxJQUFJLFNBQVMsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLElBQzNELFNBQVMsQ0FBQyxRQUNaLElBQUksU0FBUyxDQUFDLE1BQU0sSUFBSSxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUM7UUFxQnpDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO1FBRTNCLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUMvQixJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFDckIsQ0FB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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 { ICache } from './cache';
|
|
3
4
|
import { ITokenProvider, TokenAccessor } from './token-provider';
|
|
4
5
|
export declare const CACHE_SEED_TOKENS: {
|
|
@@ -1,18 +1,17 @@
|
|
|
1
|
-
import { ChainId, WETH9 } from '@x-swap-protocol/sdk-core';
|
|
2
1
|
import _ from 'lodash';
|
|
3
|
-
import { log } from '../util';
|
|
2
|
+
import { ChainId, log, WRAPPED_NATIVE_CURRENCY } from '../util';
|
|
4
3
|
import { DAI_XDC_APOTHEM, USDC_XDC, USDC_XDC_APOTHEM, USDT_XDC_APOTHEM, } from './token-provider';
|
|
5
4
|
// These tokens will added to the Token cache on initialization.
|
|
6
5
|
export const CACHE_SEED_TOKENS = {
|
|
7
|
-
[ChainId.
|
|
6
|
+
[ChainId.XDC_APOTHEM]: {
|
|
8
7
|
USDC: USDC_XDC_APOTHEM,
|
|
9
8
|
USDT: USDT_XDC_APOTHEM,
|
|
10
9
|
DAI: DAI_XDC_APOTHEM,
|
|
11
|
-
WXDC:
|
|
10
|
+
WXDC: WRAPPED_NATIVE_CURRENCY[ChainId.XDC_APOTHEM],
|
|
12
11
|
},
|
|
13
12
|
[ChainId.XDC]: {
|
|
14
13
|
USDC: USDC_XDC,
|
|
15
|
-
WXDC:
|
|
14
|
+
WXDC: WRAPPED_NATIVE_CURRENCY[ChainId.XDC],
|
|
16
15
|
},
|
|
17
16
|
// Currently we do not have providers for Moonbeam mainnet or Gnosis testnet
|
|
18
17
|
};
|
|
@@ -104,4 +103,4 @@ export class CachingTokenProviderWithFallback {
|
|
|
104
103
|
};
|
|
105
104
|
}
|
|
106
105
|
}
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy10b2tlbi1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm92aWRlcnMvY2FjaGluZy10b2tlbi1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFHaEUsT0FBTyxFQUNMLGVBQWUsRUFHZixRQUFRLEVBQ1IsZ0JBQWdCLEVBQ2hCLGdCQUFnQixHQUNqQixNQUFNLGtCQUFrQixDQUFDO0FBRTFCLGdFQUFnRTtBQUNoRSxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FFMUI7SUFDRixDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRTtRQUNyQixJQUFJLEVBQUUsZ0JBQWdCO1FBQ3RCLElBQUksRUFBRSxnQkFBZ0I7UUFDdEIsR0FBRyxFQUFFLGVBQWU7UUFDcEIsSUFBSSxFQUFFLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUM7S0FDbkQ7SUFDRCxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNiLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBSSxFQUFFLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUM7S0FDM0M7SUFFRCw0RUFBNEU7Q0FDN0UsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxnQ0FBZ0M7SUFJM0MsWUFDWSxPQUFnQjtJQUMxQix3RkFBd0Y7SUFDeEYseUVBQXlFO0lBQ2pFLFVBQXlCLEVBQ3ZCLG9CQUFvQyxFQUNwQyxxQkFBc0M7UUFMdEMsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUdsQixlQUFVLEdBQVYsVUFBVSxDQUFlO1FBQ3ZCLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBZ0I7UUFDcEMsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUFpQjtRQVQxQyxjQUFT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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
2
|
-
import { ChainId } from '@x-swap-protocol/sdk-core';
|
|
3
2
|
import { SwapOptions, SwapRoute } from '../routers';
|
|
3
|
+
import { ChainId } from '../util';
|
|
4
4
|
import { Simulator } from './simulation-provider';
|
|
5
5
|
import { IV2PoolProvider } from './v2/pool-provider';
|
|
6
6
|
import { IV3PoolProvider } from './v3/pool-provider';
|
|
@@ -77,4 +77,4 @@ export class EthEstimateGasSimulator extends Simulator {
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRoLWVzdGltYXRlLWdhcy1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm92aWRlcnMvZXRoLWVzdGltYXRlLWdhcy1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHckQsT0FBTyxFQUEwQixRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDOUQsT0FBTyxFQUFXLEdBQUcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN2QyxPQUFPLEVBQ0wsZ0JBQWdCLEVBQ2hCLHlCQUF5QixHQUMxQixNQUFNLDZCQUE2QixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxTQUFTLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUlwRSxNQUFNLE9BQU8sdUJBQXdCLFNBQVEsU0FBUztJQUdwRCxZQUNFLE9BQWdCLEVBQ2hCLFFBQXlCLEVBQ3pCLGNBQStCLEVBQy9CLGNBQStCO1FBRS9CLEtBQUssQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDekIsSUFBSSxDQUFDLGNBQWMsR0FBRyxjQUFjLENBQUM7UUFDckMsSUFBSSxDQUFDLGNBQWMsR0FBRyxjQUFjLENBQUM7SUFDdkMsQ0FBQztJQUNELEtBQUssQ0FBQyxjQUFjLENBQ2xCLFdBQW1CLEVBQ25CLFdBQXdCLEVBQ3hCLEtBQWdCO1FBRWhCLE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQztRQUNwRCxJQUFJLGdCQUEyQixDQUFDO1FBQ2hDLElBQUksV0FBVyxDQUFDLElBQUksSUFBSSxRQUFRLENBQUMsZ0JBQWdCLEVBQUU7WUFDakQsR0FBRyxDQUFDLElBQUksQ0FDTixFQUFFLGdCQUFnQixFQUFFLEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxFQUM1QyxzREFBc0QsQ0FDdkQsQ0FBQztZQUNGLElBQUk7Z0JB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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
2
|
import { BaseProvider } from '@ethersproject/providers';
|
|
3
|
-
import { ChainId } from '
|
|
3
|
+
import { ChainId } from '../util';
|
|
4
4
|
import { CallMultipleFunctionsOnSameContractParams, CallSameFunctionOnContractWithMultipleParams, CallSameFunctionOnMultipleContractsParams, IMulticallProvider, Result } from './multicall-provider';
|
|
5
5
|
export type UniswapMulticallConfig = {
|
|
6
6
|
gasLimitPerCallOverride?: number;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { MULTICALL_ADDRESSES } from '@x-swap-protocol/sdk-core';
|
|
2
1
|
import _ from 'lodash';
|
|
3
2
|
import stats from 'stats-lite';
|
|
4
3
|
import { UniswapInterfaceMulticall__factory } from '../types/v3/factories/UniswapInterfaceMulticall__factory';
|
|
4
|
+
import { UNISWAP_MULTICALL_ADDRESSES } from '../util/addresses';
|
|
5
5
|
import { log } from '../util/log';
|
|
6
6
|
import { IMulticallProvider, } from './multicall-provider';
|
|
7
7
|
/**
|
|
@@ -19,7 +19,7 @@ export class UniswapMulticallProvider extends IMulticallProvider {
|
|
|
19
19
|
this.chainId = chainId;
|
|
20
20
|
this.provider = provider;
|
|
21
21
|
this.gasLimitPerCall = gasLimitPerCall;
|
|
22
|
-
const multicallAddress =
|
|
22
|
+
const multicallAddress = UNISWAP_MULTICALL_ADDRESSES[this.chainId];
|
|
23
23
|
if (!multicallAddress) {
|
|
24
24
|
throw new Error(`No address for Uniswap Multicall Contract on chain id: ${chainId}`);
|
|
25
25
|
}
|
|
@@ -153,4 +153,4 @@ export class UniswapMulticallProvider extends IMulticallProvider {
|
|
|
153
153
|
};
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"multicall-uniswap-provider.js","sourceRoot":"","sources":["../../../src/providers/multicall-uniswap-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ChainId } from '
|
|
1
|
+
import { ChainId } from '../util/chains';
|
|
2
2
|
import { EIP1559GasPriceProvider } from './eip-1559-gas-price-provider';
|
|
3
3
|
import { GasPrice, IGasPriceProvider } from './gas-price-provider';
|
|
4
4
|
import { LegacyGasPriceProvider } from './legacy-gas-price-provider';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
2
|
import { BaseProvider } from '@ethersproject/providers';
|
|
3
|
-
import { ChainId } from '@x-swap-protocol/sdk-core';
|
|
4
3
|
import { Options as RetryOptions } from 'async-retry';
|
|
5
4
|
import { MixedRoute, V2Route, V3Route } from '../routers/router';
|
|
5
|
+
import { ChainId } from '../util';
|
|
6
6
|
import { CurrencyAmount } from '../util/amounts';
|
|
7
7
|
import { Result } from './multicall-provider';
|
|
8
8
|
import { UniswapMulticallProvider } from './multicall-uniswap-provider';
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
2
|
import { encodeMixedRouteToPath, MixedRouteSDK, Protocol, } from '@x-swap-protocol/router-sdk';
|
|
3
|
-
import {
|
|
4
|
-
import { encodeRouteToPath, Pool } from '@x-swap-protocol/v3-sdk';
|
|
3
|
+
import { encodeRouteToPath } from '@x-swap-protocol/v3-sdk';
|
|
5
4
|
import retry from 'async-retry';
|
|
6
5
|
import _ from 'lodash';
|
|
7
6
|
import stats from 'stats-lite';
|
|
8
7
|
import { V2Route } from '../routers/router';
|
|
9
8
|
import { IMixedRouteQuoterV1__factory } from '../types/other/factories/IMixedRouteQuoterV1__factory';
|
|
10
9
|
import { IQuoterV2__factory } from '../types/v3/factories/IQuoterV2__factory';
|
|
11
|
-
import {
|
|
12
|
-
import { QUOTER_V2_ADDRESSES } from '../util/addresses';
|
|
10
|
+
import { metric, MetricLoggerUnit } from '../util';
|
|
11
|
+
import { MIXED_ROUTE_QUOTER_V1_ADDRESSES, QUOTER_V2_ADDRESSES, } from '../util/addresses';
|
|
13
12
|
import { log } from '../util/log';
|
|
14
13
|
import { routeToString } from '../util/routes';
|
|
15
14
|
export class BlockConflictError extends Error {
|
|
@@ -121,17 +120,13 @@ export class OnChainQuoteProvider {
|
|
|
121
120
|
this.blockNumberConfig = blockNumberConfig;
|
|
122
121
|
this.quoterAddressOverride = quoterAddressOverride;
|
|
123
122
|
}
|
|
124
|
-
getQuoterAddress(useMixedRouteQuoter
|
|
123
|
+
getQuoterAddress(useMixedRouteQuoter) {
|
|
125
124
|
if (this.quoterAddressOverride) {
|
|
126
125
|
return this.quoterAddressOverride;
|
|
127
126
|
}
|
|
128
|
-
const quoterAddress =
|
|
129
|
-
?
|
|
130
|
-
|
|
131
|
-
: '0x5911cB3633e764939edc2d92b7e1ad375Bb57649' // UNI_v3
|
|
132
|
-
: useMixedRouteQuoter
|
|
133
|
-
? MIXED_ROUTE_QUOTER_V1_ADDRESSES[this.chainId]
|
|
134
|
-
: QUOTER_V2_ADDRESSES[this.chainId];
|
|
127
|
+
const quoterAddress = useMixedRouteQuoter
|
|
128
|
+
? MIXED_ROUTE_QUOTER_V1_ADDRESSES[this.chainId]
|
|
129
|
+
: QUOTER_V2_ADDRESSES[this.chainId];
|
|
135
130
|
if (!quoterAddress) {
|
|
136
131
|
throw new Error(`No address for the quoter contract on chain id: ${this.chainId}`);
|
|
137
132
|
}
|
|
@@ -145,10 +140,8 @@ export class OnChainQuoteProvider {
|
|
|
145
140
|
}
|
|
146
141
|
async getQuotesManyData(amounts, routes, functionName, _providerConfig) {
|
|
147
142
|
var _a;
|
|
148
|
-
const useMixedRouteQuoter = routes.some((route) => route.protocol === Protocol.V2
|
|
149
|
-
|
|
150
|
-
(route.protocol === Protocol.MIXED &&
|
|
151
|
-
route.pools.some((pool) => pool instanceof Pool && pool.factory)));
|
|
143
|
+
const useMixedRouteQuoter = routes.some((route) => route.protocol === Protocol.V2) ||
|
|
144
|
+
routes.some((route) => route.protocol === Protocol.MIXED);
|
|
152
145
|
/// Validate that there are no incorrect routes / function combinations
|
|
153
146
|
this.validateRoutes(routes, functionName, useMixedRouteQuoter);
|
|
154
147
|
let multicallChunk = this.batchParams.multicallChunk;
|
|
@@ -162,14 +155,10 @@ export class OnChainQuoteProvider {
|
|
|
162
155
|
};
|
|
163
156
|
const inputs = _(routes)
|
|
164
157
|
.flatMap((route) => {
|
|
165
|
-
const encodedRoute =
|
|
166
|
-
? encodeRouteToPath(
|
|
167
|
-
// @ts-ignore
|
|
168
|
-
route, functionName == 'quoteExactOutput' // For exactOut must be true to ensure the routes are reversed.
|
|
158
|
+
const encodedRoute = route.protocol === Protocol.V3
|
|
159
|
+
? encodeRouteToPath(route, functionName == 'quoteExactOutput' // For exactOut must be true to ensure the routes are reversed.
|
|
169
160
|
)
|
|
170
|
-
: encodeMixedRouteToPath(
|
|
171
|
-
// @ts-ignore
|
|
172
|
-
route instanceof V2Route
|
|
161
|
+
: encodeMixedRouteToPath(route instanceof V2Route
|
|
173
162
|
? new MixedRouteSDK(route.pairs, route.input, route.output)
|
|
174
163
|
: route);
|
|
175
164
|
const routeInputs = amounts.map((amount) => [
|
|
@@ -217,9 +206,8 @@ export class OnChainQuoteProvider {
|
|
|
217
206
|
const { inputs } = quoteState;
|
|
218
207
|
try {
|
|
219
208
|
totalCallsMade = totalCallsMade + 1;
|
|
220
|
-
const quoterAddress = this.getQuoterAddress(useMixedRouteQuoter, useUniV3RouteQuoter);
|
|
221
209
|
const results = await this.multicall2Provider.callSameFunctionOnContractWithMultipleParams({
|
|
222
|
-
address:
|
|
210
|
+
address: this.getQuoterAddress(useMixedRouteQuoter),
|
|
223
211
|
contractInterface: useMixedRouteQuoter
|
|
224
212
|
? IMixedRouteQuoterV1__factory.createInterface()
|
|
225
213
|
: IQuoterV2__factory.createInterface(),
|
|
@@ -504,7 +492,8 @@ export class OnChainQuoteProvider {
|
|
|
504
492
|
*/
|
|
505
493
|
validateRoutes(routes, functionName, useMixedRouteQuoter) {
|
|
506
494
|
/// We do not send any V3Routes to new qutoer becuase it is not deployed on chains besides mainnet
|
|
507
|
-
if (routes.some((route) =>
|
|
495
|
+
if (routes.some((route) => route.protocol === Protocol.V3) &&
|
|
496
|
+
useMixedRouteQuoter) {
|
|
508
497
|
throw new Error(`Cannot use mixed route quoter with V3 routes`);
|
|
509
498
|
}
|
|
510
499
|
/// We cannot call quoteExactOutput with V2 or Mixed routes
|
|
@@ -513,4 +502,4 @@ export class OnChainQuoteProvider {
|
|
|
513
502
|
}
|
|
514
503
|
}
|
|
515
504
|
}
|
|
516
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"on-chain-quote-provider.js","sourceRoot":"","sources":["../../../src/providers/on-chain-quote-provider.ts"],"names":[],"mappings":"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"}
|
|
505
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"on-chain-quote-provider.js","sourceRoot":"","sources":["../../../src/providers/on-chain-quote-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
2
|
-
import {
|
|
2
|
+
import { TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
3
|
import { SwapOptions, SwapRoute } from '../routers';
|
|
4
|
-
import { CurrencyAmount } from '../util';
|
|
4
|
+
import { ChainId, CurrencyAmount } from '../util';
|
|
5
5
|
import { ProviderConfig } from './provider';
|
|
6
6
|
import { ArbitrumGasData, OptimismGasData } from './v3/gas-data-provider';
|
|
7
7
|
export type SimulationResult = {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { TradeType } from '@x-swap-protocol/sdk-core';
|
|
2
|
+
import { PERMIT2_ADDRESS } from '../util/addresses';
|
|
3
3
|
import { BigNumber } from 'ethers/lib/ethers';
|
|
4
4
|
import { SwapType } from '../routers';
|
|
5
5
|
import { Erc20__factory } from '../types/other/factories/Erc20__factory';
|
|
6
6
|
import { Permit2__factory } from '../types/other/factories/Permit2__factory';
|
|
7
|
-
import { log } from '../util';
|
|
7
|
+
import { log, SWAP_ROUTER_02_ADDRESSES, } from '../util';
|
|
8
8
|
export var SimulationStatus;
|
|
9
9
|
(function (SimulationStatus) {
|
|
10
10
|
SimulationStatus[SimulationStatus["NotSupported"] = 0] = "NotSupported";
|
|
@@ -80,7 +80,7 @@ export class Simulator {
|
|
|
80
80
|
// Check token has approved Permit2 more than expected amount.
|
|
81
81
|
const tokenContract = Erc20__factory.connect(inputAmount.currency.wrapped.address, provider);
|
|
82
82
|
if (swapOptions.type == SwapType.UNIVERSAL_ROUTER) {
|
|
83
|
-
const permit2Allowance = await tokenContract.allowance(fromAddress,
|
|
83
|
+
const permit2Allowance = await tokenContract.allowance(fromAddress, PERMIT2_ADDRESS(this.chainId));
|
|
84
84
|
// If a permit has been provided we don't need to check if UR has already been allowed.
|
|
85
85
|
if (swapOptions.inputTokenPermit) {
|
|
86
86
|
log.info({
|
|
@@ -90,7 +90,7 @@ export class Simulator {
|
|
|
90
90
|
return permit2Allowance.gte(BigNumber.from(inputAmount.quotient.toString()));
|
|
91
91
|
}
|
|
92
92
|
// Check UR has been approved from Permit2.
|
|
93
|
-
const permit2Contract = Permit2__factory.connect(
|
|
93
|
+
const permit2Contract = Permit2__factory.connect(PERMIT2_ADDRESS(this.chainId), provider);
|
|
94
94
|
const { amount: universalRouterAllowance, expiration: tokenExpiration } = await permit2Contract.allowance(fromAddress, inputAmount.currency.wrapped.address, SWAP_ROUTER_02_ADDRESSES(this.chainId));
|
|
95
95
|
const nowTimestampS = Math.round(Date.now() / 1000);
|
|
96
96
|
const inputAmountBN = BigNumber.from(inputAmount.quotient.toString());
|
|
@@ -129,4 +129,4 @@ export class Simulator {
|
|
|
129
129
|
throw new Error(`Unsupported swap type ${swapOptions}`);
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltdWxhdGlvbi1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm92aWRlcnMvc2ltdWxhdGlvbi1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUU5QyxPQUFPLEVBQTBCLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDekUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDN0UsT0FBTyxFQUdMLEdBQUcsRUFDSCx3QkFBd0IsR0FDekIsTUFBTSxTQUFTLENBQUM7QUFVakIsTUFBTSxDQUFOLElBQVksZ0JBTVg7QUFORCxXQUFZLGdCQUFnQjtJQUMxQix1RUFBZ0IsQ0FBQTtJQUNoQiwyREFBVSxDQUFBO0lBQ1YsaUVBQWEsQ0FBQTtJQUNiLHFGQUF1QixDQUFBO0lBQ3ZCLHFFQUFlLENBQUE7QUFDakIsQ0FBQyxFQU5XLGdCQUFnQixLQUFoQixnQkFBZ0IsUUFNM0I7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sT0FBZ0IsU0FBUztJQUc3Qjs7O09BR0c7SUFDSCxZQUFZLFFBQXlCLEVBQVksT0FBZ0I7UUFBaEIsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUMvRCxJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztJQUMzQixDQUFDO0lBRU0sS0FBSyxDQUFDLFFBQVEsQ0FDbkIsV0FBbUIsRUFDbkIsV0FBd0IsRUFDeEIsU0FBb0IsRUFDcEIsTUFBc0IsRUFDdEIsS0FBcUI7UUFFckIsSUFDRSxNQUFNLElBQUksQ0FBQyx3QkFBd0IsQ0FDakMsV0FBVyxF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
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ApprovalTypes } from '@x-swap-protocol/router-sdk';
|
|
2
|
-
import {
|
|
2
|
+
import { Currency, CurrencyAmount } from '@x-swap-protocol/sdk-core';
|
|
3
|
+
import { ChainId } from '../util';
|
|
3
4
|
import { IMulticallProvider } from './multicall-provider';
|
|
4
5
|
type TokenApprovalTypes = {
|
|
5
6
|
approvalTokenIn: ApprovalTypes;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { SWAP_ROUTER_02_ADDRESSES, } from '@x-swap-protocol/sdk-core';
|
|
2
1
|
import { SwapRouter02__factory } from '../types/other/factories/SwapRouter02__factory';
|
|
3
|
-
import { log } from '../util';
|
|
2
|
+
import { log, SWAP_ROUTER_02_ADDRESSES } from '../util';
|
|
4
3
|
export class SwapRouterProvider {
|
|
5
4
|
constructor(multicall2Provider, chainId) {
|
|
6
5
|
this.multicall2Provider = multicall2Provider;
|
|
@@ -36,4 +35,4 @@ export class SwapRouterProvider {
|
|
|
36
35
|
};
|
|
37
36
|
}
|
|
38
37
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3dhcC1yb3V0ZXItcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3N3YXAtcm91dGVyLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGdEQUFnRCxDQUFDO0FBQ3ZGLE9BQU8sRUFBVyxHQUFHLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxTQUFTLENBQUM7QUE2QmpFLE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFDWSxrQkFBc0MsRUFDdEMsT0FBZ0I7UUFEaEIsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN0QyxZQUFPLEdBQVAsT0FBTyxDQUFTO0lBQ3hCLENBQUM7SUFFRSxLQUFLLENBQUMsZUFBZSxDQUMxQixhQUF1QyxFQUN2QyxjQUF3Qzs7UUFFeEMsTUFBTSxjQUFjLEdBQXVCO1lBQ3pDO2dCQUNFLGFBQWEsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE9BQU87Z0JBQ3RDLGFBQWEsQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFO2FBQ2xDO1lBQ0Q7Z0JBQ0UsY0FBYyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsT0FBTztnQkFDdkMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUU7YUFDbkM7U0FDRixDQUFDO1FBRUYsTUFBTSxFQUFFLEdBQ04sTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsNENBQTRDLENBR3hFO1lBQ0EsT0FBTyxFQUFFLHdCQUF3QixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDL0MsaUJBQWlCLEVBQUUscUJBQXFCLENBQUMsZUFBZSxFQUFFO1lBQzFELFlBQVksRUFBRSxpQkFBaUI7WUFDL0IsY0FBYztTQUNmLENBQUMsQ0FBQztRQUVMLElBQUksQ0FBQyxDQUFBLE1BQUEsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsMENBQUUsT0FBTyxDQUFBLElBQUksQ0FBQyxDQUFBLE1BQUEsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsMENBQUUsT0FBTyxDQUFBLEVBQUU7WUFDdEQsR0FBRyxDQUFDLElBQUksQ0FDTixFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQ3ZCLHdFQUF3RSxDQUN6RSxDQUFDO1lBQ0YsTUFBTSxJQUFJLEtBQUssQ0FDYix3RUFBd0UsQ0FDekUsQ0FBQztTQUNIO1FBRUQsTUFBTSxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ25ELE1BQU0sRUFBRSxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRXBELE9BQU87WUFDTCxlQUFlLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQztZQUNuQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7U0FDdEMsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
2
|
-
import { ChainId } from '@x-swap-protocol/sdk-core';
|
|
3
2
|
import { SwapOptions, SwapRoute } from '../routers';
|
|
3
|
+
import { ChainId } from '../util';
|
|
4
4
|
import { EthEstimateGasSimulator } from './eth-estimate-gas-provider';
|
|
5
5
|
import { SimulationResult, Simulator } from './simulation-provider';
|
|
6
6
|
import { IV2PoolProvider } from './v2/pool-provider';
|