@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
|
@@ -9,19 +9,20 @@ const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
|
9
9
|
const v3_sdk_1 = require("@x-swap-protocol/v3-sdk");
|
|
10
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
11
|
const token_provider_1 = require("../../../providers/token-provider");
|
|
12
|
+
const util_1 = require("../../../util");
|
|
12
13
|
const amounts_1 = require("../../../util/amounts");
|
|
13
14
|
const log_1 = require("../../../util/log");
|
|
14
15
|
const metric_1 = require("../../../util/metric");
|
|
15
16
|
const baseTokensByChain = {
|
|
16
|
-
[
|
|
17
|
-
[
|
|
17
|
+
[util_1.ChainId.XDC]: [token_provider_1.WXDC_XDC, token_provider_1.USDT_XDC],
|
|
18
|
+
[util_1.ChainId.XDC_APOTHEM]: [
|
|
18
19
|
token_provider_1.DAI_XDC_APOTHEM,
|
|
19
20
|
token_provider_1.USDC_XDC_APOTHEM,
|
|
20
21
|
token_provider_1.USDT_XDC_APOTHEM,
|
|
21
22
|
token_provider_1.WBTC_XDC_APOTHEM,
|
|
22
23
|
],
|
|
23
24
|
};
|
|
24
|
-
async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId,
|
|
25
|
+
async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, }) {
|
|
25
26
|
var _a, _b, _c, _d;
|
|
26
27
|
const { blockNumber, v3PoolSelection: { topN, topNDirectSwaps, topNTokenInOut, topNSecondHop, topNSecondHopForTokenAddress, topNWithEachBaseToken, topNWithBaseToken, }, } = routingConfig;
|
|
27
28
|
const tokenInAddress = tokenIn.address.toLowerCase();
|
|
@@ -125,12 +126,13 @@ async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
125
126
|
});
|
|
126
127
|
}
|
|
127
128
|
addToAddressSet(top2DirectSwapPool);
|
|
128
|
-
const wrappedNativeAddress = (_b =
|
|
129
|
+
const wrappedNativeAddress = (_b = util_1.WRAPPED_NATIVE_CURRENCY[chainId]) === null || _b === void 0 ? void 0 : _b.address;
|
|
129
130
|
// Main reason we need this is for gas estimates, only needed if token out is not native.
|
|
130
131
|
// We don't check the seen address set because if we've already added pools for getting native quotes
|
|
131
132
|
// theres no need to add more.
|
|
132
133
|
let top2EthQuoteTokenPool = [];
|
|
133
|
-
if (((_c =
|
|
134
|
+
if (((_c = util_1.WRAPPED_NATIVE_CURRENCY[chainId]) === null || _c === void 0 ? void 0 : _c.symbol) ==
|
|
135
|
+
((_d = util_1.WRAPPED_NATIVE_CURRENCY[util_1.ChainId.XDC]) === null || _d === void 0 ? void 0 : _d.symbol) &&
|
|
134
136
|
tokenOut.symbol != 'WXDC' &&
|
|
135
137
|
tokenOut.symbol != 'XDC') {
|
|
136
138
|
top2EthQuoteTokenPool = (0, lodash_1.default)(subgraphPoolsSorted)
|
|
@@ -242,7 +244,7 @@ async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
242
244
|
});
|
|
243
245
|
const printV3SubgraphPool = (s) => {
|
|
244
246
|
var _a, _b, _c, _d;
|
|
245
|
-
return `${
|
|
247
|
+
return `${(_b = (_a = tokenAccessor.getTokenByAddress(s.token0.id)) === null || _a === void 0 ? void 0 : _a.symbol) !== null && _b !== void 0 ? _b : s.token0.id}/${(_d = (_c = tokenAccessor.getTokenByAddress(s.token1.id)) === null || _c === void 0 ? void 0 : _c.symbol) !== null && _d !== void 0 ? _d : s.token1.id}/${s.feeTier}`;
|
|
246
248
|
};
|
|
247
249
|
log_1.log.info({
|
|
248
250
|
topByBaseWithTokenIn: topByBaseWithTokenIn.map(printV3SubgraphPool),
|
|
@@ -254,7 +256,7 @@ async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
254
256
|
topByTVLUsingTokenOutSecondHops: topByTVLUsingTokenOutSecondHops.map(printV3SubgraphPool),
|
|
255
257
|
top2DirectSwap: top2DirectSwapPool.map(printV3SubgraphPool),
|
|
256
258
|
top2EthQuotePool: top2EthQuoteTokenPool.map(printV3SubgraphPool),
|
|
257
|
-
},
|
|
259
|
+
}, `V3 Candidate Pools`);
|
|
258
260
|
const tokenPairsRaw = lodash_1.default.map(subgraphPools, (subgraphPool) => {
|
|
259
261
|
const tokenA = tokenAccessor.getTokenByAddress(subgraphPool.token0.id);
|
|
260
262
|
const tokenB = tokenAccessor.getTokenByAddress(subgraphPool.token1.id);
|
|
@@ -263,11 +265,11 @@ async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
263
265
|
fee = (0, amounts_1.parseFeeAmount)(subgraphPool.feeTier);
|
|
264
266
|
}
|
|
265
267
|
catch (err) {
|
|
266
|
-
log_1.log.info({ subgraphPool }, `Dropping candidate pool for ${
|
|
268
|
+
log_1.log.info({ subgraphPool }, `Dropping candidate pool for ${subgraphPool.token0.id}/${subgraphPool.token1.id}/${subgraphPool.feeTier} because fee tier not supported`);
|
|
267
269
|
return undefined;
|
|
268
270
|
}
|
|
269
271
|
if (!tokenA || !tokenB) {
|
|
270
|
-
log_1.log.info(`Dropping candidate pool for ${
|
|
272
|
+
log_1.log.info(`Dropping candidate pool for ${subgraphPool.token0.id}/${subgraphPool.token1.id}/${fee} because ${tokenA ? subgraphPool.token1.id : subgraphPool.token0.id} not found by token provider`);
|
|
271
273
|
return undefined;
|
|
272
274
|
}
|
|
273
275
|
return [tokenA, tokenB, fee];
|
|
@@ -277,7 +279,7 @@ async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
277
279
|
const poolAccessor = await poolProvider.getPools(tokenPairs);
|
|
278
280
|
metric_1.metric.putMetric('V3PoolsLoad', Date.now() - beforePoolsLoad, metric_1.MetricLoggerUnit.Milliseconds);
|
|
279
281
|
const poolsBySelection = {
|
|
280
|
-
protocol,
|
|
282
|
+
protocol: router_sdk_1.Protocol.V3,
|
|
281
283
|
selections: {
|
|
282
284
|
topByBaseWithTokenIn,
|
|
283
285
|
topByBaseWithTokenOut,
|
|
@@ -293,7 +295,7 @@ async function getV3CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
293
295
|
return { poolAccessor, candidatePools: poolsBySelection, subgraphPools };
|
|
294
296
|
}
|
|
295
297
|
exports.getV3CandidatePools = getV3CandidatePools;
|
|
296
|
-
async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId,
|
|
298
|
+
async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig, subgraphProvider, tokenProvider, poolProvider, blockedTokenListProvider, chainId, }) {
|
|
297
299
|
var _a;
|
|
298
300
|
const { blockNumber, v2PoolSelection: { topN, topNDirectSwaps, topNTokenInOut, topNSecondHop, topNWithEachBaseToken, topNWithBaseToken, }, } = routingConfig;
|
|
299
301
|
const tokenInAddress = tokenIn.address.toLowerCase();
|
|
@@ -386,7 +388,7 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
386
388
|
];
|
|
387
389
|
}
|
|
388
390
|
addToAddressSet(topByDirectSwapPool);
|
|
389
|
-
const wethAddress =
|
|
391
|
+
const wethAddress = util_1.WRAPPED_NATIVE_CURRENCY[chainId].address;
|
|
390
392
|
// Main reason we need this is for gas estimates, only needed if token out is not ETH.
|
|
391
393
|
// We don't check the seen address set because if we've already added pools for getting ETH quotes
|
|
392
394
|
// theres no need to add more.
|
|
@@ -394,8 +396,6 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
394
396
|
let topByEthQuoteTokenPool = [];
|
|
395
397
|
if (tokenOut.symbol != 'WETH' &&
|
|
396
398
|
tokenOut.symbol != 'WETH9' &&
|
|
397
|
-
tokenOut.symbol != 'XDC' &&
|
|
398
|
-
tokenOut.symbol != 'WXDC' &&
|
|
399
399
|
tokenOut.symbol != 'ETH') {
|
|
400
400
|
topByEthQuoteTokenPool = (0, lodash_1.default)(subgraphPoolsSorted)
|
|
401
401
|
.filter((subgraphPool) => {
|
|
@@ -531,7 +531,7 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
531
531
|
const poolAccessor = await poolProvider.getPools(tokenPairs, { blockNumber });
|
|
532
532
|
metric_1.metric.putMetric('V2PoolsLoad', Date.now() - beforePoolsLoad, metric_1.MetricLoggerUnit.Milliseconds);
|
|
533
533
|
const poolsBySelection = {
|
|
534
|
-
protocol,
|
|
534
|
+
protocol: router_sdk_1.Protocol.V2,
|
|
535
535
|
selections: {
|
|
536
536
|
topByBaseWithTokenIn,
|
|
537
537
|
topByBaseWithTokenOut,
|
|
@@ -547,7 +547,7 @@ async function getV2CandidatePools({ tokenIn, tokenOut, routeType, routingConfig
|
|
|
547
547
|
return { poolAccessor, candidatePools: poolsBySelection, subgraphPools };
|
|
548
548
|
}
|
|
549
549
|
exports.getV2CandidatePools = getV2CandidatePools;
|
|
550
|
-
async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routingConfig, v3subgraphProvider, v2subgraphProvider, tokenProvider, v3poolProvider, v2poolProvider, blockedTokenListProvider, chainId,
|
|
550
|
+
async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routingConfig, v3subgraphProvider, v2subgraphProvider, tokenProvider, v3poolProvider, v2poolProvider, blockedTokenListProvider, chainId, }) {
|
|
551
551
|
const { blockNumber } = routingConfig;
|
|
552
552
|
const { subgraphPools: V3subgraphPools, candidatePools: V3candidatePools } = await getV3CandidatePools({
|
|
553
553
|
tokenIn,
|
|
@@ -559,7 +559,6 @@ async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routi
|
|
|
559
559
|
subgraphProvider: v3subgraphProvider,
|
|
560
560
|
routingConfig,
|
|
561
561
|
chainId,
|
|
562
|
-
protocol: protocol === router_sdk_1.Protocol.V3 ? router_sdk_1.Protocol.V3 : router_sdk_1.Protocol.UNI_V3,
|
|
563
562
|
});
|
|
564
563
|
const { subgraphPools: V2subgraphPools, candidatePools: V2candidatePools } = await getV2CandidatePools({
|
|
565
564
|
tokenIn,
|
|
@@ -571,7 +570,6 @@ async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routi
|
|
|
571
570
|
subgraphProvider: v2subgraphProvider,
|
|
572
571
|
routingConfig,
|
|
573
572
|
chainId,
|
|
574
|
-
protocol: router_sdk_1.Protocol.FATHOM, //todo: Is it ok
|
|
575
573
|
});
|
|
576
574
|
/**
|
|
577
575
|
* Main heuristic for pruning mixedRoutes:
|
|
@@ -702,4 +700,4 @@ async function getMixedRouteCandidatePools({ tokenIn, tokenOut, routeType, routi
|
|
|
702
700
|
};
|
|
703
701
|
}
|
|
704
702
|
exports.getMixedRouteCandidatePools = getMixedRouteCandidatePools;
|
|
705
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"get-candidate-pools.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/functions/get-candidate-pools.ts"],"names":[],"mappings":"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"}
|
|
703
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"get-candidate-pools.js","sourceRoot":"","sources":["../../../../../src/routers/alpha-router/functions/get-candidate-pools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import {
|
|
2
|
+
import { Token } from '@x-swap-protocol/sdk-core';
|
|
3
3
|
import { IV2PoolProvider } from '../../../providers/v2/pool-provider';
|
|
4
4
|
import { ArbitrumGasData, IL2GasDataProvider, OptimismGasData } from '../../../providers/v3/gas-data-provider';
|
|
5
5
|
import { IV3PoolProvider } from '../../../providers/v3/pool-provider';
|
|
6
6
|
import { CurrencyAmount } from '../../../util/amounts';
|
|
7
|
+
import { ChainId } from '../../../util/chains';
|
|
7
8
|
import { MixedRouteWithValidQuote, RouteWithValidQuote, V2RouteWithValidQuote, V3RouteWithValidQuote } from '../entities/route-with-valid-quote';
|
|
8
9
|
export declare const usdGasTokensByChain: {
|
|
9
10
|
[chainId in ChainId]?: Token[];
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.IOnChainGasModelFactory = exports.IV2GasModelFactory = exports.usdGasTokensByChain = void 0;
|
|
4
|
-
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
5
4
|
const token_provider_1 = require("../../../providers/token-provider");
|
|
5
|
+
const chains_1 = require("../../../util/chains");
|
|
6
6
|
exports.usdGasTokensByChain = {
|
|
7
7
|
// [ChainId.POLYGON]: [USDC_POLYGON],
|
|
8
|
-
[
|
|
9
|
-
[
|
|
8
|
+
[chains_1.ChainId.XDC_APOTHEM]: [token_provider_1.DAI_XDC_APOTHEM, token_provider_1.USDC_XDC_APOTHEM, token_provider_1.USDT_XDC_APOTHEM],
|
|
9
|
+
[chains_1.ChainId.XDC]: [token_provider_1.USDT_XDC],
|
|
10
10
|
};
|
|
11
11
|
/**
|
|
12
12
|
* Factory for building gas models that can be used with any route to generate
|
|
@@ -36,4 +36,4 @@ exports.IV2GasModelFactory = IV2GasModelFactory;
|
|
|
36
36
|
class IOnChainGasModelFactory {
|
|
37
37
|
}
|
|
38
38
|
exports.IOnChainGasModelFactory = IOnChainGasModelFactory;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzLW1vZGVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL2dhcy1tb2RlbHMvZ2FzLW1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLHNFQUsyQztBQVMzQyxpREFBK0M7QUFRbEMsUUFBQSxtQkFBbUIsR0FBdUM7SUFDckUscUNBQXFDO0lBQ3JDLENBQUMsZ0JBQU8sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLGdDQUFlLEVBQUUsaUNBQWdCLEVBQUUsaUNBQWdCLENBQUM7SUFDNUUsQ0FBQyxnQkFBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMseUJBQVEsQ0FBQztDQUMxQixDQUFDO0FBb0RGOzs7Ozs7Ozs7O0dBVUc7QUFDSCxNQUFzQixrQkFBa0I7Q0FPdkM7QUFQRCxnREFPQztBQUVEOzs7Ozs7Ozs7O0dBVUc7QUFDSCxNQUFzQix1QkFBdUI7Q0FZNUM7QUFaRCwwREFZQyJ9
|
package/build/main/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js
CHANGED
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.MixedRouteHeuristicGasModelFactory = void 0;
|
|
7
7
|
const bignumber_1 = require("@ethersproject/bignumber");
|
|
8
8
|
const router_sdk_1 = require("@x-swap-protocol/router-sdk");
|
|
9
|
-
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
10
9
|
const v2_sdk_1 = require("@x-swap-protocol/v2-sdk");
|
|
11
10
|
const v3_sdk_1 = require("@x-swap-protocol/v3-sdk");
|
|
12
11
|
const lodash_1 = __importDefault(require("lodash"));
|
|
12
|
+
const __1 = require("../../../..");
|
|
13
13
|
const util_1 = require("../../../../util");
|
|
14
14
|
const amounts_1 = require("../../../../util/amounts");
|
|
15
15
|
const gas_factory_helpers_1 = require("../../../../util/gas-factory-helpers");
|
|
@@ -43,7 +43,7 @@ class MixedRouteHeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFac
|
|
|
43
43
|
// If our quote token is WETH, we don't need to convert our gas use to be in terms
|
|
44
44
|
// of the quote token in order to produce a gas adjusted amount.
|
|
45
45
|
// We do return a gas use in USD however, so we still convert to usd.
|
|
46
|
-
const nativeCurrency =
|
|
46
|
+
const nativeCurrency = __1.WRAPPED_NATIVE_CURRENCY[chainId];
|
|
47
47
|
if (quoteToken.equals(nativeCurrency)) {
|
|
48
48
|
const estimateGasCost = (routeWithValidQuote) => {
|
|
49
49
|
const { totalGasCostNativeCurrency, baseGasUse } = this.estimateGas(routeWithValidQuote, gasPriceWei, chainId);
|
|
@@ -158,7 +158,7 @@ class MixedRouteHeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFac
|
|
|
158
158
|
// base estimate gas used based on chainId estimates for hops and ticks gas useage
|
|
159
159
|
baseGasUse = baseGasUse.add(tickGasUse).add(uninitializedTickGasUse);
|
|
160
160
|
const baseGasCostWei = gasPriceWei.mul(baseGasUse);
|
|
161
|
-
const wrappedCurrency =
|
|
161
|
+
const wrappedCurrency = __1.WRAPPED_NATIVE_CURRENCY[chainId];
|
|
162
162
|
const totalGasCostNativeCurrency = amounts_1.CurrencyAmount.fromRawAmount(wrappedCurrency, baseGasCostWei.toString());
|
|
163
163
|
return {
|
|
164
164
|
totalGasCostNativeCurrency,
|
|
@@ -168,4 +168,4 @@ class MixedRouteHeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFac
|
|
|
168
168
|
}
|
|
169
169
|
}
|
|
170
170
|
exports.MixedRouteHeuristicGasModelFactory = MixedRouteHeuristicGasModelFactory;
|
|
171
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
171
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4ZWQtcm91dGUtaGV1cmlzdGljLWdhcy1tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9nYXMtbW9kZWxzL21peGVkUm91dGUvbWl4ZWQtcm91dGUtaGV1cmlzdGljLWdhcy1tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBcUQ7QUFDckQsNERBQTRFO0FBQzVFLG9EQUErQztBQUMvQyxvREFBK0M7QUFDL0Msb0RBQXVCO0FBRXZCLG1DQUFzRDtBQUN0RCwyQ0FBZ0Q7QUFDaEQsc0RBQTBEO0FBQzFELDhFQUk4QztBQUU5Qyw0Q0FJc0I7QUFDdEIseUVBR3NDO0FBQ3RDLCtDQUt5QjtBQUV6Qjs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCxNQUFhLGtDQUFtQyxTQUFRLG1DQUF1QjtJQUM3RTtRQUNFLEtBQUssRUFBRSxDQUFDO0lBQ1YsQ0FBQztJQUVNLEtBQUssQ0FBQyxhQUFhLENBQUMsRUFDekIsT0FBTyxFQUNQLFdBQVcsRUFDWCxjQUFjLEVBQUUsY0FBYyxFQUM5QixVQUFVLEVBQ1YsY0FBYyxFQUFFLGNBQWMsR0FDRTtRQUdoQyxNQUFNLE9BQU8sR0FBUyxNQUFNLElBQUEsa0RBQTRCLEVBQ3RELE9BQU8sRUFDUCxjQUFjLENBQ2YsQ0FBQztRQUVGLGtGQUFrRjtRQUNsRixnRUFBZ0U7UUFDaEUscUVBQXFFO1FBQ3JFLE1BQU0sY0FBYyxHQUFHLDJCQUF1QixDQUFDLE9BQU8sQ0FBRSxDQUFDO1FBQ3pELElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsRUFBRTtZQUNyQyxNQUFNLGVBQWUsR0FBRyxDQUN0QixtQkFBNkMsRUFLN0MsRUFBRTtnQkFDRixNQUFNLEVBQUUsMEJBQTBCLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FDakUsbUJBQW1CLEVBQ25CLFdBQVcsRUFDWCxP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
|
|
@@ -5,15 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.V2HeuristicGasModelFactory = exports.COST_PER_EXTRA_HOP = exports.BASE_SWAP_COST = void 0;
|
|
7
7
|
const bignumber_1 = require("@ethersproject/bignumber");
|
|
8
|
-
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
9
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const util_1 = require("../../../../util");
|
|
11
10
|
const amounts_1 = require("../../../../util/amounts");
|
|
12
11
|
const gas_model_1 = require("../gas-model");
|
|
13
12
|
// Constant cost for doing any swap regardless of pools.
|
|
14
|
-
exports.BASE_SWAP_COST = bignumber_1.BigNumber.from(
|
|
13
|
+
exports.BASE_SWAP_COST = bignumber_1.BigNumber.from(135000); // 115000, bumped up by 20_000 @eric 7/8/2022
|
|
15
14
|
// Constant per extra hop in the route.
|
|
16
|
-
exports.COST_PER_EXTRA_HOP = bignumber_1.BigNumber.from(
|
|
15
|
+
exports.COST_PER_EXTRA_HOP = bignumber_1.BigNumber.from(50000); // 20000, bumped up by 30_000 @eric 7/8/2022
|
|
17
16
|
/**
|
|
18
17
|
* Computes a gas estimate for a V2 swap using heuristics.
|
|
19
18
|
* Considers number of hops in the route and the typical base cost for a swap.
|
|
@@ -36,12 +35,12 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
36
35
|
super();
|
|
37
36
|
}
|
|
38
37
|
async buildGasModel({ chainId, gasPriceWei, poolProvider, token, }) {
|
|
39
|
-
if (token.equals(
|
|
38
|
+
if (token.equals(util_1.WRAPPED_NATIVE_CURRENCY[chainId])) {
|
|
40
39
|
const usdPool = await this.getHighestLiquidityUSDPool(chainId, poolProvider);
|
|
41
40
|
return {
|
|
42
41
|
estimateGasCost: (routeWithValidQuote) => {
|
|
43
42
|
const { gasCostInEth, gasUse } = this.estimateGas(routeWithValidQuote, gasPriceWei, chainId);
|
|
44
|
-
const ethToken0 = usdPool.token0.address ==
|
|
43
|
+
const ethToken0 = usdPool.token0.address == util_1.WRAPPED_NATIVE_CURRENCY[chainId].address;
|
|
45
44
|
const ethTokenPrice = ethToken0
|
|
46
45
|
? usdPool.token0Price
|
|
47
46
|
: usdPool.token1Price;
|
|
@@ -63,7 +62,7 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
63
62
|
const usdPool = await this.getHighestLiquidityUSDPool(chainId, poolProvider);
|
|
64
63
|
return {
|
|
65
64
|
estimateGasCost: (routeWithValidQuote) => {
|
|
66
|
-
const usdToken = usdPool.token0.address ==
|
|
65
|
+
const usdToken = usdPool.token0.address == util_1.WRAPPED_NATIVE_CURRENCY[chainId].address
|
|
67
66
|
? usdPool.token1
|
|
68
67
|
: usdPool.token0;
|
|
69
68
|
const { gasCostInEth, gasUse } = this.estimateGas(routeWithValidQuote, gasPriceWei, chainId);
|
|
@@ -74,7 +73,7 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
74
73
|
gasCostInUSD: amounts_1.CurrencyAmount.fromRawAmount(usdToken, 0),
|
|
75
74
|
};
|
|
76
75
|
}
|
|
77
|
-
const ethToken0 = ethPool.token0.address ==
|
|
76
|
+
const ethToken0 = ethPool.token0.address == util_1.WRAPPED_NATIVE_CURRENCY[chainId].address;
|
|
78
77
|
const ethTokenPrice = ethToken0
|
|
79
78
|
? ethPool.token0Price
|
|
80
79
|
: ethPool.token1Price;
|
|
@@ -90,7 +89,7 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
90
89
|
}, 'Debug eth price token issue');
|
|
91
90
|
throw err;
|
|
92
91
|
}
|
|
93
|
-
const ethToken0USDPool = usdPool.token0.address ==
|
|
92
|
+
const ethToken0USDPool = usdPool.token0.address == util_1.WRAPPED_NATIVE_CURRENCY[chainId].address;
|
|
94
93
|
const ethTokenPriceUSDPool = ethToken0USDPool
|
|
95
94
|
? usdPool.token0Price
|
|
96
95
|
: usdPool.token1Price;
|
|
@@ -118,12 +117,12 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
118
117
|
const hops = routeWithValidQuote.route.pairs.length;
|
|
119
118
|
const gasUse = exports.BASE_SWAP_COST.add(exports.COST_PER_EXTRA_HOP.mul(hops - 1));
|
|
120
119
|
const totalGasCostWei = gasPriceWei.mul(gasUse);
|
|
121
|
-
const weth =
|
|
120
|
+
const weth = util_1.WRAPPED_NATIVE_CURRENCY[chainId];
|
|
122
121
|
const gasCostInEth = amounts_1.CurrencyAmount.fromRawAmount(weth, totalGasCostWei.toString());
|
|
123
122
|
return { gasCostInEth, gasUse };
|
|
124
123
|
}
|
|
125
124
|
async getEthPool(chainId, token, poolProvider) {
|
|
126
|
-
const weth =
|
|
125
|
+
const weth = util_1.WRAPPED_NATIVE_CURRENCY[chainId];
|
|
127
126
|
const poolAccessor = await poolProvider.getPools([[weth, token]]);
|
|
128
127
|
const pool = poolAccessor.getPool(weth, token);
|
|
129
128
|
if (!pool || pool.reserve0.equalTo(0) || pool.reserve1.equalTo(0)) {
|
|
@@ -144,7 +143,7 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
144
143
|
}
|
|
145
144
|
const usdPools = lodash_1.default.map(usdTokens, (usdToken) => [
|
|
146
145
|
usdToken,
|
|
147
|
-
|
|
146
|
+
util_1.WRAPPED_NATIVE_CURRENCY[chainId],
|
|
148
147
|
]);
|
|
149
148
|
const poolAccessor = await poolProvider.getPools(usdPools);
|
|
150
149
|
const poolsRaw = poolAccessor.getAllPools();
|
|
@@ -154,7 +153,7 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
154
153
|
throw new Error(`Can't find USD/WETH pool for computing gas costs.`);
|
|
155
154
|
}
|
|
156
155
|
const maxPool = lodash_1.default.maxBy(pools, (pool) => {
|
|
157
|
-
if (pool.token0.equals(
|
|
156
|
+
if (pool.token0.equals(util_1.WRAPPED_NATIVE_CURRENCY[chainId])) {
|
|
158
157
|
return parseFloat(pool.reserve0.toSignificant(2));
|
|
159
158
|
}
|
|
160
159
|
else {
|
|
@@ -165,4 +164,4 @@ class V2HeuristicGasModelFactory extends gas_model_1.IV2GasModelFactory {
|
|
|
165
164
|
}
|
|
166
165
|
}
|
|
167
166
|
exports.V2HeuristicGasModelFactory = V2HeuristicGasModelFactory;
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjItaGV1cmlzdGljLWdhcy1tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9nYXMtbW9kZWxzL3YyL3YyLWhldXJpc3RpYy1nYXMtbW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsd0RBQXFEO0FBR3JELG9EQUF1QjtBQUd2QiwyQ0FBeUU7QUFDekUsc0RBQTBEO0FBRTFELDRDQUtzQjtBQUV0Qix3REFBd0Q7QUFDM0MsUUFBQSxjQUFjLEdBQUcscUJBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyw2Q0FBNkM7QUFFbkcsdUNBQXVDO0FBQzFCLFFBQUEsa0JBQWtCLEdBQUcscUJBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyw0Q0FBNEM7QUFFckc7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFhLDBCQUEyQixTQUFRLDhCQUFrQjtJQUNoRTtRQUNFLEtBQUssRUFBRSxDQUFDO0lBQ1YsQ0FBQztJQUVNLEtBQUssQ0FBQyxhQUFhLENBQUMsRUFDekIsT0FBTyxFQUNQLFdBQVcsRUFDWCxZQUFZLEVBQ1osS0FBSyxHQUNzQjtRQUMzQixJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsOEJBQXVCLENBQUMsT0FBTyxDQUFFLENBQUMsRUFBRTtZQUNuRCxNQUFNLE9BQU8sR0FBUyxNQUFNLElBQUksQ0FBQywwQkFBMEIsQ0FDekQsT0FBTyxFQUNQLFlBQVksQ0FDYixDQUFDO1lBRUYsT0FBTztnQkFDTCxlQUFlLEVBQUUsQ0FBQyxtQkFBMEMsRUFBRSxFQUFFO29CQUM5RCxNQUFNLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQy9DLG1CQUFtQixFQUNuQixXQUFXLEVBQ1gsT0FBTyxDQUNSLENBQUM7b0JBRUYsTUFBTSxTQUFTLEdBQ2IsT0FBTyxDQUFD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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BigNumber } from '@ethersproject/bignumber';
|
|
2
|
-
import { ChainId } from '
|
|
2
|
+
import { ChainId } from '../../../..';
|
|
3
3
|
export declare const COST_PER_UNINIT_TICK: BigNumber;
|
|
4
4
|
export declare const BASE_SWAP_COST: (id: ChainId) => BigNumber;
|
|
5
5
|
export declare const COST_PER_INIT_TICK: (id: ChainId) => BigNumber;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.COST_PER_HOP = exports.COST_PER_INIT_TICK = exports.BASE_SWAP_COST = exports.COST_PER_UNINIT_TICK = void 0;
|
|
4
4
|
const bignumber_1 = require("@ethersproject/bignumber");
|
|
5
|
-
const
|
|
5
|
+
const __1 = require("../../../..");
|
|
6
6
|
// Cost for crossing an uninitialized tick.
|
|
7
7
|
exports.COST_PER_UNINIT_TICK = bignumber_1.BigNumber.from(0);
|
|
8
8
|
//l2 execution fee on optimism is roughly the same as mainnet
|
|
@@ -11,9 +11,9 @@ const BASE_SWAP_COST = (id) => {
|
|
|
11
11
|
// case ChainId.MAINNET:
|
|
12
12
|
// case ChainId.BSC:
|
|
13
13
|
// return BigNumber.from(2000);
|
|
14
|
-
case
|
|
15
|
-
case
|
|
16
|
-
return bignumber_1.BigNumber.from(
|
|
14
|
+
case __1.ChainId.XDC:
|
|
15
|
+
case __1.ChainId.XDC_APOTHEM:
|
|
16
|
+
return bignumber_1.BigNumber.from(2000);
|
|
17
17
|
}
|
|
18
18
|
};
|
|
19
19
|
exports.BASE_SWAP_COST = BASE_SWAP_COST;
|
|
@@ -23,9 +23,9 @@ const COST_PER_INIT_TICK = (id) => {
|
|
|
23
23
|
// case ChainId.BSC:
|
|
24
24
|
// case ChainId.POLYGON:
|
|
25
25
|
// return BigNumber.from(31000);
|
|
26
|
-
case
|
|
27
|
-
case
|
|
28
|
-
return bignumber_1.BigNumber.from(
|
|
26
|
+
case __1.ChainId.XDC:
|
|
27
|
+
case __1.ChainId.XDC_APOTHEM:
|
|
28
|
+
return bignumber_1.BigNumber.from(31000);
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
31
|
exports.COST_PER_INIT_TICK = COST_PER_INIT_TICK;
|
|
@@ -34,10 +34,10 @@ const COST_PER_HOP = (id) => {
|
|
|
34
34
|
// case ChainId.MAINNET:
|
|
35
35
|
// case ChainId.BSC:
|
|
36
36
|
// return BigNumber.from(80000);
|
|
37
|
-
case
|
|
38
|
-
case
|
|
39
|
-
return bignumber_1.BigNumber.from(
|
|
37
|
+
case __1.ChainId.XDC:
|
|
38
|
+
case __1.ChainId.XDC_APOTHEM:
|
|
39
|
+
return bignumber_1.BigNumber.from(80000);
|
|
40
40
|
}
|
|
41
41
|
};
|
|
42
42
|
exports.COST_PER_HOP = COST_PER_HOP;
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzLWNvc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3JvdXRlcnMvYWxwaGEtcm91dGVyL2dhcy1tb2RlbHMvdjMvZ2FzLWNvc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHdEQUFxRDtBQUVyRCxtQ0FBc0M7QUFFdEMsMkNBQTJDO0FBQzlCLFFBQUEsb0JBQW9CLEdBQUcscUJBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFdEQsNkRBQTZEO0FBQ3RELE1BQU0sY0FBYyxHQUFHLENBQUMsRUFBVyxFQUFhLEVBQUU7SUFDdkQsUUFBUSxFQUFFLEVBQUU7UUFDVix3QkFBd0I7UUFDeEIsb0JBQW9CO1FBQ3BCLGlDQUFpQztRQUNqQyxLQUFLLFdBQU8sQ0FBQyxHQUFHLENBQUM7UUFDakIsS0FBSyxXQUFPLENBQUMsV0FBVztZQUN0QixPQUFPLHFCQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0tBQy9CO0FBQ0gsQ0FBQyxDQUFDO0FBVFcsUUFBQSxjQUFjLGtCQVN6QjtBQUNLLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxFQUFXLEVBQWEsRUFBRTtJQUMzRCxRQUFRLEVBQUUsRUFBRTtRQUNWLHdCQUF3QjtRQUN4QixvQkFBb0I7UUFDcEIsd0JBQXdCO1FBQ3hCLGtDQUFrQztRQUNsQyxLQUFLLFdBQU8sQ0FBQyxHQUFHLENBQUM7UUFDakIsS0FBSyxXQUFPLENBQUMsV0FBVztZQUN0QixPQUFPLHFCQUFTLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0tBQ2hDO0FBQ0gsQ0FBQyxDQUFDO0FBVlcsUUFBQSxrQkFBa0Isc0JBVTdCO0FBRUssTUFBTSxZQUFZLEdBQUcsQ0FBQyxFQUFXLEVBQWEsRUFBRTtJQUNyRCxRQUFRLEVBQUUsRUFBRTtRQUNWLHdCQUF3QjtRQUN4QixvQkFBb0I7UUFDcEIsa0NBQWtDO1FBQ2xDLEtBQUssV0FBTyxDQUFDLEdBQUcsQ0FBQztRQUNqQixLQUFLLFdBQU8sQ0FBQyxXQUFXO1lBQ3RCLE9BQU8scUJBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7S0FDaEM7QUFDSCxDQUFDLENBQUM7QUFUVyxRQUFBLFlBQVksZ0JBU3ZCIn0=
|