@pendle/core-v2 2.3.0-mainnet → 2.3.2-mainnet
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/artifacts/contracts/router/ActionAddRemoveLiq.sol/ActionAddRemoveLiq.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionAddRemoveLiq.sol/ActionAddRemoveLiq.json +2 -2
- package/build/artifacts/contracts/router/swap-aggregator/PendleSwapArbitrum.sol/PendleSwapArbitrum.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/PendleSwapArbitrum.sol/PendleSwapArbitrum.json +76 -0
- package/build/artifacts/contracts/router/swap-aggregator/PendleSwapEthereum.sol/PendleSwapEthereum.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/PendleSwapEthereum.sol/PendleSwapEthereum.json +76 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/IAggregationExecutor.sol/IAggregationExecutor.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{interfaces → arbitrum}/IAggregationExecutor.sol/IAggregationExecutor.json +1 -1
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/IExecutorHelper1.sol/IExecutorHelper1.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/IExecutorHelper1.sol/IExecutorHelper1.json +388 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/IExecutorHelper2.sol/IExecutorHelper2.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/IExecutorHelper2.sol/IExecutorHelper2.json +40 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/IHashflow.sol/IHashflow.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{interfaces → arbitrum}/IHashflow.sol/IHashflow.json +1 -1
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/IMetaAggregationRouterV2.sol/IMetaAggregationRouterV2.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{interfaces → arbitrum}/IMetaAggregationRouterV2.sol/IMetaAggregationRouterV2.json +1 -1
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/KyberHelperArbitrum.sol/KyberHelperArbitrum.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{KyberAggregationRouterHelper.sol/KyberAggregationRouterHelper.json → arbitrum/KyberHelperArbitrum.sol/KyberHelperArbitrum.json} +2 -2
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/ScaleDataHelperArbitrum.sol/ScaleDataHelperArbitrum.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/arbitrum/ScaleDataHelperArbitrum.sol/ScaleDataHelperArbitrum.json +10 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/IAggregationExecutor.sol/IAggregationExecutor.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/IAggregationExecutor.sol/IAggregationExecutor.json +65 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/IExecutorHelperEthereum1.sol/IExecutorHelperEthereum1.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{interfaces → ethereum}/IExecutorHelperEthereum1.sol/IExecutorHelperEthereum1.json +1 -1
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/IHashflow.sol/IHashflow.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/IHashflow.sol/IHashflow.json +101 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/IMetaAggregationRouterV2.sol/IMetaAggregationRouterV2.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/IMetaAggregationRouterV2.sol/IMetaAggregationRouterV2.json +215 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/KyberHelperEthereum.sol/KyberHelperEthereum.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/KyberHelperEthereum.sol/KyberHelperEthereum.json +10 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/ScaleDataHelperEthereum.sol/ScaleDataHelperEthereum.dbg.json +4 -0
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ethereum/ScaleDataHelperEthereum.sol/ScaleDataHelperEthereum.json +10 -0
- package/contracts/router/ActionAddRemoveLiq.sol +0 -1
- package/contracts/router/swap-aggregator/PendleSwapArbitrum.sol +45 -0
- package/contracts/router/swap-aggregator/{PendleSwapAggregator.sol → PendleSwapEthereum.sol} +5 -3
- package/contracts/router/swap-aggregator/kyberswap/arbitrum/IExecutorHelper1.sol +195 -0
- package/contracts/router/swap-aggregator/kyberswap/arbitrum/IExecutorHelper2.sol +10 -0
- package/contracts/router/swap-aggregator/kyberswap/arbitrum/IMetaAggregationRouterV2.sol +41 -0
- package/contracts/router/swap-aggregator/kyberswap/arbitrum/KyberHelperArbitrum.sol +200 -0
- package/contracts/router/swap-aggregator/kyberswap/arbitrum/ScaleDataHelperArbitrum.sol +135 -0
- package/contracts/router/swap-aggregator/kyberswap/ethereum/IAggregationExecutor.sol +17 -0
- package/contracts/router/swap-aggregator/kyberswap/ethereum/IHashflow.sol +30 -0
- package/contracts/router/swap-aggregator/kyberswap/{KyberAggregationRouterHelper.sol → ethereum/KyberHelperEthereum.sol} +16 -28
- package/contracts/router/swap-aggregator/kyberswap/{ScaleDataHelperEthereum1.sol → ethereum/ScaleDataHelperEthereum.sol} +2 -2
- package/deployments/1-core.json +1 -1
- package/deployments/42161-core.json +1 -1
- package/package.json +1 -1
- package/typechain-types/IExecutorHelper1.ts +643 -0
- package/typechain-types/IExecutorHelper2.ts +115 -0
- package/typechain-types/InputScalingHelper.ts +108 -0
- package/typechain-types/PendleSwapArbitrum.ts +126 -0
- package/typechain-types/PendleSwapEthereum.ts +126 -0
- package/typechain-types/factories/ActionAddRemoveLiq__factory.ts +1 -1
- package/typechain-types/factories/IExecutorHelper1__factory.ts +403 -0
- package/typechain-types/factories/IExecutorHelper2__factory.ts +55 -0
- package/typechain-types/factories/InputScalingHelper__factory.ts +88 -0
- package/typechain-types/factories/PendleSwapAggregator__factory.ts +1 -1
- package/typechain-types/factories/PendleSwapArbitrum__factory.ts +129 -0
- package/typechain-types/factories/PendleSwapEthereum__factory.ts +129 -0
- package/typechain-types/hardhat.d.ts +58 -184
- package/typechain-types/index.ts +10 -44
- package/build/artifacts/contracts/router/swap-aggregator/PendleSwapAggregator.sol/PendleSwapAggregator.dbg.json +0 -4
- package/build/artifacts/contracts/router/swap-aggregator/PendleSwapAggregator.sol/PendleSwapAggregator.json +0 -72
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/KyberAggregationRouterHelper.sol/KyberAggregationRouterHelper.dbg.json +0 -4
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ScaleDataHelperEthereum1.sol/ScaleDataHelperEthereum1.dbg.json +0 -4
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ScaleDataHelperEthereum1.sol/ScaleDataHelperEthereum1.json +0 -10
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/interfaces/IAggregationExecutor.sol/IAggregationExecutor.dbg.json +0 -4
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/interfaces/IExecutorHelperEthereum1.sol/IExecutorHelperEthereum1.dbg.json +0 -4
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/interfaces/IHashflow.sol/IHashflow.dbg.json +0 -4
- package/build/artifacts/contracts/router/swap-aggregator/kyberswap/interfaces/IMetaAggregationRouterV2.sol/IMetaAggregationRouterV2.dbg.json +0 -4
- /package/contracts/router/swap-aggregator/kyberswap/{interfaces → arbitrum}/IAggregationExecutor.sol +0 -0
- /package/contracts/router/swap-aggregator/kyberswap/{interfaces → arbitrum}/IHashflow.sol +0 -0
- /package/contracts/router/swap-aggregator/kyberswap/{interfaces → ethereum}/IExecutorHelperEthereum1.sol +0 -0
- /package/contracts/router/swap-aggregator/kyberswap/{interfaces → ethereum}/IMetaAggregationRouterV2.sol +0 -0
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
2
|
|
|
3
3
|
pragma solidity 0.8.17;
|
|
4
|
-
import "./
|
|
5
|
-
import "./
|
|
6
|
-
import "./
|
|
7
|
-
import "./
|
|
4
|
+
import "./IMetaAggregationRouterV2.sol";
|
|
5
|
+
import "./IHashflow.sol";
|
|
6
|
+
import "./IExecutorHelperEthereum1.sol";
|
|
7
|
+
import "./ScaleDataHelperEthereum.sol";
|
|
8
8
|
|
|
9
|
-
abstract contract
|
|
9
|
+
abstract contract KyberHelperEthereum {
|
|
10
10
|
uint256 private constant _PARTIAL_FILL = 0x01;
|
|
11
11
|
uint256 private constant _REQUIRES_EXTRA_ETH = 0x02;
|
|
12
12
|
uint256 private constant _SHOULD_CLAIM = 0x04;
|
|
@@ -135,47 +135,35 @@ abstract contract KyberAggregationRouterHelper {
|
|
|
135
135
|
bytes4 selector = swap.selector;
|
|
136
136
|
|
|
137
137
|
if (selector == IExecutorHelperEthereum1.executeUniSwap.selector) {
|
|
138
|
-
swap.data =
|
|
138
|
+
swap.data = ScaleDataHelperEthereum.newUniSwap(swap.data, oldAmount, newAmount);
|
|
139
139
|
} else if (selector == IExecutorHelperEthereum1.executeStableSwap.selector) {
|
|
140
|
-
swap.data =
|
|
141
|
-
swap.data,
|
|
142
|
-
oldAmount,
|
|
143
|
-
newAmount
|
|
144
|
-
);
|
|
140
|
+
swap.data = ScaleDataHelperEthereum.newStableSwap(swap.data, oldAmount, newAmount);
|
|
145
141
|
} else if (selector == IExecutorHelperEthereum1.executeCurveSwap.selector) {
|
|
146
|
-
swap.data =
|
|
142
|
+
swap.data = ScaleDataHelperEthereum.newCurveSwap(swap.data, oldAmount, newAmount);
|
|
147
143
|
} else if (selector == IExecutorHelperEthereum1.executeKyberDMMSwap.selector) {
|
|
148
|
-
swap.data =
|
|
144
|
+
swap.data = ScaleDataHelperEthereum.newKyberDMM(swap.data, oldAmount, newAmount);
|
|
149
145
|
} else if (selector == IExecutorHelperEthereum1.executeUniV3ProMMSwap.selector) {
|
|
150
|
-
swap.data =
|
|
151
|
-
swap.data,
|
|
152
|
-
oldAmount,
|
|
153
|
-
newAmount
|
|
154
|
-
);
|
|
146
|
+
swap.data = ScaleDataHelperEthereum.newUniV3ProMM(swap.data, oldAmount, newAmount);
|
|
155
147
|
} else if (selector == IExecutorHelperEthereum1.executeRfqSwap.selector) {
|
|
156
148
|
revert("InputScalingHelper: Can not scale RFQ swap");
|
|
157
149
|
} else if (selector == IExecutorHelperEthereum1.executeBalV2Swap.selector) {
|
|
158
|
-
swap.data =
|
|
159
|
-
swap.data,
|
|
160
|
-
oldAmount,
|
|
161
|
-
newAmount
|
|
162
|
-
);
|
|
150
|
+
swap.data = ScaleDataHelperEthereum.newBalancerV2(swap.data, oldAmount, newAmount);
|
|
163
151
|
} else if (selector == IExecutorHelperEthereum1.executeDODOSwap.selector) {
|
|
164
|
-
swap.data =
|
|
152
|
+
swap.data = ScaleDataHelperEthereum.newDODO(swap.data, oldAmount, newAmount);
|
|
165
153
|
} else if (selector == IExecutorHelperEthereum1.executeWrappedstETHSwap.selector) {
|
|
166
|
-
swap.data =
|
|
154
|
+
swap.data = ScaleDataHelperEthereum.newWrappedstETHSwap(
|
|
167
155
|
swap.data,
|
|
168
156
|
oldAmount,
|
|
169
157
|
newAmount
|
|
170
158
|
);
|
|
171
159
|
} else if (selector == IExecutorHelperEthereum1.executeSynthetixSwap.selector) {
|
|
172
|
-
swap.data =
|
|
160
|
+
swap.data = ScaleDataHelperEthereum.newSynthetix(swap.data, oldAmount, newAmount);
|
|
173
161
|
} else if (selector == IExecutorHelperEthereum1.executePSMSwap.selector) {
|
|
174
|
-
swap.data =
|
|
162
|
+
swap.data = ScaleDataHelperEthereum.newPSM(swap.data, oldAmount, newAmount);
|
|
175
163
|
} else if (selector == IExecutorHelperEthereum1.executeHashflowSwap.selector) {
|
|
176
164
|
revert("InputScalingHelper: Can not scale RFQ swap");
|
|
177
165
|
} else if (selector == IExecutorHelperEthereum1.executeFraxSwap.selector) {
|
|
178
|
-
swap.data =
|
|
166
|
+
swap.data = ScaleDataHelperEthereum.newFrax(swap.data, oldAmount, newAmount);
|
|
179
167
|
} else revert("AggregationExecutor: Dex type not supported");
|
|
180
168
|
}
|
|
181
169
|
return abi.encode(executorDesc);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
2
|
pragma solidity 0.8.17;
|
|
3
3
|
|
|
4
|
-
import "./
|
|
4
|
+
import "./IExecutorHelperEthereum1.sol";
|
|
5
5
|
|
|
6
|
-
library
|
|
6
|
+
library ScaleDataHelperEthereum {
|
|
7
7
|
function newUniSwap(
|
|
8
8
|
bytes memory data,
|
|
9
9
|
uint256 oldAmount,
|
package/deployments/1-core.json
CHANGED
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"bulkSellerOffchain": "0x9ACc60F915dFcd190D270fc92567aE71776bd320",
|
|
23
23
|
"router": "0x0000000001e4ef00d069e71d6ba041b0a16f7ea0",
|
|
24
24
|
"routerStatic": "0x263833d47eA3fA4a30f269323aba6a107f9eB14C",
|
|
25
|
-
"pendleSwap": "
|
|
25
|
+
"pendleSwap": "0x2065e12735D678B23eC926603180c96623d5af41",
|
|
26
26
|
"vePendle": "0x4f30A9D41B80ecC5B94306AB4364951AE3170210",
|
|
27
27
|
"senderEndpoint": "0x07b1014c88f14C9E910092526db57A20052E989F",
|
|
28
28
|
"votingController": "0x44087E105137a5095c008AaB6a6530182821F2F0",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"marketFactory": "0xf5a7De2D276dbda3EEf1b62A9E718EFf4d29dDC8",
|
|
20
20
|
"router": "0x0000000001e4ef00d069e71d6ba041b0a16f7ea0",
|
|
21
21
|
"routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
|
|
22
|
-
"pendleSwap": "
|
|
22
|
+
"pendleSwap": "0x4546FF0fbc6fb29916Ca56b4F95744B0b356112C",
|
|
23
23
|
"receiverEndpoint": "0xC9215ae9EC67385F38C755D862C8eE3702B5793A",
|
|
24
24
|
"vePendle": "0x3209E9412cca80B18338f2a56ADA59c484c39644",
|
|
25
25
|
"gaugeController": "0x1e56299ebc8a1010cec26005d12e3e5c5cc2db00"
|
package/package.json
CHANGED