@pendle/core-v2 1.4.0-mainnet → 1.4.1-testnet

package/contracts/interfaces/IPActionMintRedeem.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.17;
 
 import "../router/base/MarketApproxLib.sol";
-import "../router/kyberswap/KyberSwapHelper.sol";
+import "../router/base/ActionBaseMintRedeem.sol";
 
 interface IPActionMintRedeem {
     event MintSyFromToken(
@@ -57,26 +57,6 @@ interface IPActionMintRedeem {
         uint256 netTokenOut
     );
 
-    event RedeemDueInterestAndRewards(
-        address indexed user,
-        address[] sys,
-        address[] yts,
-        address[] markets,
-        uint256[][] syRewards,
-        uint256[] ytInterests,
-        uint256[][] ytRewards,
-        uint256[][] marketRewards
-    );
-
-    event RedeemDueInterestAndRewardsThenSwapAll(
-        address indexed user,
-        address[] sys,
-        address[] yts,
-        address[] markets,
-        address indexed tokenOut,
-        uint256 netTokenOut
-    );
-
     function mintSyFromToken(
         address receiver,
         address SY,
@@ -124,38 +104,5 @@ interface IPActionMintRedeem {
         address[] calldata sys,
         address[] calldata yts,
         address[] calldata markets
-    )
-        external
-        returns (
-            uint256[][] memory syRewards,
-            uint256[] memory ytInterests,
-            uint256[][] memory ytRewards,
-            uint256[][] memory marketRewards
-        );
-
-    struct RouterYtRedeemStruct {
-        address[] yts;
-        // key-value pair
-        address[] syAddrs;
-        address[] tokenRedeemSys;
-        address[] bulks;
-        //
-    }
-
-    struct RouterSwapAllStruct {
-        // key-value pair
-        address[] tokens;
-        bytes[] kybercalls;
-        //
-        address kyberRouter;
-        address outputToken;
-        uint256 minTokenOut;
-    }
-
-    function redeemDueInterestAndRewardsThenSwapAll(
-        address[] calldata sys,
-        RouterYtRedeemStruct calldata dataYT,
-        address[] calldata markets,
-        RouterSwapAllStruct calldata dataSwap
-    ) external returns (uint256 netTokenOut, uint256[] memory amountsSwapped);
+    ) external;
 }

package/contracts/interfaces/IPActionMintRedeemStatic.sol

@@ -0,0 +1,55 @@
+pragma solidity ^0.8.17;
+
+interface IPActionMintRedeemStatic {
+    function getAmountTokenToMintSy(
+        address SY,
+        address tokenIn,
+        address bulk,
+        uint256 netSyOut
+    ) external view returns (uint256 netTokenIn);
+
+    function getBulkSellerInfo(
+        address token,
+        address SY,
+        uint256 netTokenIn,
+        uint256 netSyIn
+    ) external view returns (address bulk, uint256 totalToken, uint256 totalSy);
+
+    function mintPyFromSyStatic(
+        address YT,
+        uint256 netSyToMint
+    ) external returns (uint256 netPYOut);
+
+    function mintPyFromTokenStatic(
+        address YT,
+        address tokenIn,
+        uint256 netTokenIn,
+        address bulk
+    ) external returns (uint256 netPyOut);
+
+    function mintSyFromTokenStatic(
+        address SY,
+        address tokenIn,
+        uint256 netTokenIn,
+        address bulk
+    ) external view returns (uint256 netSyOut);
+
+    function redeemPyToSyStatic(
+        address YT,
+        uint256 netPYToRedeem
+    ) external returns (uint256 netSyOut);
+
+    function redeemPyToTokenStatic(
+        address YT,
+        uint256 netPYToRedeem,
+        address tokenOut,
+        address bulk
+    ) external returns (uint256 netTokenOut);
+
+    function redeemSyToTokenStatic(
+        address SY,
+        address tokenOut,
+        uint256 netSyIn,
+        address bulk
+    ) external view returns (uint256 netTokenOut);
+}

package/contracts/interfaces/IPActionMisc.sol

@@ -2,8 +2,22 @@
 pragma solidity 0.8.17;
 
 interface IPActionMisc {
-    function consult(address market, uint32 secondsAgo)
-        external
-        view
-        returns (uint96 lnImpliedRateMean);
+    struct MultiApproval {
+        address[] tokens;
+        address spender;
+    }
+
+    struct Call3 {
+        bool allowFailure;
+        bytes callData;
+    }
+
+    struct Result {
+        bool success;
+        bytes returnData;
+    }
+
+    function approveInf(MultiApproval[] calldata) external;
+
+    function batchExec(Call3[] calldata calls) external returns (Result[] memory returnData);
 }

package/contracts/interfaces/IPActionStorageStatic.sol

@@ -0,0 +1,24 @@
+pragma solidity ^0.8.17;
+
+import "./IPAllAction.sol";
+
+interface IPActionStorageStatic {
+    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+
+    function setDefaultApproxParams(ApproxParams memory params) external;
+
+    function getDefaultApproxParams() external view returns (ApproxParams memory);
+
+    function setBulkSellerFactory(address _bulkSellerFactory) external;
+
+    function getBulkSellerFactory() external view returns (address);
+
+    function getOwnerAndPendingOwner()
+        external
+        view
+        returns (address _owner, address _pendingOwner);
+
+    function transferOwnership(address newOwner, bool direct, bool renounce) external;
+
+    function claimOwnership() external;
+}

package/contracts/interfaces/IPActionSwapPT.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.17;
 
 import "../router/base/MarketApproxLib.sol";
-import "../router/kyberswap/KyberSwapHelper.sol";
+import "../router/base/ActionBaseMintRedeem.sol";
 
 interface IPActionSwapPT {
     event SwapPtAndSy(

package/contracts/interfaces/IPActionSwapYT.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.17;
 
 import "../router/base/MarketApproxLib.sol";
-import "../router/kyberswap/KyberSwapHelper.sol";
+import "../router/base/ActionBaseMintRedeem.sol";
 
 interface IPActionSwapYT {
     event SwapYtAndSy(
@@ -22,12 +22,20 @@ interface IPActionSwapYT {
         int256 netTokenToAccount
     );
 
+    event SwapPtAndYt(
+        address indexed caller,
+        address indexed market,
+        address indexed receiver,
+        int256 netPtToAccount,
+        int256 netYtToAccount
+    );
+
     function swapExactSyForYt(
         address receiver,
         address market,
         uint256 exactSyIn,
         uint256 minYtOut,
-        ApproxParams memory guessYtOut
+        ApproxParams calldata guessYtOut
     ) external returns (uint256 netYtOut, uint256 netSyFee);
 
     function swapExactYtForSy(
@@ -49,14 +57,14 @@ interface IPActionSwapYT {
         address market,
         uint256 exactSyOut,
         uint256 maxYtIn,
-        ApproxParams memory guessYtIn
+        ApproxParams calldata guessYtIn
     ) external returns (uint256 netYtIn, uint256 netSyFee);
 
     function swapExactTokenForYt(
         address receiver,
         address market,
         uint256 minYtOut,
-        ApproxParams memory guessYtOut,
+        ApproxParams calldata guessYtOut,
         TokenInput calldata input
     ) external payable returns (uint256 netYtOut, uint256 netSyFee);
 
@@ -66,4 +74,20 @@ interface IPActionSwapYT {
         uint256 netYtIn,
         TokenOutput calldata output
     ) external returns (uint256 netTokenOut, uint256 netSyFee);
+
+    function swapExactPtForYt(
+        address receiver,
+        address market,
+        uint256 exactPtIn,
+        uint256 minYtOut,
+        ApproxParams calldata guessTotalPtToSwap
+    ) external returns (uint256 netYtOut, uint256 netSyFee);
+
+    function swapExactYtForPt(
+        address receiver,
+        address market,
+        uint256 exactYtIn,
+        uint256 minPtOut,
+        ApproxParams calldata guessTotalPtSwapped
+    ) external returns (uint256 netPtOut, uint256 netSyFee);
 }

package/contracts/interfaces/IPActionVePendleStatic.sol

@@ -0,0 +1,9 @@
+pragma solidity ^0.8.17;
+
+interface IPActionVePendleStatic {
+    function increaseLockPositionStatic(
+        address user,
+        uint128 additionalAmountToLock,
+        uint128 newExpiry
+    ) external view returns (uint128 newVeBalance);
+}

package/contracts/interfaces/IPAllAction.sol

@@ -5,15 +5,17 @@ pragma solidity 0.8.17;
 import "./IPActionAddRemoveLiq.sol";
 import "./IPActionSwapPT.sol";
 import "./IPActionSwapYT.sol";
-import "./IPActionSwapPTYT.sol";
 import "./IPActionMintRedeem.sol";
 import "./IPActionMisc.sol";
+import "./IPMarketSwapCallback.sol";
+import "./IDiamondLoupe.sol";
 
 interface IPAllAction is
     IPActionAddRemoveLiq,
     IPActionSwapPT,
     IPActionSwapYT,
-    IPActionSwapPTYT,
     IPActionMintRedeem,
-    IPActionMisc
+    IPActionMisc,
+    IPMarketSwapCallback,
+    IDiamondLoupe
 {}

package/contracts/interfaces/IPBulkSellerSYCallback.sol

@@ -2,9 +2,5 @@
 pragma solidity 0.8.17;
 
 interface IPBulkSellerCallback {
-    function swapCallback(
-        int256 ptToAccount,
-        int256 syToAccount,
-        bytes calldata data
-    ) external;
+    function swapCallback(int256 ptToAccount, int256 syToAccount, bytes calldata data) external;
 }

package/contracts/interfaces/IPFeeDistributor.sol

@@ -13,9 +13,10 @@ interface IPFeeDistributor {
         uint128 iter;
     }
 
-    function claimReward(address user, address[] calldata pools)
-        external
-        returns (uint256[] memory amountRewardOut);
+    function claimReward(
+        address user,
+        address[] calldata pools
+    ) external returns (uint256[] memory amountRewardOut);
 
     function getAllPools() external view returns (address[] memory);
 }

package/contracts/interfaces/IPGaugeController.sol

@@ -20,13 +20,7 @@ interface IPGaugeController {
 
     function redeemMarketReward() external;
 
-    function rewardData(address pool)
-        external
-        view
-        returns (
-            uint128 pendlePerSec,
-            uint128,
-            uint128,
-            uint128
-        );
+    function rewardData(
+        address pool
+    ) external view returns (uint128 pendlePerSec, uint128, uint128, uint128);
 }

package/contracts/interfaces/IPInterestManagerYT.sol

@@ -2,8 +2,7 @@
 pragma solidity 0.8.17;
 
 interface IPInterestManagerYT {
-    function userInterest(address user)
-        external
-        view
-        returns (uint128 lastPYIndex, uint128 accruedInterest);
+    function userInterest(
+        address user
+    ) external view returns (uint128 lastPYIndex, uint128 accruedInterest);
 }

package/contracts/interfaces/IPInterestManagerYTV2.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+interface IPInterestManagerYTV2 {
+    function userInterest(
+        address user
+    )
+        external
+        view
+        returns (uint128 lastInterestIndex, uint128 accruedInterest, uint256 lastPYIndex);
+}

package/contracts/interfaces/IPLiquidityMigrator.sol

@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "../router/base/MarketApproxLib.sol";
+import "../router/base/ActionBaseMintRedeem.sol";
+
+interface IPLiquidityMigrator {
+    struct RemoveLiquiditySingleTokenStruct {
+        address market;
+        uint256 netLpToRemove;
+        bool doRedeemRewards;
+        TokenOutput output;
+    }
+
+    struct AddLiquiditySingleTokenStruct {
+        address market;
+        uint256 minLpOut;
+        uint256 guessNetTokenIn;
+        ApproxParams guessPtReceivedFromSy;
+        address bulk;
+    }
+
+    struct AddLiquiditySingleTokenKeepYtStruct {
+        address market;
+        uint256 minLpOut;
+        uint256 minYtOut;
+        address bulk;
+    }
+
+    struct RemoveLiquiditySingleSyStruct {
+        address market;
+        uint256 netLpToRemove;
+        bool doRedeemRewards;
+    }
+
+    struct AddLiquiditySingleSyStruct {
+        address market;
+        uint256 minLpOut;
+        uint256 guessNetSyIn;
+        ApproxParams guessPtReceivedFromSy;
+    }
+
+    struct AddLiquiditySingleSyKeepYtStruct {
+        address market;
+        uint256 minLpOut;
+        uint256 minYtOut;
+    }
+
+    event MigrateDifferentSyNormal(
+        address indexed fromMarket,
+        address indexed toMarket,
+        address indexed user,
+        uint256 netLpToRemove,
+        uint256 netLpOut
+    );
+
+    event MigrateDifferentSyKeepYt(
+        address indexed fromMarket,
+        address indexed toMarket,
+        address indexed user,
+        uint256 netLpToRemove,
+        uint256 netLpOut,
+        uint256 netYtOut
+    );
+
+    event MigrateSameSyNormal(
+        address indexed fromMarket,
+        address indexed toMarket,
+        address indexed user,
+        uint256 netLpToRemove,
+        uint256 netLpOut
+    );
+
+    event MigrateSameSyKeepYt(
+        address indexed fromMarket,
+        address indexed toMarket,
+        address indexed user,
+        uint256 netLpToRemove,
+        uint256 netLpOut,
+        uint256 netYtOut
+    );
+
+    function migrateDifferentSyNormal(
+        RemoveLiquiditySingleTokenStruct calldata fromMarket,
+        AddLiquiditySingleTokenStruct calldata toMarket
+    )
+        external
+        returns (
+            uint256 netLpOut,
+            uint256 netTokenZapIn,
+            uint256 netSyFeeOfRemove,
+            uint256 netSyFeeOfAdd
+        );
+
+    function migrateDifferentSyKeepYt(
+        RemoveLiquiditySingleTokenStruct calldata fromMarket,
+        AddLiquiditySingleTokenKeepYtStruct calldata toMarket
+    )
+        external
+        returns (
+            uint256 netLpOut,
+            uint256 netYtOut,
+            uint256 netTokenZapIn,
+            uint256 netSyFeeOfRemove
+        );
+
+    function migrateSameSyNormal(
+        RemoveLiquiditySingleSyStruct calldata fromMarket,
+        AddLiquiditySingleSyStruct calldata toMarket
+    )
+        external
+        returns (
+            uint256 netLpOut,
+            uint256 netSyMigrated,
+            uint256 netSyFeeOfRemove,
+            uint256 netSyFeeOfAdd
+        );
+
+    function migrateSameSyKeepYt(
+        RemoveLiquiditySingleSyStruct calldata fromMarket,
+        AddLiquiditySingleSyKeepYtStruct calldata toMarket
+    )
+        external
+        returns (
+            uint256 netLpOut,
+            uint256 netYtOut,
+            uint256 netSyMigrated,
+            uint256 netSyFeeOfRemove
+        );
+}

package/contracts/interfaces/IPMarket.sol

@@ -44,13 +44,7 @@ interface IPMarket is IERC20Metadata, IPGauge {
         address receiver,
         uint256 netSyDesired,
         uint256 netPtDesired
-    )
-        external
-        returns (
-            uint256 netLpOut,
-            uint256 netSyUsed,
-            uint256 netPtUsed
-        );
+    ) external returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed);
 
     function burn(
         address receiverSy,
@@ -74,21 +68,16 @@ interface IPMarket is IERC20Metadata, IPGauge {
 
     function readState(address router) external view returns (MarketState memory market);
 
-    function observe(uint32[] memory secondsAgos)
-        external
-        view
-        returns (uint216[] memory lnImpliedRateCumulative);
+    function observe(
+        uint32[] memory secondsAgos
+    ) external view returns (uint216[] memory lnImpliedRateCumulative);
 
     function increaseObservationsCardinalityNext(uint16 cardinalityNext) external;
 
     function readTokens()
         external
         view
-        returns (
-            IStandardizedYield _SY,
-            IPPrincipalToken _PT,
-            IPYieldToken _YT
-        );
+        returns (IStandardizedYield _SY, IPPrincipalToken _PT, IPYieldToken _YT);
 
     function getRewardTokens() external view returns (address[] memory);
 

package/contracts/interfaces/IPMarketFactory.sol

@@ -26,12 +26,7 @@ interface IPMarketFactory {
     function isValidMarket(address market) external view returns (bool);
 
     // If this is changed, change the readState function in market as well
-    function getMarketConfig(address router)
-        external
-        view
-        returns (
-            address treasury,
-            uint80 lnFeeRateRoot,
-            uint8 reserveFeePercent
-        );
+    function getMarketConfig(
+        address router
+    ) external view returns (address treasury, uint80 lnFeeRateRoot, uint8 reserveFeePercent);
 }

package/contracts/interfaces/IPMarketSwapCallback.sol

@@ -2,9 +2,5 @@
 pragma solidity 0.8.17;
 
 interface IPMarketSwapCallback {
-    function swapCallback(
-        int256 ptToAccount,
-        int256 syToAccount,
-        bytes calldata data
-    ) external;
+    function swapCallback(int256 ptToAccount, int256 syToAccount, bytes calldata data) external;
 }

package/contracts/interfaces/IPMiniDiamond.sol

@@ -0,0 +1,12 @@
+pragma solidity ^0.8.17;
+
+interface IPMiniDiamond {
+    struct SelectorsToFacet {
+        address facet;
+        bytes4[] selectors;
+    }
+
+    function setFacetForSelectors(SelectorsToFacet[] calldata arr) external;
+
+    function facetAddress(bytes4 selector) external view returns (address);
+}

package/contracts/interfaces/IPMsgReceiverApp.sol

@@ -3,5 +3,5 @@
 pragma solidity >=0.8.0;
 
 interface IPMsgReceiverApp {
-    function executeMessage(bytes calldata message) external payable;
+    function executeMessage(bytes calldata message) external;
 }

package/contracts/interfaces/IPRouterStatic.sol

@@ -0,0 +1,19 @@
+pragma solidity ^0.8.17;
+
+import "./IPActionMarketAuxStatic.sol";
+import "./IPActionMintRedeemStatic.sol";
+import "./IPActionInfoStatic.sol";
+import "./IPActionMarketCoreStatic.sol";
+import "./IPActionVePendleStatic.sol";
+import "./IPMiniDiamond.sol";
+import "./IPActionStorageStatic.sol";
+
+interface IPRouterStatic is
+    IPActionMintRedeemStatic,
+    IPActionInfoStatic,
+    IPActionMarketAuxStatic,
+    IPActionMarketCoreStatic,
+    IPActionVePendleStatic,
+    IPMiniDiamond,
+    IPActionStorageStatic
+{}

package/contracts/interfaces/IPVotingController.sol

@@ -30,14 +30,19 @@ interface IPVotingController {
         uint256 index
     ) external view returns (Checkpoint memory);
 
-    function getWeekData(uint128 wTime, address[] calldata pools)
+    function getWeekData(
+        uint128 wTime,
+        address[] calldata pools
+    )
         external
         view
-        returns (
-            bool isEpochFinalized,
-            uint128 totalVotes,
-            uint128[] memory poolVotes
-        );
+        returns (bool isEpochFinalized, uint128 totalVotes, uint128[] memory poolVotes);
 
     function getPoolTotalVoteAt(address pool, uint128 wTime) external view returns (uint128);
+
+    function finalizeEpoch() external;
+
+    function getBroadcastResultFee(uint64 chainId) external view returns (uint256);
+
+    function broadcastResults(uint64 chainId) external payable;
 }

package/contracts/interfaces/IPVotingEscrowMainchain.sol

@@ -17,9 +17,10 @@ interface IPVotingEscrowMainchain is IPVeToken {
 
     // ============= ACTIONS =============
 
-    function increaseLockPosition(uint128 additionalAmountToLock, uint128 expiry)
-        external
-        returns (uint128);
+    function increaseLockPosition(
+        uint128 additionalAmountToLock,
+        uint128 expiry
+    ) external returns (uint128);
 
     function withdraw() external returns (uint128);
 
@@ -27,8 +28,8 @@ interface IPVotingEscrowMainchain is IPVeToken {
 
     function getUserHistoryLength(address user) external view returns (uint256);
 
-    function getUserHistoryAt(address user, uint256 index)
-        external
-        view
-        returns (Checkpoint memory);
+    function getUserHistoryAt(
+        address user,
+        uint256 index
+    ) external view returns (Checkpoint memory);
 }

package/contracts/interfaces/IPYieldToken.sol

@@ -32,9 +32,10 @@ interface IPYieldToken is IERC20Metadata, IRewardManager, IPInterestManagerYT {
 
     function redeemPY(address receiver) external returns (uint256 amountSyOut);
 
-    function redeemPYMulti(address[] calldata receivers, uint256[] calldata amountPYToRedeems)
-        external
-        returns (uint256[] memory amountSyOuts);
+    function redeemPYMulti(
+        address[] calldata receivers,
+        uint256[] calldata amountPYToRedeems
+    ) external returns (uint256[] memory amountSyOuts);
 
     function redeemDueInterestAndRewards(
         address user,