@paraswap/dex-lib 3.2.5-return-amount-pos.7 → 3.3.0-v6-only
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -12
- package/build/abi/Redstone.json +739 -0
- package/build/abi/angle-transmuter/MorphoOracle.json +193 -0
- package/build/abi/angle-transmuter/MorphoVault.json +2506 -0
- package/build/abi/angle-transmuter/Pyth.json +1534 -0
- package/build/abi/angle-transmuter/Transmuter.json +1711 -0
- package/build/abi/idle-dao/idle-cdo-factory.json +38 -0
- package/build/abi/idle-dao/idle-cdo.json +1245 -0
- package/build/abi/pharaoh/PharaohPool.abi.json +1582 -0
- package/build/abi/smardex/smardex-factory.json +185 -0
- package/build/abi/smardex/smardex-pool.json +578 -0
- package/build/abi/smardex/smardex-router.json +648 -0
- package/build/abi/trader-joe-v2_1/FactoryABI.json +1208 -0
- package/build/abi/trader-joe-v2_1/PairABI.json +1493 -0
- package/build/abi/trader-joe-v2_1/RouterABI.json +1489 -0
- package/build/abi/trader-joe-v2_1/StateMulticall.json +193 -0
- package/build/abi/wombat/pool.json +1289 -0
- package/build/dex/aave-v1/aave-v1.js +0 -1
- package/build/dex/aave-v1/aave-v1.js.map +1 -1
- package/build/dex/aave-v2/aave-v2.js +0 -1
- package/build/dex/aave-v2/aave-v2.js.map +1 -1
- package/build/dex/aave-v3/aave-v3.js +0 -1
- package/build/dex/aave-v3/aave-v3.js.map +1 -1
- package/build/dex/algebra/algebra.js +0 -4
- package/build/dex/algebra/algebra.js.map +1 -1
- package/build/dex/angle-staked-stable/angle-staked-stable.d.ts +2 -3
- package/build/dex/angle-staked-stable/angle-staked-stable.js +37 -20
- package/build/dex/angle-staked-stable/angle-staked-stable.js.map +1 -1
- package/build/dex/angle-transmuter/angle-transmuter-pool.d.ts +61 -0
- package/build/dex/angle-transmuter/angle-transmuter-pool.js +415 -0
- package/build/dex/angle-transmuter/angle-transmuter-pool.js.map +1 -0
- package/build/dex/angle-transmuter/angle-transmuter.d.ts +59 -0
- package/build/dex/angle-transmuter/angle-transmuter.js +262 -0
- package/build/dex/angle-transmuter/angle-transmuter.js.map +1 -0
- package/build/dex/angle-transmuter/backedOracle.d.ts +19 -0
- package/build/dex/angle-transmuter/backedOracle.js +56 -0
- package/build/dex/angle-transmuter/backedOracle.js.map +1 -0
- package/build/dex/angle-transmuter/config.d.ts +4 -0
- package/build/dex/angle-transmuter/config.js +30 -0
- package/build/dex/angle-transmuter/config.js.map +1 -0
- package/build/dex/angle-transmuter/constants.d.ts +77 -0
- package/build/dex/angle-transmuter/constants.js +94 -0
- package/build/dex/angle-transmuter/constants.js.map +1 -0
- package/build/dex/angle-transmuter/morphoOracle.d.ts +42 -0
- package/build/dex/angle-transmuter/morphoOracle.js +179 -0
- package/build/dex/angle-transmuter/morphoOracle.js.map +1 -0
- package/build/dex/angle-transmuter/morphoVault.d.ts +19 -0
- package/build/dex/angle-transmuter/morphoVault.js +78 -0
- package/build/dex/angle-transmuter/morphoVault.js.map +1 -0
- package/build/dex/angle-transmuter/pyth.d.ts +19 -0
- package/build/dex/angle-transmuter/pyth.js +70 -0
- package/build/dex/angle-transmuter/pyth.js.map +1 -0
- package/build/dex/angle-transmuter/redstone.d.ts +20 -0
- package/build/dex/angle-transmuter/redstone.js +73 -0
- package/build/dex/angle-transmuter/redstone.js.map +1 -0
- package/build/dex/angle-transmuter/transmuter.d.ts +52 -0
- package/build/dex/angle-transmuter/transmuter.js +374 -0
- package/build/dex/angle-transmuter/transmuter.js.map +1 -0
- package/build/dex/angle-transmuter/types.d.ts +188 -0
- package/build/dex/angle-transmuter/types.js +33 -0
- package/build/dex/angle-transmuter/types.js.map +1 -0
- package/build/dex/angle-transmuter/utils.d.ts +9 -0
- package/build/dex/angle-transmuter/utils.js +252 -0
- package/build/dex/angle-transmuter/utils.js.map +1 -0
- package/build/dex/bProtocol/bProtocol.js +0 -5
- package/build/dex/bProtocol/bProtocol.js.map +1 -1
- package/build/dex/bProtocol.d.ts +1 -2
- package/build/dex/bProtocol.js +0 -16
- package/build/dex/bProtocol.js.map +1 -1
- package/build/dex/balancer-v1/balancer-v1.js +0 -4
- package/build/dex/balancer-v1/balancer-v1.js.map +1 -1
- package/build/dex/balancer-v2/balancer-v2.js +0 -1
- package/build/dex/balancer-v2/balancer-v2.js.map +1 -1
- package/build/dex/bancor/bancor.js +0 -4
- package/build/dex/bancor/bancor.js.map +1 -1
- package/build/dex/bancor.d.ts +1 -2
- package/build/dex/bancor.js +0 -20
- package/build/dex/bancor.js.map +1 -1
- package/build/dex/camelot/camelot.js +0 -1
- package/build/dex/camelot/camelot.js.map +1 -1
- package/build/dex/compound/compound.js +0 -1
- package/build/dex/compound/compound.js.map +1 -1
- package/build/dex/compound.d.ts +1 -2
- package/build/dex/compound.js +0 -13
- package/build/dex/compound.js.map +1 -1
- package/build/dex/curve-v1/curve-v1.js +0 -1
- package/build/dex/curve-v1/curve-v1.js.map +1 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.js +0 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.js.map +1 -1
- package/build/dex/curve-v2/curve-v2.js +0 -1
- package/build/dex/curve-v2/curve-v2.js.map +1 -1
- package/build/dex/dexalot/dexalot.js +0 -1
- package/build/dex/dexalot/dexalot.js.map +1 -1
- package/build/dex/dodo-v1/dodo-v1.js +0 -4
- package/build/dex/dodo-v1/dodo-v1.js.map +1 -1
- package/build/dex/dodo-v1.d.ts +1 -2
- package/build/dex/dodo-v1.js +0 -21
- package/build/dex/dodo-v1.js.map +1 -1
- package/build/dex/dodo-v2.js +0 -4
- package/build/dex/dodo-v2.js.map +1 -1
- package/build/dex/etherfi.js +0 -2
- package/build/dex/etherfi.js.map +1 -1
- package/build/dex/generic-rfq/generic-rfq.js +0 -1
- package/build/dex/generic-rfq/generic-rfq.js.map +1 -1
- package/build/dex/gmx/gmx.js +0 -4
- package/build/dex/gmx/gmx.js.map +1 -1
- package/build/dex/hashflow/hashflow.js +0 -1
- package/build/dex/hashflow/hashflow.js.map +1 -1
- package/build/dex/idex.d.ts +1 -1
- package/build/dex/idle-dao/config.d.ts +6 -0
- package/build/dex/idle-dao/config.js +29 -0
- package/build/dex/idle-dao/config.js.map +1 -0
- package/build/dex/idle-dao/idle-dao-pool.d.ts +56 -0
- package/build/dex/idle-dao/idle-dao-pool.js +176 -0
- package/build/dex/idle-dao/idle-dao-pool.js.map +1 -0
- package/build/dex/idle-dao/idle-dao-pooling-pool.d.ts +16 -0
- package/build/dex/idle-dao/idle-dao-pooling-pool.js +57 -0
- package/build/dex/idle-dao/idle-dao-pooling-pool.js.map +1 -0
- package/build/dex/idle-dao/idle-dao.d.ts +52 -0
- package/build/dex/idle-dao/idle-dao.js +310 -0
- package/build/dex/idle-dao/idle-dao.js.map +1 -0
- package/build/dex/idle-dao/tokens.d.ts +16 -0
- package/build/dex/idle-dao/tokens.js +87 -0
- package/build/dex/idle-dao/tokens.js.map +1 -0
- package/build/dex/idle-dao/types.d.ts +37 -0
- package/build/dex/idle-dao/types.js +11 -0
- package/build/dex/idle-dao/types.js.map +1 -0
- package/build/dex/idle-dao/utils.d.ts +8 -0
- package/build/dex/idle-dao/utils.js +145 -0
- package/build/dex/idle-dao/utils.js.map +1 -0
- package/build/dex/jarvis-v6/jarvis-v6.js +0 -1
- package/build/dex/jarvis-v6/jarvis-v6.js.map +1 -1
- package/build/dex/jarvis.js +0 -8
- package/build/dex/jarvis.js.map +1 -1
- package/build/dex/kyberdmm/kyberdmm.js +0 -4
- package/build/dex/kyberdmm/kyberdmm.js.map +1 -1
- package/build/dex/lido/lido.js +0 -5
- package/build/dex/lido/lido.js.map +1 -1
- package/build/dex/lido.d.ts +1 -2
- package/build/dex/lido.js +0 -10
- package/build/dex/lido.js.map +1 -1
- package/build/dex/maker-psm/maker-psm.js +0 -1
- package/build/dex/maker-psm/maker-psm.js.map +1 -1
- package/build/dex/maverick-v1/maverick-v1.js +0 -4
- package/build/dex/maverick-v1/maverick-v1.js.map +1 -1
- package/build/dex/nerve/nerve.js +0 -4
- package/build/dex/nerve/nerve.js.map +1 -1
- package/build/dex/onebit/onebit.js +0 -5
- package/build/dex/onebit/onebit.js.map +1 -1
- package/build/dex/onebit.d.ts +1 -2
- package/build/dex/onebit.js +0 -18
- package/build/dex/onebit.js.map +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js +0 -4
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js.map +1 -1
- package/build/dex/paraswap-limit-orders/paraswap-limit-orders.js +0 -1
- package/build/dex/paraswap-limit-orders/paraswap-limit-orders.js.map +1 -1
- package/build/dex/platypus/platypus.js +3 -17
- package/build/dex/platypus/platypus.js.map +1 -1
- package/build/dex/polygon-migrator/polygon-migrator.js +0 -1
- package/build/dex/polygon-migrator/polygon-migrator.js.map +1 -1
- package/build/dex/quick-perps/quick-perps.js +1 -7
- package/build/dex/quick-perps/quick-perps.js.map +1 -1
- package/build/dex/smardex/subgraph-queries.d.ts +1 -0
- package/build/dex/smardex/subgraph-queries.js +17 -0
- package/build/dex/smardex/subgraph-queries.js.map +1 -0
- package/build/dex/smardex/usd-reserves.d.ts +23 -0
- package/build/dex/smardex/usd-reserves.js +86 -0
- package/build/dex/smardex/usd-reserves.js.map +1 -0
- package/build/dex/smoothy/smoothy.js +0 -1
- package/build/dex/smoothy/smoothy.js.map +1 -1
- package/build/dex/smoothy.d.ts +1 -2
- package/build/dex/smoothy.js +0 -13
- package/build/dex/smoothy.js.map +1 -1
- package/build/dex/solidly/solidly.js +0 -1
- package/build/dex/solidly/solidly.js.map +1 -1
- package/build/dex/solidly-v3/solidly-v3.js +0 -1
- package/build/dex/solidly-v3/solidly-v3.js.map +1 -1
- package/build/dex/spark/spark.js +0 -6
- package/build/dex/spark/spark.js.map +1 -1
- package/build/dex/stable-pool/stable-pool.js +0 -4
- package/build/dex/stable-pool/stable-pool.js.map +1 -1
- package/build/dex/stable-pool.d.ts +1 -2
- package/build/dex/stable-pool.js +0 -20
- package/build/dex/stable-pool.js.map +1 -1
- package/build/dex/swaap-v1/swaap-v1.js +0 -4
- package/build/dex/swaap-v1/swaap-v1.js.map +1 -1
- package/build/dex/swaap-v2/swaap-v2.js +0 -1
- package/build/dex/swaap-v2/swaap-v2.js.map +1 -1
- package/build/dex/swell/swell.js +0 -1
- package/build/dex/swell/swell.js.map +1 -1
- package/build/dex/synthetix/synthetix.js +0 -6
- package/build/dex/synthetix/synthetix.js.map +1 -1
- package/build/dex/trader-joe-v2-1-2/config.d.ts +4 -0
- package/build/dex/trader-joe-v2-1-2/config.js +47 -0
- package/build/dex/trader-joe-v2-1-2/config.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/constants.d.ts +20 -0
- package/build/dex/trader-joe-v2-1-2/constants.js +22 -0
- package/build/dex/trader-joe-v2-1-2/constants.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/math/index.d.ts +37 -0
- package/build/dex/trader-joe-v2-1-2/math/index.js +291 -0
- package/build/dex/trader-joe-v2-1-2/math/index.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2-pool.d.ts +60 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2-pool.js +248 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2-pool.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2.d.ts +53 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2.js +307 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/types.d.ts +82 -0
- package/build/dex/trader-joe-v2-1-2/types.js +9 -0
- package/build/dex/trader-joe-v2-1-2/types.js.map +1 -0
- package/build/dex/trader-joe-v2.1/trader-joe-v2.1.js +0 -4
- package/build/dex/trader-joe-v2.1/trader-joe-v2.1.js.map +1 -1
- package/build/dex/trader-joe-v2.1.d.ts +1 -2
- package/build/dex/trader-joe-v2.1.js +0 -28
- package/build/dex/trader-joe-v2.1.js.map +1 -1
- package/build/dex/trader-joe-v2_1/config.d.ts +4 -0
- package/build/dex/trader-joe-v2_1/config.js +47 -0
- package/build/dex/trader-joe-v2_1/config.js.map +1 -0
- package/build/dex/trader-joe-v2_1/constants.d.ts +20 -0
- package/build/dex/trader-joe-v2_1/constants.js +22 -0
- package/build/dex/trader-joe-v2_1/constants.js.map +1 -0
- package/build/dex/trader-joe-v2_1/math/index.d.ts +37 -0
- package/build/dex/trader-joe-v2_1/math/index.js +291 -0
- package/build/dex/trader-joe-v2_1/math/index.js.map +1 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2.1.d.ts +0 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2.1.js +384 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2.1.js.map +1 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2_1-pool.d.ts +60 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2_1-pool.js +247 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2_1-pool.js.map +1 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2_1.d.ts +53 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2_1.js +307 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2_1.js.map +1 -0
- package/build/dex/trader-joe-v2_1/types.d.ts +82 -0
- package/build/dex/trader-joe-v2_1/types.js +9 -0
- package/build/dex/trader-joe-v2_1/types.js.map +1 -0
- package/build/dex/uniswap-v2/uniswap-v2.js +0 -1
- package/build/dex/uniswap-v2/uniswap-v2.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3.js +0 -4
- package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
- package/build/dex/uniswap-v3.js +0 -4
- package/build/dex/uniswap-v3.js.map +1 -1
- package/build/dex/weth/weth.js +0 -1
- package/build/dex/weth/weth.js.map +1 -1
- package/build/dex/wombat/wombat-pool-poller.d.ts +22 -0
- package/build/dex/wombat/wombat-pool-poller.js +164 -0
- package/build/dex/wombat/wombat-pool-poller.js.map +1 -0
- package/build/dex/wombat/wombat.js +0 -4
- package/build/dex/wombat/wombat.js.map +1 -1
- package/build/dex/woo-fi-v2/woo-fi-v2.js +0 -4
- package/build/dex/woo-fi-v2/woo-fi-v2.js.map +1 -1
- package/build/dex/wsteth/wsteth.js +1 -8
- package/build/dex/wsteth/wsteth.js.map +1 -1
- package/build/dex/zerox/index.js +0 -1
- package/build/dex/zerox/index.js.map +1 -1
- package/build/dex-helper/Cache.d.ts +31 -0
- package/build/dex-helper/Cache.js +106 -0
- package/build/dex-helper/Cache.js.map +1 -0
- package/build/dex-helper/RedisBatcher.d.ts +20 -0
- package/build/dex-helper/RedisBatcher.js +75 -0
- package/build/dex-helper/RedisBatcher.js.map +1 -0
- package/build/dex-helper/RedisWrapper.d.ts +37 -0
- package/build/dex-helper/RedisWrapper.js +165 -0
- package/build/dex-helper/RedisWrapper.js.map +1 -0
- package/build/executor/Executor01BytecodeBuilder.js +1 -4
- package/build/executor/Executor01BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor02BytecodeBuilder.js +1 -5
- package/build/executor/Executor02BytecodeBuilder.js.map +1 -1
- package/build/executor/ExecutorBytecodeBuilder.d.ts +1 -1
- package/build/executor/ExecutorBytecodeBuilder.js +4 -5
- package/build/executor/ExecutorBytecodeBuilder.js.map +1 -1
- package/build/executor/ExecutorDetector.d.ts +1 -1
- package/build/executor/ExecutorDetector.js.map +1 -1
- package/build/executor/constants.d.ts +1 -3
- package/build/executor/constants.js +3 -4
- package/build/executor/constants.js.map +1 -1
- package/build/router/simpleswap.js +6 -3
- package/build/router/simpleswap.js.map +1 -1
- package/build/types.d.ts +0 -1
- package/dex-template/__DexName__.ts.template +2 -29
- package/package.json +1 -1
- package/src/dex/aave-v1/aave-v1.ts +0 -1
- package/src/dex/aave-v2/aave-v2.ts +0 -1
- package/src/dex/aave-v3/aave-v3.ts +0 -1
- package/src/dex/algebra/algebra.ts +0 -9
- package/src/dex/angle-staked-stable/angle-staked-stable.ts +38 -42
- package/src/dex/bProtocol/bProtocol.ts +0 -8
- package/src/dex/balancer-v1/balancer-v1.ts +0 -9
- package/src/dex/balancer-v2/balancer-v2.ts +2 -3
- package/src/dex/bancor/bancor.ts +0 -8
- package/src/dex/camelot/camelot.ts +0 -1
- package/src/dex/compound/compound.ts +0 -1
- package/src/dex/curve-v1/curve-v1.ts +0 -1
- package/src/dex/curve-v1-factory/curve-v1-factory.ts +0 -1
- package/src/dex/curve-v2/curve-v2.ts +0 -1
- package/src/dex/dexalot/dexalot.ts +0 -1
- package/src/dex/dodo-v1/dodo-v1.ts +0 -9
- package/src/dex/dodo-v2.ts +0 -9
- package/src/dex/etherfi.ts +0 -2
- package/src/dex/generic-rfq/generic-rfq.ts +0 -1
- package/src/dex/gmx/gmx.ts +0 -8
- package/src/dex/hashflow/hashflow.ts +0 -1
- package/src/dex/idex.ts +5 -3
- package/src/dex/jarvis-v6/jarvis-v6.ts +0 -1
- package/src/dex/jarvis.ts +0 -14
- package/src/dex/kyberdmm/kyberdmm.ts +0 -9
- package/src/dex/lido/lido.ts +0 -8
- package/src/dex/maker-psm/maker-psm.ts +0 -1
- package/src/dex/maverick-v1/maverick-v1.ts +0 -9
- package/src/dex/nerve/nerve.ts +0 -8
- package/src/dex/onebit/onebit.ts +0 -8
- package/src/dex/pancakeswap-v3/pancakeswap-v3.ts +0 -9
- package/src/dex/paraswap-limit-orders/paraswap-limit-orders.ts +0 -1
- package/src/dex/platypus/platypus.ts +3 -20
- package/src/dex/polygon-migrator/polygon-migrator.ts +0 -1
- package/src/dex/quick-perps/quick-perps.ts +1 -11
- package/src/dex/smoothy/smoothy.ts +0 -1
- package/src/dex/solidly/solidly.ts +0 -1
- package/src/dex/solidly-v3/solidly-v3.ts +1 -1
- package/src/dex/spark/spark.ts +0 -10
- package/src/dex/stable-pool/stable-pool.ts +0 -8
- package/src/dex/swaap-v1/swaap-v1.ts +0 -9
- package/src/dex/swaap-v2/swaap-v2.ts +0 -1
- package/src/dex/swell/swell.ts +0 -1
- package/src/dex/synthetix/synthetix.ts +0 -11
- package/src/dex/trader-joe-v2.1/trader-joe-v2.1.ts +0 -9
- package/src/dex/uniswap-v2/uniswap-v2.ts +0 -1
- package/src/dex/uniswap-v3/uniswap-v3.ts +0 -9
- package/src/dex/uniswap-v3.ts +0 -9
- package/src/dex/weth/weth.ts +0 -1
- package/src/dex/wombat/wombat.ts +0 -9
- package/src/dex/woo-fi-v2/woo-fi-v2.ts +0 -5
- package/src/dex/wsteth/wsteth.ts +4 -13
- package/src/dex/zerox/index.ts +0 -1
- package/src/executor/Executor01BytecodeBuilder.ts +1 -8
- package/src/executor/Executor02BytecodeBuilder.ts +0 -13
- package/src/executor/ExecutorBytecodeBuilder.ts +1 -6
- package/src/executor/ExecutorDetector.ts +2 -3
- package/src/executor/constants.ts +2 -4
- package/src/executor/executor01-bytecode-builder-e2e.test.ts +0 -39
- package/src/router/simpleswap.ts +7 -3
- package/src/types.ts +0 -1
- package/tests/constants-e2e.ts +1 -6
- package/.github/workflows/release-package.yml +0 -32
- package/.idea/aws.xml +0 -17
- package/.idea/codeStyles/Project.xml +0 -55
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/inspectionProfiles/Project_Default.xml +0 -6
- package/.idea/misc.xml +0 -6
- package/.idea/modules.xml +0 -8
- package/.idea/paraswap-dex-lib-private.iml +0 -9
- package/.idea/prettier.xml +0 -7
- package/.idea/vcs.xml +0 -6
- package/build/abi/AugustusV6.abi.json +0 -1454
- package/build/executor/IExecutorBytecodeBuilder.d.ts +0 -10
- package/build/executor/IExecutorBytecodeBuilder.js +0 -3
- package/build/executor/IExecutorBytecodeBuilder.js.map +0 -1
- package/build/executor/utils.d.ts +0 -2
- package/build/executor/utils.js +0 -30
- package/build/executor/utils.js.map +0 -1
- package/src/executor/utils.ts +0 -44
package/src/dex/jarvis.ts
CHANGED
|
@@ -12,7 +12,6 @@ import { SimpleExchange } from './simple-exchange';
|
|
|
12
12
|
import JarvisABI from '../abi/Jarvis.json';
|
|
13
13
|
import Web3 from 'web3';
|
|
14
14
|
import { IDexHelper } from '../dex-helper';
|
|
15
|
-
import { extractReturnAmountPosition } from '../executor/utils';
|
|
16
15
|
|
|
17
16
|
const THIRTY_MINUTES = 60 * 30;
|
|
18
17
|
|
|
@@ -198,8 +197,6 @@ export class Jarvis
|
|
|
198
197
|
const swapFunction = data.method;
|
|
199
198
|
const timestamp = (Date.now() / 1000 + THIRTY_MINUTES).toFixed(0);
|
|
200
199
|
let swapFunctionParams: JarvisParam;
|
|
201
|
-
let outputName: string;
|
|
202
|
-
|
|
203
200
|
switch (swapFunction) {
|
|
204
201
|
case JarvisFunctions.mint:
|
|
205
202
|
swapFunctionParams = [
|
|
@@ -210,7 +207,6 @@ export class Jarvis
|
|
|
210
207
|
timestamp,
|
|
211
208
|
recipient,
|
|
212
209
|
];
|
|
213
|
-
outputName = 'syntheticTokensMinted';
|
|
214
210
|
break;
|
|
215
211
|
case JarvisFunctions.redeem:
|
|
216
212
|
swapFunctionParams = [
|
|
@@ -221,7 +217,6 @@ export class Jarvis
|
|
|
221
217
|
timestamp,
|
|
222
218
|
recipient,
|
|
223
219
|
];
|
|
224
|
-
outputName = 'collateralRedeemed';
|
|
225
220
|
break;
|
|
226
221
|
case JarvisFunctions.exchange:
|
|
227
222
|
swapFunctionParams = [
|
|
@@ -234,7 +229,6 @@ export class Jarvis
|
|
|
234
229
|
timestamp,
|
|
235
230
|
recipient,
|
|
236
231
|
];
|
|
237
|
-
outputName = 'destNumTokensMinted';
|
|
238
232
|
break;
|
|
239
233
|
default:
|
|
240
234
|
throw new Error(`Unknown function ${swapFunction}`);
|
|
@@ -249,14 +243,6 @@ export class Jarvis
|
|
|
249
243
|
dexFuncHasRecipient: true,
|
|
250
244
|
exchangeData: swapData,
|
|
251
245
|
targetExchange: data.pools[0],
|
|
252
|
-
returnAmountPos:
|
|
253
|
-
side === SwapSide.SELL
|
|
254
|
-
? extractReturnAmountPosition(
|
|
255
|
-
this.poolInterface,
|
|
256
|
-
swapFunction,
|
|
257
|
-
outputName,
|
|
258
|
-
)
|
|
259
|
-
: undefined,
|
|
260
246
|
};
|
|
261
247
|
}
|
|
262
248
|
}
|
|
@@ -38,7 +38,6 @@ import kyberDmmFactoryABI from '../../abi/kyberdmm/kyber-dmm-factory.abi.json';
|
|
|
38
38
|
import kyberDmmPoolABI from '../../abi/kyberdmm/kyber-dmm-pool.abi.json';
|
|
39
39
|
import KyberDmmExchangeRouterABI from '../../abi/kyberdmm/kyber-dmm-exchange-router.abi.json';
|
|
40
40
|
import { getBigIntPow, getDexKeysWithNetwork } from '../../utils';
|
|
41
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
42
41
|
|
|
43
42
|
const MAX_TRACKED_PAIR_POOLS = 3;
|
|
44
43
|
|
|
@@ -263,14 +262,6 @@ export class KyberDmm
|
|
|
263
262
|
dexFuncHasRecipient: true,
|
|
264
263
|
exchangeData,
|
|
265
264
|
targetExchange: data.router,
|
|
266
|
-
returnAmountPos:
|
|
267
|
-
side === SwapSide.SELL
|
|
268
|
-
? extractReturnAmountPosition(
|
|
269
|
-
this.exchangeRouterInterface,
|
|
270
|
-
KyberDMMFunctions.swapExactTokensForTokens,
|
|
271
|
-
'amounts',
|
|
272
|
-
)
|
|
273
|
-
: undefined,
|
|
274
265
|
};
|
|
275
266
|
}
|
|
276
267
|
|
package/src/dex/lido/lido.ts
CHANGED
|
@@ -14,7 +14,6 @@ import { LidoData, stETHFunctions } from './types';
|
|
|
14
14
|
import { stETH } from './config';
|
|
15
15
|
import { WethFunctions } from '../weth/types';
|
|
16
16
|
import ERC20ABI from '../../abi/erc20.json';
|
|
17
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
18
17
|
|
|
19
18
|
export class Lido implements IDexTxBuilder<LidoData, any> {
|
|
20
19
|
static dexKeys = ['lido'];
|
|
@@ -98,13 +97,6 @@ export class Lido implements IDexTxBuilder<LidoData, any> {
|
|
|
98
97
|
srcAmount,
|
|
99
98
|
])
|
|
100
99
|
: undefined,
|
|
101
|
-
returnAmountPos:
|
|
102
|
-
_side === SwapSide.SELL
|
|
103
|
-
? extractReturnAmountPosition(
|
|
104
|
-
this.stETHInterface,
|
|
105
|
-
stETHFunctions.submit,
|
|
106
|
-
)
|
|
107
|
-
: undefined,
|
|
108
100
|
};
|
|
109
101
|
}
|
|
110
102
|
}
|
|
@@ -541,7 +541,6 @@ export class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
|
|
|
541
541
|
targetExchange: data.psmAddress,
|
|
542
542
|
specialDexFlag,
|
|
543
543
|
spender: isGemSell ? data.gemJoinAddress : data.psmAddress,
|
|
544
|
-
returnAmountPos: undefined,
|
|
545
544
|
};
|
|
546
545
|
}
|
|
547
546
|
// Returns list of top pools based on liquidity. Max
|
|
@@ -41,7 +41,6 @@ import {
|
|
|
41
41
|
import { SUBGRAPH_TIMEOUT } from '../../constants';
|
|
42
42
|
import RouterABI from '../../abi/maverick-v1/router.json';
|
|
43
43
|
import { NumberAsString } from '@paraswap/core';
|
|
44
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
45
44
|
|
|
46
45
|
const MAX_POOL_CNT = 1000;
|
|
47
46
|
|
|
@@ -403,14 +402,6 @@ export class MaverickV1
|
|
|
403
402
|
dexFuncHasRecipient: true,
|
|
404
403
|
exchangeData,
|
|
405
404
|
targetExchange: this.config.routerAddress,
|
|
406
|
-
returnAmountPos:
|
|
407
|
-
side === SwapSide.SELL
|
|
408
|
-
? extractReturnAmountPosition(
|
|
409
|
-
this.routerIface,
|
|
410
|
-
MaverickV1Functions.exactInputSingle,
|
|
411
|
-
'amountOut',
|
|
412
|
-
)
|
|
413
|
-
: undefined,
|
|
414
405
|
};
|
|
415
406
|
}
|
|
416
407
|
|
package/src/dex/nerve/nerve.ts
CHANGED
|
@@ -33,7 +33,6 @@ import { NerveConfig, Adapters, NERVE_GAS_COST } from './config';
|
|
|
33
33
|
import { NerveEventPool } from './nerve-pool';
|
|
34
34
|
import _ from 'lodash';
|
|
35
35
|
import { bigIntify } from './utils';
|
|
36
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
37
36
|
|
|
38
37
|
export class Nerve
|
|
39
38
|
extends SimpleExchange
|
|
@@ -383,13 +382,6 @@ export class Nerve
|
|
|
383
382
|
dexFuncHasRecipient: false,
|
|
384
383
|
exchangeData: swapData,
|
|
385
384
|
targetExchange: exchange,
|
|
386
|
-
returnAmountPos:
|
|
387
|
-
side === SwapSide.SELL
|
|
388
|
-
? extractReturnAmountPosition(
|
|
389
|
-
this.nervePoolIface,
|
|
390
|
-
NervePoolFunctions.swap,
|
|
391
|
-
)
|
|
392
|
-
: undefined,
|
|
393
385
|
};
|
|
394
386
|
}
|
|
395
387
|
|
package/src/dex/onebit/onebit.ts
CHANGED
|
@@ -13,7 +13,6 @@ import { SimpleExchange } from '../simple-exchange';
|
|
|
13
13
|
import OnebitABI from '../../abi/Onebit.json';
|
|
14
14
|
import { IDexHelper } from '../../dex-helper';
|
|
15
15
|
import { OnebitData, OnebitFunctions, OnebitParam } from './types';
|
|
16
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
17
16
|
|
|
18
17
|
export class Onebit
|
|
19
18
|
extends SimpleExchange
|
|
@@ -101,13 +100,6 @@ export class Onebit
|
|
|
101
100
|
dexFuncHasRecipient: true,
|
|
102
101
|
exchangeData: swapData,
|
|
103
102
|
targetExchange: data.router,
|
|
104
|
-
returnAmountPos:
|
|
105
|
-
_side === SwapSide.SELL
|
|
106
|
-
? extractReturnAmountPosition(
|
|
107
|
-
this.exchangeRouterInterface,
|
|
108
|
-
swapFunction,
|
|
109
|
-
)
|
|
110
|
-
: undefined,
|
|
111
103
|
};
|
|
112
104
|
}
|
|
113
105
|
}
|
|
@@ -61,7 +61,6 @@ import {
|
|
|
61
61
|
OnPoolCreatedCallback,
|
|
62
62
|
PancakeswapV3Factory,
|
|
63
63
|
} from './pancakeswap-v3-factory';
|
|
64
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
65
64
|
|
|
66
65
|
type PoolPairsInfo = {
|
|
67
66
|
token0: Address;
|
|
@@ -895,14 +894,6 @@ export class PancakeswapV3
|
|
|
895
894
|
dexFuncHasRecipient: true,
|
|
896
895
|
exchangeData,
|
|
897
896
|
targetExchange: this.config.router,
|
|
898
|
-
returnAmountPos:
|
|
899
|
-
side === SwapSide.SELL
|
|
900
|
-
? extractReturnAmountPosition(
|
|
901
|
-
this.routerIface,
|
|
902
|
-
swapFunction,
|
|
903
|
-
'amountOut',
|
|
904
|
-
)
|
|
905
|
-
: undefined,
|
|
906
897
|
};
|
|
907
898
|
}
|
|
908
899
|
|
|
@@ -38,7 +38,6 @@ import PoolABI from '../../abi/platypus/pool.json';
|
|
|
38
38
|
import AvaxPoolABI from '../../abi/platypus/avax-pool.json';
|
|
39
39
|
import AssetABI from '../../abi/platypus/asset.json';
|
|
40
40
|
import OracleABI from '../../abi/platypus/oracle.json';
|
|
41
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
42
41
|
|
|
43
42
|
export class Platypus extends SimpleExchange implements IDex<PlatypusData> {
|
|
44
43
|
static readonly erc20Interface = new Interface(ERC20ABI);
|
|
@@ -498,34 +497,22 @@ export class Platypus extends SimpleExchange implements IDex<PlatypusData> {
|
|
|
498
497
|
data: PlatypusData,
|
|
499
498
|
side: SwapSide,
|
|
500
499
|
): DexExchangeParam {
|
|
501
|
-
const iface = isETHAddress(srcToken)
|
|
502
|
-
? Platypus.avaxPoolInterface
|
|
503
|
-
: isETHAddress(destToken)
|
|
504
|
-
? Platypus.avaxPoolInterface
|
|
505
|
-
: Platypus.poolInterface;
|
|
506
|
-
|
|
507
|
-
const swapFunction = isETHAddress(srcToken)
|
|
508
|
-
? 'swapFromETH'
|
|
509
|
-
: isETHAddress(destToken)
|
|
510
|
-
? 'swapToETH'
|
|
511
|
-
: 'swap';
|
|
512
|
-
|
|
513
500
|
const swapData = isETHAddress(srcToken)
|
|
514
|
-
?
|
|
501
|
+
? Platypus.avaxPoolInterface.encodeFunctionData('swapFromETH', [
|
|
515
502
|
destToken,
|
|
516
503
|
1,
|
|
517
504
|
recipient,
|
|
518
505
|
getLocalDeadlineAsFriendlyPlaceholder(),
|
|
519
506
|
])
|
|
520
507
|
: isETHAddress(destToken)
|
|
521
|
-
?
|
|
508
|
+
? Platypus.avaxPoolInterface.encodeFunctionData('swapToETH', [
|
|
522
509
|
srcToken,
|
|
523
510
|
srcAmount,
|
|
524
511
|
1,
|
|
525
512
|
recipient,
|
|
526
513
|
getLocalDeadlineAsFriendlyPlaceholder(),
|
|
527
514
|
])
|
|
528
|
-
:
|
|
515
|
+
: Platypus.poolInterface.encodeFunctionData('swap', [
|
|
529
516
|
srcToken,
|
|
530
517
|
destToken,
|
|
531
518
|
srcAmount,
|
|
@@ -539,10 +526,6 @@ export class Platypus extends SimpleExchange implements IDex<PlatypusData> {
|
|
|
539
526
|
dexFuncHasRecipient: true,
|
|
540
527
|
exchangeData: swapData,
|
|
541
528
|
targetExchange: data.pool,
|
|
542
|
-
returnAmountPos:
|
|
543
|
-
side === SwapSide.SELL
|
|
544
|
-
? extractReturnAmountPosition(iface, swapFunction, 'actualToAmount')
|
|
545
|
-
: undefined,
|
|
546
529
|
};
|
|
547
530
|
}
|
|
548
531
|
|
|
@@ -24,7 +24,6 @@ import { QuickPerpsConfig, Adapters } from './config';
|
|
|
24
24
|
import { Vault } from './vault';
|
|
25
25
|
import ERC20ABI from '../../abi/erc20.json';
|
|
26
26
|
import { solidityPack } from 'ethers/lib/utils';
|
|
27
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
28
27
|
|
|
29
28
|
const QuickPerpsGasCost = 300 * 1000;
|
|
30
29
|
|
|
@@ -229,9 +228,7 @@ export class QuickPerps extends SimpleExchange implements IDex<QuickPerpsData> {
|
|
|
229
228
|
data: QuickPerpsData,
|
|
230
229
|
side: SwapSide,
|
|
231
230
|
): DexExchangeParam {
|
|
232
|
-
const
|
|
233
|
-
const functionName = 'swap';
|
|
234
|
-
const swapData = iface.encodeFunctionData(functionName, [
|
|
231
|
+
const swapData = Vault.interface.encodeFunctionData('swap', [
|
|
235
232
|
srcToken,
|
|
236
233
|
destToken,
|
|
237
234
|
recipient,
|
|
@@ -244,13 +241,6 @@ export class QuickPerps extends SimpleExchange implements IDex<QuickPerpsData> {
|
|
|
244
241
|
targetExchange: this.params.vault,
|
|
245
242
|
swappedAmountNotPresentInExchangeData: true,
|
|
246
243
|
transferSrcTokenBeforeSwap: this.params.vault,
|
|
247
|
-
returnAmountPos:
|
|
248
|
-
side === SwapSide.SELL
|
|
249
|
-
? extractReturnAmountPosition(
|
|
250
|
-
iface,
|
|
251
|
-
functionName,
|
|
252
|
-
)
|
|
253
|
-
: undefined,
|
|
254
244
|
};
|
|
255
245
|
}
|
|
256
246
|
|
|
@@ -47,6 +47,7 @@ import { assert, DeepReadonly } from 'ts-essentials';
|
|
|
47
47
|
import { uniswapV3Math } from './contract-math/uniswap-v3-math';
|
|
48
48
|
import { Contract } from 'web3-eth-contract';
|
|
49
49
|
import { AbiItem } from 'web3-utils';
|
|
50
|
+
import { OptimalSwapExchange } from '@paraswap/core';
|
|
50
51
|
import { TickMath } from './contract-math/TickMath';
|
|
51
52
|
import { OnPoolCreatedCallback, SolidlyV3Factory } from './solidly-v3-factory';
|
|
52
53
|
|
|
@@ -724,7 +725,6 @@ export class SolidlyV3
|
|
|
724
725
|
dexFuncHasRecipient: true,
|
|
725
726
|
exchangeData: swapData,
|
|
726
727
|
targetExchange: data.poolAddress,
|
|
727
|
-
returnAmountPos: undefined,
|
|
728
728
|
};
|
|
729
729
|
}
|
|
730
730
|
|
package/src/dex/spark/spark.ts
CHANGED
|
@@ -24,7 +24,6 @@ import { Interface } from 'ethers/lib/utils';
|
|
|
24
24
|
import { SparkSDaiEventPool } from './spark-sdai-pool';
|
|
25
25
|
import { BI_POWS } from '../../bigint-constants';
|
|
26
26
|
import { SDAI_DEPOSIT_GAS_COST, SDAI_REDEEM_GAS_COST } from './constants';
|
|
27
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
28
27
|
|
|
29
28
|
export class Spark
|
|
30
29
|
extends SimpleExchange
|
|
@@ -242,15 +241,6 @@ export class Spark
|
|
|
242
241
|
dexFuncHasRecipient: true,
|
|
243
242
|
exchangeData: swapData,
|
|
244
243
|
targetExchange: exchange,
|
|
245
|
-
returnAmountPos: isSell
|
|
246
|
-
? extractReturnAmountPosition(
|
|
247
|
-
this.sdaiInterface,
|
|
248
|
-
this.isDai(srcToken)
|
|
249
|
-
? SparkSDaiFunctions.deposit
|
|
250
|
-
: SparkSDaiFunctions.redeem,
|
|
251
|
-
this.isDai(srcToken) ? 'shares' : 'assets',
|
|
252
|
-
)
|
|
253
|
-
: undefined,
|
|
254
244
|
};
|
|
255
245
|
}
|
|
256
246
|
|
|
@@ -12,7 +12,6 @@ import { SimpleExchange } from '../simple-exchange';
|
|
|
12
12
|
import StablePoolABI from '../../abi/StablePool.json';
|
|
13
13
|
import { IDexHelper } from '../../dex-helper';
|
|
14
14
|
import { StablePoolFunctions, StablePoolData, StablePoolParam } from './types';
|
|
15
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
16
15
|
|
|
17
16
|
export class StablePool
|
|
18
17
|
extends SimpleExchange
|
|
@@ -124,13 +123,6 @@ export class StablePool
|
|
|
124
123
|
dexFuncHasRecipient: false,
|
|
125
124
|
exchangeData: swapData,
|
|
126
125
|
targetExchange: exchange,
|
|
127
|
-
returnAmountPos:
|
|
128
|
-
side === SwapSide.SELL
|
|
129
|
-
? extractReturnAmountPosition(
|
|
130
|
-
this.exchangeRouterInterface,
|
|
131
|
-
StablePoolFunctions.swap,
|
|
132
|
-
)
|
|
133
|
-
: undefined,
|
|
134
126
|
};
|
|
135
127
|
}
|
|
136
128
|
}
|
|
@@ -41,7 +41,6 @@ import {
|
|
|
41
41
|
import { SwaapV1Pool } from './swaap-v1-pool';
|
|
42
42
|
import PoolABI from '../../abi/swaap-v1/pool.json';
|
|
43
43
|
import { PoolQuotations } from './libraries/PoolQuotations';
|
|
44
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
45
44
|
|
|
46
45
|
export class SwaapV1 extends SimpleExchange implements IDex<SwaapV1Data> {
|
|
47
46
|
static readonly poolInterface = new Interface(PoolABI);
|
|
@@ -287,14 +286,6 @@ export class SwaapV1 extends SimpleExchange implements IDex<SwaapV1Data> {
|
|
|
287
286
|
dexFuncHasRecipient: false,
|
|
288
287
|
exchangeData: swapData,
|
|
289
288
|
targetExchange: data.pool,
|
|
290
|
-
returnAmountPos:
|
|
291
|
-
side === SwapSide.SELL
|
|
292
|
-
? extractReturnAmountPosition(
|
|
293
|
-
SwaapV1.poolInterface,
|
|
294
|
-
functionName,
|
|
295
|
-
'tokenAmountOut',
|
|
296
|
-
)
|
|
297
|
-
: undefined,
|
|
298
289
|
};
|
|
299
290
|
}
|
|
300
291
|
|
package/src/dex/swell/swell.ts
CHANGED
|
@@ -31,7 +31,6 @@ import { SynthetixState } from './synthetix-state';
|
|
|
31
31
|
// There are so many ABIs, where I need only one or two functions
|
|
32
32
|
// So, I decided to unite them into one combined interface
|
|
33
33
|
import CombinedSynthetixABI from '../../abi/synthetix/CombinedSynthetix.abi.json';
|
|
34
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
35
34
|
|
|
36
35
|
export class Synthetix extends SimpleExchange implements IDex<SynthetixData> {
|
|
37
36
|
readonly hasConstantPriceLargeAmounts = false;
|
|
@@ -358,16 +357,6 @@ export class Synthetix extends SimpleExchange implements IDex<SynthetixData> {
|
|
|
358
357
|
dexFuncHasRecipient: false,
|
|
359
358
|
exchangeData: swapData,
|
|
360
359
|
targetExchange: exchange,
|
|
361
|
-
returnAmountPos:
|
|
362
|
-
side === SwapSide.SELL
|
|
363
|
-
? extractReturnAmountPosition(
|
|
364
|
-
this.combinedIface,
|
|
365
|
-
this.network === Network.OPTIMISM
|
|
366
|
-
? 'exchange'
|
|
367
|
-
: 'exchangeAtomically',
|
|
368
|
-
'amountReceived',
|
|
369
|
-
)
|
|
370
|
-
: undefined,
|
|
371
360
|
};
|
|
372
361
|
}
|
|
373
362
|
|
|
@@ -21,7 +21,6 @@ import {
|
|
|
21
21
|
TraderJoeV2RouterParam,
|
|
22
22
|
} from './types';
|
|
23
23
|
import { TRADERJOE_V2_1_ROUTER_ADDRESS } from './config';
|
|
24
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
25
24
|
|
|
26
25
|
export class TraderJoeV21
|
|
27
26
|
extends SimpleExchange
|
|
@@ -167,14 +166,6 @@ export class TraderJoeV21
|
|
|
167
166
|
dexFuncHasRecipient: true,
|
|
168
167
|
exchangeData: swapData,
|
|
169
168
|
targetExchange: this.routerAddress,
|
|
170
|
-
returnAmountPos:
|
|
171
|
-
side === SwapSide.SELL
|
|
172
|
-
? extractReturnAmountPosition(
|
|
173
|
-
this.exchangeRouterInterface,
|
|
174
|
-
swapFunction,
|
|
175
|
-
'amountOut',
|
|
176
|
-
)
|
|
177
|
-
: undefined,
|
|
178
169
|
};
|
|
179
170
|
}
|
|
180
171
|
}
|
|
@@ -71,7 +71,6 @@ import {
|
|
|
71
71
|
import { OptimalSwapExchange } from '@paraswap/core';
|
|
72
72
|
import { OnPoolCreatedCallback, UniswapV3Factory } from './uniswap-v3-factory';
|
|
73
73
|
import { hexConcat, hexlify, hexZeroPad, hexValue } from 'ethers/lib/utils';
|
|
74
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
75
74
|
|
|
76
75
|
type PoolPairsInfo = {
|
|
77
76
|
token0: Address;
|
|
@@ -1142,14 +1141,6 @@ export class UniswapV3
|
|
|
1142
1141
|
dexFuncHasRecipient: true,
|
|
1143
1142
|
exchangeData,
|
|
1144
1143
|
targetExchange: this.config.router,
|
|
1145
|
-
returnAmountPos:
|
|
1146
|
-
side === SwapSide.SELL
|
|
1147
|
-
? extractReturnAmountPosition(
|
|
1148
|
-
this.routerIface,
|
|
1149
|
-
swapFunction,
|
|
1150
|
-
'amountOut',
|
|
1151
|
-
)
|
|
1152
|
-
: undefined,
|
|
1153
1144
|
};
|
|
1154
1145
|
}
|
|
1155
1146
|
|
package/src/dex/uniswap-v3.ts
CHANGED
|
@@ -15,7 +15,6 @@ import {
|
|
|
15
15
|
import UniswapV3RouterABI from '../abi/UniswapV3Router.json';
|
|
16
16
|
import { NumberAsString } from '@paraswap/core';
|
|
17
17
|
import { IDexHelper } from '../dex-helper';
|
|
18
|
-
import { extractReturnAmountPosition } from '../executor/utils';
|
|
19
18
|
|
|
20
19
|
const UNISWAP_V3_ROUTER_ADDRESSES: { [network: number]: Address } = {
|
|
21
20
|
[Network.MAINNET]: '0xE592427A0AEce92De3Edee1F18E0157C05861564',
|
|
@@ -229,14 +228,6 @@ export class UniswapV3
|
|
|
229
228
|
dexFuncHasRecipient: true,
|
|
230
229
|
exchangeData,
|
|
231
230
|
targetExchange: this.routerAddress,
|
|
232
|
-
returnAmountPos:
|
|
233
|
-
side === SwapSide.SELL
|
|
234
|
-
? extractReturnAmountPosition(
|
|
235
|
-
this.exchangeRouterInterface,
|
|
236
|
-
swapFunction,
|
|
237
|
-
'amountOut',
|
|
238
|
-
)
|
|
239
|
-
: undefined,
|
|
240
231
|
};
|
|
241
232
|
}
|
|
242
233
|
}
|
package/src/dex/weth/weth.ts
CHANGED
package/src/dex/wombat/wombat.ts
CHANGED
|
@@ -32,7 +32,6 @@ import { WombatBmw } from './wombat-bmw';
|
|
|
32
32
|
import { fromWad } from './utils';
|
|
33
33
|
import { WombatPool } from './wombat-pool';
|
|
34
34
|
import { StatePollingManager } from '../../lib/stateful-rpc-poller/state-polling-manager';
|
|
35
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
36
35
|
|
|
37
36
|
export class Wombat extends SimpleExchange implements IDex<WombatData> {
|
|
38
37
|
// contract interfaces
|
|
@@ -340,14 +339,6 @@ export class Wombat extends SimpleExchange implements IDex<WombatData> {
|
|
|
340
339
|
dexFuncHasRecipient: true,
|
|
341
340
|
exchangeData: swapData,
|
|
342
341
|
targetExchange: exchange,
|
|
343
|
-
returnAmountPos:
|
|
344
|
-
side === SwapSide.SELL
|
|
345
|
-
? extractReturnAmountPosition(
|
|
346
|
-
Wombat.poolInterface,
|
|
347
|
-
'swap',
|
|
348
|
-
'actualToAmount',
|
|
349
|
-
)
|
|
350
|
-
: undefined,
|
|
351
342
|
};
|
|
352
343
|
}
|
|
353
344
|
|
|
@@ -28,7 +28,6 @@ import { addressDecode } from '../../lib/decoders';
|
|
|
28
28
|
import { ifaces } from './utils';
|
|
29
29
|
import { StatePollingManager } from '../../lib/stateful-rpc-poller/state-polling-manager';
|
|
30
30
|
import { solidityPack } from 'ethers/lib/utils';
|
|
31
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
32
31
|
|
|
33
32
|
export class WooFiV2 extends SimpleExchange implements IDex<WooFiV2Data> {
|
|
34
33
|
readonly math: WooFiV2Math;
|
|
@@ -358,10 +357,6 @@ export class WooFiV2 extends SimpleExchange implements IDex<WooFiV2Data> {
|
|
|
358
357
|
exchangeData: swapData,
|
|
359
358
|
targetExchange: this.config.wooPPV2Address,
|
|
360
359
|
transferSrcTokenBeforeSwap: this.config.wooPPV2Address,
|
|
361
|
-
returnAmountPos:
|
|
362
|
-
side === SwapSide.SELL
|
|
363
|
-
? extractReturnAmountPosition(ifaces.PPV2, 'swap', 'realToAmount')
|
|
364
|
-
: undefined,
|
|
365
360
|
};
|
|
366
361
|
}
|
|
367
362
|
|
package/src/dex/wsteth/wsteth.ts
CHANGED
|
@@ -23,7 +23,6 @@ import { uint256ToBigInt } from '../../lib/decoders';
|
|
|
23
23
|
import { Utils } from '../../utils';
|
|
24
24
|
import WSTETH_ABI from '../../abi/wstETH.json';
|
|
25
25
|
import STETH_ABI from '../../abi/stETH.json';
|
|
26
|
-
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
27
26
|
|
|
28
27
|
export class WstETH extends SimpleExchange implements IDex<WstETHData> {
|
|
29
28
|
static readonly wstETHIface = new Interface(WSTETH_ABI);
|
|
@@ -253,24 +252,16 @@ export class WstETH extends SimpleExchange implements IDex<WstETHData> {
|
|
|
253
252
|
data: WstETHData,
|
|
254
253
|
side: SwapSide,
|
|
255
254
|
): Promise<DexExchangeParam> {
|
|
256
|
-
const
|
|
257
|
-
srcToken.toLowerCase() === this.config.stETHAddress ? 'wrap' : 'unwrap'
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
]);
|
|
255
|
+
const exchangeData = WstETH.wstETHIface.encodeFunctionData(
|
|
256
|
+
srcToken.toLowerCase() === this.config.stETHAddress ? 'wrap' : 'unwrap',
|
|
257
|
+
[srcAmount],
|
|
258
|
+
);
|
|
261
259
|
|
|
262
260
|
return {
|
|
263
261
|
needWrapNative: this.needWrapNative,
|
|
264
262
|
dexFuncHasRecipient: false,
|
|
265
263
|
exchangeData,
|
|
266
264
|
targetExchange: this.config.wstETHAddress,
|
|
267
|
-
returnAmountPos:
|
|
268
|
-
side === SwapSide.SELL
|
|
269
|
-
? extractReturnAmountPosition(
|
|
270
|
-
WstETH.wstETHIface,
|
|
271
|
-
swapFunction,
|
|
272
|
-
)
|
|
273
|
-
: undefined,
|
|
274
265
|
};
|
|
275
266
|
}
|
|
276
267
|
|
package/src/dex/zerox/index.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { OptimalRate } from '@paraswap/core';
|
|
|
4
4
|
import { isETHAddress } from '../utils';
|
|
5
5
|
import { DepositWithdrawReturn } from '../dex/weth/types';
|
|
6
6
|
import { Executors, Flag, SpecialDex } from './types';
|
|
7
|
-
import { BYTES_64_LENGTH
|
|
7
|
+
import { BYTES_64_LENGTH } from './constants';
|
|
8
8
|
import {
|
|
9
9
|
DexCallDataParams,
|
|
10
10
|
ExecutorBytecodeBuilder,
|
|
@@ -351,11 +351,6 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
|
|
|
351
351
|
const swap = priceRoute.bestRoute[routeIndex].swaps[swapIndex];
|
|
352
352
|
let { exchangeData, specialDexFlag } = exchangeParam;
|
|
353
353
|
|
|
354
|
-
const returnAmountPos =
|
|
355
|
-
exchangeParam.returnAmountPos !== undefined
|
|
356
|
-
? exchangeParam.returnAmountPos
|
|
357
|
-
: DEFAULT_RETURN_AMOUNT_POS;
|
|
358
|
-
|
|
359
354
|
let destTokenPos = 0;
|
|
360
355
|
if (checkDestTokenBalanceAfterSwap && !dontCheckBalanceAfterSwap) {
|
|
361
356
|
const destTokenAddr = isETHAddress(swap.destToken)
|
|
@@ -398,8 +393,6 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
|
|
|
398
393
|
destTokenPos,
|
|
399
394
|
specialDexFlag || SpecialDex.DEFAULT,
|
|
400
395
|
flag,
|
|
401
|
-
undefined,
|
|
402
|
-
returnAmountPos,
|
|
403
396
|
);
|
|
404
397
|
}
|
|
405
398
|
|