@paraswap/dex-lib 3.11.10-stader.0 → 3.11.10
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/.vscode/launch.json +53 -0
- package/.vscode/settings.json +2 -0
- package/.vscode/tasks.json +15 -0
- package/build/abi/balancer-v3/batch-router.json +989 -0
- package/build/abi/balancer-v3/router.json +1792 -0
- package/build/abi/balancer-v3/vault-extension.json +2834 -0
- package/build/abi/{cables/CablesMainnetRFQ.json → inception/inception-ineth-pool.json} +489 -510
- package/build/abi/inception/inception-ratio-feed.json +329 -0
- package/build/abi/inception/inception-vault.json +991 -0
- package/build/abi/permit2.json +581 -0
- package/build/abi/uniswap-v3/AlienBaseV3Router.abi.json +52 -0
- package/build/abi/usual-m-smart-m/usualM.abi.json +483 -0
- package/build/abi/usual-m-usd0/usualCollateralDao.abi.json +681 -0
- package/build/abi/{integral/relayer.json → wombat/pool.json} +474 -721
- package/build/dex/aave-v1/aave-v1.d.ts +2 -1
- package/build/dex/aave-v1/aave-v1.js +23 -0
- package/build/dex/aave-v1/aave-v1.js.map +1 -1
- package/build/dex/aave-v2/tokens-avalanche.json +44 -0
- package/build/dex/aave-v2/tokens-mainnet.json +188 -0
- package/build/dex/aave-v2/tokens-polygon.json +44 -0
- package/build/dex/balancer-v3/abi/balancerBatchRouter.d.ts +729 -0
- package/build/dex/balancer-v3/abi/balancerBatchRouter.js +732 -0
- package/build/dex/balancer-v3/abi/balancerBatchRouter.js.map +1 -0
- package/build/dex/balancer-v3/abi/balancerRouter.d.ts +1406 -0
- package/build/dex/balancer-v3/abi/balancerRouter.js +1175 -0
- package/build/dex/balancer-v3/abi/balancerRouter.js.map +1 -0
- package/build/dex/balancer-v3/abi/vaultExtension.V3.d.ts +2081 -0
- package/build/dex/balancer-v3/abi/vaultExtension.V3.js +1851 -0
- package/build/dex/balancer-v3/abi/vaultExtension.V3.js.map +1 -0
- package/build/dex/balancer-v3/balancer-v3-pool.d.ts +80 -0
- package/build/dex/balancer-v3/balancer-v3-pool.js +461 -0
- package/build/dex/balancer-v3/balancer-v3-pool.js.map +1 -0
- package/build/dex/balancer-v3/balancer-v3-sepolia-pools.d.ts +34 -0
- package/build/dex/balancer-v3/balancer-v3-sepolia-pools.js +406 -0
- package/build/dex/balancer-v3/balancer-v3-sepolia-pools.js.map +1 -0
- package/build/dex/balancer-v3/balancer-v3.d.ts +57 -0
- package/build/dex/balancer-v3/balancer-v3.js +383 -0
- package/build/dex/balancer-v3/balancer-v3.js.map +1 -0
- package/build/dex/balancer-v3/config.d.ts +8 -0
- package/build/dex/balancer-v3/config.js +24 -0
- package/build/dex/balancer-v3/config.js.map +1 -0
- package/build/dex/balancer-v3/getGasCost.d.ts +2 -0
- package/build/dex/balancer-v3/getGasCost.js +41 -0
- package/build/dex/balancer-v3/getGasCost.js.map +1 -0
- package/build/dex/balancer-v3/getOnChainState.d.ts +10 -0
- package/build/dex/balancer-v3/getOnChainState.js +164 -0
- package/build/dex/balancer-v3/getOnChainState.js.map +1 -0
- package/build/dex/balancer-v3/getPoolsApi.d.ts +2 -0
- package/build/dex/balancer-v3/getPoolsApi.js +81 -0
- package/build/dex/balancer-v3/getPoolsApi.js.map +1 -0
- package/build/dex/balancer-v3/getTopPoolsApi.d.ts +13 -0
- package/build/dex/balancer-v3/getTopPoolsApi.js +62 -0
- package/build/dex/balancer-v3/getTopPoolsApi.js.map +1 -0
- package/build/dex/balancer-v3/optimizer.d.ts +2 -0
- package/build/dex/{trader-joe-v2.1 → balancer-v3}/optimizer.js +17 -16
- package/build/dex/balancer-v3/optimizer.js.map +1 -0
- package/build/dex/balancer-v3/stablePool.d.ts +7 -0
- package/build/dex/balancer-v3/stablePool.js +73 -0
- package/build/dex/balancer-v3/stablePool.js.map +1 -0
- package/build/dex/balancer-v3/types.d.ts +62 -0
- package/build/dex/balancer-v3/types.js +3 -0
- package/build/dex/balancer-v3/types.js.map +1 -0
- package/build/dex/balancer-v3/weightedPool.d.ts +1 -0
- package/build/dex/balancer-v3/weightedPool.js +6 -0
- package/build/dex/balancer-v3/weightedPool.js.map +1 -0
- package/build/dex/inception/config.d.ts +4 -0
- package/build/dex/inception/config.js +109 -0
- package/build/dex/inception/config.js.map +1 -0
- package/build/dex/inception/inception-event-pool.d.ts +16 -0
- package/build/dex/inception/inception-event-pool.js +49 -0
- package/build/dex/inception/inception-event-pool.js.map +1 -0
- package/build/dex/inception/inception.d.ts +43 -0
- package/build/dex/inception/inception.js +180 -0
- package/build/dex/inception/inception.js.map +1 -0
- package/build/dex/inception/tokens.d.ts +9 -0
- package/build/dex/inception/tokens.js +28 -0
- package/build/dex/inception/tokens.js.map +1 -0
- package/build/dex/inception/types.d.ts +22 -0
- package/build/dex/inception/types.js +3 -0
- package/build/dex/inception/types.js.map +1 -0
- package/build/dex/inception/utils.d.ts +7 -0
- package/build/dex/inception/utils.js +58 -0
- package/build/dex/inception/utils.js.map +1 -0
- package/build/dex/index.js +0 -2
- package/build/dex/index.js.map +1 -1
- package/build/dex/jarvis.d.ts +2 -1
- package/build/dex/jarvis.js +58 -0
- package/build/dex/jarvis.js.map +1 -1
- package/build/dex/maker-psm/scripts/gem.abi.json +136 -0
- package/build/dex/maker-psm/scripts/validate-state.d.ts +0 -0
- package/build/dex/maker-psm/scripts/validate-state.js +185 -0
- package/build/dex/maker-psm/scripts/validate-state.js.map +1 -0
- package/build/dex/maker-psm/scripts/vat.abi.json +243 -0
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.d.ts +2 -0
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.js +14 -0
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.js.map +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js +4 -0
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js.map +1 -1
- package/build/dex/platypus/platypus.d.ts +2 -1
- package/build/dex/platypus/platypus.js +45 -0
- package/build/dex/platypus/platypus.js.map +1 -1
- package/build/dex/solidly-v3/scripts/check-event-pool-event.d.ts +1 -0
- package/build/dex/solidly-v3/scripts/check-event-pool-event.js +53 -0
- package/build/dex/solidly-v3/scripts/check-event-pool-event.js.map +1 -0
- package/build/dex/stable-pool.js +1 -8
- package/build/dex/stable-pool.js.map +1 -1
- package/build/dex/swaap-v1/swaap-v1.d.ts +2 -1
- package/build/dex/swaap-v1/swaap-v1.js +14 -0
- package/build/dex/swaap-v1/swaap-v1.js.map +1 -1
- package/build/dex/uniswap-v3/forks/alien-base-v3/alien-base-v3.d.ts +17 -0
- package/build/dex/uniswap-v3/forks/alien-base-v3/alien-base-v3.js +64 -0
- package/build/dex/uniswap-v3/forks/alien-base-v3/alien-base-v3.js.map +1 -0
- package/build/dex/uniswap-v3/forks/alien-v3/alien-v3.d.ts +17 -0
- package/build/dex/uniswap-v3/forks/alien-v3/alien-v3.js +79 -0
- package/build/dex/uniswap-v3/forks/alien-v3/alien-v3.js.map +1 -0
- package/build/dex/uniswap-v3/uniswap-v3-pool.d.ts +2 -0
- package/build/dex/uniswap-v3/uniswap-v3-pool.js +14 -0
- package/build/dex/uniswap-v3/uniswap-v3-pool.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3-pricing.d.ts +4 -0
- package/build/dex/uniswap-v3/uniswap-v3-pricing.js +43 -0
- package/build/dex/uniswap-v3/uniswap-v3-pricing.js.map +1 -0
- package/build/dex/uniswap-v3/uniswap-v3-worker.d.ts +1 -0
- package/build/dex/uniswap-v3/uniswap-v3-worker.js +10 -0
- package/build/dex/uniswap-v3/uniswap-v3-worker.js.map +1 -0
- package/build/dex/uniswap-v3/uniswap-v3.js +5 -0
- package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
- package/build/dex/usual/types.d.ts +13 -0
- package/build/dex/usual/types.js +3 -0
- package/build/dex/usual/types.js.map +1 -0
- package/build/dex/usual/usual-bond.d.ts +18 -0
- package/build/dex/usual/usual-bond.js +52 -0
- package/build/dex/usual/usual-bond.js.map +1 -0
- package/build/dex/usual/usual-m-smart-m.d.ts +17 -0
- package/build/dex/usual/usual-m-smart-m.js +50 -0
- package/build/dex/usual/usual-m-smart-m.js.map +1 -0
- package/build/dex/usual/usual-m-usd0.d.ts +17 -0
- package/build/dex/usual/usual-m-usd0.js +51 -0
- package/build/dex/usual/usual-m-usd0.js.map +1 -0
- package/build/dex/usual/usual.d.ts +27 -0
- package/build/dex/usual/usual.js +125 -0
- package/build/dex/usual/usual.js.map +1 -0
- package/build/dex/usual-m-smart-m/config.d.ts +3 -0
- package/build/dex/usual-m-smart-m/config.js +13 -0
- package/build/dex/usual-m-smart-m/config.js.map +1 -0
- package/build/dex/usual-m-smart-m/types.d.ts +7 -0
- package/build/dex/usual-m-smart-m/types.js +3 -0
- package/build/dex/usual-m-smart-m/types.js.map +1 -0
- package/build/dex/usual-m-smart-m/usual-m-smart-m.d.ts +35 -0
- package/build/dex/usual-m-smart-m/usual-m-smart-m.js +161 -0
- package/build/dex/usual-m-smart-m/usual-m-smart-m.js.map +1 -0
- package/build/dex/{stader → usual-m-usd0}/config.d.ts +1 -1
- package/build/dex/usual-m-usd0/config.js +14 -0
- package/build/dex/usual-m-usd0/config.js.map +1 -0
- package/build/dex/usual-m-usd0/types.d.ts +8 -0
- package/build/dex/usual-m-usd0/types.js +3 -0
- package/build/dex/usual-m-usd0/types.js.map +1 -0
- package/build/dex/usual-m-usd0/usual-m-usd0.d.ts +35 -0
- package/build/dex/usual-m-usd0/usual-m-usd0.js +159 -0
- package/build/dex/usual-m-usd0/usual-m-usd0.js.map +1 -0
- package/build/dex/zerox/index.d.ts +4 -26
- package/build/dex/zerox/index.js +50 -42
- package/build/dex/zerox/index.js.map +1 -1
- package/build/dex/zerox/types.d.ts +29 -0
- package/build/dex/zerox/types.js +8 -1
- package/build/dex/zerox/types.js.map +1 -1
- package/build/stateful-event-subscriber.d.ts +2 -2
- package/build/stateful-event-subscriber.js +15 -15
- package/build/stateful-event-subscriber.js.map +1 -1
- package/package.json +1 -1
- package/src/dex/balancer-v3/balancer-v3-sepolia-pools.ts +404 -0
- package/src/dex/index.ts +0 -2
- package/src/dex/pancakeswap-v3/pancakeswap-v3-pool.ts +27 -0
- package/src/dex/pancakeswap-v3/pancakeswap-v3.ts +10 -0
- package/src/dex/uniswap-v3/uniswap-v3-pool.ts +27 -0
- package/src/dex/uniswap-v3/uniswap-v3.ts +11 -0
- package/src/stateful-event-subscriber.ts +23 -15
- package/tests/constants-e2e.ts +0 -5
- package/.idea/aws.xml +0 -17
- package/.idea/codeStyles/Project.xml +0 -19
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/misc.xml +0 -6
- package/.idea/modules.xml +0 -8
- package/.idea/paraswap-dex-lib.iml +0 -9
- package/.idea/prettier.xml +0 -7
- package/.idea/vcs.xml +0 -6
- package/build/abi/SSPM.json +0 -829
- package/build/abi/StaderOracle.json +0 -2170
- package/build/abi/integral/factory.json +0 -333
- package/build/abi/integral/oracle.json +0 -501
- package/build/abi/integral/pool.json +0 -1041
- package/build/dex/cables/cables.d.ts +0 -59
- package/build/dex/cables/cables.js +0 -614
- package/build/dex/cables/cables.js.map +0 -1
- package/build/dex/cables/config.d.ts +0 -4
- package/build/dex/cables/config.js +0 -15
- package/build/dex/cables/config.js.map +0 -1
- package/build/dex/cables/constants.d.ts +0 -20
- package/build/dex/cables/constants.js +0 -24
- package/build/dex/cables/constants.js.map +0 -1
- package/build/dex/cables/rate-fetcher.d.ts +0 -34
- package/build/dex/cables/rate-fetcher.js +0 -106
- package/build/dex/cables/rate-fetcher.js.map +0 -1
- package/build/dex/cables/types.d.ts +0 -113
- package/build/dex/cables/types.js +0 -19
- package/build/dex/cables/types.js.map +0 -1
- package/build/dex/cables/validators.d.ts +0 -5
- package/build/dex/cables/validators.js +0 -49
- package/build/dex/cables/validators.js.map +0 -1
- package/build/dex/fluid-dex/fluid-dex-generate-pool.d.ts +0 -49
- package/build/dex/fluid-dex/fluid-dex-generate-pool.js +0 -104
- package/build/dex/fluid-dex/fluid-dex-generate-pool.js.map +0 -1
- package/build/dex/integral/config.d.ts +0 -4
- package/build/dex/integral/config.js +0 -20
- package/build/dex/integral/config.js.map +0 -1
- package/build/dex/integral/context.d.ts +0 -40
- package/build/dex/integral/context.js +0 -158
- package/build/dex/integral/context.js.map +0 -1
- package/build/dex/integral/integral-factory.d.ts +0 -24
- package/build/dex/integral/integral-factory.js +0 -95
- package/build/dex/integral/integral-factory.js.map +0 -1
- package/build/dex/integral/integral-pool.d.ts +0 -50
- package/build/dex/integral/integral-pool.js +0 -149
- package/build/dex/integral/integral-pool.js.map +0 -1
- package/build/dex/integral/integral-pricing.d.ts +0 -18
- package/build/dex/integral/integral-pricing.js +0 -114
- package/build/dex/integral/integral-pricing.js.map +0 -1
- package/build/dex/integral/integral-relayer.d.ts +0 -42
- package/build/dex/integral/integral-relayer.js +0 -192
- package/build/dex/integral/integral-relayer.js.map +0 -1
- package/build/dex/integral/integral-token.d.ts +0 -27
- package/build/dex/integral/integral-token.js +0 -59
- package/build/dex/integral/integral-token.js.map +0 -1
- package/build/dex/integral/integral.d.ts +0 -41
- package/build/dex/integral/integral.js +0 -376
- package/build/dex/integral/integral.js.map +0 -1
- package/build/dex/integral/types.d.ts +0 -85
- package/build/dex/integral/types.js +0 -9
- package/build/dex/integral/types.js.map +0 -1
- package/build/dex/integral/utils-e2e.d.ts +0 -9
- package/build/dex/integral/utils-e2e.js +0 -131
- package/build/dex/integral/utils-e2e.js.map +0 -1
- package/build/dex/integral/utils.d.ts +0 -17
- package/build/dex/integral/utils.js +0 -94
- package/build/dex/integral/utils.js.map +0 -1
- package/build/dex/stader/config.js +0 -14
- package/build/dex/stader/config.js.map +0 -1
- package/build/dex/stader/stader-pool.d.ts +0 -18
- package/build/dex/stader/stader-pool.js +0 -47
- package/build/dex/stader/stader-pool.js.map +0 -1
- package/build/dex/stader/stader.d.ts +0 -42
- package/build/dex/stader/stader.js +0 -171
- package/build/dex/stader/stader.js.map +0 -1
- package/build/dex/stader/types.d.ts +0 -13
- package/build/dex/stader/types.js +0 -8
- package/build/dex/stader/types.js.map +0 -1
- package/build/dex/stader/utils.d.ts +0 -4
- package/build/dex/stader/utils.js +0 -24
- package/build/dex/stader/utils.js.map +0 -1
- package/build/dex/trader-joe-v2.1/optimizer.d.ts +0 -2
- package/build/dex/trader-joe-v2.1/optimizer.js.map +0 -1
- package/src/abi/SSPM.json +0 -829
- package/src/abi/StaderOracle.json +0 -2170
- package/src/dex/stader/config.ts +0 -13
- package/src/dex/stader/stader-e2e.test.ts +0 -74
- package/src/dex/stader/stader-events.test.ts +0 -64
- package/src/dex/stader/stader-integration.test.ts +0 -240
- package/src/dex/stader/stader-pool.ts +0 -68
- package/src/dex/stader/stader.ts +0 -240
- package/src/dex/stader/types.ts +0 -16
- package/src/dex/stader/utils.ts +0 -34
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.UsualMUsd01 = void 0;
|
|
30
|
+
const constants_1 = require("../../constants");
|
|
31
|
+
const CALLDATA_GAS_COST = __importStar(require("../../calldata-gas-cost"));
|
|
32
|
+
const utils_1 = require("../../utils");
|
|
33
|
+
const simple_exchange_1 = require("../simple-exchange");
|
|
34
|
+
const config_1 = require("./config");
|
|
35
|
+
const abi_1 = require("@ethersproject/abi");
|
|
36
|
+
const usualCollateralDao_abi_json_1 = __importDefault(require("../../abi/usual-m-usd0/usualCollateralDao.abi.json"));
|
|
37
|
+
const bigint_constants_1 = require("../../bigint-constants");
|
|
38
|
+
class UsualMUsd01 extends simple_exchange_1.SimpleExchange {
|
|
39
|
+
constructor(network, dexKey, dexHelper) {
|
|
40
|
+
super(dexHelper, dexKey);
|
|
41
|
+
this.network = network;
|
|
42
|
+
this.dexKey = dexKey;
|
|
43
|
+
this.dexHelper = dexHelper;
|
|
44
|
+
this.hasConstantPriceLargeAmounts = true;
|
|
45
|
+
this.needWrapNative = false;
|
|
46
|
+
this.isFeeOnTransferSupported = false;
|
|
47
|
+
const config = config_1.UsualMUsd0Config[dexKey][network];
|
|
48
|
+
this.usualDaoCollateralIface = new abi_1.Interface(usualCollateralDao_abi_json_1.default);
|
|
49
|
+
this.config = {
|
|
50
|
+
usualMAddress: config.usualMAddress.toLowerCase(),
|
|
51
|
+
usd0Address: config.usd0Address.toLowerCase(),
|
|
52
|
+
usualDaoCollateralAddress: config.usualDaoCollateralAddress.toLowerCase(),
|
|
53
|
+
};
|
|
54
|
+
this.logger = dexHelper.getLogger(dexKey);
|
|
55
|
+
}
|
|
56
|
+
async initializePricing(blockNumber) {
|
|
57
|
+
// No initialization needed for constant price
|
|
58
|
+
}
|
|
59
|
+
getConfig() {
|
|
60
|
+
return this.config;
|
|
61
|
+
}
|
|
62
|
+
is_usualM(token) {
|
|
63
|
+
return token.toLowerCase() === this.config.usualMAddress.toLowerCase();
|
|
64
|
+
}
|
|
65
|
+
is_usd0(token) {
|
|
66
|
+
return token.toLowerCase() === this.config.usd0Address.toLowerCase();
|
|
67
|
+
}
|
|
68
|
+
is_usd0_swap_token(srcToken, destToken) {
|
|
69
|
+
return this.is_usualM(srcToken) && this.is_usd0(destToken);
|
|
70
|
+
}
|
|
71
|
+
getAdapters() {
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
async getPoolIdentifiers(srcToken, destToken, side, blockNumber) {
|
|
75
|
+
if (!srcToken || !destToken) {
|
|
76
|
+
this.logger.error('Source or destination token is undefined');
|
|
77
|
+
return [];
|
|
78
|
+
}
|
|
79
|
+
const srcTokenAddress = srcToken.address?.toLowerCase();
|
|
80
|
+
const destTokenAddress = destToken.address?.toLowerCase();
|
|
81
|
+
if (!srcTokenAddress || !destTokenAddress) {
|
|
82
|
+
this.logger.error('Source or destination token address is undefined');
|
|
83
|
+
return [];
|
|
84
|
+
}
|
|
85
|
+
if (this.is_usd0_swap_token(srcTokenAddress, destTokenAddress)) {
|
|
86
|
+
return [`${this.dexKey}_${this.config.usd0Address}`];
|
|
87
|
+
}
|
|
88
|
+
return [];
|
|
89
|
+
}
|
|
90
|
+
async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools) {
|
|
91
|
+
if (side === constants_1.SwapSide.BUY) {
|
|
92
|
+
return null;
|
|
93
|
+
}
|
|
94
|
+
const isUsd0SwapToken = this.is_usd0_swap_token(srcToken.address, destToken.address);
|
|
95
|
+
if (!isUsd0SwapToken) {
|
|
96
|
+
return null;
|
|
97
|
+
}
|
|
98
|
+
const unitOut = bigint_constants_1.BI_POWS[18]; // 1:1 swap
|
|
99
|
+
const amountsOut = amounts; // 1:1 swap, so output amounts are the same as input
|
|
100
|
+
return [
|
|
101
|
+
{
|
|
102
|
+
unit: unitOut,
|
|
103
|
+
prices: amountsOut,
|
|
104
|
+
data: {},
|
|
105
|
+
poolAddresses: [this.config.usd0Address],
|
|
106
|
+
exchange: this.dexKey,
|
|
107
|
+
gasCost: 70000,
|
|
108
|
+
poolIdentifier: this.dexKey,
|
|
109
|
+
},
|
|
110
|
+
];
|
|
111
|
+
}
|
|
112
|
+
getCalldataGasCost(poolPrices) {
|
|
113
|
+
return CALLDATA_GAS_COST.DEX_NO_PAYLOAD;
|
|
114
|
+
}
|
|
115
|
+
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
116
|
+
const payload = '0x';
|
|
117
|
+
return {
|
|
118
|
+
targetExchange: this.config.usualMAddress,
|
|
119
|
+
payload,
|
|
120
|
+
networkFee: '0',
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
async getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
|
|
124
|
+
if (this.is_usualM(srcToken) && this.is_usd0(destToken)) {
|
|
125
|
+
const exchangeData = this.usualDaoCollateralIface.encodeFunctionData('swap', [srcToken, srcAmount, destAmount]);
|
|
126
|
+
return {
|
|
127
|
+
needWrapNative: false,
|
|
128
|
+
dexFuncHasRecipient: false,
|
|
129
|
+
exchangeData,
|
|
130
|
+
targetExchange: this.config.usualDaoCollateralAddress,
|
|
131
|
+
returnAmountPos: undefined,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
throw new Error('LOGIC ERROR');
|
|
135
|
+
}
|
|
136
|
+
async getTopPoolsForToken(tokenAddress, limit) {
|
|
137
|
+
const isUsualM = this.is_usualM(tokenAddress);
|
|
138
|
+
if (!isUsualM && !this.is_usd0(tokenAddress))
|
|
139
|
+
return [];
|
|
140
|
+
return [
|
|
141
|
+
{
|
|
142
|
+
exchange: this.dexKey,
|
|
143
|
+
address: this.config.usualMAddress,
|
|
144
|
+
connectorTokens: [
|
|
145
|
+
{
|
|
146
|
+
decimals: isUsualM ? 6 : 18,
|
|
147
|
+
address: isUsualM
|
|
148
|
+
? this.config.usd0Address
|
|
149
|
+
: this.config.usualMAddress,
|
|
150
|
+
},
|
|
151
|
+
],
|
|
152
|
+
liquidityUSD: 1000000000, // Just returning a big number so this DEX will be preferred
|
|
153
|
+
},
|
|
154
|
+
];
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
exports.UsualMUsd01 = UsualMUsd01;
|
|
158
|
+
UsualMUsd01.dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(config_1.UsualMUsd0Config);
|
|
159
|
+
//# sourceMappingURL=usual-m-usd0.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usual-m-usd0.js","sourceRoot":"","sources":["../../../src/dex/usual-m-usd0/usual-m-usd0.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,31 +2,9 @@ import { Interface } from '@ethersproject/abi';
|
|
|
2
2
|
import { SwapSide } from '../../constants';
|
|
3
3
|
import { SimpleExchange } from '../simple-exchange';
|
|
4
4
|
import type { IDexTxBuilder } from '../idex';
|
|
5
|
-
import type { AdapterExchangeParam, Address, NumberAsString, SimpleExchangeParam, TxInfo } from '../../types';
|
|
6
|
-
import type
|
|
5
|
+
import type { AdapterExchangeParam, Address, DexExchangeParam, NumberAsString, SimpleExchangeParam, TxInfo } from '../../types';
|
|
6
|
+
import { type ZeroXData, type ZeroXParam } from './types';
|
|
7
7
|
import { IDexHelper } from '../../dex-helper';
|
|
8
|
-
declare type ZeroXData = {
|
|
9
|
-
version: number;
|
|
10
|
-
order: ZeroXSignedOrder;
|
|
11
|
-
};
|
|
12
|
-
declare type SwapOnZeroXParam = [
|
|
13
|
-
srcToken: Address,
|
|
14
|
-
destToken: Address,
|
|
15
|
-
srcAmount: NumberAsString,
|
|
16
|
-
destAmount: NumberAsString,
|
|
17
|
-
exchange: Address,
|
|
18
|
-
payload: string
|
|
19
|
-
];
|
|
20
|
-
declare type SwapOnZeroXWithPermitParam = [
|
|
21
|
-
srcToken: Address,
|
|
22
|
-
destToken: Address,
|
|
23
|
-
srcAmount: NumberAsString,
|
|
24
|
-
destAmount: NumberAsString,
|
|
25
|
-
exchange: Address,
|
|
26
|
-
payload: string,
|
|
27
|
-
permit: string
|
|
28
|
-
];
|
|
29
|
-
declare type ZeroXParam = SwapOnZeroXParam | SwapOnZeroXWithPermitParam;
|
|
30
8
|
export declare class ZeroX extends SimpleExchange implements IDexTxBuilder<ZeroXData, ZeroXParam> {
|
|
31
9
|
static dexKeys: string[];
|
|
32
10
|
routerInterface: Interface;
|
|
@@ -38,7 +16,7 @@ export declare class ZeroX extends SimpleExchange implements IDexTxBuilder<ZeroX
|
|
|
38
16
|
getAdapterParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, toAmount: NumberAsString, // required for buy case
|
|
39
17
|
data: ZeroXData, side: SwapSide): AdapterExchangeParam;
|
|
40
18
|
getSimpleParam(src: Address, dest: Address, srcAmount: NumberAsString, destAmount: NumberAsString, data: ZeroXData, side: SwapSide): Promise<SimpleExchangeParam>;
|
|
41
|
-
|
|
19
|
+
getDexParam(_srcToken: Address, _destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, _recipient: Address, data: ZeroXData, side: SwapSide): DexExchangeParam;
|
|
20
|
+
getDirectParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, expectedAmount: NumberAsString, data: ZeroXData, side: SwapSide, permit: string, uuid: string, feePercent: NumberAsString, deadline: NumberAsString, partner: string, beneficiary: string, contractMethod: string): TxInfo<ZeroXParam>;
|
|
42
21
|
static getDirectFunctionName(): string[];
|
|
43
22
|
}
|
|
44
|
-
export {};
|
package/build/dex/zerox/index.js
CHANGED
|
@@ -13,46 +13,13 @@ const zrx_v4_json_1 = __importDefault(require("../../abi/zrx.v4.json"));
|
|
|
13
13
|
const constants_1 = require("../../constants");
|
|
14
14
|
const simple_exchange_1 = require("../simple-exchange");
|
|
15
15
|
const order_1 = require("./order");
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
2: '0x080bf510fcbf18b91105470639e9561022937712',
|
|
19
|
-
3: '0x61935CbDd02287B511119DDb11Aeb42F1593b7Ef',
|
|
20
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
21
|
-
},
|
|
22
|
-
56: {
|
|
23
|
-
2: '0x3F93C3D9304a70c9104642AB8cD37b1E2a7c203A',
|
|
24
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
25
|
-
},
|
|
26
|
-
137: {
|
|
27
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
28
|
-
},
|
|
29
|
-
};
|
|
16
|
+
const types_1 = require("./types");
|
|
17
|
+
const config_1 = require("./config");
|
|
30
18
|
const ZRX_ABI = {
|
|
31
19
|
2: zrx_v2_json_1.default,
|
|
32
20
|
3: zrx_v3_json_1.default,
|
|
33
21
|
4: zrx_v4_json_1.default,
|
|
34
22
|
};
|
|
35
|
-
const ZRX_EXCHANGE_ERC20PROXY = {
|
|
36
|
-
1: {
|
|
37
|
-
1: '0x95E6F48254609A6ee006F7D493c8e5fB97094ceF',
|
|
38
|
-
2: '0x95E6F48254609A6ee006F7D493c8e5fB97094ceF',
|
|
39
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
40
|
-
},
|
|
41
|
-
56: {
|
|
42
|
-
2: '0xCF21d4b7a265FF779accBA55Ace0F56C8cE6e379',
|
|
43
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
44
|
-
},
|
|
45
|
-
137: {
|
|
46
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
47
|
-
},
|
|
48
|
-
};
|
|
49
|
-
var ZeroXFunctions;
|
|
50
|
-
(function (ZeroXFunctions) {
|
|
51
|
-
ZeroXFunctions["swapOnZeroXv2"] = "swapOnZeroXv2";
|
|
52
|
-
ZeroXFunctions["swapOnZeroXv4"] = "swapOnZeroXv4";
|
|
53
|
-
ZeroXFunctions["swapOnZeroXv2WithPermit"] = "swapOnZeroXv2WithPermit";
|
|
54
|
-
ZeroXFunctions["swapOnZeroXv4WithPermit"] = "swapOnZeroXv4WithPermit";
|
|
55
|
-
})(ZeroXFunctions || (ZeroXFunctions = {}));
|
|
56
23
|
class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
57
24
|
constructor(dexHelper) {
|
|
58
25
|
super(dexHelper, 'zerox');
|
|
@@ -60,7 +27,7 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
60
27
|
this.routerInterface = new abi_1.Interface(IParaswap_json_1.default);
|
|
61
28
|
}
|
|
62
29
|
getExchange(data) {
|
|
63
|
-
return ZRX_EXCHANGE[this.network][data.version];
|
|
30
|
+
return config_1.ZRX_EXCHANGE[this.network][data.version];
|
|
64
31
|
}
|
|
65
32
|
buildSimpleSwapData(data, srcAmount) {
|
|
66
33
|
const zrxABI = ZRX_ABI[data.version];
|
|
@@ -167,7 +134,48 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
167
134
|
}
|
|
168
135
|
const swapData = this.buildSimpleSwapData(data, srcAmount);
|
|
169
136
|
const networkFees = '0';
|
|
170
|
-
return this.buildSimpleParamWithoutWETHConversion(src, srcAmount, dest, destAmount, swapData, this.getExchange(data), ZRX_EXCHANGE_ERC20PROXY[this.network][data.version], networkFees);
|
|
137
|
+
return this.buildSimpleParamWithoutWETHConversion(src, srcAmount, dest, destAmount, swapData, this.getExchange(data), config_1.ZRX_EXCHANGE_ERC20PROXY[this.network][data.version], networkFees);
|
|
138
|
+
}
|
|
139
|
+
getDexParam(_srcToken, _destToken, srcAmount, destAmount, _recipient, data, side) {
|
|
140
|
+
if (side === constants_1.SwapSide.BUY) {
|
|
141
|
+
// Adjust the srcAmount according to the exact order price (rounding up)
|
|
142
|
+
if (data.version === 4) {
|
|
143
|
+
const order = data.order;
|
|
144
|
+
if (BigInt(destAmount) > BigInt(order.makerAmount)) {
|
|
145
|
+
throw new Error(`ZeroX destAmount ${destAmount} > makerAmount ${order.makerAmount}`);
|
|
146
|
+
}
|
|
147
|
+
const calc = (BigInt(destAmount) * BigInt(order.takerAmount) +
|
|
148
|
+
BigInt(order.makerAmount) -
|
|
149
|
+
1n) /
|
|
150
|
+
BigInt(order.makerAmount);
|
|
151
|
+
if (calc > BigInt(srcAmount)) {
|
|
152
|
+
throw new Error(`ZeroX calc ${calc} > srcAmount ${srcAmount}`);
|
|
153
|
+
}
|
|
154
|
+
srcAmount = calc.toString();
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
const order = data.order;
|
|
158
|
+
if (BigInt(destAmount) > BigInt(order.makerAssetAmount)) {
|
|
159
|
+
throw new Error(`ZeroX destAmount ${destAmount} > makerAmount ${order.makerAssetAmount}`);
|
|
160
|
+
}
|
|
161
|
+
const calc = (BigInt(destAmount) * BigInt(order.takerAssetAmount) +
|
|
162
|
+
BigInt(order.makerAssetAmount) -
|
|
163
|
+
1n) /
|
|
164
|
+
BigInt(order.makerAssetAmount);
|
|
165
|
+
if (calc > BigInt(srcAmount)) {
|
|
166
|
+
throw new Error(`ZeroX calc ${calc} > srcAmount ${srcAmount}`);
|
|
167
|
+
}
|
|
168
|
+
srcAmount = calc.toString();
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
const swapData = this.buildSimpleSwapData(data, srcAmount);
|
|
172
|
+
return {
|
|
173
|
+
needWrapNative: this.needWrapNative,
|
|
174
|
+
dexFuncHasRecipient: false,
|
|
175
|
+
exchangeData: swapData,
|
|
176
|
+
targetExchange: this.getExchange(data),
|
|
177
|
+
returnAmountPos: undefined,
|
|
178
|
+
};
|
|
171
179
|
}
|
|
172
180
|
getDirectParam(srcToken, destToken, srcAmount, destAmount, expectedAmount, data, side, permit, uuid, feePercent, deadline, partner, beneficiary, contractMethod) {
|
|
173
181
|
const usePermit = permit !== '0x';
|
|
@@ -175,12 +183,12 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
175
183
|
switch (data.version) {
|
|
176
184
|
case 2:
|
|
177
185
|
return this.routerInterface.encodeFunctionData(usePermit
|
|
178
|
-
? ZeroXFunctions.swapOnZeroXv2WithPermit
|
|
179
|
-
: ZeroXFunctions.swapOnZeroXv2, params);
|
|
186
|
+
? types_1.ZeroXFunctions.swapOnZeroXv2WithPermit
|
|
187
|
+
: types_1.ZeroXFunctions.swapOnZeroXv2, params);
|
|
180
188
|
case 4:
|
|
181
189
|
return this.routerInterface.encodeFunctionData(usePermit
|
|
182
|
-
? ZeroXFunctions.swapOnZeroXv4WithPermit
|
|
183
|
-
: ZeroXFunctions.swapOnZeroXv4, params);
|
|
190
|
+
? types_1.ZeroXFunctions.swapOnZeroXv4WithPermit
|
|
191
|
+
: types_1.ZeroXFunctions.swapOnZeroXv4, params);
|
|
184
192
|
default:
|
|
185
193
|
throw new Error(`ZeroX version ${data.version} is not supported!`);
|
|
186
194
|
}
|
|
@@ -209,7 +217,7 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
209
217
|
};
|
|
210
218
|
}
|
|
211
219
|
static getDirectFunctionName() {
|
|
212
|
-
return [ZeroXFunctions.swapOnZeroXv2, ZeroXFunctions.swapOnZeroXv4];
|
|
220
|
+
return [types_1.ZeroXFunctions.swapOnZeroXv2, types_1.ZeroXFunctions.swapOnZeroXv4];
|
|
213
221
|
}
|
|
214
222
|
}
|
|
215
223
|
exports.ZeroX = ZeroX;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dex/zerox/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAuC;AACvC,4CAA+C;AAE/C,8EAAoD;AACpD,wEAA+C;AAC/C,wEAA+C;AAC/C,wEAA+C;AAE/C,+CAA2C;AAC3C,wDAAoD;AACpD,mCAAqC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dex/zerox/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAuC;AACvC,4CAA+C;AAE/C,8EAAoD;AACpD,wEAA+C;AAC/C,wEAA+C;AAC/C,wEAA+C;AAE/C,+CAA2C;AAC3C,wDAAoD;AACpD,mCAAqC;AAWrC,mCAMiB;AAEjB,qCAAiE;AAEjE,MAAM,OAAO,GAAQ;IACnB,CAAC,EAAE,qBAAU;IACb,CAAC,EAAE,qBAAU;IACb,CAAC,EAAE,qBAAU;CACd,CAAC;AAEF,MAAa,KACX,SAAQ,gCAAc;IAOtB,YAAY,SAAqB;QAC/B,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAH5B,mBAAc,GAAG,IAAI,CAAC;QAIpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAS,CAAC,wBAAY,CAAC,CAAC;IACrD,CAAC;IAEO,WAAW,CAAC,IAAe;QACjC,OAAO,qBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAES,mBAAmB,CAAC,IAAe,EAAE,SAAyB;QACtE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QACvC,MAAM,KAAK,GAAG,kBAAU,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAC3B,CAAC,CAAM,EAAE,EAAE,CACT,CAAC,CAAC,IAAI;YACN,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,yBAAyB,CAAC,CACpE,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,kBAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACpD,8FAA8F;QAC9F,OAAO,UAAU,CAAC,MAAM,CACtB,IAAI,CAAC,OAAO,KAAK,CAAC;YAChB,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC;YAC/B,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CACtC,CAAC;IACJ,CAAC;IAES,YAAY,CAAC,IAAe;QACpC,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,KAAK,CAAC;YAChB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAC3B;gBACE,YAAY,EAAE;oBACZ,KAAK,EAAE;wBACL,UAAU,EAAE,SAAS;wBACrB,UAAU,EAAE,SAAS;wBACrB,WAAW,EAAE,SAAS;wBACtB,WAAW,EAAE,SAAS;wBACtB,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,SAAS;wBAChB,QAAQ,EAAE,SAAS;wBACnB,IAAI,EAAE,SAAS;wBACf,MAAM,EAAE,QAAQ;wBAChB,IAAI,EAAE,SAAS;qBAChB;oBACD,SAAS,EAAE;wBACT,aAAa,EAAE,OAAO;wBACtB,CAAC,EAAE,OAAO;wBACV,CAAC,EAAE,SAAS;wBACZ,CAAC,EAAE,SAAS;qBACb;iBACF;aACF,EACD;gBACE,KAAK,EAAE,kBAAU,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7C,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;aAChC,CACF;YACH,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAC3B;gBACE,YAAY,EAAE;oBACZ,UAAU,EAAE;wBACV,YAAY,EAAE,SAAS;wBACvB,YAAY,EAAE,SAAS;wBACvB,mBAAmB,EAAE,SAAS;wBAC9B,aAAa,EAAE,SAAS;wBACxB,gBAAgB,EAAE,SAAS;wBAC3B,gBAAgB,EAAE,SAAS;wBAC3B,QAAQ,EAAE,SAAS;wBACnB,QAAQ,EAAE,SAAS;wBACnB,qBAAqB,EAAE,SAAS;wBAChC,IAAI,EAAE,SAAS;wBACf,cAAc,EAAE,OAAO;wBACvB,cAAc,EAAE,OAAO;qBACxB;oBACD,UAAU,EAAE,SAAS;iBACtB;aACF,EACD;gBACE,MAAM,EAAE,CAAC,kBAAU,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAChD,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;aACnC,CACF,CAAC;QACR,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,eAAe,CACb,QAAiB,EACjB,SAAkB,EAClB,SAAyB,EACzB,QAAwB,EAAE,wBAAwB;IAClD,IAAe,EACf,IAAc;QAEd,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YACtC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;YAChC,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,GAAY,EACZ,IAAa,EACb,SAAyB,EACzB,UAA0B,EAC1B,IAAe,EACf,IAAc;QAEd,IAAI,IAAI,KAAK,oBAAQ,CAAC,GAAG,EAAE;YACzB,wEAAwE;YACxE,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;gBACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAA2B,CAAC;gBAC/C,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;oBAClD,MAAM,IAAI,KAAK,CACb,oBAAoB,UAAU,kBAAkB,KAAK,CAAC,WAAW,EAAE,CACpE,CAAC;iBACH;gBACD,MAAM,IAAI,GACR,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;oBAC7C,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;oBACzB,EAAE,CAAC;oBACL,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAC5B,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,gBAAgB,SAAS,EAAE,CAAC,CAAC;iBAChE;gBACD,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;aAC7B;iBAAM;gBACL,MAAM,KAAK,GAAG,IAAI,CAAC,KAA2B,CAAC;gBAC/C,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE;oBACvD,MAAM,IAAI,KAAK,CACb,oBAAoB,UAAU,kBAAkB,KAAK,CAAC,gBAAgB,EAAE,CACzE,CAAC;iBACH;gBACD,MAAM,IAAI,GACR,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;oBAClD,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;oBAC9B,EAAE,CAAC;oBACL,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBACjC,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,gBAAgB,SAAS,EAAE,CAAC,CAAC;iBAChE;gBACD,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;aAC7B;SACF;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,GAAG,CAAC;QAExB,OAAO,IAAI,CAAC,qCAAqC,CAC/C,GAAG,EACH,SAAS,EACT,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EACtB,gCAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EACnD,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,WAAW,CACT,SAAkB,EAClB,UAAmB,EACnB,SAAyB,EACzB,UAA0B,EAC1B,UAAmB,EACnB,IAAe,EACf,IAAc;QAEd,IAAI,IAAI,KAAK,oBAAQ,CAAC,GAAG,EAAE;YACzB,wEAAwE;YACxE,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;gBACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAA2B,CAAC;gBAC/C,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;oBAClD,MAAM,IAAI,KAAK,CACb,oBAAoB,UAAU,kBAAkB,KAAK,CAAC,WAAW,EAAE,CACpE,CAAC;iBACH;gBACD,MAAM,IAAI,GACR,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;oBAC7C,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;oBACzB,EAAE,CAAC;oBACL,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAC5B,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,gBAAgB,SAAS,EAAE,CAAC,CAAC;iBAChE;gBACD,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;aAC7B;iBAAM;gBACL,MAAM,KAAK,GAAG,IAAI,CAAC,KAA2B,CAAC;gBAC/C,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE;oBACvD,MAAM,IAAI,KAAK,CACb,oBAAoB,UAAU,kBAAkB,KAAK,CAAC,gBAAgB,EAAE,CACzE,CAAC;iBACH;gBACD,MAAM,IAAI,GACR,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;oBAClD,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;oBAC9B,EAAE,CAAC;oBACL,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBACjC,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,gBAAgB,SAAS,EAAE,CAAC,CAAC;iBAChE;gBACD,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;aAC7B;SACF;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAE3D,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,mBAAmB,EAAE,KAAK;YAC1B,YAAY,EAAE,QAAQ;YACtB,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YACtC,eAAe,EAAE,SAAS;SAC3B,CAAC;IACJ,CAAC;IAED,cAAc,CACZ,QAAiB,EACjB,SAAkB,EAClB,SAAyB,EACzB,UAA0B,EAC1B,cAA8B,EAC9B,IAAe,EACf,IAAc,EACd,MAAc,EACd,IAAY,EACZ,UAA0B,EAC1B,QAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,cAAsB;QAEtB,MAAM,SAAS,GAAG,MAAM,KAAK,IAAI,CAAC;QAClC,MAAM,OAAO,GAAG,CAAC,GAAG,MAAkB,EAAE,EAAE;YACxC,QAAQ,IAAI,CAAC,OAAO,EAAE;gBACpB,KAAK,CAAC;oBACJ,OAAO,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAC5C,SAAS;wBACP,CAAC,CAAC,sBAAc,CAAC,uBAAuB;wBACxC,CAAC,CAAC,sBAAc,CAAC,aAAa,EAChC,MAAM,CACP,CAAC;gBACJ,KAAK,CAAC;oBACJ,OAAO,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAC5C,SAAS;wBACP,CAAC,CAAC,sBAAc,CAAC,uBAAuB;wBACxC,CAAC,CAAC,sBAAc,CAAC,aAAa,EAChC,MAAM,CACP,CAAC;gBACJ;oBACE,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;aACtE;QACH,CAAC,CAAC;QACF,OAAO;YACL,MAAM,EAAE,SAAS;gBACf,CAAC,CAAC;oBACE,QAAQ;oBACR,SAAS;oBACT,SAAS;oBACT,UAAU;oBACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;oBACtB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;oBACvB,MAAM;iBACP;gBACH,CAAC,CAAC;oBACE,QAAQ;oBACR,SAAS;oBACT,SAAS;oBACT,UAAU;oBACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;oBACtB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;iBACxB;YACL,OAAO;YACP,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,qBAAqB;QAC1B,OAAO,CAAC,sBAAc,CAAC,aAAa,EAAE,sBAAc,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;;AAjSH,sBAkSC;AA9RQ,aAAO,GAAG,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Address } from '@paraswap/sdk';
|
|
1
2
|
import { NumberAsString } from '../../types';
|
|
2
3
|
export declare enum OrderStatus {
|
|
3
4
|
INVALID = 0,
|
|
@@ -41,4 +42,32 @@ export interface ZeroXSignedOrderV4 {
|
|
|
41
42
|
signature: any;
|
|
42
43
|
}
|
|
43
44
|
export declare type ZeroXSignedOrder = ZeroXSignedOrderV2 | ZeroXSignedOrderV4;
|
|
45
|
+
export declare enum ZeroXFunctions {
|
|
46
|
+
swapOnZeroXv2 = "swapOnZeroXv2",
|
|
47
|
+
swapOnZeroXv4 = "swapOnZeroXv4",
|
|
48
|
+
swapOnZeroXv2WithPermit = "swapOnZeroXv2WithPermit",
|
|
49
|
+
swapOnZeroXv4WithPermit = "swapOnZeroXv4WithPermit"
|
|
50
|
+
}
|
|
51
|
+
export declare type ZeroXData = {
|
|
52
|
+
version: number;
|
|
53
|
+
order: ZeroXSignedOrder;
|
|
54
|
+
};
|
|
55
|
+
export declare type SwapOnZeroXParam = [
|
|
56
|
+
srcToken: Address,
|
|
57
|
+
destToken: Address,
|
|
58
|
+
srcAmount: NumberAsString,
|
|
59
|
+
destAmount: NumberAsString,
|
|
60
|
+
exchange: Address,
|
|
61
|
+
payload: string
|
|
62
|
+
];
|
|
63
|
+
export declare type SwapOnZeroXWithPermitParam = [
|
|
64
|
+
srcToken: Address,
|
|
65
|
+
destToken: Address,
|
|
66
|
+
srcAmount: NumberAsString,
|
|
67
|
+
destAmount: NumberAsString,
|
|
68
|
+
exchange: Address,
|
|
69
|
+
payload: string,
|
|
70
|
+
permit: string
|
|
71
|
+
];
|
|
72
|
+
export declare type ZeroXParam = SwapOnZeroXParam | SwapOnZeroXWithPermitParam;
|
|
44
73
|
export {};
|
package/build/dex/zerox/types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.OrderStatus = void 0;
|
|
3
|
+
exports.ZeroXFunctions = exports.OrderStatus = void 0;
|
|
4
4
|
var OrderStatus;
|
|
5
5
|
(function (OrderStatus) {
|
|
6
6
|
OrderStatus[OrderStatus["INVALID"] = 0] = "INVALID";
|
|
@@ -11,4 +11,11 @@ var OrderStatus;
|
|
|
11
11
|
OrderStatus[OrderStatus["FULLY_FILLED"] = 5] = "FULLY_FILLED";
|
|
12
12
|
OrderStatus[OrderStatus["CANCELLED"] = 6] = "CANCELLED";
|
|
13
13
|
})(OrderStatus = exports.OrderStatus || (exports.OrderStatus = {}));
|
|
14
|
+
var ZeroXFunctions;
|
|
15
|
+
(function (ZeroXFunctions) {
|
|
16
|
+
ZeroXFunctions["swapOnZeroXv2"] = "swapOnZeroXv2";
|
|
17
|
+
ZeroXFunctions["swapOnZeroXv4"] = "swapOnZeroXv4";
|
|
18
|
+
ZeroXFunctions["swapOnZeroXv2WithPermit"] = "swapOnZeroXv2WithPermit";
|
|
19
|
+
ZeroXFunctions["swapOnZeroXv4WithPermit"] = "swapOnZeroXv4WithPermit";
|
|
20
|
+
})(ZeroXFunctions = exports.ZeroXFunctions || (exports.ZeroXFunctions = {}));
|
|
14
21
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/zerox/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/zerox/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,yFAA0B,CAAA;IAC1B,yFAA0B,CAAA;IAC1B,qDAAQ,CAAA;IACR,mDAAO,CAAA;IACP,6DAAY,CAAA;IACZ,uDAAS,CAAA;AACX,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB;AAuCD,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,iDAA+B,CAAA;IAC/B,iDAA+B,CAAA;IAC/B,qEAAmD,CAAA;IACnD,qEAAmD,CAAA;AACrD,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB"}
|
|
@@ -42,7 +42,7 @@ export declare abstract class StatefulEventSubscriber<State> implements EventSub
|
|
|
42
42
|
invalidate(): void;
|
|
43
43
|
getState(minBlockNumber: number): DeepReadonly<State> | null;
|
|
44
44
|
getStaleState(): DeepReadonly<State> | null;
|
|
45
|
-
_setState(state: DeepReadonly<State> | null, blockNumber: number): void;
|
|
45
|
+
_setState(state: DeepReadonly<State> | null, blockNumber: number, reason?: string): void;
|
|
46
46
|
_logBatchTypicalMessages(message: string, level: 'warn' | 'info', publishPeriod?: number): void;
|
|
47
|
-
setState(state: DeepReadonly<State>, blockNumber: number): void;
|
|
47
|
+
setState(state: DeepReadonly<State>, blockNumber: number, reason?: string): void;
|
|
48
48
|
}
|
|
@@ -48,13 +48,13 @@ class StatefulEventSubscriber {
|
|
|
48
48
|
async initialize(blockNumber, options) {
|
|
49
49
|
let masterBn = undefined;
|
|
50
50
|
if (options && options.state) {
|
|
51
|
-
this.setState(options.state, blockNumber);
|
|
51
|
+
this.setState(options.state, blockNumber, 'initialize_1');
|
|
52
52
|
}
|
|
53
53
|
else if (options && options.forceRegenerate) {
|
|
54
54
|
// ZkEVM forces to always regenerate state when it is old
|
|
55
55
|
this.logger.debug(`${this.parentName}: ${this.name}: forced to regenerate state`);
|
|
56
56
|
const state = await this.generateState(blockNumber);
|
|
57
|
-
this.setState(state, blockNumber);
|
|
57
|
+
this.setState(state, blockNumber, 'initialize_2');
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
60
60
|
if (this.dexHelper.config.isSlave && this.masterPoolNeeded) {
|
|
@@ -80,13 +80,13 @@ class StatefulEventSubscriber {
|
|
|
80
80
|
}
|
|
81
81
|
// set state and the according blockNumber. state.bn can be smaller, greater or equal
|
|
82
82
|
// to blockNumber
|
|
83
|
-
this.setState(state.state, blockNumber);
|
|
83
|
+
this.setState(state.state, blockNumber, 'initialize_3');
|
|
84
84
|
}
|
|
85
85
|
else {
|
|
86
86
|
// if no state found in cache generate new state using rpc
|
|
87
87
|
this.logger.info(`${this.parentName}: ${this.name}: did not found state on cache generating new one`);
|
|
88
88
|
const state = await this.generateState(blockNumber);
|
|
89
|
-
this.setState(state, blockNumber);
|
|
89
|
+
this.setState(state, blockNumber, 'initialize_4');
|
|
90
90
|
// we should publish only if generateState succeeded
|
|
91
91
|
const data = this.getPoolIdentifierData();
|
|
92
92
|
this.dexHelper.cache.publish('new_pools', JSON.stringify({
|
|
@@ -99,7 +99,7 @@ class StatefulEventSubscriber {
|
|
|
99
99
|
// if you are not a slave instance always generate new state
|
|
100
100
|
this.logger.info(`${this.parentName}: ${this.name}: cache generating state`);
|
|
101
101
|
const state = await this.generateState(blockNumber);
|
|
102
|
-
this.setState(state, blockNumber);
|
|
102
|
+
this.setState(state, blockNumber, 'initialize_5');
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
// apply a callback on the state
|
|
@@ -139,7 +139,7 @@ class StatefulEventSubscriber {
|
|
|
139
139
|
}
|
|
140
140
|
if (this.state && this.stateBlockNumber < blockNumber) {
|
|
141
141
|
this.logger.info(`StatefulEventSubscriber_1 restart, bn: ${blockNumber}, state_bn: ${this.stateBlockNumber}: ${this.parentName}: ${this.name}`);
|
|
142
|
-
this._setState(null, blockNumber);
|
|
142
|
+
this._setState(null, blockNumber, 'restart');
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
//Implementation must call setState() for every block in which the state
|
|
@@ -173,7 +173,7 @@ class StatefulEventSubscriber {
|
|
|
173
173
|
}
|
|
174
174
|
if (!this.state) {
|
|
175
175
|
const freshState = await this.generateState(blockNumber);
|
|
176
|
-
this.setState(freshState, blockNumber);
|
|
176
|
+
this.setState(freshState, blockNumber, 'update_1');
|
|
177
177
|
}
|
|
178
178
|
//Find the last state before the blockNumber of the logs
|
|
179
179
|
let stateBeforeLog;
|
|
@@ -187,7 +187,7 @@ class StatefulEventSubscriber {
|
|
|
187
187
|
if (stateBeforeLog) {
|
|
188
188
|
const nextState = await this.processBlockLogs(stateBeforeLog, logs.slice(index, indexBlockEnd), blockHeader);
|
|
189
189
|
if (nextState)
|
|
190
|
-
this.setState(nextState, blockNumber);
|
|
190
|
+
this.setState(nextState, blockNumber, 'update_2');
|
|
191
191
|
}
|
|
192
192
|
lastBlockNumber = blockNumber;
|
|
193
193
|
index = indexBlockEnd;
|
|
@@ -205,7 +205,7 @@ class StatefulEventSubscriber {
|
|
|
205
205
|
this.logger.warn(`${network}: ${this.parentName}: ${this.name}: master generate (latest: ${latestBlockNumber}) new state because state is null`);
|
|
206
206
|
try {
|
|
207
207
|
const state = await this.generateState(latestBlockNumber);
|
|
208
|
-
this.setState(state, latestBlockNumber);
|
|
208
|
+
this.setState(state, latestBlockNumber, 'update_3');
|
|
209
209
|
return true;
|
|
210
210
|
}
|
|
211
211
|
catch (e) {
|
|
@@ -233,11 +233,11 @@ class StatefulEventSubscriber {
|
|
|
233
233
|
}
|
|
234
234
|
}
|
|
235
235
|
if (lastBn) {
|
|
236
|
-
this._setState(this.stateHistory[lastBn], lastBn);
|
|
236
|
+
this._setState(this.stateHistory[lastBn], lastBn, 'rollback_1');
|
|
237
237
|
}
|
|
238
238
|
else {
|
|
239
239
|
this.logger.info(`StatefulEventSubscriber_1 rollback, bn: ${blockNumber}: ${this.parentName}: ${this.name}`);
|
|
240
|
-
this._setState(null, blockNumber);
|
|
240
|
+
this._setState(null, blockNumber, 'rollback_2');
|
|
241
241
|
}
|
|
242
242
|
}
|
|
243
243
|
else {
|
|
@@ -272,7 +272,7 @@ class StatefulEventSubscriber {
|
|
|
272
272
|
getStaleState() {
|
|
273
273
|
return this.state;
|
|
274
274
|
}
|
|
275
|
-
_setState(state, blockNumber) {
|
|
275
|
+
_setState(state, blockNumber, reason) {
|
|
276
276
|
if (this.dexHelper.config.isSlave &&
|
|
277
277
|
this.masterPoolNeeded &&
|
|
278
278
|
state === null) {
|
|
@@ -287,7 +287,7 @@ class StatefulEventSubscriber {
|
|
|
287
287
|
return false;
|
|
288
288
|
}
|
|
289
289
|
this._logBatchTypicalMessages(`${this.parentName}: received state from a scheduled job`, 'info');
|
|
290
|
-
this.setState(state.state, state.bn);
|
|
290
|
+
this.setState(state.state, state.bn, 'addBatchHGet');
|
|
291
291
|
return true;
|
|
292
292
|
});
|
|
293
293
|
}
|
|
@@ -329,14 +329,14 @@ class StatefulEventSubscriber {
|
|
|
329
329
|
//no longer needed. If the blockNumber is greater than or equal to the
|
|
330
330
|
//current state, then the current state will be updated and the invalid flag
|
|
331
331
|
//can be reset.
|
|
332
|
-
setState(state, blockNumber) {
|
|
332
|
+
setState(state, blockNumber, reason) {
|
|
333
333
|
if (!blockNumber) {
|
|
334
334
|
this.logger.error('setState() with blockNumber', blockNumber);
|
|
335
335
|
return;
|
|
336
336
|
}
|
|
337
337
|
this.stateHistory[blockNumber] = state;
|
|
338
338
|
if (!this.state || blockNumber >= this.stateBlockNumber) {
|
|
339
|
-
this._setState(state, blockNumber);
|
|
339
|
+
this._setState(state, blockNumber, reason);
|
|
340
340
|
this.invalid = false;
|
|
341
341
|
}
|
|
342
342
|
const minBlockNumberToKeep = this.stateBlockNumber - constants_1.MAX_BLOCKS_HISTORY;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateful-event-subscriber.js","sourceRoot":"","sources":["../src/stateful-event-subscriber.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stateful-event-subscriber.js","sourceRoot":"","sources":["../src/stateful-event-subscriber.ts"],"names":[],"mappings":"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"}
|