@paraswap/dex-lib 4.8.37-native-dex-math.1 → 4.8.37-native-dex-math.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/abi/pancakeswap-infinity/cl-pool-manager.json +80 -0
- package/build/dex/balancer-v3/balancer-v3-pool.js +53 -11
- package/build/dex/balancer-v3/balancer-v3-pool.js.map +1 -1
- package/build/dex/balancer-v3/getOnChainState.d.ts +3 -1
- package/build/dex/balancer-v3/getOnChainState.js +48 -9
- package/build/dex/balancer-v3/getOnChainState.js.map +1 -1
- package/build/dex/balancer-v3/types.d.ts +9 -1
- package/build/dex/deth/dETH.d.ts +2 -0
- package/build/dex/deth/dETH.js +33 -20
- package/build/dex/deth/dETH.js.map +1 -1
- package/build/dex/etherfi.js +7 -6
- package/build/dex/etherfi.js.map +1 -1
- package/build/dex/fluid-dex/scripts/measure-calc-time.js +178 -0
- package/build/dex/fluid-dex/scripts/measure-calc-time.js.map +1 -0
- package/build/dex/index.d.ts +4 -1
- package/build/dex/index.js +33 -0
- package/build/dex/index.js.map +1 -1
- package/build/dex/lido/lido.d.ts +1 -4
- package/build/dex/lido/lido.js +2 -16
- package/build/dex/lido/lido.js.map +1 -1
- package/build/dex/{infusion → pancakeswap-infinity}/config.d.ts +2 -2
- package/build/dex/pancakeswap-infinity/config.js +14 -0
- package/build/dex/pancakeswap-infinity/config.js.map +1 -0
- package/build/dex/pancakeswap-infinity/encoder.d.ts +4 -0
- package/build/dex/pancakeswap-infinity/encoder.js +230 -0
- package/build/dex/pancakeswap-infinity/encoder.js.map +1 -0
- package/build/dex/pancakeswap-infinity/pancakeswap-infinity.d.ts +21 -0
- package/build/dex/pancakeswap-infinity/pancakeswap-infinity.js +102 -0
- package/build/dex/pancakeswap-infinity/pancakeswap-infinity.js.map +1 -0
- package/build/dex/pancakeswap-infinity/subgraph.d.ts +7 -0
- package/build/dex/pancakeswap-infinity/subgraph.js +62 -0
- package/build/dex/pancakeswap-infinity/subgraph.js.map +1 -0
- package/build/dex/pancakeswap-infinity/types.d.ts +39 -0
- package/build/dex/pancakeswap-infinity/types.js.map +1 -0
- package/build/dex/swell/swell.js +1 -5
- package/build/dex/swell/swell.js.map +1 -1
- package/build/dex/uniswap-v4/api-go/compare-pricing.d.ts +1 -0
- package/build/dex/uniswap-v4/api-go/compare-pricing.js +187 -0
- package/build/dex/uniswap-v4/api-go/compare-pricing.js.map +1 -0
- package/build/dex/uniswap-v4/api-go/compare-states.d.ts +1 -0
- package/build/dex/uniswap-v4/api-go/compare-states.js +149 -0
- package/build/dex/uniswap-v4/api-go/compare-states.js.map +1 -0
- package/build/dex/uniswap-v4/api-go/fetch-pool-key.d.ts +0 -0
- package/build/dex/uniswap-v4/api-go/fetch-pool-key.js +140 -0
- package/build/dex/uniswap-v4/api-go/fetch-pool-key.js.map +1 -0
- package/build/executor/Executor01BytecodeBuilder.js +35 -10
- package/build/executor/Executor01BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor02BytecodeBuilder.js +36 -10
- package/build/executor/Executor02BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor03BytecodeBuilder.js +28 -1
- package/build/executor/Executor03BytecodeBuilder.js.map +1 -1
- package/build/executor/ExecutorBytecodeBuilder.js +5 -0
- package/build/executor/ExecutorBytecodeBuilder.js.map +1 -1
- package/build/pools-helper.js +3 -3
- package/build/pools-helper.js.map +1 -1
- package/build/types.d.ts +1 -1
- package/package.json +3 -2
- package/build/abi/BProtocol.json +0 -1155
- package/build/abi/Jarvis.json +0 -1172
- package/build/abi/MStableAsset.json +0 -1545
- package/build/abi/OneInchLp.json +0 -1304
- package/build/abi/Onebit.json +0 -736
- package/build/abi/Shell.json +0 -1294
- package/build/abi/TraderJoeV2Router.json +0 -50
- package/build/abi/idle-dao/idle-cdo-factory.json +0 -38
- package/build/abi/idle-dao/idle-cdo.json +0 -1245
- 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/abi/maker-psm/pot.json +0 -322
- package/build/abi/maker-psm/psm.json +0 -243
- package/build/abi/maker-psm/vat.json +0 -363
- package/build/abi/nomiswap-v2/nomiswap-v2-pool.json +0 -773
- package/build/abi/quick-perps/fast-price-events.json +0 -70
- package/build/abi/quick-perps/fast-price-feed.json +0 -741
- package/build/abi/quick-perps/reader.json +0 -313
- package/build/abi/quick-perps/vault-price-feed.json +0 -323
- package/build/abi/quick-perps/vault.json +0 -1953
- package/build/abi/uniswap-v2/excalibur-pool.json +0 -881
- package/build/abi/uniswap-v2/mdex-factory.json +0 -759
- package/build/abi/wUSDM.json +0 -757
- package/build/abi/zrx.v2.json +0 -1967
- package/build/abi/zrx.v3.json +0 -3454
- package/build/abi/zrx.v4.json +0 -2193
- package/build/dex/OneInchLp.d.ts +0 -24
- package/build/dex/OneInchLp.js +0 -43
- package/build/dex/OneInchLp.js.map +0 -1
- package/build/dex/bProtocol/bProtocol.d.ts +0 -15
- package/build/dex/bProtocol/bProtocol.js +0 -56
- package/build/dex/bProtocol/bProtocol.js.map +0 -1
- package/build/dex/bProtocol/types.d.ts +0 -11
- package/build/dex/bProtocol/types.js +0 -8
- package/build/dex/bProtocol/types.js.map +0 -1
- package/build/dex/ekubo/pools/base-pool.d.ts +0 -47
- package/build/dex/ekubo/pools/base-pool.js +0 -184
- package/build/dex/ekubo/pools/base-pool.js.map +0 -1
- package/build/dex/ekubo/pools/iface.d.ts +0 -46
- package/build/dex/ekubo/pools/iface.js +0 -75
- package/build/dex/ekubo/pools/iface.js.map +0 -1
- package/build/dex/ekubo/pools/math/price.d.ts +0 -7
- package/build/dex/ekubo/pools/math/price.js +0 -112
- package/build/dex/ekubo/pools/math/price.js.map +0 -1
- package/build/dex/ekubo/pools/oracle-pool.d.ts +0 -10
- package/build/dex/ekubo/pools/oracle-pool.js +0 -19
- package/build/dex/ekubo/pools/oracle-pool.js.map +0 -1
- package/build/dex/ekubo/pools/pool-utils.d.ts +0 -44
- package/build/dex/ekubo/pools/pool-utils.js +0 -240
- package/build/dex/ekubo/pools/pool-utils.js.map +0 -1
- package/build/dex/idle-dao/config.d.ts +0 -5
- package/build/dex/idle-dao/config.js +0 -24
- package/build/dex/idle-dao/config.js.map +0 -1
- package/build/dex/idle-dao/idle-dao.d.ts +0 -42
- package/build/dex/idle-dao/idle-dao.js +0 -279
- package/build/dex/idle-dao/idle-dao.js.map +0 -1
- package/build/dex/idle-dao/token_list.d.ts +0 -4
- package/build/dex/idle-dao/token_list.js +0 -289
- package/build/dex/idle-dao/token_list.js.map +0 -1
- package/build/dex/idle-dao/tokens.d.ts +0 -9
- package/build/dex/idle-dao/tokens.js +0 -68
- package/build/dex/idle-dao/tokens.js.map +0 -1
- package/build/dex/idle-dao/types.d.ts +0 -35
- package/build/dex/idle-dao/types.js +0 -11
- package/build/dex/idle-dao/types.js.map +0 -1
- package/build/dex/idle-dao/utils.d.ts +0 -8
- package/build/dex/idle-dao/utils.js +0 -149
- package/build/dex/idle-dao/utils.js.map +0 -1
- 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 -500
- package/build/dex/infusion/infusion.js.map +0 -1
- package/build/dex/infusion/types.d.ts +0 -45
- 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/build/dex/jarvis.d.ts +0 -56
- package/build/dex/jarvis.js +0 -163
- package/build/dex/jarvis.js.map +0 -1
- package/build/dex/mStable.d.ts +0 -44
- package/build/dex/mStable.js +0 -75
- package/build/dex/mStable.js.map +0 -1
- package/build/dex/maker-psm/config.d.ts +0 -11
- package/build/dex/maker-psm/config.js +0 -53
- package/build/dex/maker-psm/config.js.map +0 -1
- package/build/dex/maker-psm/maker-psm.d.ts +0 -103
- package/build/dex/maker-psm/maker-psm.js +0 -493
- package/build/dex/maker-psm/maker-psm.js.map +0 -1
- package/build/dex/maker-psm/types.d.ts +0 -39
- package/build/dex/maker-psm/types.js +0 -3
- package/build/dex/maker-psm/types.js.map +0 -1
- package/build/dex/onebit/onebit.d.ts +0 -16
- package/build/dex/onebit/onebit.js +0 -61
- package/build/dex/onebit/onebit.js.map +0 -1
- package/build/dex/onebit/types.d.ts +0 -14
- package/build/dex/onebit/types.js +0 -8
- package/build/dex/onebit/types.js.map +0 -1
- package/build/dex/quick-perps/config.d.ts +0 -11
- package/build/dex/quick-perps/config.js +0 -27
- package/build/dex/quick-perps/config.js.map +0 -1
- package/build/dex/quick-perps/fast-price-feed.d.ts +0 -26
- package/build/dex/quick-perps/fast-price-feed.js +0 -184
- package/build/dex/quick-perps/fast-price-feed.js.map +0 -1
- package/build/dex/quick-perps/pool.d.ts +0 -21
- package/build/dex/quick-perps/pool.js +0 -229
- package/build/dex/quick-perps/pool.js.map +0 -1
- package/build/dex/quick-perps/quick-perps.d.ts +0 -53
- package/build/dex/quick-perps/quick-perps.js +0 -247
- package/build/dex/quick-perps/quick-perps.js.map +0 -1
- package/build/dex/quick-perps/types.d.ts +0 -98
- package/build/dex/quick-perps/types.js +0 -3
- package/build/dex/quick-perps/types.js.map +0 -1
- package/build/dex/quick-perps/usdq.d.ts +0 -15
- package/build/dex/quick-perps/usdq.js +0 -62
- package/build/dex/quick-perps/usdq.js.map +0 -1
- package/build/dex/quick-perps/vault-price-feed.d.ts +0 -43
- package/build/dex/quick-perps/vault-price-feed.js +0 -203
- package/build/dex/quick-perps/vault-price-feed.js.map +0 -1
- package/build/dex/quick-perps/vault-utils.d.ts +0 -8
- package/build/dex/quick-perps/vault-utils.js +0 -42
- package/build/dex/quick-perps/vault-utils.js.map +0 -1
- package/build/dex/quick-perps/vault.d.ts +0 -46
- package/build/dex/quick-perps/vault.js +0 -182
- package/build/dex/quick-perps/vault.js.map +0 -1
- package/build/dex/se-vlr/config.d.ts +0 -3
- package/build/dex/se-vlr/config.js +0 -24
- package/build/dex/se-vlr/config.js.map +0 -1
- package/build/dex/se-vlr/se-vlr-pool.d.ts +0 -39
- package/build/dex/se-vlr/se-vlr-pool.js +0 -70
- package/build/dex/se-vlr/se-vlr-pool.js.map +0 -1
- package/build/dex/se-vlr/se-vlr.d.ts +0 -35
- package/build/dex/se-vlr/se-vlr.js +0 -131
- package/build/dex/se-vlr/se-vlr.js.map +0 -1
- package/build/dex/se-vlr/types.d.ts +0 -6
- package/build/dex/se-vlr/types.js +0 -3
- package/build/dex/se-vlr/types.js.map +0 -1
- package/build/dex/shell.d.ts +0 -25
- package/build/dex/shell.js +0 -41
- package/build/dex/shell.js.map +0 -1
- package/build/dex/solidly/forks-override/aerodrome.d.ts +0 -14
- package/build/dex/solidly/forks-override/aerodrome.js +0 -46
- package/build/dex/solidly/forks-override/aerodrome.js.map +0 -1
- package/build/dex/solidly/forks-override/chronos.d.ts +0 -23
- package/build/dex/solidly/forks-override/chronos.js +0 -141
- package/build/dex/solidly/forks-override/chronos.js.map +0 -1
- package/build/dex/solidly/forks-override/usdfi.d.ts +0 -8
- package/build/dex/solidly/forks-override/usdfi.js +0 -15
- package/build/dex/solidly/forks-override/usdfi.js.map +0 -1
- package/build/dex/solidly/forks-override/velocimeter.d.ts +0 -23
- package/build/dex/solidly/forks-override/velocimeter.js +0 -77
- package/build/dex/solidly/forks-override/velocimeter.js.map +0 -1
- package/build/dex/trader-joe-v2.d.ts +0 -40
- package/build/dex/trader-joe-v2.js +0 -74
- package/build/dex/trader-joe-v2.js.map +0 -1
- package/build/dex/uniswap-v2/dfyn.d.ts +0 -19
- package/build/dex/uniswap-v2/dfyn.js +0 -61
- package/build/dex/uniswap-v2/dfyn.js.map +0 -1
- package/build/dex/uniswap-v2/excalibur.d.ts +0 -24
- package/build/dex/uniswap-v2/excalibur.js +0 -47
- package/build/dex/uniswap-v2/excalibur.js.map +0 -1
- package/build/dex/uniswap-v2/mdex.d.ts +0 -24
- package/build/dex/uniswap-v2/mdex.js +0 -50
- package/build/dex/uniswap-v2/mdex.js.map +0 -1
- package/build/dex/uniswap-v2/nomiswap-v2.d.ts +0 -24
- package/build/dex/uniswap-v2/nomiswap-v2.js +0 -57
- package/build/dex/uniswap-v2/nomiswap-v2.js.map +0 -1
- package/build/dex/uniswap-v3/scripts/bench-all-dexes.js +0 -160
- package/build/dex/uniswap-v3/scripts/bench-all-dexes.js.map +0 -1
- package/build/dex/uniswap-v3/uniswap-v3-new.d.ts +0 -94
- package/build/dex/uniswap-v3/uniswap-v3-new.js +0 -923
- package/build/dex/uniswap-v3/uniswap-v3-new.js.map +0 -1
- package/build/dex/uniswap-v4/contract-math/Position.d.ts +0 -3
- package/build/dex/uniswap-v4/contract-math/Position.js +0 -10
- package/build/dex/uniswap-v4/contract-math/Position.js.map +0 -1
- package/build/dex/usual-bond/config.d.ts +0 -3
- package/build/dex/usual-bond/config.js +0 -13
- package/build/dex/usual-bond/config.js.map +0 -1
- package/build/dex/usual-bond/types.d.ts +0 -7
- package/build/dex/usual-bond/types.js +0 -3
- package/build/dex/usual-bond/types.js.map +0 -1
- package/build/dex/usual-bond/usual-bond.d.ts +0 -35
- package/build/dex/usual-bond/usual-bond.js +0 -176
- package/build/dex/usual-bond/usual-bond.js.map +0 -1
- package/build/dex/wusdm/config.d.ts +0 -3
- package/build/dex/wusdm/config.js +0 -43
- package/build/dex/wusdm/config.js.map +0 -1
- package/build/dex/wusdm/constants.d.ts +0 -2
- package/build/dex/wusdm/constants.js +0 -6
- package/build/dex/wusdm/constants.js.map +0 -1
- package/build/dex/wusdm/types.d.ts +0 -18
- package/build/dex/wusdm/types.js +0 -11
- package/build/dex/wusdm/types.js.map +0 -1
- package/build/dex/wusdm/wusdm-pool.d.ts +0 -21
- package/build/dex/wusdm/wusdm-pool.js +0 -74
- package/build/dex/wusdm/wusdm-pool.js.map +0 -1
- package/build/dex/wusdm/wusdm.d.ts +0 -46
- package/build/dex/wusdm/wusdm.js +0 -243
- package/build/dex/wusdm/wusdm.js.map +0 -1
- package/build/dex/zerox/config.d.ts +0 -2
- package/build/dex/zerox/config.js +0 -33
- package/build/dex/zerox/config.js.map +0 -1
- package/build/dex/zerox/index.d.ts +0 -22
- package/build/dex/zerox/index.js +0 -225
- package/build/dex/zerox/index.js.map +0 -1
- package/build/dex/zerox/order.d.ts +0 -88
- package/build/dex/zerox/order.js +0 -53
- package/build/dex/zerox/order.js.map +0 -1
- package/build/dex/zerox/types.d.ts +0 -73
- package/build/dex/zerox/types.js +0 -21
- package/build/dex/zerox/types.js.map +0 -1
- /package/build/dex/{uniswap-v3/scripts/bench-all-dexes.d.ts → fluid-dex/scripts/measure-calc-time.d.ts} +0 -0
- /package/build/dex/{infusion → pancakeswap-infinity}/types.js +0 -0
package/build/dex/deth/dETH.js
CHANGED
|
@@ -64,6 +64,15 @@ class dETH extends simple_exchange_1.SimpleExchange {
|
|
|
64
64
|
isDETH(tokenAddress) {
|
|
65
65
|
return this.config.wrappedToken === tokenAddress.toLowerCase();
|
|
66
66
|
}
|
|
67
|
+
isWETH(tokenAddress) {
|
|
68
|
+
return this.dexHelper.config.isWETH(tokenAddress);
|
|
69
|
+
}
|
|
70
|
+
// Treats native ETH and WETH as equivalent for routing/pricing purposes. The
|
|
71
|
+
// delta adapter itself only handles native ETH; WETH is auto-(un)wrapped by
|
|
72
|
+
// the executor via the `needUnwrapNative` flag in getDexParam.
|
|
73
|
+
isETHOrWETH(tokenAddress) {
|
|
74
|
+
return (0, utils_1.isETHAddress)(tokenAddress) || this.isWETH(tokenAddress);
|
|
75
|
+
}
|
|
67
76
|
getAdapters(_side) {
|
|
68
77
|
return null;
|
|
69
78
|
}
|
|
@@ -71,11 +80,11 @@ class dETH extends simple_exchange_1.SimpleExchange {
|
|
|
71
80
|
return `${this.network}_${this.config.wrappedToken}`;
|
|
72
81
|
}
|
|
73
82
|
async getPoolIdentifiers(srcToken, destToken) {
|
|
74
|
-
if (
|
|
83
|
+
if (this.isETHOrWETH(srcToken.address) && this.isDETH(destToken.address)) {
|
|
75
84
|
return [this.getPoolIdentifier()];
|
|
76
85
|
}
|
|
77
86
|
else if (this.isDETH(srcToken.address) &&
|
|
78
|
-
|
|
87
|
+
this.isETHOrWETH(destToken.address)) {
|
|
79
88
|
return [this.getPoolIdentifier()];
|
|
80
89
|
}
|
|
81
90
|
else {
|
|
@@ -83,11 +92,14 @@ class dETH extends simple_exchange_1.SimpleExchange {
|
|
|
83
92
|
}
|
|
84
93
|
}
|
|
85
94
|
async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools) {
|
|
86
|
-
const canSwap = (
|
|
87
|
-
(this.isDETH(srcToken.address) &&
|
|
95
|
+
const canSwap = (this.isETHOrWETH(srcToken.address) && this.isDETH(destToken.address)) ||
|
|
96
|
+
(this.isDETH(srcToken.address) && this.isETHOrWETH(destToken.address));
|
|
88
97
|
if (!canSwap)
|
|
89
98
|
return null;
|
|
90
|
-
const
|
|
99
|
+
const srcIsEthOrWeth = this.isETHOrWETH(srcToken.address);
|
|
100
|
+
// deposit is cheaper than withdraw; WETH side adds a wrap/unwrap hop.
|
|
101
|
+
const involvesWETH = this.isWETH(srcToken.address) || this.isWETH(destToken.address);
|
|
102
|
+
const gasCost = (srcIsEthOrWeth ? 6_500 : 9_000) + (involvesWETH ? 25_000 : 0);
|
|
91
103
|
return [
|
|
92
104
|
{
|
|
93
105
|
prices: amounts,
|
|
@@ -112,38 +124,39 @@ class dETH extends simple_exchange_1.SimpleExchange {
|
|
|
112
124
|
};
|
|
113
125
|
}
|
|
114
126
|
getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
|
|
115
|
-
|
|
127
|
+
// Delta adapter speaks native ETH only. WETH on either side is routed via
|
|
128
|
+
// executor-level unwrap/wrap (see needUnwrapNative).
|
|
129
|
+
const swapData = this.isETHOrWETH(srcToken)
|
|
116
130
|
? DELTA_INTERFACE.encodeFunctionData('depositNative')
|
|
117
131
|
: DELTA_INTERFACE.encodeFunctionData('withdrawNative', [srcAmount]);
|
|
118
132
|
return {
|
|
119
133
|
needWrapNative: false,
|
|
134
|
+
needUnwrapNative: true,
|
|
120
135
|
dexFuncHasRecipient: false,
|
|
121
136
|
exchangeData: swapData,
|
|
122
137
|
targetExchange: this.config.deltaAdapter,
|
|
123
|
-
returnAmountPos: undefined,
|
|
124
138
|
};
|
|
125
139
|
}
|
|
126
140
|
async getTopPoolsForToken(tokenAddress) {
|
|
127
|
-
const
|
|
141
|
+
const isEthOrWeth = this.isETHOrWETH(tokenAddress);
|
|
128
142
|
const isDETH = this.isDETH(tokenAddress);
|
|
129
|
-
if (!
|
|
143
|
+
if (!isEthOrWeth && !isDETH) {
|
|
130
144
|
return [];
|
|
131
145
|
}
|
|
146
|
+
const connectorTokens = isDETH
|
|
147
|
+
? [
|
|
148
|
+
{ address: constants_1.ETHER_ADDRESS, decimals: 18 },
|
|
149
|
+
{
|
|
150
|
+
address: this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase(),
|
|
151
|
+
decimals: 18,
|
|
152
|
+
},
|
|
153
|
+
]
|
|
154
|
+
: [{ address: this.config.wrappedToken, decimals: 18 }];
|
|
132
155
|
return [
|
|
133
156
|
{
|
|
134
157
|
exchange: this.dexKey,
|
|
135
158
|
address: this.config.wrappedToken,
|
|
136
|
-
connectorTokens
|
|
137
|
-
isETH
|
|
138
|
-
? {
|
|
139
|
-
address: this.config.wrappedToken,
|
|
140
|
-
decimals: 18,
|
|
141
|
-
}
|
|
142
|
-
: {
|
|
143
|
-
address: constants_1.ETHER_ADDRESS,
|
|
144
|
-
decimals: 18,
|
|
145
|
-
},
|
|
146
|
-
],
|
|
159
|
+
connectorTokens,
|
|
147
160
|
liquidityUSD: constants_1.UNLIMITED_USD_LIQUIDITY,
|
|
148
161
|
},
|
|
149
162
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dETH.js","sourceRoot":"","sources":["../../../src/dex/deth/dETH.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,+CAKyB;AACzB,2EAA6D;AAC7D,uCAAkE;AAGlE,wDAAoD;AACpD,qCAAiD;AACjD,6DAAiD;AAEjD,mFAAsD;AACtD,mCAAgC;AAEhC,MAAM,eAAe,GAAG,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,wBAAS,CAAC,CAAC;AAE9D,MAAa,IAAK,SAAQ,gCAAc;IAU1B;IAEA;IACA;IAZH,4BAA4B,GAAG,IAAI,CAAC;IACpC,wBAAwB,GAAG,KAAK,CAAC;IAEnC,MAAM,CAAC,kBAAkB,GAC9B,IAAA,6BAAqB,EAAC,mBAAU,CAAC,CAAC;IAEpC,MAAM,CAAS;IAEf,YACY,OAAgB,EAC1B,MAAc,EACJ,SAAqB,EACrB,SAAS,mBAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;QAE9C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QALf,YAAO,GAAP,OAAO,CAAS;QAEhB,cAAS,GAAT,SAAS,CAAY;QACrB,WAAM,GAAN,MAAM,CAA8B;QAG9C,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,YAAqB;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE,CAAC;IACjE,CAAC;IAED,WAAW,CAAC,KAAe;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,iBAAiB;QACvB,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,QAAe,EACf,SAAgB;QAEhB,IAAI,
|
|
1
|
+
{"version":3,"file":"dETH.js","sourceRoot":"","sources":["../../../src/dex/deth/dETH.ts"],"names":[],"mappings":"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"}
|
package/build/dex/etherfi.js
CHANGED
|
@@ -94,7 +94,7 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
94
94
|
getDexParam(srcToken, destToken, srcAmount) {
|
|
95
95
|
const is_eETH_dest = this.is_eETH(destToken);
|
|
96
96
|
const isWETH_src = this.isWETH(srcToken);
|
|
97
|
-
const [Interface, swapCallee, swapFunction, swapFunctionParams] = (() => {
|
|
97
|
+
const [Interface, swapCallee, swapFunction, swapFunctionParams, shouldExtractReturnAmountPos,] = (() => {
|
|
98
98
|
if (this.is_weETH(destToken)) {
|
|
99
99
|
(0, ts_essentials_1.assert)(this.is_eETH(srcToken), 'srcToken should be eETH');
|
|
100
100
|
return [
|
|
@@ -102,6 +102,7 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
102
102
|
this.weETH,
|
|
103
103
|
EtherFiFunctions.wrap,
|
|
104
104
|
[srcAmount],
|
|
105
|
+
true,
|
|
105
106
|
];
|
|
106
107
|
}
|
|
107
108
|
if (this.is_weETH(srcToken)) {
|
|
@@ -111,6 +112,7 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
111
112
|
this.weETH,
|
|
112
113
|
EtherFiFunctions.unwrap,
|
|
113
114
|
[srcAmount],
|
|
115
|
+
true,
|
|
114
116
|
];
|
|
115
117
|
}
|
|
116
118
|
if (is_eETH_dest) {
|
|
@@ -120,6 +122,7 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
120
122
|
this.eETHPool,
|
|
121
123
|
EtherFiFunctions.deposit,
|
|
122
124
|
[],
|
|
125
|
+
false,
|
|
123
126
|
];
|
|
124
127
|
}
|
|
125
128
|
throw new Error('LOGIC ERROR');
|
|
@@ -128,17 +131,15 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
128
131
|
const skipApproval = this.is_weETH(srcToken) && this.is_eETH(destToken);
|
|
129
132
|
return {
|
|
130
133
|
needWrapNative: this.needWrapNative,
|
|
134
|
+
needUnwrapNative: true,
|
|
131
135
|
dexFuncHasRecipient: false,
|
|
132
136
|
exchangeData: swapData,
|
|
133
137
|
targetExchange: swapCallee,
|
|
134
138
|
spender: swapCallee,
|
|
135
139
|
swappedAmountNotPresentInExchangeData: is_eETH_dest,
|
|
136
|
-
|
|
137
|
-
?
|
|
138
|
-
srcAmount,
|
|
139
|
-
])
|
|
140
|
+
returnAmountPos: shouldExtractReturnAmountPos
|
|
141
|
+
? (0, utils_2.extractReturnAmountPosition)(Interface, swapFunction)
|
|
140
142
|
: undefined,
|
|
141
|
-
returnAmountPos: (0, utils_2.extractReturnAmountPosition)(Interface, swapFunction),
|
|
142
143
|
skipApproval,
|
|
143
144
|
};
|
|
144
145
|
}
|
package/build/dex/etherfi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etherfi.js","sourceRoot":"","sources":["../../src/dex/etherfi.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"etherfi.js","sourceRoot":"","sources":["../../src/dex/etherfi.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,178 @@
|
|
|
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 () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
/*
|
|
37
|
+
|
|
38
|
+
Measures real calculation time for FluidDex swap math.
|
|
39
|
+
Uses performance.now() for sub-millisecond precision.
|
|
40
|
+
|
|
41
|
+
*/
|
|
42
|
+
const dotenv = __importStar(require("dotenv"));
|
|
43
|
+
const log4js_1 = require("../../../lib/log4js");
|
|
44
|
+
dotenv.config();
|
|
45
|
+
const constants_1 = require("../../../constants");
|
|
46
|
+
const dex_helper_1 = require("../../../dex-helper");
|
|
47
|
+
const fluid_dex_1 = require("../fluid-dex");
|
|
48
|
+
const perf_hooks_1 = require("perf_hooks");
|
|
49
|
+
const logger = (0, log4js_1.getLogger)('FluidDexMeasureScript');
|
|
50
|
+
const runsNumber = 1000;
|
|
51
|
+
const printFrequency = 100;
|
|
52
|
+
const network = constants_1.Network.MAINNET;
|
|
53
|
+
const dexHelper = new dex_helper_1.DummyDexHelper(network);
|
|
54
|
+
const fluidDex = new fluid_dex_1.FluidDex(network, 'FluidDex', dexHelper);
|
|
55
|
+
const side = constants_1.SwapSide.SELL;
|
|
56
|
+
// USDC
|
|
57
|
+
const srcToken = {
|
|
58
|
+
address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
|
|
59
|
+
decimals: 6,
|
|
60
|
+
};
|
|
61
|
+
// ETH
|
|
62
|
+
const destToken = {
|
|
63
|
+
address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
|
|
64
|
+
decimals: 18,
|
|
65
|
+
};
|
|
66
|
+
// 50 amounts from 0 to 1,000,000 USDC
|
|
67
|
+
const amounts = [0n];
|
|
68
|
+
{
|
|
69
|
+
const min = 0.001;
|
|
70
|
+
const max = 1_000_000;
|
|
71
|
+
const steps = 49;
|
|
72
|
+
const seen = new Set([0n]);
|
|
73
|
+
for (let i = 0; i < steps; i++) {
|
|
74
|
+
const value = min * Math.pow(max / min, i / (steps - 1));
|
|
75
|
+
const raw = BigInt(Math.round(value * 1e6));
|
|
76
|
+
if (!seen.has(raw)) {
|
|
77
|
+
seen.add(raw);
|
|
78
|
+
amounts.push(raw);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
const aggregateAndPrintMeasures = (measures, label) => {
|
|
83
|
+
const sorted = [...measures].sort((a, b) => a - b);
|
|
84
|
+
const sum = sorted.reduce((a, b) => a + b);
|
|
85
|
+
const avg = sum / sorted.length;
|
|
86
|
+
const p50 = sorted[Math.floor(sorted.length * 0.5)];
|
|
87
|
+
const p95 = sorted[Math.floor(sorted.length * 0.95)];
|
|
88
|
+
const p99 = sorted[Math.floor(sorted.length * 0.99)];
|
|
89
|
+
const max = sorted[sorted.length - 1];
|
|
90
|
+
logger.info(` ${label ? `[${label}] ` : ''}n=${measures.length} | avg=${avg.toFixed(3)}ms | p50=${p50.toFixed(3)}ms | ` +
|
|
91
|
+
`p95=${p95.toFixed(3)}ms | p99=${p99.toFixed(3)}ms | max=${max.toFixed(3)}ms`);
|
|
92
|
+
};
|
|
93
|
+
const executeGetPricesVolume = async (blockNumber, limitPools) => {
|
|
94
|
+
return fluidDex.getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools);
|
|
95
|
+
};
|
|
96
|
+
const executeSwapInDirect = (poolData) => {
|
|
97
|
+
const syncTime = Math.floor(Date.now() / 1000);
|
|
98
|
+
for (const amount of amounts) {
|
|
99
|
+
fluidDex.swapIn(poolData.swap0To1, amount, poolData.colReserves, poolData.debtReserves, poolData.inDecimals, poolData.outDecimals, poolData.fee, poolData.dexLimits, poolData.centerPrice, syncTime);
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
(async function main() {
|
|
103
|
+
logger.info(`Started FluidDex benchmark (${runsNumber} runs, ${amounts.length} amounts)\n`);
|
|
104
|
+
const blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
|
|
105
|
+
logger.info(`Block: ${blockNumber}`);
|
|
106
|
+
await fluidDex.initializePricing(blockNumber);
|
|
107
|
+
// Warm-up: fetch state & discover pools
|
|
108
|
+
const warmupResult = await executeGetPricesVolume(blockNumber);
|
|
109
|
+
if (!warmupResult || warmupResult.length === 0) {
|
|
110
|
+
logger.error('No pools found for USDC -> ETH on FluidDex');
|
|
111
|
+
process.exit(1);
|
|
112
|
+
}
|
|
113
|
+
const poolIds = warmupResult.map(p => p.poolIdentifiers[0]);
|
|
114
|
+
logger.info(`Found ${poolIds.length} pool(s): ${poolIds.join(', ')}\n`);
|
|
115
|
+
// === Benchmark 1: Full getPricesVolume (all pools) ===
|
|
116
|
+
logger.info(`\n${'='.repeat(60)}`);
|
|
117
|
+
logger.info('BENCHMARK: Full getPricesVolume (all pools)');
|
|
118
|
+
logger.info(`${'='.repeat(60)}\n`);
|
|
119
|
+
{
|
|
120
|
+
const measures = [];
|
|
121
|
+
for (let i = 0; i < runsNumber; i++) {
|
|
122
|
+
const start = perf_hooks_1.performance.now();
|
|
123
|
+
await executeGetPricesVolume(blockNumber);
|
|
124
|
+
measures.push(perf_hooks_1.performance.now() - start);
|
|
125
|
+
if (measures.length % printFrequency === 0) {
|
|
126
|
+
aggregateAndPrintMeasures(measures);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
logger.info('');
|
|
130
|
+
aggregateAndPrintMeasures(measures, 'FINAL - all pools');
|
|
131
|
+
}
|
|
132
|
+
// === Benchmark 2: getPricesVolume per pool ===
|
|
133
|
+
logger.info(`\n${'='.repeat(60)}`);
|
|
134
|
+
logger.info('BENCHMARK: getPricesVolume per pool');
|
|
135
|
+
logger.info(`${'='.repeat(60)}\n`);
|
|
136
|
+
for (const poolId of poolIds) {
|
|
137
|
+
const measures = [];
|
|
138
|
+
for (let i = 0; i < runsNumber; i++) {
|
|
139
|
+
const start = perf_hooks_1.performance.now();
|
|
140
|
+
await executeGetPricesVolume(blockNumber, [poolId]);
|
|
141
|
+
measures.push(perf_hooks_1.performance.now() - start);
|
|
142
|
+
}
|
|
143
|
+
aggregateAndPrintMeasures(measures, poolId);
|
|
144
|
+
}
|
|
145
|
+
// === Benchmark 3: Pure sync swapIn (no async overhead) ===
|
|
146
|
+
logger.info(`\n${'='.repeat(60)}`);
|
|
147
|
+
logger.info('BENCHMARK: Pure sync swapIn per pool');
|
|
148
|
+
logger.info(`${'='.repeat(60)}\n`);
|
|
149
|
+
const liquidityProxyState = await fluidDex.liquidityProxy.getState();
|
|
150
|
+
if (liquidityProxyState) {
|
|
151
|
+
for (const pool of fluidDex.pools) {
|
|
152
|
+
const reserves = liquidityProxyState.poolsReserves.find((r) => r.pool.toLowerCase() === pool.address.toLowerCase());
|
|
153
|
+
if (!reserves)
|
|
154
|
+
continue;
|
|
155
|
+
const swap0To1 = srcToken.address.toLowerCase() === pool.token0.toLowerCase();
|
|
156
|
+
const poolData = {
|
|
157
|
+
swap0To1,
|
|
158
|
+
colReserves: reserves.collateralReserves,
|
|
159
|
+
debtReserves: reserves.debtReserves,
|
|
160
|
+
fee: BigInt(reserves.fee),
|
|
161
|
+
dexLimits: reserves.dexLimits,
|
|
162
|
+
centerPrice: BigInt(reserves.centerPrice),
|
|
163
|
+
inDecimals: srcToken.decimals,
|
|
164
|
+
outDecimals: destToken.decimals,
|
|
165
|
+
};
|
|
166
|
+
const measures = [];
|
|
167
|
+
for (let i = 0; i < runsNumber; i++) {
|
|
168
|
+
const start = perf_hooks_1.performance.now();
|
|
169
|
+
executeSwapInDirect(poolData);
|
|
170
|
+
measures.push(perf_hooks_1.performance.now() - start);
|
|
171
|
+
}
|
|
172
|
+
aggregateAndPrintMeasures(measures, `sync ${pool.address.slice(0, 10)}`);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
logger.info(`\nBenchmark complete.`);
|
|
176
|
+
process.exit(0);
|
|
177
|
+
})();
|
|
178
|
+
//# sourceMappingURL=measure-calc-time.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"measure-calc-time.js","sourceRoot":"","sources":["../../../../src/dex/fluid-dex/scripts/measure-calc-time.ts"],"names":[],"mappings":"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"}
|
package/build/dex/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { UnoptimizedRate } from '../types';
|
|
2
|
-
import { IDexTxBuilder, DexConstructor, IDex, IRouteOptimizer } from './idex';
|
|
2
|
+
import { IDexTxBuilder, DexConstructor, IDex, IDexPooltracker, IRouteOptimizer } from './idex';
|
|
3
3
|
import { IDexHelper } from '../dex-helper';
|
|
4
4
|
import { SwapSide } from '../constants';
|
|
5
5
|
import { Adapters } from '../types';
|
|
@@ -21,6 +21,7 @@ export declare class DexAdapterService {
|
|
|
21
21
|
[dexKey: string]: boolean;
|
|
22
22
|
};
|
|
23
23
|
dexKeys: string[];
|
|
24
|
+
legacyPoolTrackerDexKeys: string[];
|
|
24
25
|
genericRFQDexKeys: Set<string>;
|
|
25
26
|
uniswapV2Alias: string | null;
|
|
26
27
|
routeOptimizers: IRouteOptimizer<UnoptimizedRate>[];
|
|
@@ -29,7 +30,9 @@ export declare class DexAdapterService {
|
|
|
29
30
|
isDirectFunctionName(functionName: string): boolean;
|
|
30
31
|
isDirectFunctionNameV6(functionName: string): boolean;
|
|
31
32
|
getAllDexKeys(): string[];
|
|
33
|
+
getPoolTrackerDexKeys(): string[];
|
|
32
34
|
getDexByKey(key: string): IDex<any, any, any>;
|
|
35
|
+
getPoolTrackerByKey(key: string): IDexPooltracker;
|
|
33
36
|
getAllDexAdapters(side?: SwapSide): Adapters;
|
|
34
37
|
getDexKeySpecial(dexKey: string, isAdapters?: boolean): string;
|
|
35
38
|
getAdapter(dexKey: string, side: SwapSide): {
|
package/build/dex/index.js
CHANGED
|
@@ -100,6 +100,7 @@ const blackhole_1 = require("./solidly/forks-override/blackhole");
|
|
|
100
100
|
const blackhole_cl_1 = require("./algebra-integral/forks/blackhole-cl");
|
|
101
101
|
const dETH_1 = require("./deth/dETH");
|
|
102
102
|
const cap_1 = require("./cap/cap");
|
|
103
|
+
const pancakeswap_infinity_1 = require("./pancakeswap-infinity/pancakeswap-infinity");
|
|
103
104
|
const metric_1 = require("./metric/metric");
|
|
104
105
|
const LegacyDexes = [
|
|
105
106
|
curve_v2_1.CurveV2,
|
|
@@ -111,6 +112,7 @@ const LegacyDexes = [
|
|
|
111
112
|
lido_1.Lido,
|
|
112
113
|
augustus_rfq_1.AugustusRFQOrder,
|
|
113
114
|
etherfi_1.EtherFi,
|
|
115
|
+
pancakeswap_infinity_1.PancakeSwapInfinity,
|
|
114
116
|
metric_1.Metric,
|
|
115
117
|
];
|
|
116
118
|
const Dexes = [
|
|
@@ -204,6 +206,9 @@ class DexAdapterService {
|
|
|
204
206
|
isLegacy = {};
|
|
205
207
|
// dexKeys only has keys for non legacy dexes
|
|
206
208
|
dexKeys = [];
|
|
209
|
+
// legacy dex keys whose class implements `getTopPoolsForToken` and was
|
|
210
|
+
// successfully constructed for the current network
|
|
211
|
+
legacyPoolTrackerDexKeys = [];
|
|
207
212
|
genericRFQDexKeys = new Set();
|
|
208
213
|
uniswapV2Alias;
|
|
209
214
|
routeOptimizers = [
|
|
@@ -251,6 +256,24 @@ class DexAdapterService {
|
|
|
251
256
|
}
|
|
252
257
|
});
|
|
253
258
|
});
|
|
259
|
+
LegacyDexes.forEach(DexAdapter => {
|
|
260
|
+
const proto = DexAdapter.prototype;
|
|
261
|
+
if (typeof proto.getTopPoolsForToken !== 'function')
|
|
262
|
+
return;
|
|
263
|
+
DexAdapter.dexKeys.forEach(key => {
|
|
264
|
+
const _key = key.toLowerCase();
|
|
265
|
+
try {
|
|
266
|
+
const dex = new DexAdapter(dexHelper);
|
|
267
|
+
this.dexInstances[_key] = dex;
|
|
268
|
+
this.legacyPoolTrackerDexKeys.push(key);
|
|
269
|
+
}
|
|
270
|
+
catch (e) {
|
|
271
|
+
dexHelper
|
|
272
|
+
.getLogger('DexAdapterService')
|
|
273
|
+
.warn(`Skipping legacy pool-tracker dex "${key}" on network ${network}: ${e?.message ?? e}`);
|
|
274
|
+
}
|
|
275
|
+
});
|
|
276
|
+
});
|
|
254
277
|
const rfqConfigs = dexHelper.config.data.rfqConfigs;
|
|
255
278
|
Object.keys(dexHelper.config.data.rfqConfigs).forEach(rfqName => {
|
|
256
279
|
const dex = new generic_rfq_1.GenericRFQ(network, rfqName, dexHelper, rfqConfigs[rfqName]);
|
|
@@ -300,12 +323,22 @@ class DexAdapterService {
|
|
|
300
323
|
getAllDexKeys() {
|
|
301
324
|
return lodash_1.default.uniq(this.dexKeys);
|
|
302
325
|
}
|
|
326
|
+
getPoolTrackerDexKeys() {
|
|
327
|
+
return lodash_1.default.uniq([...this.dexKeys, ...this.legacyPoolTrackerDexKeys]);
|
|
328
|
+
}
|
|
303
329
|
getDexByKey(key) {
|
|
304
330
|
const _key = key.toLowerCase();
|
|
305
331
|
if (!(_key in this.isLegacy) || this.isLegacy[_key])
|
|
306
332
|
throw new Error(`Invalid Dex Key ${key}`);
|
|
307
333
|
return this.dexInstances[_key];
|
|
308
334
|
}
|
|
335
|
+
getPoolTrackerByKey(key) {
|
|
336
|
+
const _key = key.toLowerCase();
|
|
337
|
+
const instance = this.dexInstances[_key];
|
|
338
|
+
if (!instance || typeof instance.getTopPoolsForToken !== 'function')
|
|
339
|
+
throw new Error(`Invalid pool-tracker dex key ${key}`);
|
|
340
|
+
return instance;
|
|
341
|
+
}
|
|
309
342
|
getAllDexAdapters(side = constants_2.SwapSide.SELL) {
|
|
310
343
|
return side === constants_2.SwapSide.SELL ? this.sellAdapters : this.buyAdapters;
|
|
311
344
|
}
|
package/build/dex/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dex/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,kDAA8C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dex/index.ts"],"names":[],"mappings":"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"}
|
package/build/dex/lido/lido.d.ts
CHANGED
|
@@ -7,14 +7,11 @@ import { LidoData } from './types';
|
|
|
7
7
|
export declare class Lido implements IDexTxBuilder<LidoData, any> {
|
|
8
8
|
static dexKeys: string[];
|
|
9
9
|
stETHInterface: Interface;
|
|
10
|
-
erc20Interface: Interface;
|
|
11
10
|
needWrapNative: boolean;
|
|
12
11
|
private readonly network;
|
|
13
12
|
private readonly referralAddress;
|
|
14
|
-
private readonly wethAddress;
|
|
15
13
|
constructor(dexHelper: IDexHelper);
|
|
16
14
|
getAdapterParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, data: LidoData, side: SwapSide): AdapterExchangeParam;
|
|
17
15
|
getSimpleParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, data: LidoData, side: SwapSide): Promise<SimpleExchangeParam>;
|
|
18
|
-
|
|
19
|
-
getDexParam(srcToken: Address, _destToken: Address, srcAmount: NumberAsString, _destAmount: NumberAsString, _recipient: Address, _data: LidoData, _side: SwapSide): DexExchangeParam;
|
|
16
|
+
getDexParam(_srcToken: Address, _destToken: Address, _srcAmount: NumberAsString, _destAmount: NumberAsString, _recipient: Address, _data: LidoData, _side: SwapSide): DexExchangeParam;
|
|
20
17
|
}
|
package/build/dex/lido/lido.js
CHANGED
|
@@ -9,24 +9,17 @@ const stETH_json_1 = __importDefault(require("../../abi/stETH.json"));
|
|
|
9
9
|
const constants_1 = require("../../constants");
|
|
10
10
|
const types_1 = require("./types");
|
|
11
11
|
const config_1 = require("./config");
|
|
12
|
-
const types_2 = require("../weth/types");
|
|
13
|
-
const erc20_json_1 = __importDefault(require("../../abi/erc20.json"));
|
|
14
12
|
class Lido {
|
|
15
13
|
static dexKeys = ['lido'];
|
|
16
14
|
stETHInterface;
|
|
17
|
-
erc20Interface;
|
|
18
15
|
needWrapNative = false;
|
|
19
16
|
network;
|
|
20
17
|
referralAddress;
|
|
21
|
-
wethAddress;
|
|
22
18
|
constructor(dexHelper) {
|
|
23
19
|
this.network = dexHelper.config.data.network;
|
|
24
20
|
this.stETHInterface = new abi_1.Interface(stETH_json_1.default);
|
|
25
|
-
this.erc20Interface = new abi_1.Interface(erc20_json_1.default);
|
|
26
21
|
this.referralAddress =
|
|
27
22
|
dexHelper.config.data.lidoReferralAddress ?? constants_1.NULL_ADDRESS;
|
|
28
|
-
this.wethAddress =
|
|
29
|
-
dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
|
|
30
23
|
}
|
|
31
24
|
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
32
25
|
return {
|
|
@@ -44,21 +37,14 @@ class Lido {
|
|
|
44
37
|
networkFee: '0',
|
|
45
38
|
};
|
|
46
39
|
}
|
|
47
|
-
|
|
48
|
-
return tokenAddress.toLowerCase() === this.wethAddress;
|
|
49
|
-
}
|
|
50
|
-
getDexParam(srcToken, _destToken, srcAmount, _destAmount, _recipient, _data, _side) {
|
|
40
|
+
getDexParam(_srcToken, _destToken, _srcAmount, _destAmount, _recipient, _data, _side) {
|
|
51
41
|
const swapData = this.stETHInterface.encodeFunctionData(types_1.stETHFunctions.submit, [this.referralAddress]);
|
|
52
42
|
return {
|
|
53
43
|
needWrapNative: this.needWrapNative,
|
|
44
|
+
needUnwrapNative: true,
|
|
54
45
|
dexFuncHasRecipient: false,
|
|
55
46
|
exchangeData: swapData,
|
|
56
47
|
targetExchange: config_1.stETH[this.network],
|
|
57
|
-
preSwapUnwrapCalldata: this.isWETH(srcToken)
|
|
58
|
-
? this.erc20Interface.encodeFunctionData(types_2.WethFunctions.withdraw, [
|
|
59
|
-
srcAmount,
|
|
60
|
-
])
|
|
61
|
-
: undefined,
|
|
62
48
|
};
|
|
63
49
|
}
|
|
64
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lido.js","sourceRoot":"","sources":["../../../src/dex/lido/lido.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAS7D,sEAA4C;AAC5C,+CAA+C;AAE/C,mCAAmD;AACnD,qCAAiC;
|
|
1
|
+
{"version":3,"file":"lido.js","sourceRoot":"","sources":["../../../src/dex/lido/lido.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAS7D,sEAA4C;AAC5C,+CAA+C;AAE/C,mCAAmD;AACnD,qCAAiC;AAEjC,MAAa,IAAI;IACf,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,cAAc,CAAY;IAE1B,cAAc,GAAG,KAAK,CAAC;IAEN,OAAO,CAAS;IAChB,eAAe,CAAU;IAE1C,YAAY,SAAqB;QAC/B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QAE7C,IAAI,CAAC,cAAc,GAAG,IAAI,eAAS,CAAC,oBAA0B,CAAC,CAAC;QAChE,IAAI,CAAC,eAAe;YAClB,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,wBAAY,CAAC;IAC9D,CAAC;IAED,eAAe,CACb,QAAiB,EACjB,SAAkB,EAClB,SAAyB,EACzB,UAA0B,EAC1B,IAAc,EACd,IAAc;QAEd,OAAO;YACL,cAAc,EAAE,cAAK,CAAC,IAAI,CAAC,OAAO,CAAC;YACnC,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAiB,EACjB,SAAkB,EAClB,SAAyB,EACzB,UAA0B,EAC1B,IAAc,EACd,IAAc;QAEd,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CACrD,sBAAc,CAAC,MAAM,EACrB,CAAC,IAAI,CAAC,eAAe,CAAC,CACvB,CAAC;QAEF,OAAO;YACL,OAAO,EAAE,CAAC,cAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9B,QAAQ,EAAE,CAAC,QAAQ,CAAC;YACpB,MAAM,EAAE,CAAC,SAAS,CAAC;YACnB,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,WAAW,CACT,SAAkB,EAClB,UAAmB,EACnB,UAA0B,EAC1B,WAA2B,EAC3B,UAAmB,EACnB,KAAe,EACf,KAAe;QAEf,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CACrD,sBAAc,CAAC,MAAM,EACrB,CAAC,IAAI,CAAC,eAAe,CAAC,CACvB,CAAC;QAEF,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,gBAAgB,EAAE,IAAI;YACtB,mBAAmB,EAAE,KAAK;YAC1B,YAAY,EAAE,QAAQ;YACtB,cAAc,EAAE,cAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SACpC,CAAC;IACJ,CAAC;;AA1EH,oBA2EC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PancakeSwapInfinityConfig = void 0;
|
|
4
|
+
const constants_1 = require("../../constants");
|
|
5
|
+
exports.PancakeSwapInfinityConfig = {
|
|
6
|
+
PancakeSwapInfinity: {
|
|
7
|
+
[constants_1.Network.BSC]: {
|
|
8
|
+
clPoolManager: '0xa0ffb9c1ce1fe56963b0321b32e7a0302114058b',
|
|
9
|
+
router: '0xd9c500dff816a1da21a48a732d3498bf09dc9aeb',
|
|
10
|
+
subgraphURL: '8jFYxwKP8tNGSDisucpHRK1ojUchZd7ELd8zh2ugHGDN',
|
|
11
|
+
},
|
|
12
|
+
},
|
|
13
|
+
};
|
|
14
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/pancakeswap-infinity/config.ts"],"names":[],"mappings":";;;AACA,+CAA0C;AAG7B,QAAA,yBAAyB,GAA4B;IAChE,mBAAmB,EAAE;QACnB,CAAC,mBAAO,CAAC,GAAG,CAAC,EAAE;YACb,aAAa,EAAE,4CAA4C;YAC3D,MAAM,EAAE,4CAA4C;YACpD,WAAW,EAAE,8CAA8C;SAC5D;KACF;CACF,CAAC"}
|