@pendle/core-v2 2.2.0-mainnet → 2.3.1-mainnet

package/contracts/router/swap-aggregator/kyberswap/arbitrum/KyberHelperArbitrum.sol

@@ -0,0 +1,200 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IExecutorHelper1 } from "./IExecutorHelper1.sol";
+import { IExecutorHelper2 } from "./IExecutorHelper2.sol";
+import { IMetaAggregationRouterV2 } from "./IMetaAggregationRouterV2.sol";
+import { ScaleDataHelperArbitrum } from "./ScaleDataHelperArbitrum.sol";
+
+abstract contract KyberHelperArbitrum {
+    uint256 private constant _PARTIAL_FILL = 0x01;
+    uint256 private constant _REQUIRES_EXTRA_ETH = 0x02;
+    uint256 private constant _SHOULD_CLAIM = 0x04;
+    uint256 private constant _BURN_FROM_MSG_SENDER = 0x08;
+    uint256 private constant _BURN_FROM_TX_ORIGIN = 0x10;
+    uint256 private constant _SIMPLE_SWAP = 0x20;
+
+    struct Swap {
+        bytes data;
+        bytes4 selector;
+    }
+
+    struct SimpleSwapData {
+        address[] firstPools;
+        uint256[] firstSwapAmounts;
+        bytes[] swapDatas;
+        uint256 deadline;
+        bytes destTokenFeeData;
+    }
+
+    struct SwapExecutorDescription {
+        Swap[][] swapSequences;
+        address tokenIn;
+        address tokenOut;
+        uint256 minTotalAmountOut;
+        address to;
+        uint256 deadline;
+        bytes destTokenFeeData;
+    }
+
+    function _getKyberScaledInputData(
+        bytes calldata kybercall,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        bytes4 selector = bytes4(kybercall[:4]);
+
+        if (selector == IMetaAggregationRouterV2.swap.selector) {
+            IMetaAggregationRouterV2.SwapExecutionParams memory params = abi.decode(
+                kybercall[4:],
+                (IMetaAggregationRouterV2.SwapExecutionParams)
+            );
+
+            (params.desc, params.targetData) = _getScaledInputDataV2(
+                params.desc,
+                params.targetData,
+                newAmount,
+                _flagsChecked(params.desc.flags, _SIMPLE_SWAP)
+            );
+            return abi.encodeWithSelector(selector, params);
+        }
+
+        if (selector == IMetaAggregationRouterV2.swapSimpleMode.selector) {
+            (
+                address callTarget,
+                IMetaAggregationRouterV2.SwapDescriptionV2 memory desc,
+                bytes memory targetData,
+                bytes memory clientData
+            ) = abi.decode(
+                    kybercall[4:],
+                    (address, IMetaAggregationRouterV2.SwapDescriptionV2, bytes, bytes)
+                );
+
+            (desc, targetData) = _getScaledInputDataV2(desc, targetData, newAmount, true);
+            return abi.encodeWithSelector(selector, callTarget, desc, targetData, clientData);
+        }
+
+        revert("InputScalingHelper: Invalid selector");
+    }
+
+    function _getScaledInputDataV2(
+        IMetaAggregationRouterV2.SwapDescriptionV2 memory desc,
+        bytes memory executorData,
+        uint256 newAmount,
+        bool isSimpleMode
+    ) internal pure returns (IMetaAggregationRouterV2.SwapDescriptionV2 memory, bytes memory) {
+        uint256 oldAmount = desc.amount;
+        if (oldAmount == newAmount) {
+            return (desc, executorData);
+        }
+
+        // simple mode swap
+        if (isSimpleMode) {
+            return (
+                _scaledSwapDescriptionV2(desc, oldAmount, newAmount),
+                _scaledSimpleSwapData(executorData, oldAmount, newAmount)
+            );
+        }
+
+        //normal mode swap
+        return (
+            _scaledSwapDescriptionV2(desc, oldAmount, newAmount),
+            _scaledExecutorCallBytesData(executorData, oldAmount, newAmount)
+        );
+    }
+
+    function _scaledSimpleSwapData(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        SimpleSwapData memory swapData = abi.decode(data, (SimpleSwapData));
+        uint256 numberSeq = swapData.firstPools.length;
+        uint256 newTotalSwapAmount;
+        for (uint256 i = 0; i < numberSeq; i++) {
+            if (i == numberSeq - 1) {
+                swapData.firstSwapAmounts[i] = newAmount - newTotalSwapAmount;
+            } else {
+                swapData.firstSwapAmounts[i] =
+                    (swapData.firstSwapAmounts[i] * newAmount) /
+                    oldAmount;
+            }
+            newTotalSwapAmount += swapData.firstSwapAmounts[i];
+        }
+        return abi.encode(swapData);
+    }
+
+    function _scaledExecutorCallBytesData(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        SwapExecutorDescription memory executorDesc = abi.decode(data, (SwapExecutorDescription));
+        executorDesc.minTotalAmountOut = (executorDesc.minTotalAmountOut * newAmount) / oldAmount;
+        for (uint256 i = 0; i < executorDesc.swapSequences.length; i++) {
+            Swap memory swap = executorDesc.swapSequences[i][0];
+            bytes4 selector = swap.selector;
+
+            if (selector == IExecutorHelper1.executeUniSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newUniSwap(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeStableSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newStableSwap(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeCurveSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newCurveSwap(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeKyberDMMSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newKyberDMM(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeUniV3ProMMSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newUniV3ProMM(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeRfqSwap.selector) {
+                revert("InputScalingHelper: Can not scale RFQ swap");
+            } else if (selector == IExecutorHelper1.executeBalV2Swap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newBalancerV2(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeDODOSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newDODO(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeVelodromeSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newVelodrome(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeGMXSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newGMX(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeSynthetixSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newSynthetix(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper1.executeHashflowSwap.selector) {
+                revert("InputScalingHelper: Can not scale RFQ swap");
+            } else if (selector == IExecutorHelper1.executeCamelotSwap.selector) {
+                swap.data = ScaleDataHelperArbitrum.newCamelot(swap.data, oldAmount, newAmount);
+            } else if (selector == IExecutorHelper2.executeKyberLimitOrder.selector) {
+                revert("InputScalingHelper: Can not scale RFQ swap");
+            } else revert("AggregationExecutor: Dex type not supported");
+        }
+        return abi.encode(executorDesc);
+    }
+
+    function _scaledSwapDescriptionV2(
+        IMetaAggregationRouterV2.SwapDescriptionV2 memory desc,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (IMetaAggregationRouterV2.SwapDescriptionV2 memory) {
+        uint256 oldMinReturnAmount = desc.minReturnAmount;
+        desc.minReturnAmount = (desc.minReturnAmount * newAmount) / oldAmount;
+        //newMinReturnAmount should no be 0 if oldMinReturnAmount > 0
+        if (oldMinReturnAmount > 0 && desc.minReturnAmount == 0) desc.minReturnAmount = 1;
+        desc.amount = newAmount;
+        if (desc.srcReceivers.length == 0) {
+            return desc;
+        }
+
+        uint256 newTotal;
+        for (uint256 i = 0; i < desc.srcReceivers.length; i++) {
+            if (i == desc.srcReceivers.length - 1) {
+                desc.srcAmounts[i] = newAmount - newTotal;
+            } else {
+                desc.srcAmounts[i] = (desc.srcAmounts[i] * newAmount) / oldAmount;
+            }
+            newTotal += desc.srcAmounts[i];
+        }
+        return desc;
+    }
+
+    function _flagsChecked(uint256 number, uint256 flag) internal pure returns (bool) {
+        return number & flag != 0;
+    }
+}

package/contracts/router/swap-aggregator/kyberswap/arbitrum/ScaleDataHelperArbitrum.sol

@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
+import { IExecutorHelper1 } from "./IExecutorHelper1.sol";
+
+library ScaleDataHelperArbitrum {
+    function newUniSwap(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.UniSwap memory uniSwap = abi.decode(data, (IExecutorHelper1.UniSwap));
+        uniSwap.collectAmount = (uniSwap.collectAmount * newAmount) / oldAmount;
+        return abi.encode(uniSwap);
+    }
+
+    function newStableSwap(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.StableSwap memory stableSwap = abi.decode(
+            data,
+            (IExecutorHelper1.StableSwap)
+        );
+        stableSwap.dx = (stableSwap.dx * newAmount) / oldAmount;
+        return abi.encode(stableSwap);
+    }
+
+    function newCurveSwap(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.CurveSwap memory curveSwap = abi.decode(
+            data,
+            (IExecutorHelper1.CurveSwap)
+        );
+        curveSwap.dx = (curveSwap.dx * newAmount) / oldAmount;
+        return abi.encode(curveSwap);
+    }
+
+    function newKyberDMM(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.UniSwap memory kyberDMMSwap = abi.decode(
+            data,
+            (IExecutorHelper1.UniSwap)
+        );
+        kyberDMMSwap.collectAmount = (kyberDMMSwap.collectAmount * newAmount) / oldAmount;
+        return abi.encode(kyberDMMSwap);
+    }
+
+    function newUniV3ProMM(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.UniSwapV3ProMM memory uniSwapV3ProMM = abi.decode(
+            data,
+            (IExecutorHelper1.UniSwapV3ProMM)
+        );
+        uniSwapV3ProMM.swapAmount = (uniSwapV3ProMM.swapAmount * newAmount) / oldAmount;
+
+        return abi.encode(uniSwapV3ProMM);
+    }
+
+    function newBalancerV2(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.BalancerV2 memory balancerV2 = abi.decode(
+            data,
+            (IExecutorHelper1.BalancerV2)
+        );
+        balancerV2.amount = (balancerV2.amount * newAmount) / oldAmount;
+        return abi.encode(balancerV2);
+    }
+
+    function newDODO(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.DODO memory dodo = abi.decode(data, (IExecutorHelper1.DODO));
+        dodo.amount = (dodo.amount * newAmount) / oldAmount;
+        return abi.encode(dodo);
+    }
+
+    function newVelodrome(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.UniSwap memory velodrome = abi.decode(data, (IExecutorHelper1.UniSwap));
+        velodrome.collectAmount = (velodrome.collectAmount * newAmount) / oldAmount;
+        return abi.encode(velodrome);
+    }
+
+    function newGMX(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.GMX memory gmx = abi.decode(data, (IExecutorHelper1.GMX));
+        gmx.amount = (gmx.amount * newAmount) / oldAmount;
+        return abi.encode(gmx);
+    }
+
+    function newSynthetix(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.Synthetix memory synthetix = abi.decode(
+            data,
+            (IExecutorHelper1.Synthetix)
+        );
+        synthetix.sourceAmount = (synthetix.sourceAmount * newAmount) / oldAmount;
+        return abi.encode(synthetix);
+    }
+
+    function newCamelot(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper1.UniSwap memory camelot = abi.decode(data, (IExecutorHelper1.UniSwap));
+        camelot.collectAmount = (camelot.collectAmount * newAmount) / oldAmount;
+        return abi.encode(camelot);
+    }
+}

package/contracts/router/swap-aggregator/kyberswap/ethereum/IAggregationExecutor.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.6.12;
+
+interface IAggregationExecutor {
+    function callBytes(bytes calldata data) external payable; // 0xd9c45357
+
+    // callbytes per swap sequence
+    function swapSingleSequence(bytes calldata data) external;
+
+    function finalTransactionProcessing(
+        address tokenIn,
+        address tokenOut,
+        address to,
+        bytes calldata destTokenFeeData
+    ) external;
+}

package/contracts/router/swap-aggregator/kyberswap/ethereum/IHashflow.sol

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.17;
+
+interface IHashflow {
+    enum RFQType {
+        TAKER,
+        MAKER
+    }
+
+    struct Quote {
+        RFQType rfqType;
+        address pool;
+        address eoa;
+        address trader;
+        address effectiveTrader;
+        address baseToken;
+        address quoteToken;
+        uint256 effectiveBaseTokenAmount;
+        uint256 maxBaseTokenAmount;
+        uint256 maxQuoteTokenAmount;
+        uint256 fees;
+        uint256 quoteExpiry;
+        uint256 nonce;
+        bytes32 txid;
+        bytes signedQuote;
+    }
+
+    function tradeSingleHop(Quote memory quote) external payable;
+}

package/contracts/router/swap-aggregator/kyberswap/{KyberAggregationRouterHelper.sol → ethereum/KyberHelperEthereum.sol}

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity 0.8.17;
-import "./interfaces/IMetaAggregationRouterV2.sol";
-import "./interfaces/IHashflow.sol";
-import "./interfaces/IExecutorHelperEthereum1.sol";
-import "./ScaleDataHelperEthereum1.sol";
+import "./IMetaAggregationRouterV2.sol";
+import "./IHashflow.sol";
+import "./IExecutorHelperEthereum1.sol";
+import "./ScaleDataHelperEthereum.sol";
 
-abstract contract KyberAggregationRouterHelper {
+abstract contract KyberHelperEthereum {
     uint256 private constant _PARTIAL_FILL = 0x01;
     uint256 private constant _REQUIRES_EXTRA_ETH = 0x02;
     uint256 private constant _SHOULD_CLAIM = 0x04;
@@ -135,47 +135,35 @@ abstract contract KyberAggregationRouterHelper {
             bytes4 selector = swap.selector;
 
             if (selector == IExecutorHelperEthereum1.executeUniSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newUniSwap(swap.data, oldAmount, newAmount);
+                swap.data = ScaleDataHelperEthereum.newUniSwap(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeStableSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newStableSwap(
-                    swap.data,
-                    oldAmount,
-                    newAmount
-                );
+                swap.data = ScaleDataHelperEthereum.newStableSwap(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeCurveSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newCurveSwap(swap.data, oldAmount, newAmount);
+                swap.data = ScaleDataHelperEthereum.newCurveSwap(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeKyberDMMSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newKyberDMM(swap.data, oldAmount, newAmount);
+                swap.data = ScaleDataHelperEthereum.newKyberDMM(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeUniV3ProMMSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newUniV3ProMM(
-                    swap.data,
-                    oldAmount,
-                    newAmount
-                );
+                swap.data = ScaleDataHelperEthereum.newUniV3ProMM(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeRfqSwap.selector) {
                 revert("InputScalingHelper: Can not scale RFQ swap");
             } else if (selector == IExecutorHelperEthereum1.executeBalV2Swap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newBalancerV2(
-                    swap.data,
-                    oldAmount,
-                    newAmount
-                );
+                swap.data = ScaleDataHelperEthereum.newBalancerV2(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeDODOSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newDODO(swap.data, oldAmount, newAmount);
+                swap.data = ScaleDataHelperEthereum.newDODO(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeWrappedstETHSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newWrappedstETHSwap(
+                swap.data = ScaleDataHelperEthereum.newWrappedstETHSwap(
                     swap.data,
                     oldAmount,
                     newAmount
                 );
             } else if (selector == IExecutorHelperEthereum1.executeSynthetixSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newSynthetix(swap.data, oldAmount, newAmount);
+                swap.data = ScaleDataHelperEthereum.newSynthetix(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executePSMSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newPSM(swap.data, oldAmount, newAmount);
+                swap.data = ScaleDataHelperEthereum.newPSM(swap.data, oldAmount, newAmount);
             } else if (selector == IExecutorHelperEthereum1.executeHashflowSwap.selector) {
                 revert("InputScalingHelper: Can not scale RFQ swap");
             } else if (selector == IExecutorHelperEthereum1.executeFraxSwap.selector) {
-                swap.data = ScaleDataHelperEthereum1.newFrax(swap.data, oldAmount, newAmount);
+                swap.data = ScaleDataHelperEthereum.newFrax(swap.data, oldAmount, newAmount);
             } else revert("AggregationExecutor: Dex type not supported");
         }
         return abi.encode(executorDesc);

package/contracts/router/swap-aggregator/kyberswap/{ScaleDataHelperEthereum1.sol → ethereum/ScaleDataHelperEthereum.sol}

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "./interfaces/IExecutorHelperEthereum1.sol";
+import "./IExecutorHelperEthereum1.sol";
 
-library ScaleDataHelperEthereum1 {
+library ScaleDataHelperEthereum {
     function newUniSwap(
         bytes memory data,
         uint256 oldAmount,

package/deployments/1-markets/BALANCER-LP-AURA-ANKRETH-WETH-MARCH-28-2024.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY ankrETH-WETH_BalancerLP Aura",
+    "SY": "0xc0CA1e345bE44Ea2c83202222E5084ae3a01e9DC",
+    "YT": "0xF88Cf36C49f19713E2BB6FdfAD02c5e73e3019d0",
+    "PT": "0xf431a1d9b87e8e275C9B26DC9b99641c81a2b11A",
+    "market": "0xbEEf0aCD30d146F8ac4Ca6665D672727b943f105",
+    "expiry": 1711584000,
+    "bulkSeller": "0x8B9dE1a4f948474AAE072A24Ef45Fb9aC1278de4",
+    "scalarRoot": "24269700000000000000",
+    "initAnchor": "1114771000000000000"
+}

package/deployments/42161-core.json

@@ -19,7 +19,7 @@
     "marketFactory": "0xf5a7De2D276dbda3EEf1b62A9E718EFf4d29dDC8",
     "router": "0x0000000001e4ef00d069e71d6ba041b0a16f7ea0",
     "routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
-    "pendleSwap": "0x0E669e08bd717d7F9c9DE158636BD8561295fbB5",
+    "pendleSwap": "0xDa78D46C4133EA548386e64eaca26FC456F71D2d",
     "receiverEndpoint": "0xC9215ae9EC67385F38C755D862C8eE3702B5793A",
     "vePendle": "0x3209E9412cca80B18338f2a56ADA59c484c39644",
     "gaugeController": "0x1e56299ebc8a1010cec26005d12e3e5c5cc2db00"

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "2.2.0-mainnet",
+  "version": "2.3.1-mainnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",