@paraswap/dex-lib 3.8.22-infusion.3 → 3.8.23-remove-logs
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 +16 -0
- package/.vscode/settings.json +3 -0
- package/build/abi/Uncompressor.json +250 -0
- package/build/abi/integral/factory.json +333 -0
- package/build/abi/integral/oracle.json +501 -0
- package/build/abi/{inception/inception-ineth-pool.json → integral/pool.json} +522 -543
- package/build/abi/integral/relayer.json +1536 -0
- package/build/abi/maverick-v2/MaverickV2Router.json +778 -0
- package/build/dex/aave-v1/aave-v1.d.ts +1 -2
- package/build/dex/aave-v1/aave-v1.js +0 -22
- package/build/dex/aave-v1/aave-v1.js.map +1 -1
- package/build/dex/bProtocol.d.ts +18 -0
- package/build/dex/bProtocol.js +39 -0
- package/build/dex/bProtocol.js.map +1 -0
- package/build/dex/bancor.d.ts +26 -0
- package/build/dex/bancor.js +58 -0
- package/build/dex/bancor.js.map +1 -0
- package/build/dex/compound.d.ts +18 -0
- package/build/dex/compound.js +46 -0
- package/build/dex/compound.js.map +1 -0
- package/build/dex/curve-v2.d.ts +58 -0
- package/build/dex/curve-v2.js +180 -0
- package/build/dex/curve-v2.js.map +1 -0
- package/build/dex/dodo-v1.d.ts +33 -0
- package/build/dex/dodo-v1.js +63 -0
- package/build/dex/dodo-v1.js.map +1 -0
- package/build/dex/etherfi/etherfi.d.ts +26 -0
- package/build/dex/etherfi/etherfi.js +96 -0
- package/build/dex/etherfi/etherfi.js.map +1 -0
- package/build/dex/generic-rfq/rate-fetcher.js +1 -1
- package/build/dex/generic-rfq/rate-fetcher.js.map +1 -1
- package/build/dex/index.js +0 -2
- package/build/dex/index.js.map +1 -1
- package/build/dex/integral/config.d.ts +4 -0
- package/build/dex/integral/config.js +20 -0
- package/build/dex/integral/config.js.map +1 -0
- package/build/dex/integral/context.d.ts +40 -0
- package/build/dex/integral/context.js +158 -0
- package/build/dex/integral/context.js.map +1 -0
- package/build/dex/integral/helpers.d.ts +17 -0
- package/build/dex/integral/helpers.js +157 -0
- package/build/dex/integral/helpers.js.map +1 -0
- package/build/dex/integral/integral-factory.d.ts +24 -0
- package/build/dex/integral/integral-factory.js +95 -0
- package/build/dex/integral/integral-factory.js.map +1 -0
- package/build/dex/integral/integral-pool.d.ts +50 -0
- package/build/dex/integral/integral-pool.js +149 -0
- package/build/dex/integral/integral-pool.js.map +1 -0
- package/build/dex/integral/integral-pricing.d.ts +18 -0
- package/build/dex/integral/integral-pricing.js +114 -0
- package/build/dex/integral/integral-pricing.js.map +1 -0
- package/build/dex/integral/integral-relayer.d.ts +42 -0
- package/build/dex/integral/integral-relayer.js +192 -0
- package/build/dex/integral/integral-relayer.js.map +1 -0
- package/build/dex/integral/integral-token.d.ts +27 -0
- package/build/dex/integral/integral-token.js +59 -0
- package/build/dex/integral/integral-token.js.map +1 -0
- package/build/dex/{inception/inception-native.d.ts → integral/integral.d.ts} +19 -21
- package/build/dex/integral/integral.js +376 -0
- package/build/dex/integral/integral.js.map +1 -0
- package/build/dex/integral/types.d.ts +85 -0
- package/build/dex/integral/types.js +9 -0
- package/build/dex/integral/types.js.map +1 -0
- package/build/dex/integral/utils-e2e.d.ts +9 -0
- package/build/dex/integral/utils-e2e.js +131 -0
- package/build/dex/integral/utils-e2e.js.map +1 -0
- package/build/dex/integral/utils.d.ts +17 -0
- package/build/dex/integral/utils.js +94 -0
- package/build/dex/integral/utils.js.map +1 -0
- package/build/dex/lido.d.ts +19 -0
- package/build/dex/lido.js +42 -0
- package/build/dex/lido.js.map +1 -0
- package/build/dex/lite-psm/lite-psm.js +5 -2
- package/build/dex/lite-psm/lite-psm.js.map +1 -1
- package/build/dex/maker-psm/maker-psm.js +6 -2
- package/build/dex/maker-psm/maker-psm.js.map +1 -1
- package/build/dex/maverick-v2/config.js +4 -0
- package/build/dex/maverick-v2/config.js.map +1 -1
- package/build/dex/maverick-v2/maverick-math/maverick-pool-math.js +4 -0
- package/build/dex/maverick-v2/maverick-math/maverick-pool-math.js.map +1 -1
- package/build/dex/maverick-v2/maverick-v2-pool.d.ts +1 -1
- package/build/dex/maverick-v2/maverick-v2-pool.js +8 -8
- package/build/dex/maverick-v2/maverick-v2-pool.js.map +1 -1
- package/build/dex/maverick-v2/maverick-v2.d.ts +5 -4
- package/build/dex/maverick-v2/maverick-v2.js +73 -63
- package/build/dex/maverick-v2/maverick-v2.js.map +1 -1
- package/build/dex/maverick-v2/types.d.ts +4 -0
- package/build/dex/onebit.d.ts +25 -0
- package/build/dex/onebit.js +42 -0
- package/build/dex/onebit.js.map +1 -0
- package/build/dex/oswap/oswap-pool.js +8 -8
- package/build/dex/oswap/oswap-pool.js.map +1 -1
- package/build/dex/oswap/oswap.js +8 -8
- package/build/dex/oswap/oswap.js.map +1 -1
- package/build/dex/oswap/types.d.ts +4 -4
- package/build/dex/platypus/platypus.d.ts +1 -2
- package/build/dex/platypus/platypus.js +0 -31
- package/build/dex/platypus/platypus.js.map +1 -1
- package/build/dex/sdai/config.d.ts +11 -0
- package/build/dex/sdai/config.js +21 -0
- package/build/dex/sdai/config.js.map +1 -0
- package/build/dex/sdai/constants.d.ts +2 -0
- package/build/dex/sdai/constants.js +6 -0
- package/build/dex/sdai/constants.js.map +1 -0
- package/build/dex/sdai/scripts/validate-state.d.ts +1 -0
- package/build/dex/sdai/scripts/validate-state.js +102 -0
- package/build/dex/sdai/scripts/validate-state.js.map +1 -0
- package/build/dex/sdai/sdai-pool.d.ts +16 -0
- package/build/dex/sdai/sdai-pool.js +85 -0
- package/build/dex/sdai/sdai-pool.js.map +1 -0
- package/build/dex/sdai/sdai.d.ts +51 -0
- package/build/dex/sdai/sdai.js +172 -0
- package/build/dex/sdai/sdai.js.map +1 -0
- package/build/dex/sdai/types.d.ts +21 -0
- package/build/dex/sdai/types.js +11 -0
- package/build/dex/sdai/types.js.map +1 -0
- package/build/dex/sdai/utils.d.ts +4 -0
- package/build/dex/sdai/utils.js +39 -0
- package/build/dex/sdai/utils.js.map +1 -0
- package/build/dex/smoothy.d.ts +26 -0
- package/build/dex/smoothy.js +48 -0
- package/build/dex/smoothy.js.map +1 -0
- package/build/dex/stable-pool.d.ts +28 -0
- package/build/dex/stable-pool.js +62 -0
- package/build/dex/stable-pool.js.map +1 -0
- package/build/dex/swaap-v1/swaap-v1.d.ts +1 -2
- package/build/dex/swaap-v1/swaap-v1.js +0 -10
- package/build/dex/swaap-v1/swaap-v1.js.map +1 -1
- package/build/dex/trader-joe-v2.1/optimizer.d.ts +2 -0
- package/build/dex/trader-joe-v2.1/optimizer.js +44 -0
- package/build/dex/trader-joe-v2.1/optimizer.js.map +1 -0
- package/build/dex/trader-joe-v2.1.d.ts +43 -0
- package/build/dex/trader-joe-v2.1.js +79 -0
- package/build/dex/trader-joe-v2.1.js.map +1 -0
- package/build/executor/compressor/Compressor.d.ts +23 -0
- package/build/executor/compressor/Compressor.js +144 -0
- package/build/executor/compressor/Compressor.js.map +1 -0
- package/build/executor/compressor/compress.d.ts +17 -0
- package/build/executor/compressor/compress.js +187 -0
- package/build/executor/compressor/compress.js.map +1 -0
- package/build/executor/compressor/compress_functions/addressSubstitution.d.ts +6 -0
- package/build/executor/compressor/compress_functions/addressSubstitution.js +29 -0
- package/build/executor/compressor/compress_functions/addressSubstitution.js.map +1 -0
- package/build/executor/compressor/compress_functions/addressSubstitutionFromObject.d.ts +10 -0
- package/build/executor/compressor/compress_functions/addressSubstitutionFromObject.js +40 -0
- package/build/executor/compressor/compress_functions/addressSubstitutionFromObject.js.map +1 -0
- package/build/executor/compressor/compress_functions/byteSubstitution.d.ts +11 -0
- package/build/executor/compressor/compress_functions/byteSubstitution.js +64 -0
- package/build/executor/compressor/compress_functions/byteSubstitution.js.map +1 -0
- package/build/executor/compressor/compress_functions/ffSubstitution.d.ts +7 -0
- package/build/executor/compressor/compress_functions/ffSubstitution.js +54 -0
- package/build/executor/compressor/compress_functions/ffSubstitution.js.map +1 -0
- package/build/executor/compressor/compress_functions/findLongestAndSubstitute.d.ts +8 -0
- package/build/executor/compressor/compress_functions/findLongestAndSubstitute.js +67 -0
- package/build/executor/compressor/compress_functions/findLongestAndSubstitute.js.map +1 -0
- package/build/executor/compressor/compress_functions/findLongestAndSubstitute_old.d.ts +8 -0
- package/build/executor/compressor/compress_functions/findLongestAndSubstitute_old.js +61 -0
- package/build/executor/compressor/compress_functions/findLongestAndSubstitute_old.js.map +1 -0
- package/build/executor/compressor/compress_functions/reverseAddressSubstitution.d.ts +6 -0
- package/build/executor/compressor/compress_functions/reverseAddressSubstitution.js +37 -0
- package/build/executor/compressor/compress_functions/reverseAddressSubstitution.js.map +1 -0
- package/build/executor/compressor/compress_functions/searchUnusedBytes.d.ts +9 -0
- package/build/executor/compressor/compress_functions/searchUnusedBytes.js +33 -0
- package/build/executor/compressor/compress_functions/searchUnusedBytes.js.map +1 -0
- package/build/executor/compressor/fetchSaved.d.ts +0 -0
- package/build/executor/compressor/fetchSaved.js +17 -0
- package/build/executor/compressor/fetchSaved.js.map +1 -0
- package/build/executor/compressor/utils/computeCostL2.d.ts +2 -0
- package/build/executor/compressor/utils/computeCostL2.js +14 -0
- package/build/executor/compressor/utils/computeCostL2.js.map +1 -0
- package/build/executor/compressor/utils/findLongestDuplicatedString.d.ts +2 -0
- package/build/executor/compressor/utils/findLongestDuplicatedString.js +30 -0
- package/build/executor/compressor/utils/findLongestDuplicatedString.js.map +1 -0
- package/build/executor/compressor/utils/getAllIndexes.d.ts +2 -0
- package/build/executor/compressor/utils/getAllIndexes.js +12 -0
- package/build/executor/compressor/utils/getAllIndexes.js.map +1 -0
- package/build/executor/compressor/utils/getByteForAddress.d.ts +2 -0
- package/build/executor/compressor/utils/getByteForAddress.js +14 -0
- package/build/executor/compressor/utils/getByteForAddress.js.map +1 -0
- package/build/executor/compressor/utils/intTo2Bytes.d.ts +2 -0
- package/build/executor/compressor/utils/intTo2Bytes.js +14 -0
- package/build/executor/compressor/utils/intTo2Bytes.js.map +1 -0
- package/build/executor/compressor/utils/intTo3Bytes.d.ts +2 -0
- package/build/executor/compressor/utils/intTo3Bytes.js +18 -0
- package/build/executor/compressor/utils/intTo3Bytes.js.map +1 -0
- package/build/executor/compressor/utils/intToByte.d.ts +2 -0
- package/build/executor/compressor/utils/intToByte.js +10 -0
- package/build/executor/compressor/utils/intToByte.js.map +1 -0
- package/package.json +1 -1
- package/src/abi/maverick-v2/MaverickV2Router.json +778 -0
- package/src/dex/generic-rfq/rate-fetcher.ts +6 -5
- package/src/dex/index.ts +0 -2
- package/src/dex/lite-psm/lite-psm.ts +5 -2
- package/src/dex/maker-psm/maker-psm.ts +6 -2
- package/src/dex/maverick-v2/config.ts +4 -0
- package/src/dex/maverick-v2/maverick-math/maverick-pool-math.ts +5 -0
- package/src/dex/maverick-v2/maverick-v2-e2e.test.ts +21 -43
- package/src/dex/maverick-v2/maverick-v2-integration.test.ts +100 -96
- package/src/dex/maverick-v2/maverick-v2-pool.ts +8 -8
- package/src/dex/maverick-v2/maverick-v2.ts +111 -81
- package/src/dex/maverick-v2/types.ts +4 -0
- package/tests/constants-e2e.ts +10 -1
- package/build/abi/inception/inception-ineth.json +0 -609
- package/build/abi/inception/inception-ratio-feed.json +0 -93
- package/build/abi/inception/inception-vault.json +0 -991
- package/build/abi/infusion/InfusionFactory.json +0 -147
- package/build/abi/infusion/InfusionPair.json +0 -658
- package/build/abi/infusion/InfusionRouter.json +0 -442
- package/build/dex/idle-dao/idle-dao-pool.d.ts +0 -56
- package/build/dex/idle-dao/idle-dao-pool.js +0 -176
- package/build/dex/idle-dao/idle-dao-pool.js.map +0 -1
- package/build/dex/idle-dao/idle-dao-pooling-pool.d.ts +0 -16
- package/build/dex/idle-dao/idle-dao-pooling-pool.js +0 -57
- package/build/dex/idle-dao/idle-dao-pooling-pool.js.map +0 -1
- package/build/dex/idle-dao/scripts.d.ts +0 -9
- package/build/dex/idle-dao/scripts.js +0 -552
- package/build/dex/idle-dao/scripts.js.map +0 -1
- package/build/dex/inception/config.d.ts +0 -5
- package/build/dex/inception/config.js +0 -112
- package/build/dex/inception/config.js.map +0 -1
- package/build/dex/inception/inception-event-pool.d.ts +0 -23
- package/build/dex/inception/inception-event-pool.js +0 -34
- package/build/dex/inception/inception-event-pool.js.map +0 -1
- package/build/dex/inception/inception-native.js +0 -131
- package/build/dex/inception/inception-native.js.map +0 -1
- package/build/dex/inception/inception-pool.d.ts +0 -18
- package/build/dex/inception/inception-pool.js +0 -32
- package/build/dex/inception/inception-pool.js.map +0 -1
- package/build/dex/inception/inception-price-feed.d.ts +0 -19
- package/build/dex/inception/inception-price-feed.js +0 -51
- package/build/dex/inception/inception-price-feed.js.map +0 -1
- package/build/dex/inception/inception.d.ts +0 -44
- package/build/dex/inception/inception.js +0 -162
- package/build/dex/inception/inception.js.map +0 -1
- package/build/dex/inception/tokens.d.ts +0 -9
- package/build/dex/inception/tokens.js +0 -28
- package/build/dex/inception/tokens.js.map +0 -1
- package/build/dex/inception/types.d.ts +0 -22
- package/build/dex/inception/types.js +0 -3
- package/build/dex/inception/types.js.map +0 -1
- package/build/dex/inception/utils.d.ts +0 -7
- package/build/dex/inception/utils.js +0 -58
- package/build/dex/inception/utils.js.map +0 -1
- package/build/dex/infusion/config.d.ts +0 -3
- package/build/dex/infusion/config.js +0 -20
- package/build/dex/infusion/config.js.map +0 -1
- package/build/dex/infusion/infusion-stable-pool.d.ts +0 -4
- package/build/dex/infusion/infusion-stable-pool.js +0 -74
- package/build/dex/infusion/infusion-stable-pool.js.map +0 -1
- package/build/dex/infusion/infusion.d.ts +0 -51
- package/build/dex/infusion/infusion.js +0 -458
- package/build/dex/infusion/infusion.js.map +0 -1
- package/build/dex/infusion/types.d.ts +0 -47
- package/build/dex/infusion/types.js +0 -3
- package/build/dex/infusion/types.js.map +0 -1
- package/build/dex/infusion/utils/isStablePair.d.ts +0 -2
- package/build/dex/infusion/utils/isStablePair.js +0 -18
- package/build/dex/infusion/utils/isStablePair.js.map +0 -1
- package/src/abi/infusion/InfusionFactory.json +0 -147
- package/src/abi/infusion/InfusionPair.json +0 -658
- package/src/abi/infusion/InfusionRouter.json +0 -442
- package/src/dex/infusion/config.ts +0 -21
- package/src/dex/infusion/infusion-e2e.test.ts +0 -110
- package/src/dex/infusion/infusion-integration.test.ts +0 -232
- package/src/dex/infusion/infusion-stable-pool.ts +0 -91
- package/src/dex/infusion/infusion.ts +0 -653
- package/src/dex/infusion/types.ts +0 -60
- package/src/dex/infusion/utils/isStablePair.ts +0 -18
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, PoolLiquidity, Logger, NumberAsString, DexExchangeParam } from '../../types';
|
|
2
2
|
import { SwapSide, Network } from '../../constants';
|
|
3
|
-
import {
|
|
3
|
+
import { IDex } from '../../dex/idex';
|
|
4
4
|
import { IDexHelper } from '../../dex-helper/idex-helper';
|
|
5
5
|
import { MaverickV2Data } from './types';
|
|
6
6
|
import { SimpleExchange } from '../simple-exchange';
|
|
@@ -13,6 +13,7 @@ export declare class MaverickV2 extends SimpleExchange implements IDex<MaverickV
|
|
|
13
13
|
protected adapters: {};
|
|
14
14
|
protected config: import("./types").DexParams;
|
|
15
15
|
protected maverickV2Iface: Interface;
|
|
16
|
+
protected maverickV2RouterIface: Interface;
|
|
16
17
|
pools: {
|
|
17
18
|
[key: string]: MaverickV2EventPool;
|
|
18
19
|
};
|
|
@@ -25,18 +26,18 @@ export declare class MaverickV2 extends SimpleExchange implements IDex<MaverickV
|
|
|
25
26
|
}[];
|
|
26
27
|
logger: Logger;
|
|
27
28
|
static erc20Interface: Interface;
|
|
28
|
-
constructor(network: Network, dexKey: string, dexHelper: IDexHelper, adapters?: {}, config?: import("./types").DexParams, maverickV2Iface?: Interface);
|
|
29
|
+
constructor(network: Network, dexKey: string, dexHelper: IDexHelper, adapters?: {}, config?: import("./types").DexParams, maverickV2Iface?: Interface, maverickV2RouterIface?: Interface);
|
|
29
30
|
initializePricing(blockNumber: number): Promise<void>;
|
|
30
31
|
getAdapters(side: SwapSide): {
|
|
31
32
|
name: string;
|
|
32
33
|
index: number;
|
|
33
34
|
}[] | null;
|
|
35
|
+
getEventPools(srcToken: Token, destToken: Token): Promise<MaverickV2EventPool[]>;
|
|
34
36
|
getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
|
|
35
|
-
getPools(srcToken: Token, destToken: Token): Promise<MaverickV2EventPool[]>;
|
|
36
37
|
getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<null | ExchangePrices<MaverickV2Data>>;
|
|
37
38
|
getCalldataGasCost(poolPrices: PoolPrices<MaverickV2Data>): number | number[];
|
|
38
39
|
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: MaverickV2Data, side: SwapSide): AdapterExchangeParam;
|
|
39
|
-
getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: MaverickV2Data, side: SwapSide
|
|
40
|
+
getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: MaverickV2Data, side: SwapSide): DexExchangeParam;
|
|
40
41
|
updatePoolState(): Promise<void>;
|
|
41
42
|
getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
|
|
42
43
|
private _queryPoolsAPI;
|
|
@@ -37,11 +37,13 @@ const maverick_v2_pool_1 = require("./maverick-v2-pool");
|
|
|
37
37
|
const constants_2 = require("../../constants");
|
|
38
38
|
const abi_1 = require("@ethersproject/abi");
|
|
39
39
|
const MaverickV2Pool_json_1 = __importDefault(require("../../abi/maverick-v2/MaverickV2Pool.json"));
|
|
40
|
+
const MaverickV2Router_json_1 = __importDefault(require("../../abi/maverick-v2/MaverickV2Router.json"));
|
|
40
41
|
const erc20_json_1 = __importDefault(require("../../abi/erc20.json"));
|
|
41
42
|
const utils_2 = require("../../executor/utils");
|
|
42
|
-
const
|
|
43
|
+
const POOL_LIST_CACHE_KEY = 'maverickv2-pool-list';
|
|
44
|
+
const POOL_LIST_TTL_SECONDS = 60;
|
|
43
45
|
class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
44
|
-
constructor(network, dexKey, dexHelper, adapters = {}, config = config_1.MaverickV2Config[dexKey][network], maverickV2Iface = new abi_1.Interface(MaverickV2Pool_json_1.default)) {
|
|
46
|
+
constructor(network, dexKey, dexHelper, adapters = {}, config = config_1.MaverickV2Config[dexKey][network], maverickV2Iface = new abi_1.Interface(MaverickV2Pool_json_1.default), maverickV2RouterIface = new abi_1.Interface(MaverickV2Router_json_1.default)) {
|
|
45
47
|
super(dexHelper, dexKey);
|
|
46
48
|
this.network = network;
|
|
47
49
|
this.dexKey = dexKey;
|
|
@@ -49,6 +51,7 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
49
51
|
this.adapters = adapters;
|
|
50
52
|
this.config = config;
|
|
51
53
|
this.maverickV2Iface = maverickV2Iface;
|
|
54
|
+
this.maverickV2RouterIface = maverickV2RouterIface;
|
|
52
55
|
this.pools = {};
|
|
53
56
|
this.hasConstantPriceLargeAmounts = false;
|
|
54
57
|
this.needWrapNative = true;
|
|
@@ -56,7 +59,7 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
56
59
|
this.logger = dexHelper.getLogger(dexKey);
|
|
57
60
|
}
|
|
58
61
|
async initializePricing(blockNumber) {
|
|
59
|
-
const pools = await this._queryPoolsAPI(
|
|
62
|
+
const pools = await this._queryPoolsAPI();
|
|
60
63
|
await Promise.all(pools.map(async (pool) => {
|
|
61
64
|
const eventPool = new maverick_v2_pool_1.MaverickV2EventPool(this.dexKey, this.network, this.dexHelper, this.logger, {
|
|
62
65
|
address: pool.tokenA.address,
|
|
@@ -74,29 +77,27 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
74
77
|
getAdapters(side) {
|
|
75
78
|
return null;
|
|
76
79
|
}
|
|
80
|
+
async getEventPools(srcToken, destToken) {
|
|
81
|
+
const fromToken = this.dexHelper.config.wrapETH(srcToken);
|
|
82
|
+
const toToken = this.dexHelper.config.wrapETH(destToken);
|
|
83
|
+
return Object.values(this.pools).filter((pool) => {
|
|
84
|
+
const tokenA = pool.tokenA.address.toLowerCase();
|
|
85
|
+
const tokenB = pool.tokenB.address.toLowerCase();
|
|
86
|
+
const fromAddress = fromToken.address.toLowerCase();
|
|
87
|
+
const toAddress = toToken.address.toLowerCase();
|
|
88
|
+
return ((tokenA === fromAddress && tokenB === toAddress) ||
|
|
89
|
+
(tokenA === toAddress && tokenB === fromAddress));
|
|
90
|
+
});
|
|
91
|
+
}
|
|
77
92
|
async getPoolIdentifiers(srcToken, destToken, side, blockNumber) {
|
|
78
|
-
// TODO:
|
|
79
|
-
if (side === constants_1.SwapSide.BUY)
|
|
80
|
-
return [];
|
|
81
93
|
const from = this.dexHelper.config.wrapETH(srcToken);
|
|
82
94
|
const to = this.dexHelper.config.wrapETH(destToken);
|
|
83
95
|
if (from.address.toLowerCase() === to.address.toLowerCase()) {
|
|
84
96
|
return [];
|
|
85
97
|
}
|
|
86
|
-
const pools = await this.
|
|
98
|
+
const pools = await this.getEventPools(from, to);
|
|
87
99
|
return pools.map(pool => pool.name);
|
|
88
100
|
}
|
|
89
|
-
async getPools(srcToken, destToken) {
|
|
90
|
-
srcToken = this.dexHelper.config.wrapETH(srcToken);
|
|
91
|
-
destToken = this.dexHelper.config.wrapETH(destToken);
|
|
92
|
-
return Object.values(this.pools).filter((pool) => {
|
|
93
|
-
return ((pool.tokenA.address.toLowerCase() === srcToken.address.toLowerCase() ||
|
|
94
|
-
pool.tokenA.address.toLowerCase() ===
|
|
95
|
-
destToken.address.toLowerCase()) &&
|
|
96
|
-
(pool.tokenB.address.toLowerCase() === srcToken.address.toLowerCase() ||
|
|
97
|
-
pool.tokenB.address.toLowerCase() === destToken.address.toLowerCase()));
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
101
|
async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools) {
|
|
101
102
|
try {
|
|
102
103
|
const from = this.dexHelper.config.wrapETH(srcToken);
|
|
@@ -104,19 +105,13 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
104
105
|
if (from.address.toLowerCase() === to.address.toLowerCase()) {
|
|
105
106
|
return null;
|
|
106
107
|
}
|
|
107
|
-
|
|
108
|
-
if (side === constants_1.SwapSide.BUY)
|
|
109
|
-
return null;
|
|
110
|
-
const allPools = await this.getPools(from, to);
|
|
108
|
+
const allPools = await this.getEventPools(from, to);
|
|
111
109
|
const allowedPools = limitPools
|
|
112
110
|
? allPools.filter(pool => limitPools.includes(pool.name))
|
|
113
111
|
: allPools;
|
|
114
112
|
if (!allowedPools.length)
|
|
115
113
|
return null;
|
|
116
|
-
|
|
117
|
-
// side === SwapSide.BUY ? to.decimals : from.decimals,
|
|
118
|
-
// );
|
|
119
|
-
const unitAmount = (0, utils_1.getBigIntPow)(from.decimals);
|
|
114
|
+
const unitAmount = (0, utils_1.getBigIntPow)(side === constants_1.SwapSide.BUY ? to.decimals : from.decimals);
|
|
120
115
|
const tasks = allowedPools.map(async (pool) => {
|
|
121
116
|
try {
|
|
122
117
|
const state = await pool.getOrGenerateState(blockNumber);
|
|
@@ -124,15 +119,13 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
124
119
|
this.logger.debug(`Received null state for pool ${pool.address}`);
|
|
125
120
|
return null;
|
|
126
121
|
}
|
|
127
|
-
|
|
128
|
-
const [unit] = pool.swap(unitAmount, from, to, false);
|
|
122
|
+
const [unit] = pool.swap(unitAmount, from, to, side === constants_1.SwapSide.BUY);
|
|
129
123
|
let lastOutput = 1n;
|
|
130
124
|
const dataList = amounts.map(amount => {
|
|
131
125
|
if (amount === 0n || lastOutput === 0n) {
|
|
132
126
|
return [0n, 0n];
|
|
133
127
|
}
|
|
134
|
-
|
|
135
|
-
const output = pool.swap(amount, from, to, false);
|
|
128
|
+
const output = pool.swap(amount, from, to, side === constants_1.SwapSide.BUY);
|
|
136
129
|
lastOutput = output[0];
|
|
137
130
|
return output;
|
|
138
131
|
});
|
|
@@ -178,36 +171,43 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
178
171
|
networkFee: '0',
|
|
179
172
|
};
|
|
180
173
|
}
|
|
181
|
-
getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side
|
|
182
|
-
// TODO:
|
|
183
|
-
if (side === constants_1.SwapSide.BUY)
|
|
184
|
-
throw new Error(`Buy not supported`);
|
|
174
|
+
getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
|
|
185
175
|
const { pool } = data;
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
const
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
176
|
+
const from = this.dexHelper.config.wrapETH(srcToken);
|
|
177
|
+
const tokenAIn = data.tokenA.toLowerCase() === from.toLowerCase();
|
|
178
|
+
const tickLimit = tokenAIn
|
|
179
|
+
? BigInt(data.activeTick) + 100n
|
|
180
|
+
: BigInt(data.activeTick) - 100n;
|
|
181
|
+
if (side === constants_1.SwapSide.SELL) {
|
|
182
|
+
// Perform direct swap for SELL side
|
|
183
|
+
const exchangeData = this.maverickV2Iface.encodeFunctionData('swap', [
|
|
184
|
+
recipient,
|
|
185
|
+
{
|
|
186
|
+
amount: srcAmount,
|
|
187
|
+
tokenAIn,
|
|
188
|
+
exactOutput: false,
|
|
189
|
+
tickLimit,
|
|
190
|
+
},
|
|
191
|
+
'0x',
|
|
192
|
+
]);
|
|
193
|
+
return {
|
|
194
|
+
needWrapNative: this.needWrapNative,
|
|
195
|
+
transferSrcTokenBeforeSwap: pool,
|
|
196
|
+
skipApproval: true,
|
|
197
|
+
targetExchange: pool,
|
|
198
|
+
dexFuncHasRecipient: true,
|
|
199
|
+
exchangeData,
|
|
200
|
+
returnAmountPos: (0, utils_2.extractReturnAmountPosition)(this.maverickV2Iface, 'swap', 'amountOut'),
|
|
201
|
+
};
|
|
202
|
+
}
|
|
203
|
+
// perform "exactOutputSingleMinimal" via MaverickV2's Router
|
|
204
|
+
const exchangeData = this.maverickV2RouterIface.encodeFunctionData('exactOutputSingleMinimal', [recipient, pool, tokenAIn, destAmount, tickLimit]);
|
|
201
205
|
return {
|
|
202
206
|
needWrapNative: this.needWrapNative,
|
|
203
|
-
|
|
204
|
-
// skipApproval: true,
|
|
205
|
-
targetExchange: pool,
|
|
207
|
+
targetExchange: this.config.routerAddress,
|
|
206
208
|
dexFuncHasRecipient: true,
|
|
207
209
|
exchangeData,
|
|
208
|
-
returnAmountPos:
|
|
209
|
-
? (0, utils_2.extractReturnAmountPosition)(this.maverickV2Iface, 'swap', 'amountOut')
|
|
210
|
-
: undefined,
|
|
210
|
+
returnAmountPos: (0, utils_2.extractReturnAmountPosition)(this.maverickV2RouterIface, 'exactOutputSingleMinimal', 'amountOut_'),
|
|
211
211
|
};
|
|
212
212
|
}
|
|
213
213
|
// This is called once before getTopPoolsForToken is
|
|
@@ -221,13 +221,15 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
221
221
|
// Returns list of top pools based on liquidity. Max
|
|
222
222
|
// limit number pools should be returned.
|
|
223
223
|
async getTopPoolsForToken(tokenAddress, limit) {
|
|
224
|
-
const _tokenAddress = this.dexHelper.config
|
|
225
|
-
|
|
224
|
+
const _tokenAddress = this.dexHelper.config
|
|
225
|
+
.wrapETH(tokenAddress)
|
|
226
|
+
.toLowerCase();
|
|
227
|
+
const pools = await this._queryPoolsAPI();
|
|
226
228
|
if (!pools.length) {
|
|
227
229
|
this.logger.error(`Error_${this.dexKey}_Subgraph: couldn't fetch the pools from the subgraph`);
|
|
228
230
|
return [];
|
|
229
231
|
}
|
|
230
|
-
const filteredPools =
|
|
232
|
+
const filteredPools = pools.filter(pool => {
|
|
231
233
|
return (pool.tokenA.address.toLowerCase() === _tokenAddress ||
|
|
232
234
|
pool.tokenB.address.toLowerCase() === _tokenAddress);
|
|
233
235
|
});
|
|
@@ -244,15 +246,23 @@ class MaverickV2 extends simple_exchange_1.SimpleExchange {
|
|
|
244
246
|
decimals: token.decimals,
|
|
245
247
|
},
|
|
246
248
|
],
|
|
247
|
-
liquidityUSD: pool.tvl.amount
|
|
249
|
+
liquidityUSD: pool.tvl.amount,
|
|
248
250
|
};
|
|
249
251
|
});
|
|
250
|
-
|
|
252
|
+
const sortedPools = lodash_1.default.sortBy(labeledPools, [
|
|
253
|
+
pool => -1 * pool.liquidityUSD,
|
|
254
|
+
]);
|
|
255
|
+
return lodash_1.default.slice(sortedPools, 0, limit);
|
|
251
256
|
}
|
|
252
|
-
async _queryPoolsAPI(
|
|
257
|
+
async _queryPoolsAPI() {
|
|
258
|
+
let cachedPoolsJson = await this.dexHelper.cache.getAndCacheLocally(this.dexKey, this.network, POOL_LIST_CACHE_KEY, POOL_LIST_TTL_SECONDS);
|
|
259
|
+
if (cachedPoolsJson)
|
|
260
|
+
return JSON.parse(cachedPoolsJson);
|
|
253
261
|
try {
|
|
254
|
-
const res = await this.dexHelper.httpRequest.get(`${config_1.MAVERICK_API_URL}/api/v5/poolsNoBins/${this.network}`,
|
|
255
|
-
|
|
262
|
+
const res = await this.dexHelper.httpRequest.get(`${config_1.MAVERICK_API_URL}/api/v5/poolsNoBins/${this.network}`, constants_2.SUBGRAPH_TIMEOUT);
|
|
263
|
+
const pools = res.pools || [];
|
|
264
|
+
await this.dexHelper.cache.setex(this.dexKey, this.network, POOL_LIST_CACHE_KEY, POOL_LIST_TTL_SECONDS, JSON.stringify(pools));
|
|
265
|
+
return pools;
|
|
256
266
|
}
|
|
257
267
|
catch (e) {
|
|
258
268
|
this.logger.error(`${this.dexKey}: can not query subgraph: `, e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maverick-v2.js","sourceRoot":"","sources":["../../../src/dex/maverick-v2/maverick-v2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AAYvB,+CAAkE;AAClE,2EAA6D;AAC7D,uCAA4E;AAI5E,wDAAoD;AACpD,qCAKkB;AAClB,yDAAyD;AACzD,+CAAmD;AACnD,4CAA+C;AAC/C,oGAA0E;AAC1E,sEAA4C;AAC5C,gDAAmE;
|
|
1
|
+
{"version":3,"file":"maverick-v2.js","sourceRoot":"","sources":["../../../src/dex/maverick-v2/maverick-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,6 +112,7 @@ export declare type MaverickV2Param = {
|
|
|
112
112
|
data: string;
|
|
113
113
|
};
|
|
114
114
|
export declare type DexParams = {
|
|
115
|
+
routerAddress: string;
|
|
115
116
|
quoterAddress: string;
|
|
116
117
|
poolLensAddress: string;
|
|
117
118
|
};
|
|
@@ -123,6 +124,9 @@ export declare type PoolAPIResponse = {
|
|
|
123
124
|
lowerTick: number;
|
|
124
125
|
tickSpacing: number;
|
|
125
126
|
id: string;
|
|
127
|
+
volume: {
|
|
128
|
+
amount: number;
|
|
129
|
+
};
|
|
126
130
|
tokenA: {
|
|
127
131
|
name: string;
|
|
128
132
|
symbol: string;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Interface } from '@ethersproject/abi';
|
|
2
|
+
import { SwapSide } from '../constants';
|
|
3
|
+
import { AdapterExchangeParam, Address, SimpleExchangeParam } from '../types';
|
|
4
|
+
import { IDexTxBuilder } from './idex';
|
|
5
|
+
import { SimpleExchange } from './simple-exchange';
|
|
6
|
+
import { IDexHelper } from '../dex-helper';
|
|
7
|
+
export declare type OnebitData = {
|
|
8
|
+
router: Address;
|
|
9
|
+
};
|
|
10
|
+
declare type OnebitParam = [
|
|
11
|
+
srcToken: string,
|
|
12
|
+
destToken: string,
|
|
13
|
+
srcAmount: string,
|
|
14
|
+
destAmountMin: string,
|
|
15
|
+
to: string
|
|
16
|
+
];
|
|
17
|
+
export declare class Onebit extends SimpleExchange implements IDexTxBuilder<OnebitData, OnebitParam> {
|
|
18
|
+
static dexKeys: string[];
|
|
19
|
+
exchangeRouterInterface: Interface;
|
|
20
|
+
needWrapNative: boolean;
|
|
21
|
+
constructor(dexHelper: IDexHelper);
|
|
22
|
+
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: OnebitData, side: SwapSide): AdapterExchangeParam;
|
|
23
|
+
getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: OnebitData, side: SwapSide): Promise<SimpleExchangeParam>;
|
|
24
|
+
}
|
|
25
|
+
export {};
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.Onebit = void 0;
|
|
7
|
+
const abi_1 = require("@ethersproject/abi");
|
|
8
|
+
const simple_exchange_1 = require("./simple-exchange");
|
|
9
|
+
const Onebit_json_1 = __importDefault(require("../abi/Onebit.json"));
|
|
10
|
+
var OnebitFunctions;
|
|
11
|
+
(function (OnebitFunctions) {
|
|
12
|
+
OnebitFunctions["swapTokensWithTrust"] = "swapTokensWithTrust";
|
|
13
|
+
})(OnebitFunctions || (OnebitFunctions = {}));
|
|
14
|
+
class Onebit extends simple_exchange_1.SimpleExchange {
|
|
15
|
+
constructor(dexHelper) {
|
|
16
|
+
super(dexHelper, 'omm1');
|
|
17
|
+
this.needWrapNative = true;
|
|
18
|
+
this.exchangeRouterInterface = new abi_1.Interface(Onebit_json_1.default);
|
|
19
|
+
}
|
|
20
|
+
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
21
|
+
return {
|
|
22
|
+
targetExchange: data.router,
|
|
23
|
+
payload: '0x',
|
|
24
|
+
networkFee: '0',
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
28
|
+
const swapFunction = OnebitFunctions.swapTokensWithTrust;
|
|
29
|
+
const swapFunctionParams = [
|
|
30
|
+
srcToken,
|
|
31
|
+
destToken,
|
|
32
|
+
srcAmount,
|
|
33
|
+
destAmount,
|
|
34
|
+
this.augustusAddress,
|
|
35
|
+
];
|
|
36
|
+
const swapData = this.exchangeRouterInterface.encodeFunctionData(swapFunction, swapFunctionParams);
|
|
37
|
+
return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, data.router);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
exports.Onebit = Onebit;
|
|
41
|
+
Onebit.dexKeys = ['omm1'];
|
|
42
|
+
//# sourceMappingURL=onebit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"onebit.js","sourceRoot":"","sources":["../../src/dex/onebit.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAK7D,uDAAmD;AACnD,qEAA2C;AAc3C,IAAK,eAEJ;AAFD,WAAK,eAAe;IAClB,8DAA2C,CAAA;AAC7C,CAAC,EAFI,eAAe,KAAf,eAAe,QAEnB;AAED,MAAa,MACX,SAAQ,gCAAc;IAOtB,YAAY,SAAqB;QAC/B,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAH3B,mBAAc,GAAG,IAAI,CAAC;QAIpB,IAAI,CAAC,uBAAuB,GAAG,IAAI,eAAS,CAAC,qBAA2B,CAAC,CAAC;IAC5E,CAAC;IAED,eAAe,CACb,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAgB,EAChB,IAAc;QAEd,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,MAAM;YAC3B,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAgB,EAChB,IAAc;QAEd,MAAM,YAAY,GAAG,eAAe,CAAC,mBAAmB,CAAC;QACzD,MAAM,kBAAkB,GAAgB;YACtC,QAAQ;YACR,SAAS;YACT,SAAS;YACT,UAAU;YACV,IAAI,CAAC,eAAe;SACrB,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAC9D,YAAY,EACZ,kBAAkB,CACnB,CAAC;QAEF,OAAO,IAAI,CAAC,qCAAqC,CAC/C,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,QAAQ,EACR,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;;AAzDH,wBA0DC;AAtDQ,cAAO,GAAG,CAAC,MAAM,CAAC,CAAC"}
|
|
@@ -87,10 +87,10 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
87
87
|
];
|
|
88
88
|
const results = await this.dexHelper.multiWrapper.aggregate(callData, blockNumber, this.dexHelper.multiWrapper.defaultBatchSize);
|
|
89
89
|
return {
|
|
90
|
-
balance0: results[0],
|
|
91
|
-
balance1: results[1],
|
|
92
|
-
traderate0: results[2],
|
|
93
|
-
traderate1: results[3],
|
|
90
|
+
balance0: results[0].toString(),
|
|
91
|
+
balance1: results[1].toString(),
|
|
92
|
+
traderate0: results[2].toString(),
|
|
93
|
+
traderate1: results[3].toString(),
|
|
94
94
|
};
|
|
95
95
|
}
|
|
96
96
|
async getStateOrGenerate(blockNumber, readonly = true) {
|
|
@@ -117,8 +117,8 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
117
117
|
* to keep the state's token balances up to date.
|
|
118
118
|
*/
|
|
119
119
|
handleTransfer(event, state, log) {
|
|
120
|
-
let balance0 = state.balance0;
|
|
121
|
-
let balance1 = state.balance1;
|
|
120
|
+
let balance0 = BigInt(state.balance0);
|
|
121
|
+
let balance1 = BigInt(state.balance1);
|
|
122
122
|
const tokenAddress = log.address.toLowerCase();
|
|
123
123
|
const fromAddress = event.args.from.toLowerCase();
|
|
124
124
|
const toAddress = event.args.to.toLowerCase();
|
|
@@ -141,8 +141,8 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
141
141
|
}
|
|
142
142
|
return {
|
|
143
143
|
...state,
|
|
144
|
-
balance0,
|
|
145
|
-
balance1,
|
|
144
|
+
balance0: balance0.toString(),
|
|
145
|
+
balance1: balance1.toString(),
|
|
146
146
|
};
|
|
147
147
|
}
|
|
148
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oswap-pool.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap-pool.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAG/C,uCAAiD;AACjD,+EAA0E;AAG1E,iDAAqD;AAErD,oFAAsD;AACtD,8EAAgD;AAEhD,MAAa,cAAe,SAAQ,mDAAuC;IAazE,YACW,UAAkB,EAClB,IAAe,EACd,OAAe,EACf,SAAqB,EAC/B,MAAc,EACJ,SAAS,IAAI,eAAS,CAAC,wBAAQ,CAAC,EAChC,SAAS,IAAI,eAAS,CAAC,wBAAQ,CAAC;QAE1C,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QARrC,eAAU,GAAV,UAAU,CAAQ;QAClB,SAAI,GAAJ,IAAI,CAAW;QACd,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAErB,WAAM,GAAN,MAAM,CAA0B;QAChC,WAAM,GAAN,MAAM,CAA0B;QAnB5C,aAAQ,GAMJ,EAAE,CAAC;QAiBL,IAAI,CAAC,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,CAAC,mBAAmB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAES,QAAQ,CAAC,GAAQ;QACzB,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACnD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED;;;;;;;;OAQG;IACO,UAAU,CAClB,KAAmC,EACnC,GAAkB;QAElB,IAAI;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aACrD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,0BAAkB,EAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SACpC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CACjB,WAAmB;QAEnB,MAAM,MAAM,GAAG,IAAI,eAAS,CAAC,wBAAQ,CAAC,CAAC;QACvC,MAAM,QAAQ,GAA8B;YAC1C;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;gBACxB,QAAQ,EAAE,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrE,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;gBACxB,QAAQ,EAAE,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrE,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACzB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC1D,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACzB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC1D,cAAc,EAAE,0BAAe;aAChC;SACF,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,CACzD,QAAQ,EACR,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,gBAAgB,CAC7C,CAAC;QAEF,OAAO;YACL,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"oswap-pool.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap-pool.ts"],"names":[],"mappings":"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"}
|
package/build/dex/oswap/oswap.js
CHANGED
|
@@ -108,8 +108,8 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
108
108
|
// Note: OSwap traderate is at precision 36.
|
|
109
109
|
calcPrice(pool, state, from, amount, side, checkLiquidity = true) {
|
|
110
110
|
const rate = from.address.toLowerCase() === pool.token0
|
|
111
|
-
? state.traderate0
|
|
112
|
-
: state.traderate1;
|
|
111
|
+
? BigInt(state.traderate0)
|
|
112
|
+
: BigInt(state.traderate1);
|
|
113
113
|
const price = side === constants_1.SwapSide.SELL
|
|
114
114
|
? (amount * rate) / (0, utils_1.getBigIntPow)(36)
|
|
115
115
|
: (amount * (0, utils_1.getBigIntPow)(36)) / rate;
|
|
@@ -123,13 +123,13 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
123
123
|
hasEnoughLiquidity(pool, state, from, amount, needed, side) {
|
|
124
124
|
if (side === constants_1.SwapSide.SELL) {
|
|
125
125
|
return from.address.toLowerCase() === pool.token0
|
|
126
|
-
? needed <= state.balance1
|
|
127
|
-
: needed <= state.balance0;
|
|
126
|
+
? needed <= BigInt(state.balance1)
|
|
127
|
+
: needed <= BigInt(state.balance0);
|
|
128
128
|
}
|
|
129
129
|
// SwapSide.BUY
|
|
130
130
|
return from.address.toLowerCase() === pool.token0
|
|
131
|
-
? amount <= state.balance1
|
|
132
|
-
: amount <= state.balance0;
|
|
131
|
+
? amount <= BigInt(state.balance1)
|
|
132
|
+
: amount <= BigInt(state.balance0);
|
|
133
133
|
}
|
|
134
134
|
// Returns pool prices for amounts.
|
|
135
135
|
// If limitPools is defined only pools in limitPools
|
|
@@ -246,8 +246,8 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
246
246
|
const eventPool = this.eventPools[pool.id];
|
|
247
247
|
const blockNumber = await this.dexHelper.web3Provider.eth.getBlockNumber();
|
|
248
248
|
const state = await eventPool.getStateOrGenerate(blockNumber);
|
|
249
|
-
const usd0 = await this.dexHelper.getTokenUSDPrice({ address: pool.token0, decimals: 18 }, state.balance0);
|
|
250
|
-
const usd1 = await this.dexHelper.getTokenUSDPrice({ address: pool.token1, decimals: 18 }, state.balance1);
|
|
249
|
+
const usd0 = await this.dexHelper.getTokenUSDPrice({ address: pool.token0, decimals: 18 }, BigInt(state.balance0));
|
|
250
|
+
const usd1 = await this.dexHelper.getTokenUSDPrice({ address: pool.token1, decimals: 18 }, BigInt(state.balance1));
|
|
251
251
|
// Get the other token in the pair.
|
|
252
252
|
const pairedToken = pool.token0 === tokenAddress.toLowerCase()
|
|
253
253
|
? { address: pool.token1, decimals: 18 }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Address } from '../../types';
|
|
2
2
|
export declare type OSwapPoolState = {
|
|
3
|
-
traderate0:
|
|
4
|
-
traderate1:
|
|
5
|
-
balance0:
|
|
6
|
-
balance1:
|
|
3
|
+
traderate0: string;
|
|
4
|
+
traderate1: string;
|
|
5
|
+
balance0: string;
|
|
6
|
+
balance1: string;
|
|
7
7
|
};
|
|
8
8
|
export declare type OSwapData = {
|
|
9
9
|
pool: Address;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Interface } from '@ethersproject/abi';
|
|
2
|
-
import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger
|
|
2
|
+
import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger } from '../../types';
|
|
3
3
|
import { SwapSide, Network } from '../../constants';
|
|
4
4
|
import { IDex } from '../../dex/idex';
|
|
5
5
|
import { IDexHelper } from '../../dex-helper/idex-helper';
|
|
@@ -57,7 +57,6 @@ export declare class Platypus extends SimpleExchange implements IDex<PlatypusDat
|
|
|
57
57
|
getCalldataGasCost(poolPrices: PoolPrices<PlatypusData>): number | number[];
|
|
58
58
|
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: PlatypusData, side: SwapSide): AdapterExchangeParam;
|
|
59
59
|
getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: PlatypusData, side: SwapSide): Promise<SimpleExchangeParam>;
|
|
60
|
-
getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: PlatypusData, side: SwapSide): DexExchangeParam;
|
|
61
60
|
updatePoolState(): Promise<void>;
|
|
62
61
|
getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
|
|
63
62
|
}
|
|
@@ -362,37 +362,6 @@ class Platypus extends simple_exchange_1.SimpleExchange {
|
|
|
362
362
|
(0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
|
|
363
363
|
]), data.pool);
|
|
364
364
|
}
|
|
365
|
-
getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
|
|
366
|
-
const swapData = (0, utils_1.isETHAddress)(srcToken)
|
|
367
|
-
? Platypus.avaxPoolInterface.encodeFunctionData('swapFromETH', [
|
|
368
|
-
destToken,
|
|
369
|
-
1,
|
|
370
|
-
recipient,
|
|
371
|
-
(0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
|
|
372
|
-
])
|
|
373
|
-
: (0, utils_1.isETHAddress)(destToken)
|
|
374
|
-
? Platypus.avaxPoolInterface.encodeFunctionData('swapToETH', [
|
|
375
|
-
srcToken,
|
|
376
|
-
srcAmount,
|
|
377
|
-
1,
|
|
378
|
-
recipient,
|
|
379
|
-
(0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
|
|
380
|
-
])
|
|
381
|
-
: Platypus.poolInterface.encodeFunctionData('swap', [
|
|
382
|
-
srcToken,
|
|
383
|
-
destToken,
|
|
384
|
-
srcAmount,
|
|
385
|
-
1,
|
|
386
|
-
recipient,
|
|
387
|
-
(0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
|
|
388
|
-
]);
|
|
389
|
-
return {
|
|
390
|
-
needWrapNative: this.needWrapNative,
|
|
391
|
-
dexFuncHasRecipient: true,
|
|
392
|
-
exchangeData: swapData,
|
|
393
|
-
targetExchange: data.pool,
|
|
394
|
-
};
|
|
395
|
-
}
|
|
396
365
|
// This is called once before getTopPoolsForToken is
|
|
397
366
|
// called for multiple tokens. This can be helpful to
|
|
398
367
|
// update common state required for calculating
|