@xspswap/smart-order-router 1.1.4 → 1.1.6
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 +2 -3
- package/build/main/providers/caching/route/model/cached-routes.js +4 -4
- package/build/main/providers/caching/route/route-caching-provider.d.ts +1 -2
- package/build/main/providers/caching/route/route-caching-provider.js +11 -6
- 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 +1 -2
- package/build/main/providers/caching-token-list-provider.js +1 -2
- package/build/main/providers/caching-token-provider.d.ts +1 -2
- package/build/main/providers/caching-token-provider.js +7 -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 +24 -13
- 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 +1 -2
- package/build/main/providers/swap-router-provider.js +3 -2
- package/build/main/providers/tenderly-simulation-provider.d.ts +1 -1
- package/build/main/providers/tenderly-simulation-provider.js +8 -7
- package/build/main/providers/token-provider.d.ts +9 -14
- package/build/main/providers/token-provider.js +32 -46
- package/build/main/providers/token-validator-provider.d.ts +1 -2
- package/build/main/providers/token-validator-provider.js +3 -2
- 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 +5 -3
- package/build/main/providers/v2/caching-pool-provider.js +5 -3
- package/build/main/providers/v2/caching-subgraph-provider.d.ts +1 -1
- package/build/main/providers/v2/pool-provider.d.ts +13 -4
- package/build/main/providers/v2/pool-provider.js +12 -10
- package/build/main/providers/v2/quote-provider.js +2 -2
- package/build/main/providers/v2/static-subgraph-provider.d.ts +1 -2
- package/build/main/providers/v2/static-subgraph-provider.js +9 -21
- package/build/main/providers/v2/subgraph-provider.d.ts +1 -2
- package/build/main/providers/v2/subgraph-provider.js +1 -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 +22 -0
- package/build/main/providers/v2-fathom/static-subgraph-provider.js +169 -0
- package/build/main/providers/v2-fathom/subgraph-provider.d.ts +34 -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/caching-pool-provider.d.ts +5 -3
- package/build/main/providers/v3/caching-pool-provider.js +5 -3
- package/build/main/providers/v3/caching-subgraph-provider.d.ts +1 -1
- package/build/main/providers/v3/pool-provider.d.ts +5 -3
- package/build/main/providers/v3/pool-provider.js +14 -8
- package/build/main/providers/v3/static-subgraph-provider-v3-uni.d.ts +29 -0
- package/build/main/providers/v3/static-subgraph-provider-v3-uni.js +209 -0
- package/build/main/providers/v3/static-subgraph-provider.d.ts +1 -2
- package/build/main/providers/v3/static-subgraph-provider.js +43 -91
- package/build/main/providers/v3/subgraph-provider.d.ts +1 -2
- package/build/main/providers/v3/subgraph-provider.js +2 -2
- package/build/main/routers/alpha-router/alpha-router.d.ts +25 -6
- package/build/main/routers/alpha-router/alpha-router.js +100 -38
- package/build/main/routers/alpha-router/config.d.ts +1 -1
- package/build/main/routers/alpha-router/entities/route-with-valid-quote.d.ts +9 -7
- 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 +1 -2
- 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 +4 -3
- 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 +7 -5
- package/build/main/routers/alpha-router/functions/get-candidate-pools.js +19 -17
- package/build/main/routers/alpha-router/gas-models/gas-model.d.ts +1 -2
- 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 +13 -12
- 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 +4 -5
- package/build/main/routers/alpha-router/quoters/base-quoter.d.ts +5 -3
- package/build/main/routers/alpha-router/quoters/base-quoter.js +3 -2
- package/build/main/routers/alpha-router/quoters/mixed-quoter.d.ts +4 -3
- package/build/main/routers/alpha-router/quoters/mixed-quoter.js +80 -14
- package/build/main/routers/alpha-router/quoters/v2-quoter.d.ts +4 -3
- package/build/main/routers/alpha-router/quoters/v2-quoter.js +9 -4
- package/build/main/routers/alpha-router/quoters/v3-quoter.d.ts +5 -4
- package/build/main/routers/alpha-router/quoters/v3-quoter.js +9 -10
- package/build/main/routers/legacy-router/bases.d.ts +1 -2
- package/build/main/routers/legacy-router/bases.js +7 -6
- package/build/main/routers/legacy-router/legacy-router.d.ts +1 -2
- package/build/main/routers/legacy-router/legacy-router.js +5 -5
- package/build/main/routers/router.d.ts +7 -4
- package/build/main/routers/router.js +8 -8
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/addresses.d.ts +0 -21
- package/build/main/util/addresses.js +6 -59
- package/build/main/util/chains.d.ts +2 -11
- package/build/main/util/chains.js +18 -37
- package/build/main/util/gas-factory-helpers.d.ts +2 -3
- package/build/main/util/gas-factory-helpers.js +10 -6
- package/build/main/util/methodParameters.d.ts +2 -2
- package/build/main/util/methodParameters.js +5 -5
- package/build/main/util/protocols.d.ts +2 -0
- package/build/main/util/protocols.js +14 -2
- package/build/main/util/routes.js +19 -10
- package/build/module/providers/caching/route/model/cached-routes.d.ts +2 -3
- package/build/module/providers/caching/route/model/cached-routes.js +4 -4
- package/build/module/providers/caching/route/route-caching-provider.d.ts +1 -2
- package/build/module/providers/caching/route/route-caching-provider.js +12 -7
- 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 +1 -2
- package/build/module/providers/caching-token-list-provider.js +1 -2
- package/build/module/providers/caching-token-provider.d.ts +1 -2
- package/build/module/providers/caching-token-provider.js +8 -7
- 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 +27 -16
- 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 +1 -2
- package/build/module/providers/swap-router-provider.js +3 -2
- package/build/module/providers/tenderly-simulation-provider.d.ts +1 -1
- package/build/module/providers/tenderly-simulation-provider.js +8 -7
- package/build/module/providers/token-provider.d.ts +9 -14
- package/build/module/providers/token-provider.js +20 -33
- package/build/module/providers/token-validator-provider.d.ts +1 -2
- package/build/module/providers/token-validator-provider.js +4 -3
- 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 +5 -3
- package/build/module/providers/v2/caching-pool-provider.js +5 -3
- package/build/module/providers/v2/caching-subgraph-provider.d.ts +1 -1
- package/build/module/providers/v2/pool-provider.d.ts +13 -4
- package/build/module/providers/v2/pool-provider.js +12 -10
- package/build/module/providers/v2/quote-provider.js +2 -2
- package/build/module/providers/v2/static-subgraph-provider.d.ts +1 -2
- package/build/module/providers/v2/static-subgraph-provider.js +8 -20
- package/build/module/providers/v2/subgraph-provider.d.ts +1 -2
- package/build/module/providers/v2/subgraph-provider.js +1 -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 +22 -0
- package/build/module/providers/v2-fathom/static-subgraph-provider.js +162 -0
- package/build/module/providers/v2-fathom/subgraph-provider.d.ts +34 -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/caching-pool-provider.d.ts +5 -3
- package/build/module/providers/v3/caching-pool-provider.js +5 -3
- package/build/module/providers/v3/caching-subgraph-provider.d.ts +1 -1
- package/build/module/providers/v3/pool-provider.d.ts +5 -3
- package/build/module/providers/v3/pool-provider.js +14 -8
- package/build/module/providers/v3/static-subgraph-provider-v3-uni.d.ts +29 -0
- package/build/module/providers/v3/static-subgraph-provider-v3-uni.js +202 -0
- package/build/module/providers/v3/static-subgraph-provider.d.ts +1 -2
- package/build/module/providers/v3/static-subgraph-provider.js +42 -90
- package/build/module/providers/v3/subgraph-provider.d.ts +1 -2
- package/build/module/providers/v3/subgraph-provider.js +2 -2
- package/build/module/routers/alpha-router/alpha-router.d.ts +25 -6
- package/build/module/routers/alpha-router/alpha-router.js +102 -40
- package/build/module/routers/alpha-router/config.d.ts +1 -1
- package/build/module/routers/alpha-router/entities/route-with-valid-quote.d.ts +9 -7
- 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 +1 -2
- 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 +4 -3
- 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 +7 -5
- package/build/module/routers/alpha-router/functions/get-candidate-pools.js +21 -19
- package/build/module/routers/alpha-router/gas-models/gas-model.d.ts +1 -2
- 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 +14 -13
- 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 +5 -6
- package/build/module/routers/alpha-router/quoters/base-quoter.d.ts +5 -3
- package/build/module/routers/alpha-router/quoters/base-quoter.js +3 -2
- package/build/module/routers/alpha-router/quoters/mixed-quoter.d.ts +4 -3
- package/build/module/routers/alpha-router/quoters/mixed-quoter.js +81 -15
- package/build/module/routers/alpha-router/quoters/v2-quoter.d.ts +4 -3
- package/build/module/routers/alpha-router/quoters/v2-quoter.js +9 -4
- package/build/module/routers/alpha-router/quoters/v3-quoter.d.ts +5 -4
- package/build/module/routers/alpha-router/quoters/v3-quoter.js +9 -10
- package/build/module/routers/legacy-router/bases.d.ts +1 -2
- package/build/module/routers/legacy-router/bases.js +8 -7
- package/build/module/routers/legacy-router/legacy-router.d.ts +1 -2
- package/build/module/routers/legacy-router/legacy-router.js +6 -6
- package/build/module/routers/router.d.ts +7 -4
- package/build/module/routers/router.js +8 -8
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/addresses.d.ts +0 -21
- package/build/module/util/addresses.js +3 -66
- package/build/module/util/chains.d.ts +2 -11
- package/build/module/util/chains.js +13 -32
- package/build/module/util/gas-factory-helpers.d.ts +2 -3
- package/build/module/util/gas-factory-helpers.js +12 -8
- package/build/module/util/methodParameters.d.ts +2 -2
- package/build/module/util/methodParameters.js +7 -7
- package/build/module/util/protocols.d.ts +2 -0
- package/build/module/util/protocols.js +11 -1
- package/build/module/util/routes.js +20 -11
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Simulator = exports.SimulationStatus = void 0;
|
|
4
4
|
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
5
|
-
const
|
|
5
|
+
const universal_router_sdk_1 = require("@x-swap-protocol/universal-router-sdk");
|
|
6
6
|
const ethers_1 = require("ethers/lib/ethers");
|
|
7
7
|
const routers_1 = require("../routers");
|
|
8
8
|
const Erc20__factory_1 = require("../types/other/factories/Erc20__factory");
|
|
@@ -77,7 +77,7 @@ class Simulator {
|
|
|
77
77
|
// Check token has approved Permit2 more than expected amount.
|
|
78
78
|
const tokenContract = Erc20__factory_1.Erc20__factory.connect(inputAmount.currency.wrapped.address, provider);
|
|
79
79
|
if (swapOptions.type == routers_1.SwapType.UNIVERSAL_ROUTER) {
|
|
80
|
-
const permit2Allowance = await tokenContract.allowance(fromAddress, (0,
|
|
80
|
+
const permit2Allowance = await tokenContract.allowance(fromAddress, (0, universal_router_sdk_1.PERMIT2_ADDRESSES)(this.chainId));
|
|
81
81
|
// If a permit has been provided we don't need to check if UR has already been allowed.
|
|
82
82
|
if (swapOptions.inputTokenPermit) {
|
|
83
83
|
util_1.log.info({
|
|
@@ -87,8 +87,8 @@ class Simulator {
|
|
|
87
87
|
return permit2Allowance.gte(ethers_1.BigNumber.from(inputAmount.quotient.toString()));
|
|
88
88
|
}
|
|
89
89
|
// Check UR has been approved from Permit2.
|
|
90
|
-
const permit2Contract = Permit2__factory_1.Permit2__factory.connect((0,
|
|
91
|
-
const { amount: universalRouterAllowance, expiration: tokenExpiration } = await permit2Contract.allowance(fromAddress, inputAmount.currency.wrapped.address, (0,
|
|
90
|
+
const permit2Contract = Permit2__factory_1.Permit2__factory.connect((0, universal_router_sdk_1.PERMIT2_ADDRESSES)(this.chainId), provider);
|
|
91
|
+
const { amount: universalRouterAllowance, expiration: tokenExpiration } = await permit2Contract.allowance(fromAddress, inputAmount.currency.wrapped.address, (0, sdk_core_1.SWAP_ROUTER_02_ADDRESSES)(this.chainId));
|
|
92
92
|
const nowTimestampS = Math.round(Date.now() / 1000);
|
|
93
93
|
const inputAmountBN = ethers_1.BigNumber.from(inputAmount.quotient.toString());
|
|
94
94
|
const permit2Approved = permit2Allowance.gte(inputAmountBN);
|
|
@@ -113,7 +113,7 @@ class Simulator {
|
|
|
113
113
|
}, 'Simulating on SwapRouter02 info - Permit was provided for simulation. Not checking allowances.');
|
|
114
114
|
return true;
|
|
115
115
|
}
|
|
116
|
-
const allowance = await tokenContract.allowance(fromAddress, (0,
|
|
116
|
+
const allowance = await tokenContract.allowance(fromAddress, (0, sdk_core_1.SWAP_ROUTER_02_ADDRESSES)(this.chainId));
|
|
117
117
|
const hasAllowance = allowance.gte(ethers_1.BigNumber.from(inputAmount.quotient.toString()));
|
|
118
118
|
util_1.log.info({
|
|
119
119
|
hasAllowance,
|
|
@@ -127,4 +127,4 @@ class Simulator {
|
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
exports.Simulator = Simulator;
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltdWxhdGlvbi1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm92aWRlcnMvc2ltdWxhdGlvbi1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx3REFJbUM7QUFDbkMsZ0ZBQTBFO0FBQzFFLDhDQUE4QztBQUU5Qyx3Q0FBOEQ7QUFDOUQsNEVBQXlFO0FBQ3pFLGdGQUE2RTtBQUM3RSxrQ0FBOEM7QUFVOUMsSUFBWSxnQkFNWDtBQU5ELFdBQVksZ0JBQWdCO0lBQzFCLHVFQUFnQixDQUFBO0lBQ2hCLDJEQUFVLENBQUE7SUFDVixpRUFBYSxDQUFBO0lBQ2IscUZBQXVCLENBQUE7SUFDdkIscUVBQWUsQ0FBQTtBQUNqQixDQUFDLEVBTlcsZ0JBQWdCLEdBQWhCLHdCQUFnQixLQUFoQix3QkFBZ0IsUUFNM0I7QUFFRDs7Ozs7R0FLRztBQUNILE1BQXNCLFNBQVM7SUFHN0I7OztPQUdHO0lBQ0gsWUFBWSxRQUF5QixFQUFZLE9BQWdCO1FBQWhCLFlBQU8sR0FBUCxPQUFPLENBQVM7UUFDL0QsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7SUFDM0IsQ0FBQztJQUVNLEtBQUssQ0FBQyxRQUFRLENBQ25CLFdBQW1CLEVBQ25CLFdBQXdCLEVBQ3hCLFNBQW9CLEVBQ3BCLE1BQXNCLEVBQ3RCLEtBQXFCO1FBRXJCLElBQ0UsTUFBTSxJQUFJLENBQUMsd0JBQXdCLENBQ2pDLFdBQVcsRUFDWCxTQUFTLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFDekIsTUFBTSxFQUNOLEtBQUssQ0FDTixFQUNEO1lBQ0EsVUFBRyxDQUFDLElBQUksQ0FDTixrRUFBa0UsQ0FDbkUsQ0FBQztZQUNGLElBQUk7Z0JBQ0YsT0FBTyxJQUFJLENBQUMsbUJBQW1CLENBQUMsV0FBVyxFQUFFLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQzthQUN0RTtZQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNWLFVBQUcsQ0FB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
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ApprovalTypes } from '@x-swap-protocol/router-sdk';
|
|
2
|
-
import { Currency, CurrencyAmount } from '@x-swap-protocol/sdk-core';
|
|
3
|
-
import { ChainId } from '../util';
|
|
2
|
+
import { ChainId, Currency, CurrencyAmount } from '@x-swap-protocol/sdk-core';
|
|
4
3
|
import { IMulticallProvider } from './multicall-provider';
|
|
5
4
|
type TokenApprovalTypes = {
|
|
6
5
|
approvalTokenIn: ApprovalTypes;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SwapRouterProvider = void 0;
|
|
4
|
+
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
4
5
|
const SwapRouter02__factory_1 = require("../types/other/factories/SwapRouter02__factory");
|
|
5
6
|
const util_1 = require("../util");
|
|
6
7
|
class SwapRouterProvider {
|
|
@@ -21,7 +22,7 @@ class SwapRouterProvider {
|
|
|
21
22
|
],
|
|
22
23
|
];
|
|
23
24
|
const tx = await this.multicall2Provider.callSameFunctionOnContractWithMultipleParams({
|
|
24
|
-
address: (0,
|
|
25
|
+
address: (0, sdk_core_1.SWAP_ROUTER_02_ADDRESSES)(this.chainId),
|
|
25
26
|
contractInterface: SwapRouter02__factory_1.SwapRouter02__factory.createInterface(),
|
|
26
27
|
functionName: 'getApprovalType',
|
|
27
28
|
functionParams,
|
|
@@ -39,4 +40,4 @@ class SwapRouterProvider {
|
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
exports.SwapRouterProvider = SwapRouterProvider;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3dhcC1yb3V0ZXItcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3N3YXAtcm91dGVyLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHdEQUttQztBQUVuQywwRkFBdUY7QUFDdkYsa0NBQThCO0FBNkI5QixNQUFhLGtCQUFrQjtJQUM3QixZQUNZLGtCQUFzQyxFQUN0QyxPQUFnQjtRQURoQix1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ3RDLFlBQU8sR0FBUCxPQUFPLENBQVM7SUFDekIsQ0FBQztJQUVHLEtBQUssQ0FBQyxlQUFlLENBQzFCLGFBQXVDLEVBQ3ZDLGNBQXdDOztRQUV4QyxNQUFNLGNBQWMsR0FBdUI7WUFDekM7Z0JBQ0UsYUFBYSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsT0FBTztnQkFDdEMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUU7YUFDbEM7WUFDRDtnQkFDRSxjQUFjLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxPQUFPO2dCQUN2QyxjQUFjLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRTthQUNuQztTQUNGLENBQUM7UUFFRixNQUFNLEVBQUUsR0FDTixNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0Q0FBNEMsQ0FHeEU7WUFDQSxPQUFPLEVBQUUsSUFBQSxtQ0FBd0IsRUFBQyxJQUFJLENBQUMsT0FBTyxDQUFDO1lBQy9DLGlCQUFpQixFQUFFLDZDQUFxQixDQUFDLGVBQWUsRUFBRTtZQUMxRCxZQUFZLEVBQUUsaUJBQWlCO1lBQy9CLGNBQWM7U0FDZixDQUFDLENBQUM7UUFFTCxJQUFJLENBQUMsQ0FBQSxNQUFBLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLDBDQUFFLE9BQU8sQ0FBQSxJQUFJLENBQUMsQ0FBQSxNQUFBLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLDBDQUFFLE9BQU8sQ0FBQSxFQUFFO1lBQ3RELFVBQUcsQ0FBQyxJQUFJLENBQ04sRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUN2Qix3RUFBd0UsQ0FDekUsQ0FBQztZQUNGLE1BQU0sSUFBSSxLQUFLLENBQ2Isd0VBQXdFLENBQ3pFLENBQUM7U0FDSDtRQUVELE1BQU0sRUFBRSxNQUFNLEVBQUUsZUFBZSxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNuRCxNQUFNLEVBQUUsTUFBTSxFQUFFLGdCQUFnQixFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVwRCxPQUFPO1lBQ0wsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUM7WUFDbkMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO1NBQ3RDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFsREQsZ0RBa0RDIn0=
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
2
|
+
import { ChainId } from '@x-swap-protocol/sdk-core';
|
|
2
3
|
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';
|
|
@@ -5,7 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TenderlySimulator = exports.FallbackTenderlySimulator = void 0;
|
|
7
7
|
const constants_1 = require("@ethersproject/constants");
|
|
8
|
-
const
|
|
8
|
+
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
9
|
+
const universal_router_sdk_1 = require("@x-swap-protocol/universal-router-sdk");
|
|
9
10
|
const axios_1 = __importDefault(require("axios"));
|
|
10
11
|
const ethers_1 = require("ethers/lib/ethers");
|
|
11
12
|
const routers_1 = require("../routers");
|
|
@@ -84,13 +85,13 @@ class TenderlySimulator extends simulation_provider_1.Simulator {
|
|
|
84
85
|
if (swapOptions.type == routers_1.SwapType.UNIVERSAL_ROUTER) {
|
|
85
86
|
// Do initial onboarding approval of Permit2.
|
|
86
87
|
const erc20Interface = Erc20__factory_1.Erc20__factory.createInterface();
|
|
87
|
-
const approvePermit2Calldata = erc20Interface.encodeFunctionData('approve', [(0,
|
|
88
|
+
const approvePermit2Calldata = erc20Interface.encodeFunctionData('approve', [(0, universal_router_sdk_1.PERMIT2_ADDRESSES)(chainId), constants_1.MaxUint256]);
|
|
88
89
|
// We are unsure if the users calldata contains a permit or not. We just
|
|
89
90
|
// max approve the Univeral Router from Permit2 instead, which will cover both cases.
|
|
90
91
|
const permit2Interface = Permit2__factory_1.Permit2__factory.createInterface();
|
|
91
92
|
const approveUniversalRouterCallData = permit2Interface.encodeFunctionData('approve', [
|
|
92
93
|
tokenIn.address,
|
|
93
|
-
(0,
|
|
94
|
+
(0, universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS)(this.chainId, true),
|
|
94
95
|
util_1.MAX_UINT160,
|
|
95
96
|
Math.floor(new Date().getTime() / 1000) + 10000000,
|
|
96
97
|
]);
|
|
@@ -106,7 +107,7 @@ class TenderlySimulator extends simulation_provider_1.Simulator {
|
|
|
106
107
|
network_id: chainId,
|
|
107
108
|
gas_estimate: true,
|
|
108
109
|
input: approveUniversalRouterCallData,
|
|
109
|
-
to:
|
|
110
|
+
to: universal_router_sdk_1.PERMIT2_ADDRESSES,
|
|
110
111
|
value: '0',
|
|
111
112
|
from: fromAddress,
|
|
112
113
|
};
|
|
@@ -114,7 +115,7 @@ class TenderlySimulator extends simulation_provider_1.Simulator {
|
|
|
114
115
|
network_id: chainId,
|
|
115
116
|
input: calldata,
|
|
116
117
|
gas_estimate: true,
|
|
117
|
-
to: (0,
|
|
118
|
+
to: (0, universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS)(this.chainId, true),
|
|
118
119
|
value: currencyIn.isNative ? swapRoute.methodParameters.value : '0',
|
|
119
120
|
from: fromAddress,
|
|
120
121
|
// TODO: This is a Temporary fix given by Tenderly team, remove once resolved on their end.
|
|
@@ -163,7 +164,7 @@ class TenderlySimulator extends simulation_provider_1.Simulator {
|
|
|
163
164
|
const swap = {
|
|
164
165
|
network_id: chainId,
|
|
165
166
|
input: calldata,
|
|
166
|
-
to: (0,
|
|
167
|
+
to: (0, sdk_core_1.SWAP_ROUTER_02_ADDRESSES)(chainId),
|
|
167
168
|
gas_estimate: true,
|
|
168
169
|
value: currencyIn.isNative ? swapRoute.methodParameters.value : '0',
|
|
169
170
|
from: fromAddress,
|
|
@@ -241,4 +242,4 @@ class TenderlySimulator extends simulation_provider_1.Simulator {
|
|
|
241
242
|
}
|
|
242
243
|
}
|
|
243
244
|
exports.TenderlySimulator = TenderlySimulator;
|
|
244
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tenderly-simulation-provider.js","sourceRoot":"","sources":["../../../src/providers/tenderly-simulation-provider.ts"],"names":[],"mappings":"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"}
|
|
245
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tenderly-simulation-provider.js","sourceRoot":"","sources":["../../../src/providers/tenderly-simulation-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { Token } from '@x-swap-protocol/sdk-core';
|
|
2
|
-
import { ChainId } from '../util';
|
|
1
|
+
import { ChainId, Token } from '@x-swap-protocol/sdk-core';
|
|
3
2
|
import { IMulticallProvider } from './multicall-provider';
|
|
4
3
|
import { ProviderConfig } from './provider';
|
|
5
4
|
/**
|
|
@@ -28,30 +27,27 @@ export declare const USDC_XDC_APOTHEM: Token;
|
|
|
28
27
|
export declare const DAI_XDC_APOTHEM: Token;
|
|
29
28
|
export declare const WBTC_XDC_APOTHEM: Token;
|
|
30
29
|
export declare const XSP_XDC: Token;
|
|
31
|
-
export declare const XTT_XDC: Token;
|
|
32
30
|
export declare const SRX_XDC: Token;
|
|
33
31
|
export declare const PLI_XDC: Token;
|
|
34
|
-
export declare const EURS_XDC: Token;
|
|
35
|
-
export declare const PRNT_XDC: Token;
|
|
36
32
|
export declare const USDT_XDC: Token;
|
|
33
|
+
export declare const stgUSDT_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;
|
|
@@ -3,42 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.WNATIVE_ON = exports.USDC_ON = exports.
|
|
6
|
+
exports.WNATIVE_ON = exports.USDC_ON = exports.DAI_ON = exports.TokenProvider = exports.EEG_XDC = exports.PWM3_XDC = exports.TIVO_XDC = exports.GLL_XDC = exports.ROXN_XDC = exports.AVR_XDC = exports.CHUPAV2_XDC = exports.CGO_XDC = exports.LBT_XDC = exports.BBB_XDC = exports.GAMA_XDC = exports.psXDC_XDC = exports.DOPU_XDC = exports.WXDC_XDC = exports.FXD_XDC = exports.USDC_XDC = exports.EURS_XDC = exports.stgUSDT_XDC = exports.USDT_XDC = exports.PLI_XDC = exports.SRX_XDC = exports.XSP_XDC = exports.WBTC_XDC_APOTHEM = exports.DAI_XDC_APOTHEM = exports.USDC_XDC_APOTHEM = exports.USDT_XDC_APOTHEM = void 0;
|
|
7
7
|
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const IERC20Metadata__factory_1 = require("../types/v3/factories/IERC20Metadata__factory");
|
|
10
10
|
const util_1 = require("../util");
|
|
11
11
|
// Some well known tokens on each chain for seeding cache / testing.
|
|
12
|
-
exports.USDT_XDC_APOTHEM = new sdk_core_1.Token(
|
|
13
|
-
exports.USDC_XDC_APOTHEM = new sdk_core_1.Token(
|
|
14
|
-
exports.DAI_XDC_APOTHEM = new sdk_core_1.Token(
|
|
15
|
-
exports.WBTC_XDC_APOTHEM = new sdk_core_1.Token(
|
|
16
|
-
exports.XSP_XDC = new sdk_core_1.Token(
|
|
17
|
-
exports.
|
|
18
|
-
exports.
|
|
19
|
-
exports.
|
|
20
|
-
exports.
|
|
21
|
-
exports.
|
|
22
|
-
exports.
|
|
23
|
-
exports.
|
|
24
|
-
exports.
|
|
25
|
-
exports.
|
|
26
|
-
exports.
|
|
27
|
-
exports.
|
|
28
|
-
exports.
|
|
29
|
-
exports.
|
|
30
|
-
exports.
|
|
31
|
-
exports.BBB_XDC = new sdk_core_1.Token(util_1.ChainId.XDC, '0xFa4dDcFa8E3d0475f544d0de469277CF6e0A6Fd1', 18, 'BBB', 'Beny Bad Boy');
|
|
32
|
-
exports.LBT_XDC = new sdk_core_1.Token(util_1.ChainId.XDC, '0x05940B2dF33D6371201e7Ae099CeD4C363855dFE', 18, 'LBT', 'Law Block');
|
|
33
|
-
exports.CGO_XDC = new sdk_core_1.Token(util_1.ChainId.XDC, '0x8f9920283470F52128bF11B0c14E798bE704fD15', 18, 'CGO', 'Comtech Gold');
|
|
12
|
+
exports.USDT_XDC_APOTHEM = new sdk_core_1.Token(sdk_core_1.ChainId.APOTHEM, '0xac4cdD44931d4A0Ff6B1Ea9206e02FeaC8EB9a50', 6, 'USDT', 'Tether Token');
|
|
13
|
+
exports.USDC_XDC_APOTHEM = new sdk_core_1.Token(sdk_core_1.ChainId.APOTHEM, '0xDF5038D080Ca5bd21c6c90F0b004306a26Af4bA8', 18, 'USDC', 'USDC');
|
|
14
|
+
exports.DAI_XDC_APOTHEM = new sdk_core_1.Token(sdk_core_1.ChainId.APOTHEM, '0xE46554Ad93a7046C85f2dA0C20EbD68e41f11b36', 18, 'DAI', 'DAI Stablecoin on XDC testnet');
|
|
15
|
+
exports.WBTC_XDC_APOTHEM = new sdk_core_1.Token(sdk_core_1.ChainId.APOTHEM, '0x885c04a08FbE1C6059f407E36c35B165704D1A03', 8, 'WBTC', 'Wrapped BTC');
|
|
16
|
+
exports.XSP_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x36726235dAdbdb4658D33E62a249dCA7c4B2bC68', 18, 'XSP', 'XSwap Protocol');
|
|
17
|
+
exports.SRX_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x5D5f074837f5d4618B3916ba74De1Bf9662a3fEd', 18, 'SRX', 'StoreX');
|
|
18
|
+
exports.PLI_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xff7412ea7c8445c46a8254dfb557ac1e48094391', 18, 'PLI', 'Plugin');
|
|
19
|
+
exports.USDT_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xd4b5f10d61916bd6e0860144a91ac658de8a1437', 6, 'xUSDT', 'USDT@xinfin');
|
|
20
|
+
exports.stgUSDT_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xcdA5b77E2E2268D9E09c874c1b9A4c3F07b37555', 6, 'USDT', 'Bridget stgUSDT');
|
|
21
|
+
exports.EURS_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x1eBb2C8a71A9ec59bF558886a8Adf8F4a565814F', 2, 'EURS', 'STASIS EURO');
|
|
22
|
+
exports.USDC_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xfA2958CB79b0491CC627c1557F441eF849Ca8eb1', 6, 'USDC', 'USDC');
|
|
23
|
+
exports.FXD_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x49d3f7543335cf38Fa10889CCFF10207e22110B5', 18, 'FXD', 'Fathom USD');
|
|
24
|
+
exports.WXDC_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x951857744785e80e2de051c32ee7b25f9c458c42', 18, 'WXDC', 'Wrapped XDC');
|
|
25
|
+
exports.DOPU_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x3fB46c4Db76d8E9f69F3F8388f43a7CA7E140807', 18, 'DOPU', 'Dog with a Purpose');
|
|
26
|
+
exports.psXDC_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x9B8e12b0BAC165B86967E771d98B520Ec3F665A6', 18, 'psXDC', 'PrimeStakedXDC');
|
|
27
|
+
exports.GAMA_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x3a170C7C987F55C84f28733Bfa27962D8CdD5D3B', 18, 'GAMA', 'Gama Token');
|
|
28
|
+
exports.BBB_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xFa4dDcFa8E3d0475f544d0de469277CF6e0A6Fd1', 18, 'BBB', 'Beny Bad Boy');
|
|
29
|
+
exports.LBT_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x05940B2dF33D6371201e7Ae099CeD4C363855dFE', 18, 'LBT', 'Law Block');
|
|
30
|
+
exports.CGO_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x8f9920283470F52128bF11B0c14E798bE704fD15', 18, 'CGO', 'Comtech Gold');
|
|
34
31
|
// Chupa v2
|
|
35
|
-
exports.CHUPAV2_XDC = new sdk_core_1.Token(
|
|
36
|
-
exports.
|
|
37
|
-
exports.
|
|
38
|
-
exports.
|
|
39
|
-
exports.
|
|
40
|
-
exports.PWM3_XDC = new sdk_core_1.Token(
|
|
41
|
-
exports.
|
|
32
|
+
exports.CHUPAV2_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xCF071288cC70D737105c97485F9820668EAcCa51', 18, 'CHUPAV2', 'ChupaCabraV2');
|
|
33
|
+
exports.AVR_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x92bb5d72bd65E8BAD36405D7C3D1497015A41160', 18, 'AVR', 'Avatar');
|
|
34
|
+
exports.ROXN_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x2d1C02Cf9e7a1659b82185feF243078BfD237B23', 18, 'ROXN', 'Roxonn Token');
|
|
35
|
+
exports.GLL_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xc6126EBFa8B5fFD41561C086979c97416969CeBF', 18, 'GLL', 'Growlimitless');
|
|
36
|
+
exports.TIVO_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0x765087A2360F4D1F516De6552970256F9DB64827', 18, 'Tivo', 'Tivo Token');
|
|
37
|
+
exports.PWM3_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xB2b2aaB80f9fcD8f2bcA8A404Cbbf72A618897c0', 18, 'PWM3', 'Diamondium Private Currency');
|
|
38
|
+
exports.EEG_XDC = new sdk_core_1.Token(sdk_core_1.ChainId.XDC, '0xAec5Eaf63402BF842D8642d917685e5ad3BA14bb', 18, 'EEG', 'EquitEdge ERC20 Token');
|
|
42
39
|
class TokenProvider {
|
|
43
40
|
constructor(chainId, multicall2Provider) {
|
|
44
41
|
this.chainId = chainId;
|
|
@@ -105,29 +102,18 @@ const DAI_ON = (chainId) => {
|
|
|
105
102
|
switch (chainId) {
|
|
106
103
|
// case ChainId.XDC:
|
|
107
104
|
// return USDT_BSC;
|
|
108
|
-
case
|
|
105
|
+
case sdk_core_1.ChainId.APOTHEM:
|
|
109
106
|
return exports.DAI_XDC_APOTHEM;
|
|
110
107
|
default:
|
|
111
108
|
throw new Error(`Chain id: ${chainId} not supported`);
|
|
112
109
|
}
|
|
113
110
|
};
|
|
114
111
|
exports.DAI_ON = DAI_ON;
|
|
115
|
-
const USDT_ON = (chainId) => {
|
|
116
|
-
switch (chainId) {
|
|
117
|
-
case util_1.ChainId.XDC:
|
|
118
|
-
return exports.USDT_XDC;
|
|
119
|
-
case util_1.ChainId.XDC_APOTHEM:
|
|
120
|
-
return exports.USDT_XDC_APOTHEM;
|
|
121
|
-
default:
|
|
122
|
-
throw new Error(`Chain id: ${chainId} not supported`);
|
|
123
|
-
}
|
|
124
|
-
};
|
|
125
|
-
exports.USDT_ON = USDT_ON;
|
|
126
112
|
const USDC_ON = (chainId) => {
|
|
127
113
|
switch (chainId) {
|
|
128
|
-
case
|
|
114
|
+
case sdk_core_1.ChainId.XDC:
|
|
129
115
|
return exports.USDC_XDC;
|
|
130
|
-
case
|
|
116
|
+
case sdk_core_1.ChainId.APOTHEM:
|
|
131
117
|
return exports.USDC_XDC_APOTHEM;
|
|
132
118
|
default:
|
|
133
119
|
throw new Error(`Chain id: ${chainId} not supported`);
|
|
@@ -135,7 +121,7 @@ const USDC_ON = (chainId) => {
|
|
|
135
121
|
};
|
|
136
122
|
exports.USDC_ON = USDC_ON;
|
|
137
123
|
const WNATIVE_ON = (chainId) => {
|
|
138
|
-
return
|
|
124
|
+
return sdk_core_1.WETH9[chainId];
|
|
139
125
|
};
|
|
140
126
|
exports.WNATIVE_ON = WNATIVE_ON;
|
|
141
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4tcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3Rva2VuLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHdEQUFrRTtBQUNsRSxvREFBdUI7QUFFdkIsMkZBQXdGO0FBQ3hGLGtDQUE4QjtBQStCOUIsb0VBQW9FO0FBQ3ZELFFBQUEsZ0JBQWdCLEdBQUcsSUFBSSxnQkFBSyxDQUN2QyxrQkFBTyxDQUFDLE9BQU8sRUFDZiw0Q0FBNEMsRUFDNUMsQ0FBQyxFQUNELE1BQU0sRUFDTixjQUFjLENBQ2YsQ0FBQztBQUVXLFFBQUEsZ0JBQWdCLEdBQUcsSUFBSSxnQkFBSyxDQUN2QyxrQkFBTyxDQUFDLE9BQU8sRUFDZiw0Q0FBNEMsRUFDNUMsRUFBRSxFQUNGLE1BQU0sRUFDTixNQUFNLENBQ1AsQ0FBQztBQUVXLFFBQUEsZUFBZSxHQUFHLElBQUksZ0JBQUssQ0FDdEMsa0JBQU8sQ0FBQyxPQUFPLEVBQ2YsNENBQTRDLEVBQzVDLEVBQUUsRUFDRixLQUFLLEVBQ0wsK0JBQStCLENBQ2hDLENBQUM7QUFFVyxRQUFBLGdCQUFnQixHQUFHLElBQUksZ0JBQUssQ0FDdkMsa0JBQU8sQ0FBQyxPQUFPLEVBQ2YsNENBQTRDLEVBQzVDLENBQUMsRUFDRCxNQUFNLEVBQ04sYUFBYSxDQUNkLENBQUM7QUFFVyxRQUFBLE9BQU8sR0FBRyxJQUFJLGdCQUFLLENBQzlCLGtCQUFPLENBQUMsR0FBRyxFQUNYLDRDQUE0QyxFQUM1QyxFQUFFLEVBQ0YsS0FBSyxFQUNMLGdCQUFnQixDQUNqQixDQUFDO0FBRVcsUUFBQSxPQUFPLEdBQUcsSUFBSSxnQkFBSyxDQUM5QixrQkFBTyxDQUFDLEdBQUcsRUFDWCw0Q0FBNEMsRUFDNUMsRUFBRSxFQUNGLEtBQUssRUFDTCxRQUFRLENBQ1QsQ0FBQztBQUNXLFFBQUEsT0FBTyxHQUFHLElBQUksZ0JBQUssQ0FDOUIsa0JBQU8sQ0FB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
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { Token } from '@x-swap-protocol/sdk-core';
|
|
2
|
-
import { ChainId } from '../util';
|
|
1
|
+
import { ChainId, Token } from '@x-swap-protocol/sdk-core';
|
|
3
2
|
import { ICache } from './cache';
|
|
4
3
|
import { IMulticallProvider } from './multicall-provider';
|
|
5
4
|
import { ProviderConfig } from './provider';
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TokenValidatorProvider = exports.TokenValidationResult = void 0;
|
|
7
|
+
const sdk_core_1 = require("@x-swap-protocol/sdk-core");
|
|
7
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
9
|
const ITokenValidator__factory_1 = require("../types/other/factories/ITokenValidator__factory");
|
|
9
10
|
const util_1 = require("../util");
|
|
@@ -30,7 +31,7 @@ class TokenValidatorProvider {
|
|
|
30
31
|
this.amountToFlashBorrow = amountToFlashBorrow;
|
|
31
32
|
this.allowList = allowList;
|
|
32
33
|
this.CACHE_KEY = (chainId, address) => `token-${chainId}-${address}`;
|
|
33
|
-
this.BASES = [
|
|
34
|
+
this.BASES = [sdk_core_1.WETH9[this.chainId].address];
|
|
34
35
|
}
|
|
35
36
|
async validateTokens(tokens, providerConfig) {
|
|
36
37
|
const tokenAddressToToken = lodash_1.default.keyBy(tokens, 'address');
|
|
@@ -92,4 +93,4 @@ class TokenValidatorProvider {
|
|
|
92
93
|
}
|
|
93
94
|
}
|
|
94
95
|
exports.TokenValidatorProvider = TokenValidatorProvider;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4tdmFsaWRhdG9yLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy90b2tlbi12YWxpZGF0b3ItcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsd0RBQWtFO0FBQ2xFLG9EQUF1QjtBQUV2QixnR0FBNkY7QUFDN0Ysa0NBQThCO0FBTTlCLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLENBQVM7SUFDeEMsMEVBQTBFO0lBQzFFLDRDQUE0QyxDQUFDLFdBQVcsRUFBRTtDQUMzRCxDQUFDLENBQUM7QUFFSCxJQUFZLHFCQUlYO0FBSkQsV0FBWSxxQkFBcUI7SUFDL0IsaUVBQVEsQ0FBQTtJQUNSLCtEQUFPLENBQUE7SUFDUCwrREFBTyxDQUFBO0FBQ1QsQ0FBQyxFQUpXLHFCQUFxQixHQUFyQiw2QkFBcUIsS0FBckIsNkJBQXFCLFFBSWhDO0FBTUQsTUFBTSx1QkFBdUIsR0FBRyw0Q0FBNEMsQ0FBQztBQUM3RSxNQUFNLHNCQUFzQixHQUFHLE1BQU0sQ0FBQztBQUN0QyxNQUFNLHNCQUFzQixHQUFHLE9BQVMsQ0FBQztBQXNCekMsTUFBYSxzQkFBc0I7SUFNakMsWUFDWSxPQUFnQixFQUNoQixrQkFBc0MsRUFDeEMsb0JBQW1ELEVBQ25ELHdCQUF3Qix1QkFBdUIsRUFDL0Msa0JBQWtCLHNCQUFzQixFQUN4QyxzQkFBc0Isc0JBQXNCLEVBQzVDLFlBQVksaUJBQWlCO1FBTjNCLFlBQU8sR0FBUCxPQUFPLENBQVM7UUFDaEIsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN4Qyx5QkFBb0IsR0FBcEIsb0JBQW9CLENBQStCO1FBQ25ELDBCQUFxQixHQUFyQixxQkFBcUIsQ0FBMEI7UUFDL0Msb0JBQWUsR0FBZixlQUFlLENBQXlCO1FBQ3hDLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBeUI7UUFDNUMsY0FBUyxHQUFULFNBQVMsQ0FBb0I7UUFaL0IsY0FB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
|
|
@@ -62,4 +62,4 @@ class URISubgraphProvider {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
exports.URISubgraphProvider = URISubgraphProvider;
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXJpLXN1YmdyYXBoLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy91cmktc3ViZ3JhcGgtcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsOERBQWdDO0FBQ2hDLGtFQUFvQztBQUNwQyxrREFBMEI7QUFFMUIscUNBQWtDO0FBS2xDOzs7Ozs7OztHQVFHO0FBQ0gsTUFBYSxtQkFBbUI7SUFHOUIsWUFDVSxPQUFnQixFQUNoQixHQUFXLEVBQ1gsVUFBVSxJQUFJLEVBQ2QsVUFBVSxDQUFDO1FBSFgsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUNoQixRQUFHLEdBQUgsR0FBRyxDQUFRO1FBQ1gsWUFBTyxHQUFQLE9BQU8sQ0FBTztRQUNkLFlBQU8sR0FBUCxPQUFPLENBQUk7SUFDbEIsQ0FBQztJQUVHLEtBQUssQ0FBQyxRQUFRO1FBQ25CLFNBQUcsQ0FBQyxJQUFJLENBQ04sRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUNqQix3Q0FBd0MsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUNuRCxDQUFDO1FBRUYsSUFBSSxRQUFRLEdBQW9CLEVBQUUsQ0FBQztRQUVuQyxNQUFNLElBQUEscUJBQUssRUFDVCxLQUFLLElBQUksRUFBRTtZQUNULE1BQU0sT0FBTyxHQUFHLElBQUksdUJBQU8sRUFBRSxDQUFDO1lBQzlCLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7Z0JBQ3ZELE1BQU0sSUFBSSxLQUFLLENBQ2IsMENBQTBDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FDekQsQ0FBQztZQUNKLENBQUMsQ0FBQyxDQUFDO1lBRUgsSUFBSSxRQUFRLENBQUM7WUFFYixxQ0FBcUM7WUFDckMsSUFBSTtnQkFDRixRQUFRLEdBQUcsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsZUFBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQzthQUNwRTtZQUFDLE9BQU8sR0FBRyxFQUFFO2dCQUNaLE1BQU0sR0FBRyxDQUFDO2FBQ1g7b0JBQVM7Z0JBQ1IsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO2FBQ2pCO1lBQ0Qsb0NBQW9DO1lBRXBDLE1BQU0sRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxHQUFHLFFBQVEsQ0FBQztZQUUvQyxJQUFJLE1BQU0sSUFBSSxHQUFHLEVBQUU7Z0JBQ2pCLFNBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxRQUFRLEVBQUUsRUFBRSw2QkFBNkIsSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUM7Z0JBRWxFLE1BQU0sSUFBSSxLQUFLLENBQUMsNEJBQTRCLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO2FBQ3pEO1lBRUQsTUFBTSxLQUFLLEdBQUcsV0FBOEIsQ0FBQztZQUU3QyxTQUFHLENBQUMsSUFBSSxDQUNOLEVBQUUsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFDdEMscUNBQXFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FDcEQsQ0FBQztZQUVGLFFBQVEsR0FBRyxLQUFLLENBQUM7UUFDbkIsQ0FBQyxFQUNEO1lBQ0UsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ3JCLE9BQU8sRUFBRSxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRTtnQkFDdEIsU0FBRyxDQUFDLElBQUksQ0FDTixFQUFFLEdBQUcsRUFBRSxFQUNQLGdDQUFnQyxJQUFJLENBQUMsR0FBRyxvQkFBb0IsS0FBSyxFQUFFLENBQ3BFLENBQUM7WUFDSixDQUFDO1NBQ0YsQ0FDRixDQUFDO1FBRUYsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztDQUNGO0FBckVELGtEQXFFQyJ9
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Protocol } from '@x-swap-protocol/router-sdk';
|
|
2
|
+
import { ChainId, Token } from '@x-swap-protocol/sdk-core';
|
|
2
3
|
import { Pair } from '@x-swap-protocol/v2-sdk';
|
|
3
|
-
import { ChainId } from '../../util/chains';
|
|
4
4
|
import { ICache } from './../cache';
|
|
5
5
|
import { ProviderConfig } from './../provider';
|
|
6
6
|
import { IV2PoolProvider, V2PoolAccessor } from './pool-provider';
|
|
@@ -11,17 +11,19 @@ import { IV2PoolProvider, V2PoolAccessor } from './pool-provider';
|
|
|
11
11
|
* @class CachingV2PoolProvider
|
|
12
12
|
*/
|
|
13
13
|
export declare class CachingV2PoolProvider implements IV2PoolProvider {
|
|
14
|
+
protected protocol: Protocol;
|
|
14
15
|
protected chainId: ChainId;
|
|
15
16
|
protected poolProvider: IV2PoolProvider;
|
|
16
17
|
private cache;
|
|
17
18
|
private POOL_KEY;
|
|
18
19
|
/**
|
|
19
20
|
* Creates an instance of CachingV3PoolProvider.
|
|
21
|
+
* @param protocol Protocol V2 or FATHOM
|
|
20
22
|
* @param chainId The chain id to use.
|
|
21
23
|
* @param poolProvider The provider to use to get the pools when not in the cache.
|
|
22
24
|
* @param cache Cache instance to hold cached pools.
|
|
23
25
|
*/
|
|
24
|
-
constructor(chainId: ChainId, poolProvider: IV2PoolProvider, cache: ICache<{
|
|
26
|
+
constructor(protocol: Protocol, chainId: ChainId, poolProvider: IV2PoolProvider, cache: ICache<{
|
|
25
27
|
pair: Pair;
|
|
26
28
|
block?: number;
|
|
27
29
|
}>);
|
|
@@ -15,19 +15,21 @@ const log_1 = require("../../util/log");
|
|
|
15
15
|
class CachingV2PoolProvider {
|
|
16
16
|
/**
|
|
17
17
|
* Creates an instance of CachingV3PoolProvider.
|
|
18
|
+
* @param protocol Protocol V2 or FATHOM
|
|
18
19
|
* @param chainId The chain id to use.
|
|
19
20
|
* @param poolProvider The provider to use to get the pools when not in the cache.
|
|
20
21
|
* @param cache Cache instance to hold cached pools.
|
|
21
22
|
*/
|
|
22
|
-
constructor(chainId, poolProvider,
|
|
23
|
+
constructor(protocol, chainId, poolProvider,
|
|
23
24
|
// Cache is block aware. For V2 pools we need to use the current blocks reserves values since
|
|
24
25
|
// we compute quotes off-chain.
|
|
25
26
|
// If no block is specified in the call to getPools we just return whatever is in the cache.
|
|
26
27
|
cache) {
|
|
28
|
+
this.protocol = protocol;
|
|
27
29
|
this.chainId = chainId;
|
|
28
30
|
this.poolProvider = poolProvider;
|
|
29
31
|
this.cache = cache;
|
|
30
|
-
this.POOL_KEY = (chainId, address) => `pool-${chainId}-${address}`;
|
|
32
|
+
this.POOL_KEY = (chainId, address) => `pool-${this.protocol}-${chainId}-${address}`;
|
|
31
33
|
}
|
|
32
34
|
async getPools(tokenPairs, providerConfig) {
|
|
33
35
|
const poolAddressSet = new Set();
|
|
@@ -85,4 +87,4 @@ class CachingV2PoolProvider {
|
|
|
85
87
|
}
|
|
86
88
|
}
|
|
87
89
|
exports.CachingV2PoolProvider = CachingV2PoolProvider;
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy1wb29sLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy92Mi9jYWNoaW5nLXBvb2wtcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBR0Esb0RBQXVCO0FBRXZCLHdDQUFxQztBQU1yQzs7Ozs7R0FLRztBQUNILE1BQWEscUJBQXFCO0lBSWhDOzs7Ozs7T0FNRztJQUNILFlBQ1ksUUFBa0IsRUFDbEIsT0FBZ0IsRUFDaEIsWUFBNkI7SUFDdkMsNkZBQTZGO0lBQzdGLCtCQUErQjtJQUMvQiw0RkFBNEY7SUFDcEYsS0FBNkM7UUFOM0MsYUFBUSxHQUFSLFFBQVEsQ0FBVTtRQUNsQixZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQ2hCLGlCQUFZLEdBQVosWUFBWSxDQUFpQjtRQUkvQixVQUFLLEdBQUwsS0FBSyxDQUF3QztRQWpCL0MsYUFBUSxHQUFHLENBQUMsT0FBZ0IsRUFBRSxPQUFlLEVBQUUsRUFBRSxDQUN2RCxRQUFRLElBQUksQ0FBQyxRQUFRLElBQUksT0FBTyxJQUFJLE9BQU8sRUFBRSxDQUFDO0lBaUI3QyxDQUFDO0lBRUcsS0FBSyxDQUFDLFFBQVEsQ0FDbkIsVUFBNEIsRUFDNUIsY0FBK0I7UUFFL0IsTUFBTSxjQUFjLEdBQWdCLElBQUksR0FBRyxFQUFVLENBQUM7UUFDdEQsTUFBTSxvQkFBb0IsR0FBMEIsRUFBRSxDQUFDO1FBQ3ZELE1BQU0sbUJBQW1CLEdBQWEsRUFBRSxDQUFDO1FBQ3pDLE1BQU0saUJBQWlCLEdBQW9DLEVBQUUsQ0FBQztRQUU5RCxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUEsY0FBYyxhQUFkLGNBQWMsdUJBQWQsY0FBYyxDQUFFLFdBQVcsQ0FBQSxDQUFDO1FBRXRELEtBQUssTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsSUFBSSxVQUFVLEVBQUU7WUFDekMsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLEVB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
|