@xspswap/smart-order-router 1.1.4 → 1.2.1-beta.2
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/README.md +5 -0
- package/build/main/providers/caching-token-provider.js +2 -2
- package/build/main/providers/on-chain-quote-provider.js +2 -1
- package/build/main/providers/token-provider.d.ts +7 -12
- package/build/main/providers/token-provider.js +11 -26
- package/build/main/providers/v2/caching-pool-provider.js +1 -1
- package/build/main/providers/v2/pool-provider.d.ts +12 -3
- package/build/main/providers/v2/pool-provider.js +11 -10
- package/build/main/providers/v2/quote-provider.js +2 -2
- package/build/main/providers/v2/static-subgraph-provider.js +4 -16
- package/build/main/providers/v2/subgraph-provider-with-fallback.js +2 -1
- package/build/main/providers/v2-fathom/constants.d.ts +2 -0
- package/build/main/providers/v2-fathom/constants.js +6 -0
- package/build/main/providers/v2-fathom/static-subgraph-provider.d.ts +23 -0
- package/build/main/providers/v2-fathom/static-subgraph-provider.js +170 -0
- package/build/main/providers/v2-fathom/subgraph-provider.d.ts +35 -0
- package/build/main/providers/v2-fathom/subgraph-provider.js +130 -0
- package/build/main/providers/v2-fathom/utils.d.ts +2 -0
- package/build/main/providers/v2-fathom/utils.js +14 -0
- package/build/main/providers/v3/pool-provider.js +3 -2
- package/build/main/providers/v3/static-subgraph-provider.js +33 -82
- package/build/main/routers/alpha-router/alpha-router.d.ts +10 -2
- package/build/main/routers/alpha-router/alpha-router.js +43 -14
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.d.ts +4 -3
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.js +3 -3
- package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts +2 -1
- 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 -1
- package/build/main/routers/alpha-router/functions/get-candidate-pools.js +11 -3
- package/build/main/routers/alpha-router/quoters/base-quoter.d.ts +3 -1
- package/build/main/routers/alpha-router/quoters/base-quoter.js +3 -2
- package/build/main/routers/alpha-router/quoters/mixed-quoter.js +3 -2
- package/build/main/routers/alpha-router/quoters/v2-quoter.d.ts +2 -1
- package/build/main/routers/alpha-router/quoters/v2-quoter.js +10 -4
- package/build/main/routers/alpha-router/quoters/v3-quoter.js +3 -2
- package/build/main/routers/legacy-router/legacy-router.js +1 -1
- package/build/main/routers/router.d.ts +5 -3
- package/build/main/routers/router.js +5 -5
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/gas-factory-helpers.d.ts +1 -1
- package/build/main/util/gas-factory-helpers.js +4 -2
- package/build/main/util/methodParameters.js +3 -2
- package/build/main/util/protocols.js +3 -1
- package/build/main/util/routes.js +5 -2
- package/build/module/providers/caching-token-provider.js +3 -3
- package/build/module/providers/on-chain-quote-provider.js +2 -1
- package/build/module/providers/token-provider.d.ts +7 -12
- package/build/module/providers/token-provider.js +10 -24
- package/build/module/providers/v2/caching-pool-provider.js +1 -1
- package/build/module/providers/v2/pool-provider.d.ts +12 -3
- package/build/module/providers/v2/pool-provider.js +11 -10
- package/build/module/providers/v2/quote-provider.js +2 -2
- package/build/module/providers/v2/static-subgraph-provider.js +5 -17
- package/build/module/providers/v2/subgraph-provider-with-fallback.js +2 -1
- package/build/module/providers/v2-fathom/constants.d.ts +2 -0
- package/build/module/providers/v2-fathom/constants.js +3 -0
- package/build/module/providers/v2-fathom/static-subgraph-provider.d.ts +23 -0
- package/build/module/providers/v2-fathom/static-subgraph-provider.js +163 -0
- package/build/module/providers/v2-fathom/subgraph-provider.d.ts +35 -0
- package/build/module/providers/v2-fathom/subgraph-provider.js +131 -0
- package/build/module/providers/v2-fathom/utils.d.ts +2 -0
- package/build/module/providers/v2-fathom/utils.js +10 -0
- package/build/module/providers/v3/pool-provider.js +3 -2
- package/build/module/providers/v3/static-subgraph-provider.js +34 -83
- package/build/module/routers/alpha-router/alpha-router.d.ts +10 -2
- package/build/module/routers/alpha-router/alpha-router.js +43 -14
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.d.ts +4 -3
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.js +3 -3
- package/build/module/routers/alpha-router/functions/compute-all-routes.d.ts +2 -1
- 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 -1
- package/build/module/routers/alpha-router/functions/get-candidate-pools.js +11 -3
- package/build/module/routers/alpha-router/quoters/base-quoter.d.ts +3 -1
- package/build/module/routers/alpha-router/quoters/base-quoter.js +3 -2
- package/build/module/routers/alpha-router/quoters/mixed-quoter.js +3 -2
- package/build/module/routers/alpha-router/quoters/v2-quoter.d.ts +2 -1
- package/build/module/routers/alpha-router/quoters/v2-quoter.js +10 -4
- package/build/module/routers/alpha-router/quoters/v3-quoter.js +3 -2
- package/build/module/routers/legacy-router/legacy-router.js +2 -2
- package/build/module/routers/router.d.ts +5 -3
- package/build/module/routers/router.js +5 -5
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/gas-factory-helpers.d.ts +1 -1
- package/build/module/util/gas-factory-helpers.js +5 -3
- package/build/module/util/methodParameters.js +5 -4
- package/build/module/util/protocols.js +3 -1
- package/build/module/util/routes.js +5 -2
- package/package.json +7 -7
|
@@ -14,7 +14,8 @@ const __1 = require("..");
|
|
|
14
14
|
function buildTrade(tokenInCurrency, tokenOutCurrency, tradeType, routeAmounts) {
|
|
15
15
|
/// Removed partition because of new mixedRoutes
|
|
16
16
|
const v3RouteAmounts = lodash_1.default.filter(routeAmounts, (routeAmount) => routeAmount.protocol === router_sdk_1.Protocol.V3);
|
|
17
|
-
const v2RouteAmounts = lodash_1.default.filter(routeAmounts, (routeAmount) => routeAmount.protocol === router_sdk_1.Protocol.V2
|
|
17
|
+
const v2RouteAmounts = lodash_1.default.filter(routeAmounts, (routeAmount) => routeAmount.protocol === router_sdk_1.Protocol.V2 ||
|
|
18
|
+
routeAmount.protocol === router_sdk_1.Protocol.FATHOM);
|
|
18
19
|
const mixedRouteAmounts = lodash_1.default.filter(routeAmounts, (routeAmount) => routeAmount.protocol === router_sdk_1.Protocol.MIXED);
|
|
19
20
|
const v3Routes = lodash_1.default.map(v3RouteAmounts, (routeAmount) => {
|
|
20
21
|
const { route, amount, quote } = routeAmount;
|
|
@@ -105,4 +106,4 @@ function buildSwapMethodParameters(trade, swapConfig, chainId) {
|
|
|
105
106
|
throw new Error(`Unsupported swap type ${swapConfig}`);
|
|
106
107
|
}
|
|
107
108
|
exports.buildSwapMethodParameters = buildSwapMethodParameters;
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0aG9kUGFyYW1ldGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlsL21ldGhvZFBhcmFtZXRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNERBS3FDO0FBQ3JDLHdEQUFnRTtBQUNoRSxnRkFBcUY7QUFDckYsb0RBQThEO0FBQzlELG9EQUE4RDtBQUM5RCxvREFBdUI7QUFFdkIsMEJBWVk7QUFFWixTQUFnQixVQUFVLENBQ3hCLGVBQXlCLEVBQ3pCLGdCQUEwQixFQUMxQixTQUFxQixFQUNyQixZQUFtQztJQUVuQyxnREFBZ0Q7SUFDaEQsTUFBTSxjQUFjLEdBQUcsZ0JBQUMsQ0FBQyxNQUFNLENBQzdCLFlBQVksRUFDWixDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLFFBQVEsS0FBSyxxQkFBUSxDQUFDLEVBQUUsQ0FDdEQsQ0FBQztJQUNGLE1BQU0sY0FBYyxHQUFHLGdCQUFDLENBQUMsTUFBTSxDQUM3QixZQUFZLEVBQ1osQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUNkLFdBQVcsQ0FBQyxRQUFRLEtBQUsscUJBQVEsQ0FBQyxFQUFFO1FBQ3BDLFdBQVcsQ0FBQyxRQUFRLEtBQUsscUJBQVEsQ0FBQyxNQUFNLENBQzNDLENBQUM7SUFDRixNQUFNLGlCQUFpQixHQUFHLGdCQUFDLENBQUMsTUFBTSxDQUNoQyxZQUFZLEVBQ1osQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEtBQUsscUJBQVEsQ0FBQyxLQUFLLENBQ3pELENBQUM7SUFFRixNQUFNLFFBQVEsR0FBRyxnQkFBQyxDQUFDLEdBQUcsQ0FRcEIsY0FBeUMsRUFDekMsQ0FBQyxXQUFrQyxFQUFFLEVBQUU7UUFDckMsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsV0FBVyxDQUFDO1FBRTdDLGtFQUFrRTtRQUNsRSx1RUFBdUU7UUFDdkUsa0dBQWtHO1FB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
|
|
@@ -8,6 +8,8 @@ const TO_PROTOCOL = (protocol) => {
|
|
|
8
8
|
return router_sdk_1.Protocol.V3;
|
|
9
9
|
case 'v2':
|
|
10
10
|
return router_sdk_1.Protocol.V2;
|
|
11
|
+
case 'fathom':
|
|
12
|
+
return router_sdk_1.Protocol.FATHOM;
|
|
11
13
|
case 'mixed':
|
|
12
14
|
return router_sdk_1.Protocol.MIXED;
|
|
13
15
|
default:
|
|
@@ -15,4 +17,4 @@ const TO_PROTOCOL = (protocol) => {
|
|
|
15
17
|
}
|
|
16
18
|
};
|
|
17
19
|
exports.TO_PROTOCOL = TO_PROTOCOL;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWwvcHJvdG9jb2xzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDREQUF1RDtBQUVoRCxNQUFNLFdBQVcsR0FBRyxDQUFDLFFBQWdCLEVBQVksRUFBRTtJQUN4RCxRQUFRLFFBQVEsQ0FBQyxXQUFXLEVBQUUsRUFBRTtRQUM5QixLQUFLLElBQUk7WUFDUCxPQUFPLHFCQUFRLENBQUMsRUFBRSxDQUFDO1FBQ3JCLEtBQUssSUFBSTtZQUNQLE9BQU8scUJBQVEsQ0FBQyxFQUFFLENBQUM7UUFDckIsS0FBSyxRQUFRO1lBQ1gsT0FBTyxxQkFBUSxDQUFDLE1BQU0sQ0FBQztRQUN6QixLQUFLLE9BQU87WUFDVixPQUFPLHFCQUFRLENBQUMsS0FBSyxDQUFDO1FBQ3hCO1lBQ0UsTUFBTSxJQUFJLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0tBQzdDO0FBQ0gsQ0FBQyxDQUFDO0FBYlcsUUFBQSxXQUFXLGVBYXRCIn0=
|
|
@@ -9,6 +9,7 @@ const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
|
9
9
|
const v2_sdk_1 = require("@x-swap-protocol/v2-sdk");
|
|
10
10
|
const v3_sdk_1 = require("@x-swap-protocol/v3-sdk");
|
|
11
11
|
const lodash_1 = __importDefault(require("lodash"));
|
|
12
|
+
const utils_1 = require("../providers/v2-fathom/utils");
|
|
12
13
|
const addresses_1 = require("./addresses");
|
|
13
14
|
const _1 = require(".");
|
|
14
15
|
const routeToString = (route) => {
|
|
@@ -24,7 +25,9 @@ const routeToString = (route) => {
|
|
|
24
25
|
const poolFeePath = lodash_1.default.map(pools, (pool) => {
|
|
25
26
|
return `${pool instanceof v3_sdk_1.Pool
|
|
26
27
|
? ` -- ${pool.fee / 10000}% [${v3_sdk_1.Pool.getAddress(pool.token0, pool.token1, pool.fee, undefined, addresses_1.V3_CORE_FACTORY_ADDRESSES[pool.chainId])}]`
|
|
27
|
-
:
|
|
28
|
+
: route.protocol === router_sdk_1.Protocol.FATHOM
|
|
29
|
+
? ` -- [${(0, utils_1.getFathomPoolAddress)(pool.token0, pool.token1)}]`
|
|
30
|
+
: ` -- [${v2_sdk_1.Pair.getAddress(pool.token0, pool.token1)}]`} --> `;
|
|
28
31
|
});
|
|
29
32
|
for (let i = 0; i < tokenPath.length; i++) {
|
|
30
33
|
routeStr.push(tokenPath[i]);
|
|
@@ -57,4 +60,4 @@ const poolToString = (p) => {
|
|
|
57
60
|
return `${p.token0.symbol}/${p.token1.symbol}${p instanceof v3_sdk_1.Pool ? `/${p.fee / 10000}%` : ``}`;
|
|
58
61
|
};
|
|
59
62
|
exports.poolToString = poolToString;
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWwvcm91dGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDREQUF1RDtBQUN2RCx3REFBb0Q7QUFDcEQsb0RBQStDO0FBQy9DLG9EQUErQztBQUMvQyxvREFBdUI7QUFFdkIsd0RBQW9FO0FBSXBFLDJDQUF3RDtBQUV4RCx3QkFBbUM7QUFFNUIsTUFBTSxhQUFhLEdBQUcsQ0FDM0IsS0FBcUMsRUFDN0IsRUFBRTtJQUNWLE1BQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQztJQUNwQixNQUFNLE1BQU0sR0FDVixLQUFLLENBQUMsUUFBUSxLQUFLLHFCQUFRLENBQUMsRUFBRTtRQUM1QixDQUFDLENBQUMsS0FBSyxDQUFDLFNBQVM7UUFDakIsQ0FBQyxDQUFDLG1DQUFtQztZQUNuQyxLQUFLLENBQUMsSUFBSSxDQUFDO0lBQ2pCLE1BQU0sU0FBUyxHQUFHLGdCQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUM5RCxNQUFNLEtBQUssR0FDVCxLQUFLLENBQUMsUUFBUSxLQUFLLHFCQUFRLENBQUMsRUFBRSxJQUFJLEtBQUssQ0FBQyxRQUFRLEtBQUsscUJBQVEsQ0FBQyxLQUFLO1FBQ2pFLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSztRQUNiLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDO0lBQ2xCLE1BQU0sV0FBVyxHQUFHLGdCQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ3hDLE9BQU8sR0FDTCxJQUFJLFlBQVksYUFBSTtZQUNsQixDQUFDLENBQUMsT0FBTyxJQUFJLENBQUMsR0FBRyxHQUFHLEtBQUssTUFBTSxhQUFJLENBQUMsVUFBVSxDQUMxQyxJQUFJLENBQUMsTUFBTSxF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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
2
|
import { ChainId, log, WRAPPED_NATIVE_CURRENCY } from '../util';
|
|
3
|
-
import { DAI_XDC_APOTHEM,
|
|
3
|
+
import { DAI_XDC_APOTHEM, USDC_XDC, USDC_XDC_APOTHEM, USDT_XDC_APOTHEM, } from './token-provider';
|
|
4
4
|
// These tokens will added to the Token cache on initialization.
|
|
5
5
|
export const CACHE_SEED_TOKENS = {
|
|
6
6
|
[ChainId.XDC_APOTHEM]: {
|
|
@@ -10,7 +10,7 @@ export const CACHE_SEED_TOKENS = {
|
|
|
10
10
|
WXDC: WRAPPED_NATIVE_CURRENCY[ChainId.XDC_APOTHEM],
|
|
11
11
|
},
|
|
12
12
|
[ChainId.XDC]: {
|
|
13
|
-
|
|
13
|
+
USDC: USDC_XDC,
|
|
14
14
|
WXDC: WRAPPED_NATIVE_CURRENCY[ChainId.XDC],
|
|
15
15
|
},
|
|
16
16
|
// Currently we do not have providers for Moonbeam mainnet or Gnosis testnet
|
|
@@ -103,4 +103,4 @@ export class CachingTokenProviderWithFallback {
|
|
|
103
103
|
};
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy10b2tlbi1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm92aWRlcnMvY2FjaGluZy10b2tlbi1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFHaEUsT0FBTyxFQUNMLGVBQWUsRUFHZixRQUFRLEVBQ1IsZ0JBQWdCLEVBQ2hCLGdCQUFnQixHQUNqQixNQUFNLGtCQUFrQixDQUFDO0FBRTFCLGdFQUFnRTtBQUNoRSxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FFMUI7SUFDRixDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRTtRQUNyQixJQUFJLEVBQUUsZ0JBQWdCO1FBQ3RCLElBQUksRUFBRSxnQkFBZ0I7UUFDdEIsR0FBRyxFQUFFLGVBQWU7UUFDcEIsSUFBSSxFQUFFLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUM7S0FDbkQ7SUFDRCxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNiLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBSSxFQUFFLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUM7S0FDM0M7SUFFRCw0RUFBNEU7Q0FDN0UsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxnQ0FBZ0M7SUFJM0MsWUFDWSxPQUFnQjtJQUMxQix3RkFBd0Y7SUFDeEYseUVBQXlFO0lBQ2pFLFVBQXlCLEVBQ3ZCLG9CQUFvQyxFQUNwQyxxQkFBc0M7UUFMdEMsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUdsQixlQUFVLEdBQVYsVUFBVSxDQUFlO1FBQ3ZCLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBZ0I7UUFDcEMsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUFpQjtRQVQxQyxjQUFT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
|
|
@@ -140,6 +140,7 @@ export class OnChainQuoteProvider {
|
|
|
140
140
|
}
|
|
141
141
|
async getQuotesManyData(amounts, routes, functionName, _providerConfig) {
|
|
142
142
|
var _a;
|
|
143
|
+
//todo: mixed
|
|
143
144
|
const useMixedRouteQuoter = routes.some((route) => route.protocol === Protocol.V2) ||
|
|
144
145
|
routes.some((route) => route.protocol === Protocol.MIXED);
|
|
145
146
|
/// Validate that there are no incorrect routes / function combinations
|
|
@@ -502,4 +503,4 @@ export class OnChainQuoteProvider {
|
|
|
502
503
|
}
|
|
503
504
|
}
|
|
504
505
|
}
|
|
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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"}
|
|
506
|
+
//# 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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"}
|
|
@@ -28,30 +28,26 @@ export declare const USDC_XDC_APOTHEM: Token;
|
|
|
28
28
|
export declare const DAI_XDC_APOTHEM: Token;
|
|
29
29
|
export declare const WBTC_XDC_APOTHEM: Token;
|
|
30
30
|
export declare const XSP_XDC: Token;
|
|
31
|
-
export declare const XTT_XDC: Token;
|
|
32
31
|
export declare const SRX_XDC: Token;
|
|
33
32
|
export declare const PLI_XDC: Token;
|
|
34
|
-
export declare const EURS_XDC: Token;
|
|
35
|
-
export declare const PRNT_XDC: Token;
|
|
36
33
|
export declare const USDT_XDC: Token;
|
|
34
|
+
export declare const EURS_XDC: Token;
|
|
37
35
|
export declare const USDC_XDC: Token;
|
|
38
|
-
export declare const FTHM_XDC: Token;
|
|
39
36
|
export declare const FXD_XDC: Token;
|
|
40
37
|
export declare const WXDC_XDC: Token;
|
|
41
38
|
export declare const DOPU_XDC: Token;
|
|
42
|
-
export declare const
|
|
39
|
+
export declare const psXDC_XDC: Token;
|
|
43
40
|
export declare const GAMA_XDC: Token;
|
|
44
|
-
export declare const BTCx_XDC: Token;
|
|
45
41
|
export declare const BBB_XDC: Token;
|
|
46
42
|
export declare const LBT_XDC: Token;
|
|
47
43
|
export declare const CGO_XDC: Token;
|
|
48
44
|
export declare const CHUPAV2_XDC: Token;
|
|
49
|
-
export declare const
|
|
50
|
-
export declare const
|
|
51
|
-
export declare const
|
|
52
|
-
export declare const
|
|
45
|
+
export declare const AVR_XDC: Token;
|
|
46
|
+
export declare const ROXN_XDC: Token;
|
|
47
|
+
export declare const GLL_XDC: Token;
|
|
48
|
+
export declare const TIVO_XDC: Token;
|
|
53
49
|
export declare const PWM3_XDC: Token;
|
|
54
|
-
export declare const
|
|
50
|
+
export declare const EEG_XDC: Token;
|
|
55
51
|
export declare class TokenProvider implements ITokenProvider {
|
|
56
52
|
private chainId;
|
|
57
53
|
protected multicall2Provider: IMulticallProvider;
|
|
@@ -59,6 +55,5 @@ export declare class TokenProvider implements ITokenProvider {
|
|
|
59
55
|
getTokens(_addresses: string[], providerConfig?: ProviderConfig): Promise<TokenAccessor>;
|
|
60
56
|
}
|
|
61
57
|
export declare const DAI_ON: (chainId: ChainId) => Token;
|
|
62
|
-
export declare const USDT_ON: (chainId: ChainId) => Token;
|
|
63
58
|
export declare const USDC_ON: (chainId: ChainId) => Token;
|
|
64
59
|
export declare const WNATIVE_ON: (chainId: ChainId) => Token;
|
|
@@ -8,31 +8,27 @@ export const USDC_XDC_APOTHEM = new Token(ChainId.XDC_APOTHEM, '0xDF5038D080Ca5b
|
|
|
8
8
|
export const DAI_XDC_APOTHEM = new Token(ChainId.XDC_APOTHEM, '0xE46554Ad93a7046C85f2dA0C20EbD68e41f11b36', 18, 'DAI', 'DAI Stablecoin on XDC testnet');
|
|
9
9
|
export const WBTC_XDC_APOTHEM = new Token(ChainId.XDC_APOTHEM, '0x885c04a08FbE1C6059f407E36c35B165704D1A03', 8, 'WBTC', 'Wrapped BTC');
|
|
10
10
|
export const XSP_XDC = new Token(ChainId.XDC, '0x36726235dAdbdb4658D33E62a249dCA7c4B2bC68', 18, 'XSP', 'XSwap Protocol');
|
|
11
|
-
export const XTT_XDC = new Token(ChainId.XDC, '0x17476dc3eda45aD916cEAdDeA325B240A7FB259D', 18, 'XTT', 'XSwap Treasury Token');
|
|
12
11
|
export const SRX_XDC = new Token(ChainId.XDC, '0x5D5f074837f5d4618B3916ba74De1Bf9662a3fEd', 18, 'SRX', 'StoreX');
|
|
13
12
|
export const PLI_XDC = new Token(ChainId.XDC, '0xff7412ea7c8445c46a8254dfb557ac1e48094391', 18, 'PLI', 'Plugin');
|
|
14
|
-
export const EURS_XDC = new Token(ChainId.XDC, '0x1eBb2C8a71A9ec59bF558886a8Adf8F4a565814F', 2, 'EURS', 'STASIS EURO');
|
|
15
|
-
export const PRNT_XDC = new Token(ChainId.XDC, '0x0e11710aad67e7427cfbc12c353284c2e335f62c', 18, 'PRNT', 'PrimeNumbers Token');
|
|
16
13
|
export const USDT_XDC = new Token(ChainId.XDC, '0xd4b5f10d61916bd6e0860144a91ac658de8a1437', 6, 'xUSDT', 'USDT@xinfin');
|
|
17
|
-
export const
|
|
18
|
-
export const
|
|
14
|
+
export const EURS_XDC = new Token(ChainId.XDC, '0x1eBb2C8a71A9ec59bF558886a8Adf8F4a565814F', 2, 'EURS', 'STASIS EURO');
|
|
15
|
+
export const USDC_XDC = new Token(ChainId.XDC, '0xfA2958CB79b0491CC627c1557F441eF849Ca8eb1', 6, 'USDC', 'USDC');
|
|
19
16
|
export const FXD_XDC = new Token(ChainId.XDC, '0x49d3f7543335cf38Fa10889CCFF10207e22110B5', 18, 'FXD', 'Fathom USD');
|
|
20
17
|
export const WXDC_XDC = new Token(ChainId.XDC, '0x951857744785e80e2de051c32ee7b25f9c458c42', 18, 'WXDC', 'Wrapped XDC');
|
|
21
18
|
export const DOPU_XDC = new Token(ChainId.XDC, '0x3fB46c4Db76d8E9f69F3F8388f43a7CA7E140807', 18, 'DOPU', 'Dog with a Purpose');
|
|
22
|
-
export const
|
|
23
|
-
export const GAMA_XDC = new Token(ChainId.XDC, '
|
|
24
|
-
export const BTCx_XDC = new Token(ChainId.XDC, '0xb6E57fBB2D44092f75d9da2769FFc788ce931320', 18, 'BTCx', 'BitcoinX');
|
|
19
|
+
export const psXDC_XDC = new Token(ChainId.XDC, '0x9B8e12b0BAC165B86967E771d98B520Ec3F665A6', 18, 'psXDC', 'PrimeStakedXDC');
|
|
20
|
+
export const GAMA_XDC = new Token(ChainId.XDC, '0x3a170C7C987F55C84f28733Bfa27962D8CdD5D3B', 18, 'GAMA', 'Gama Token');
|
|
25
21
|
export const BBB_XDC = new Token(ChainId.XDC, '0xFa4dDcFa8E3d0475f544d0de469277CF6e0A6Fd1', 18, 'BBB', 'Beny Bad Boy');
|
|
26
22
|
export const LBT_XDC = new Token(ChainId.XDC, '0x05940B2dF33D6371201e7Ae099CeD4C363855dFE', 18, 'LBT', 'Law Block');
|
|
27
23
|
export const CGO_XDC = new Token(ChainId.XDC, '0x8f9920283470F52128bF11B0c14E798bE704fD15', 18, 'CGO', 'Comtech Gold');
|
|
28
24
|
// Chupa v2
|
|
29
25
|
export const CHUPAV2_XDC = new Token(ChainId.XDC, '0xCF071288cC70D737105c97485F9820668EAcCa51', 18, 'CHUPAV2', 'ChupaCabraV2');
|
|
30
|
-
export const
|
|
31
|
-
export const
|
|
32
|
-
export const
|
|
33
|
-
export const
|
|
26
|
+
export const AVR_XDC = new Token(ChainId.XDC, '0x92bb5d72bd65E8BAD36405D7C3D1497015A41160', 18, 'AVR', 'Avatar');
|
|
27
|
+
export const ROXN_XDC = new Token(ChainId.XDC, '0x2d1C02Cf9e7a1659b82185feF243078BfD237B23', 18, 'ROXN', 'Roxonn Token');
|
|
28
|
+
export const GLL_XDC = new Token(ChainId.XDC, '0xc6126EBFa8B5fFD41561C086979c97416969CeBF', 18, 'GLL', 'Growlimitless');
|
|
29
|
+
export const TIVO_XDC = new Token(ChainId.XDC, '0x765087A2360F4D1F516De6552970256F9DB64827', 18, 'Tivo', 'Tivo Token');
|
|
34
30
|
export const PWM3_XDC = new Token(ChainId.XDC, '0xB2b2aaB80f9fcD8f2bcA8A404Cbbf72A618897c0', 18, 'PWM3', 'Diamondium Private Currency');
|
|
35
|
-
export const
|
|
31
|
+
export const EEG_XDC = new Token(ChainId.XDC, '0xAec5Eaf63402BF842D8642d917685e5ad3BA14bb', 18, 'EEG', 'EquitEdge ERC20 Token');
|
|
36
32
|
export class TokenProvider {
|
|
37
33
|
constructor(chainId, multicall2Provider) {
|
|
38
34
|
this.chainId = chainId;
|
|
@@ -104,16 +100,6 @@ export const DAI_ON = (chainId) => {
|
|
|
104
100
|
throw new Error(`Chain id: ${chainId} not supported`);
|
|
105
101
|
}
|
|
106
102
|
};
|
|
107
|
-
export const USDT_ON = (chainId) => {
|
|
108
|
-
switch (chainId) {
|
|
109
|
-
case ChainId.XDC:
|
|
110
|
-
return USDT_XDC;
|
|
111
|
-
case ChainId.XDC_APOTHEM:
|
|
112
|
-
return USDT_XDC_APOTHEM;
|
|
113
|
-
default:
|
|
114
|
-
throw new Error(`Chain id: ${chainId} not supported`);
|
|
115
|
-
}
|
|
116
|
-
};
|
|
117
103
|
export const USDC_ON = (chainId) => {
|
|
118
104
|
switch (chainId) {
|
|
119
105
|
case ChainId.XDC:
|
|
@@ -127,4 +113,4 @@ export const USDC_ON = (chainId) => {
|
|
|
127
113
|
export const WNATIVE_ON = (chainId) => {
|
|
128
114
|
return WRAPPED_NATIVE_CURRENCY[chainId];
|
|
129
115
|
};
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4tcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3Rva2VuLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNsRCxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDeEYsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxTQUFTLENBQUM7QUErQmhFLG9FQUFvRTtBQUNwRSxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLEtBQUssQ0FDdkMsT0FBTyxDQUFDLFdBQVcsRUFDbkIsNENBQTRDLEVBQzVDLENBQUMsRUFDRCxNQUFNLEVBQ04sY0FBYyxDQUNmLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLEtBQUssQ0FDdkMsT0FBTyxDQUFDLFdBQVcsRUFDbkIsNENBQTRDLEVBQzVDLEVBQUUsRUFDRixNQUFNLEVBQ04sTUFBTSxDQUNQLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsSUFBSSxLQUFLLENBQ3RDLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLDRDQUE0QyxFQUM1QyxFQUFFLEVBQ0YsS0FBSyxFQUNMLCtCQUErQixDQUNoQyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxLQUFLLENBQ3ZDLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLDRDQUE0QyxFQUM1QyxDQUFDLEVBQ0QsTUFBTSxFQUNOLGFBQWEsQ0FDZCxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLElBQUksS0FBSyxDQUM5QixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxFQUFFLEVBQ0YsS0FBSyxFQUNMLGdCQUFnQixDQUNqQixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLElBQUksS0FBSyxDQUM5QixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxFQUFFLEVBQ0YsS0FBSyxFQUNMLFFBQVEsQ0FDVCxDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLElBQUksS0FBSyxDQUM5QixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxFQUFFLEVBQ0YsS0FBSyxFQUNMLFFBQVEsQ0FDVCxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLElBQUksS0FBSyxDQUMvQixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxDQUFDLEVBQ0QsT0FBTyxFQUNQLGFBQWEsQ0FDZCxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLElBQUksS0FBSyxDQUMvQixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxDQUFDLEVBQ0QsTUFBTSxFQUNOLGFBQWEsQ0FDZCxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLElBQUksS0FBSyxDQUMvQixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxDQUFDLEVBQ0QsTUFBTSxFQUNOLE1BQU0sQ0FDUCxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLElBQUksS0FBSyxDQUM5QixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxFQUFFLEVBQ0YsS0FBSyxFQUNMLFlBQVksQ0FDYixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLElBQUksS0FBSyxDQUMvQixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxFQUFFLEVBQ0YsTUFBTSxFQUNOLGFBQWEsQ0FDZCxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLElBQUksS0FBSyxDQUMvQixPQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxFQUFFLEVB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
|
|
@@ -78,4 +78,4 @@ export class CachingV2PoolProvider {
|
|
|
78
78
|
return this.poolProvider.getPoolAddress(tokenA, tokenB);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy1wb29sLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy92Mi9jYWNoaW5nLXBvb2wtcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBR3ZCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQU1yQzs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxxQkFBcUI7SUFJaEM7Ozs7O09BS0c7SUFDSCxZQUNZLE9BQWdCLEVBQ2hCLFlBQTZCO0lBQ3ZDLDZGQUE2RjtJQUM3RiwrQkFBK0I7SUFDL0IsNEZBQTRGO0lBQ3BGLEtBQTZDO1FBTDNDLFlBQU8sR0FBUCxPQUFPLENBQVM7UUFDaEIsaUJBQVksR0FBWixZQUFZLENBQWlCO1FBSS9CLFVBQUssR0FBTCxLQUFLLENBQXdDO1FBZi9DLGFBQVEsR0FBRyxDQUFDLE9BQWdCLEVBQUUsT0FBZSxFQUFFLEVBQUUsQ0FDdkQsUUFBUSxPQUFPLElBQUksT0FBTyxFQUFFLENBQUM7SUFlNUIsQ0FBQztJQUVHLEtBQUssQ0FBQyxRQUFRLENBQ25CLFVBQTRCLEVBQzVCLGNBQStCO1FBRS9CLE1BQU0sY0FBYyxHQUFnQixJQUFJLEdBQUcsRUFBVSxDQUFDO1FBQ3RELE1BQU0sb0JBQW9CLEdBQTBCLEVBQUUsQ0FBQztRQUN2RCxNQUFNLG1CQUFtQixHQUFhLEVBQUUsQ0FBQztRQUN6QyxNQUFNLGlCQUFpQixHQUFvQyxFQUFFLENBQUM7UUFFOUQsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFBLGNBQWMsYUFBZCxjQUFjLHVCQUFkLGNBQWMsQ0FBRSxXQUFXLENBQUEsQ0FBQztRQUV0RCxLQUFLLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLElBQUksVUFBVSxFQUFFO1lBQ3pDLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxH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
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
import { BigNumber } from '@ethersproject/bignumber';
|
|
1
2
|
import { Token } from '@x-swap-protocol/sdk-core';
|
|
2
|
-
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
3
|
+
import { FactoryConfig, Pair } from '@x-swap-protocol/v2-sdk';
|
|
3
4
|
import { Options as RetryOptions } from 'async-retry';
|
|
4
5
|
import { ChainId } from '../../util';
|
|
5
6
|
import { IMulticallProvider } from '../multicall-provider';
|
|
6
7
|
import { ProviderConfig } from '../provider';
|
|
8
|
+
export type IReserves = {
|
|
9
|
+
reserve0: BigNumber;
|
|
10
|
+
reserve1: BigNumber;
|
|
11
|
+
blockTimestampLast: number;
|
|
12
|
+
};
|
|
7
13
|
/**
|
|
8
14
|
* Provider for getting V2 pools.
|
|
9
15
|
*
|
|
@@ -42,14 +48,17 @@ export declare class V2PoolProvider implements IV2PoolProvider {
|
|
|
42
48
|
protected chainId: ChainId;
|
|
43
49
|
protected multicall2Provider: IMulticallProvider;
|
|
44
50
|
protected retryOptions: V2PoolRetryOptions;
|
|
51
|
+
protected factory?: FactoryConfig | undefined;
|
|
52
|
+
protected name?: string | undefined;
|
|
45
53
|
private POOL_ADDRESS_CACHE;
|
|
46
54
|
/**
|
|
47
55
|
* Creates an instance of V2PoolProvider.
|
|
48
56
|
* @param chainId The chain id to use.
|
|
49
57
|
* @param multicall2Provider The multicall provider to use to get the pools.
|
|
50
|
-
* @param retryOptions The retry options for each call to the multicall.
|
|
58
|
+
* @param [retryOptions] The retry options for each call to the multicall.
|
|
59
|
+
* @param {FactoryConfig} [factory] specific factory.
|
|
51
60
|
*/
|
|
52
|
-
constructor(chainId: ChainId, multicall2Provider: IMulticallProvider, retryOptions?:
|
|
61
|
+
constructor(chainId: ChainId, multicall2Provider: IMulticallProvider, retryOptions: V2PoolRetryOptions, factory?: FactoryConfig | undefined, name?: string | undefined);
|
|
53
62
|
getPools(tokenPairs: [Token, Token][], providerConfig?: ProviderConfig): Promise<V2PoolAccessor>;
|
|
54
63
|
getPoolAddress(tokenA: Token, tokenB: Token): {
|
|
55
64
|
poolAddress: string;
|
|
@@ -10,16 +10,15 @@ export class V2PoolProvider {
|
|
|
10
10
|
* Creates an instance of V2PoolProvider.
|
|
11
11
|
* @param chainId The chain id to use.
|
|
12
12
|
* @param multicall2Provider The multicall provider to use to get the pools.
|
|
13
|
-
* @param retryOptions The retry options for each call to the multicall.
|
|
13
|
+
* @param [retryOptions] The retry options for each call to the multicall.
|
|
14
|
+
* @param {FactoryConfig} [factory] specific factory.
|
|
14
15
|
*/
|
|
15
|
-
constructor(chainId, multicall2Provider, retryOptions
|
|
16
|
-
retries: 2,
|
|
17
|
-
minTimeout: 50,
|
|
18
|
-
maxTimeout: 500,
|
|
19
|
-
}) {
|
|
16
|
+
constructor(chainId, multicall2Provider, retryOptions, factory, name) {
|
|
20
17
|
this.chainId = chainId;
|
|
21
18
|
this.multicall2Provider = multicall2Provider;
|
|
22
19
|
this.retryOptions = retryOptions;
|
|
20
|
+
this.factory = factory;
|
|
21
|
+
this.name = name;
|
|
23
22
|
// Computing pool addresses is slow as it requires hashing, encoding etc.
|
|
24
23
|
// Addresses never change so can always be cached.
|
|
25
24
|
this.POOL_ADDRESS_CACHE = {};
|
|
@@ -54,7 +53,7 @@ export class V2PoolProvider {
|
|
|
54
53
|
}
|
|
55
54
|
const [token0, token1] = sortedTokenPairs[i];
|
|
56
55
|
const { reserve0, reserve1 } = reservesResult.result;
|
|
57
|
-
const pool = new Pair(CurrencyAmount.fromRawAmount(token0, reserve0.toString()), CurrencyAmount.fromRawAmount(token1, reserve1.toString()));
|
|
56
|
+
const pool = new Pair(CurrencyAmount.fromRawAmount(token0, reserve0.toString()), CurrencyAmount.fromRawAmount(token1, reserve1.toString()), this.factory);
|
|
58
57
|
const poolAddress = sortedPoolAddresses[i];
|
|
59
58
|
poolAddressToPool[poolAddress] = pool;
|
|
60
59
|
}
|
|
@@ -78,12 +77,14 @@ export class V2PoolProvider {
|
|
|
78
77
|
const [token0, token1] = tokenA.sortsBefore(tokenB)
|
|
79
78
|
? [tokenA, tokenB]
|
|
80
79
|
: [tokenB, tokenA];
|
|
81
|
-
const cacheKey = `${this.chainId}
|
|
80
|
+
const cacheKey = `${this.chainId}/` +
|
|
81
|
+
(this.factory ? 'Fathom' : 'XSwap') +
|
|
82
|
+
`/${token0.address}/${token1.address}`;
|
|
82
83
|
const cachedAddress = this.POOL_ADDRESS_CACHE[cacheKey];
|
|
83
84
|
if (cachedAddress) {
|
|
84
85
|
return { poolAddress: cachedAddress, token0, token1 };
|
|
85
86
|
}
|
|
86
|
-
const poolAddress = Pair.getAddress(token0, token1);
|
|
87
|
+
const poolAddress = Pair.getAddress(token0, token1, this.factory);
|
|
87
88
|
this.POOL_ADDRESS_CACHE[cacheKey] = poolAddress;
|
|
88
89
|
return { poolAddress, token0, token1 };
|
|
89
90
|
}
|
|
@@ -100,4 +101,4 @@ export class V2PoolProvider {
|
|
|
100
101
|
return results;
|
|
101
102
|
}
|
|
102
103
|
}
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9vbC1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvdjIvcG9vbC1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQWlCLElBQUksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzlELE9BQU8sS0FBa0MsTUFBTSxhQUFhLENBQUM7QUFDN0QsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBRXZCLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGtEQUFrRCxDQUFDO0FBQzNGLE9BQU8sRUFBVyxjQUFjLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDckQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWtEakQsTUFBTSxPQUFPLGNBQWM7SUFLekI7Ozs7OztPQU1HO0lBQ0gsWUFDWSxPQUFnQixFQUNoQixrQkFBc0MsRUFDdEMsWUFBZ0MsRUFDaEMsT0FBdUIsRUFDdkIsSUFBYTtRQUpiLFlBQU8sR0FBUCxPQUFPLENBQVM7UUFDaEIsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN0QyxpQkFBWSxHQUFaLFlBQVksQ0FBb0I7UUFDaEMsWUFBTyxHQUFQLE9BQU8sQ0FBZ0I7UUFDdkIsU0FBSSxHQUFKLElBQUksQ0FBUztRQWhCekIseUVBQXlFO1FBQ3pFLGtEQUFrRDtRQUMxQyx1QkFBa0IsR0FBOEIsRUFBRSxDQUFDO0lBZXhELENBQUM7SUFFRyxLQUFLLENBQUMsUUFBUSxDQUNuQixVQUE0QixFQUM1QixjQUErQjtRQUUvQixNQUFNLGNBQWMsR0FBZ0IsSUFBSSxHQUFHLEVBQVUsQ0FBQztRQUN0RCxNQUFNLGdCQUFnQixHQUEwQixFQUFFLENBQUM7UUFDbkQsTUFBTSxtQkFBbUIsR0FBYSxFQUFFLENBQUM7UUFFekMsS0FBSyxNQUFNLFNBQVMsSUFB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
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
2
|
import { TradeType } from '@x-swap-protocol/sdk-core';
|
|
3
3
|
import { InsufficientInputAmountError, InsufficientReservesError, } from '@x-swap-protocol/v2-sdk';
|
|
4
|
+
import { parseEther } from 'ethers/lib/utils';
|
|
4
5
|
import { CurrencyAmount } from '../../util/amounts';
|
|
5
6
|
import { log } from '../../util/log';
|
|
6
7
|
import { routeToString } from '../../util/routes';
|
|
7
|
-
import { parseEther } from 'ethers/lib/utils';
|
|
8
8
|
/**
|
|
9
9
|
* Computes quotes for V2 off-chain. Quotes are computed using the balances
|
|
10
10
|
* of the pools within each route provided.
|
|
@@ -98,4 +98,4 @@ export class V2QuoteProvider {
|
|
|
98
98
|
};
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVvdGUtcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3YyL3F1b3RlLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdEQsT0FBTyxFQUNMLDRCQUE0QixFQUM1Qix5QkFBeUIsR0FDMUIsTUFBTSx5QkFBeUIsQ0FBQztBQUNqQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFzQmxEOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQzFCLHlEQUF5RDtJQUN6RCxnQkFBZSxDQUFDO0lBQ2hCLHdEQUF3RDtJQUVqRCxLQUFLLENBQUMsb0JBQW9CLENBQy9CLFNBQTJCLEVBQzNCLE1BQWlCO1FBRWpCLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBRU0sS0FBSyxDQUFDLHFCQUFxQixDQUNoQyxVQUE0QixFQUM1QixNQUFpQjtRQUVqQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUVPLEtBQUssQ0FBQyxTQUFTLENBQ3JCLE9BQXlCLEVBQ3pCLE1BQWlCLEVBQ2pCLFNBQW9CO1FBRXBCLE1BQU0sZ0JBQWdCLEdBQXdCLEVBQUUsQ0FBQztRQUVqRCxN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
|