@pendle/core-v2 2.29.1 → 3.0.0-beta-2

package/contracts/router/PendleRouter.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity 0.8.21;
 
 import "@openzeppelin/contracts/proxy/Proxy.sol";
 import "../interfaces/IPAllAction.sol";
@@ -8,7 +8,6 @@ import "../interfaces/IDiamondCut.sol";
 
 // solhint-disable no-empty-blocks
 contract PendleRouter is Proxy, IDiamondLoupe {
-    address internal immutable ACTION_MINT_REDEEM;
     address internal immutable ACTION_ADD_REMOVE_LIQ;
     address internal immutable ACTION_SWAP_PT;
     address internal immutable ACTION_SWAP_YT;
@@ -17,13 +16,11 @@ contract PendleRouter is Proxy, IDiamondLoupe {
     event DiamondCut(IDiamondCut.FacetCut[] _diamondCut, address _init, bytes _calldata);
 
     constructor(
-        address _ACTION_MINT_REDEEM,
         address _ACTION_ADD_REMOVE_LIQ,
         address _ACTION_SWAP_PT,
         address _ACTION_SWAP_YT,
         address _ACTION_MISC
     ) {
-        ACTION_MINT_REDEEM = _ACTION_MINT_REDEEM;
         ACTION_ADD_REMOVE_LIQ = _ACTION_ADD_REMOVE_LIQ;
         ACTION_SWAP_PT = _ACTION_SWAP_PT;
         ACTION_SWAP_YT = _ACTION_SWAP_YT;
@@ -37,7 +34,7 @@ contract PendleRouter is Proxy, IDiamondLoupe {
         uint256 nFacets = facets_.length;
 
         IDiamondCut.FacetCut[] memory cuts = new IDiamondCut.FacetCut[](nFacets);
-        for (uint256 i; i < nFacets; ) {
+        for (uint256 i; i < nFacets;) {
             cuts[i].facetAddress = facets_[i].facetAddress;
             cuts[i].action = IDiamondCut.FacetCutAction.Add;
             cuts[i].functionSelectors = facets_[i].functionSelectors;
@@ -58,7 +55,7 @@ contract PendleRouter is Proxy, IDiamondLoupe {
         uint256 numFacets = facetAddresses_.length;
 
         facets_ = new Facet[](numFacets);
-        for (uint256 i; i < numFacets; ) {
+        for (uint256 i; i < numFacets;) {
             facets_[i].facetAddress = facetAddresses_[i];
             facets_[i].functionSelectors = facetFunctionSelectors(facetAddresses_[i]);
             unchecked {
@@ -68,171 +65,150 @@ contract PendleRouter is Proxy, IDiamondLoupe {
     }
 
     function facetFunctionSelectors(address facet) public view returns (bytes4[] memory res) {
+        if (facet == address(this)) {
+            res = new bytes4[](4);
+            res[0] = 0x52ef6b2c; // facetAddresses
+            res[1] = 0x7a0ed627; // facets
+            res[2] = 0xadfca15e; // facetFunctionSelectors
+            res[3] = 0xcdffacc6; // facetAddress
+        }
         if (facet == ACTION_ADD_REMOVE_LIQ) {
             res = new bytes4[](12);
-            res[0] = 0x97ee279e; // addLiquidityDualSyAndPt
-            res[1] = 0xcb591eb2; // addLiquidityDualTokenAndPt
-            res[2] = 0x3af1f329; // addLiquiditySinglePt
-            res[3] = 0x409c7a89; // addLiquiditySingleSy
-            res[4] = 0x015491d1; // addLiquiditySingleToken
-            res[5] = 0xb7d75b8b; // removeLiquidityDualSyAndPt
-            res[6] = 0xe6eaba01; // removeLiquidityDualTokenAndPt
-            res[7] = 0x694ab559; // removeLiquiditySinglePt
-            res[8] = 0x178d29d3; // removeLiquiditySingleSy
-            res[9] = 0x690807ad; // removeLiquiditySingleToken
-            res[10] = 0xdfbc814e; // addLiquiditySingleTokenKeepYt
-            res[11] = 0x844384aa; // addLiquiditySingleSyKeepYt
-            return res;
+            res[0] = 0x17eb5cce; // addLiquiditySingleToken
+            res[1] = 0x1ab7a03e; // removeLiquiditySingleSy
+            res[2] = 0x2756ce06; // addLiquidityDualTokenAndPt
+            res[3] = 0x30f9e6c8; // addLiquiditySinglePt
+            res[4] = 0x3dbe1c55; // addLiquiditySingleTokenKeepYt
+            res[5] = 0x5d8e6054; // removeLiquiditySingleToken
+            res[6] = 0x844384aa; // addLiquiditySingleSyKeepYt
+            res[7] = 0x888a2843; // addLiquiditySingleSy
+            res[8] = 0x97ee279e; // addLiquidityDualSyAndPt
+            res[9] = 0xb00f09d7; // removeLiquidityDualTokenAndPt
+            res[10] = 0xb7d75b8b; // removeLiquidityDualSyAndPt
+            res[11] = 0xbce3faa7; // removeLiquiditySinglePt
         }
-        if (facet == ACTION_MINT_REDEEM) {
+        if (facet == ACTION_SWAP_YT) {
             res = new bytes4[](7);
-            res[0] = 0x1a8631b2; // mintPyFromSy
-            res[1] = 0x46eb2db6; // mintPyFromToken
-            res[2] = 0x443e6512; // mintSyFromToken
-            res[3] = 0xf7e375e8; // redeemDueInterestAndRewards
-            res[4] = 0x339748cb; // redeemPyToSy
-            res[5] = 0x527df199; // redeemPyToToken
-            res[6] = 0x85b29936; // redeemSyToToken
-            return res;
+            res[0] = 0x233548e7; // swapExactSyForYt
+            res[1] = 0x287b21a2; // swapExactYtForToken
+            res[2] = 0x423a1dac; // swapExactTokenForYt
+            res[3] = 0x448b9b95; // swapExactYtForPt
+            res[4] = 0xc861a898; // swapExactPtForYt
+            res[5] = 0xd91a37b0; // swapExactYtForSy
+            res[6] = 0xfa483e72; // swapCallback
         }
         if (facet == ACTION_SWAP_PT) {
-            res = new bytes4[](6);
-            res[0] = 0x2032aecd; // swapExactPtForSy
-            res[1] = 0xb85f50ba; // swapExactPtForToken
-            res[2] = 0x83c71b69; // swapExactSyForPt
-            res[3] = 0xa5f9931b; // swapExactTokenForPt
-            res[4] = 0xdd371acd; // swapPtForExactSy
-            res[5] = 0x6b8bdf32; // swapSyForExactPt
-            return res;
-        }
-        if (facet == ACTION_SWAP_YT) {
-            res = new bytes4[](9);
-            res[0] = 0xfa483e72; // swapCallback
-            res[1] = 0xc861a898; // swapExactPtForYt
-            res[2] = 0x448b9b95; // swapExactYtForPt
-            res[3] = 0xfdd71f43; // swapExactSyForYt
-            res[4] = 0xc4a9c7de; // swapExactTokenForYt
-            res[5] = 0x357d6540; // swapExactYtForSy
-            res[6] = 0xd6308fa4; // swapExactYtForToken
-            res[7] = 0xbf1bd434; // swapSyForExactYt
-            res[8] = 0xe15cc098; // swapYtForExactSy
-            return res;
+            res = new bytes4[](4);
+            res[0] = 0x18300b27; // swapExactTokenForPt
+            res[1] = 0x71ea75aa; // swapExactSyForPt
+            res[2] = 0x82064435; // swapExactPtForSy
+            res[3] = 0xf392f08d; // swapExactPtForToken
         }
         if (facet == ACTION_MISC) {
-            res = new bytes4[](2);
-            res[0] = 0xacdb32df; // approveInf
-            res[1] = 0xd617b03b; // batchExec
-            return res;
-        }
-        if (facet == address(this)) {
-            res = new bytes4[](4);
-            res[0] = 0xcdffacc6; // facetAddress
-            res[1] = 0x52ef6b2c; // facetAddresses
-            res[2] = 0xadfca15e; // facetFunctionSelectors
-            res[3] = 0x7a0ed627; // facets
-            return res;
+            res = new bytes4[](11);
+            res[0] = 0x1a8631b2; // mintPyFromSy
+            res[1] = 0x2e071dc6; // mintSyFromToken
+            res[2] = 0x339748cb; // redeemPyToSy
+            res[3] = 0x339a5572; // redeemSyToToken
+            res[4] = 0x47f1de22; // redeemPyToToken
+            res[5] = 0x60fc8466; // multicall
+            res[6] = 0x7ad2c7af; // multicallRevert
+            res[7] = 0x8ee52744; // callThenRevert
+            res[8] = 0xacdb32df; // approveInf
+            res[9] = 0xd0f42385; // mintPyFromToken
+            res[10] = 0xf7e375e8; // redeemDueInterestAndRewards
         }
-        revert Errors.RouterInvalidFacet(facet);
     }
 
     function facetAddress(bytes4 sig) public view returns (address) {
-        if (sig < 0x97ee279e) {
-            if (sig < 0x46eb2db6) {
-                if (sig < 0x357d6540) {
-                    if (sig < 0x1a8631b2) {
-                        if (sig == 0x015491d1) return ACTION_ADD_REMOVE_LIQ; // addLiquiditySingleToken 5
-                        if (sig == 0x178d29d3) return ACTION_ADD_REMOVE_LIQ; // removeLiquiditySingleSy 6
-                    } else {
-                        if (sig == 0x1a8631b2) return ACTION_MINT_REDEEM; // mintPyFromSy 5
-                        if (sig == 0x2032aecd) return ACTION_SWAP_PT; // swapExactPtForSy 6
-                        if (sig == 0x339748cb) return ACTION_MINT_REDEEM; // redeemPyToSy 7
-                    }
+        if (sig < 0x7a0ed627) {
+            if (sig < 0x339748cb) {
+                if (sig < 0x233548e7) {
+                    if (sig == 0x17eb5cce) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleToken
+                    if (sig == 0x18300b27) return ACTION_SWAP_PT; //swapExactTokenForPt
+                    if (sig == 0x1a8631b2) return ACTION_MISC; //mintPyFromSy
+                    if (sig == 0x1ab7a03e) return ACTION_ADD_REMOVE_LIQ; //removeLiquiditySingleSy
                 } else {
-                    if (sig < 0x409c7a89) {
-                        if (sig == 0x357d6540) return ACTION_SWAP_YT; // swapExactYtForSy 5
-                        if (sig == 0x3af1f329) return ACTION_ADD_REMOVE_LIQ; // addLiquiditySinglePt 6
+                    if (sig < 0x287b21a2) {
+                        if (sig == 0x233548e7) return ACTION_SWAP_YT; //swapExactSyForYt
+                        if (sig == 0x2756ce06) return ACTION_ADD_REMOVE_LIQ; //addLiquidityDualTokenAndPt
                     } else {
-                        if (sig == 0x409c7a89) return ACTION_ADD_REMOVE_LIQ; // addLiquiditySingleSy 5
-                        if (sig == 0x443e6512) return ACTION_MINT_REDEEM; // mintSyFromToken 6
-                        if (sig == 0x448b9b95) return ACTION_SWAP_YT; // swapExactYtForPt 7
+                        if (sig == 0x287b21a2) return ACTION_SWAP_YT; //swapExactYtForToken
+                        if (sig == 0x2e071dc6) return ACTION_MISC; //mintSyFromToken
+                        if (sig == 0x30f9e6c8) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySinglePt
                     }
                 }
             } else {
-                if (sig < 0x6b8bdf32) {
-                    if (sig < 0x52ef6b2c) {
-                        if (sig == 0x46eb2db6) return ACTION_MINT_REDEEM; // mintPyFromToken 5
-                        if (sig == 0x527df199) return ACTION_MINT_REDEEM; // redeemPyToToken 6
+                if (sig < 0x47f1de22) {
+                    if (sig < 0x3dbe1c55) {
+                        if (sig == 0x339748cb) return ACTION_MISC; //redeemPyToSy
+                        if (sig == 0x339a5572) return ACTION_MISC; //redeemSyToToken
                     } else {
-                        if (sig == 0x690807ad) return ACTION_ADD_REMOVE_LIQ; // removeLiquiditySingleToken 5
-                        if (sig == 0x694ab559) return ACTION_ADD_REMOVE_LIQ; // removeLiquiditySinglePt 6
-                        if (sig == 0x52ef6b2c) return address(this); // facetAddresses 7
+                        if (sig == 0x3dbe1c55) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleTokenKeepYt
+                        if (sig == 0x423a1dac) return ACTION_SWAP_YT; //swapExactTokenForYt
+                        if (sig == 0x448b9b95) return ACTION_SWAP_YT; //swapExactYtForPt
                     }
                 } else {
-                    if (sig < 0x83c71b69) {
-                        if (sig == 0x6b8bdf32) return ACTION_SWAP_PT; // swapSyForExactPt 5
-                        if (sig == 0x7a0ed627) return address(this); // facets 6
+                    if (sig < 0x5d8e6054) {
+                        if (sig == 0x47f1de22) return ACTION_MISC; //redeemPyToToken
+                        if (sig == 0x52ef6b2c) return address(this); //facetAddresses
                     } else {
-                        if (sig == 0x85b29936) return ACTION_MINT_REDEEM; // redeemSyToToken 5
-                        if (sig == 0x844384aa) return ACTION_ADD_REMOVE_LIQ; // addLiquiditySingleSyKeepYt 6
-                        if (sig == 0x83c71b69) return ACTION_SWAP_PT; // swapExactSyForPt 7
+                        if (sig == 0x5d8e6054) return ACTION_ADD_REMOVE_LIQ; //removeLiquiditySingleToken
+                        if (sig == 0x60fc8466) return ACTION_MISC; //multicall
+                        if (sig == 0x71ea75aa) return ACTION_SWAP_PT; //swapExactSyForPt
                     }
                 }
             }
         } else {
-            if (sig < 0xcdffacc6) {
-                if (sig < 0xb85f50ba) {
-                    if (sig < 0xacdb32df) {
-                        if (sig == 0xa5f9931b) return ACTION_SWAP_PT; // swapExactTokenForPt 5
-                        if (sig == 0x97ee279e) return ACTION_ADD_REMOVE_LIQ; // addLiquidityDualSyAndPt 6
-                    } else {
-                        if (sig == 0xb7d75b8b) return ACTION_ADD_REMOVE_LIQ; // removeLiquidityDualSyAndPt 5
-                        if (sig == 0xacdb32df) return ACTION_MISC; // approveInf 6
-                        if (sig == 0xadfca15e) return address(this); // facetFunctionSelectors 7
-                    }
+            if (sig < 0xb00f09d7) {
+                if (sig < 0x888a2843) {
+                    if (sig == 0x7a0ed627) return address(this); //facets
+                    if (sig == 0x7ad2c7af) return ACTION_MISC; //multicallRevert
+                    if (sig == 0x82064435) return ACTION_SWAP_PT; //swapExactPtForSy
+                    if (sig == 0x844384aa) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleSyKeepYt
                 } else {
-                    if (sig < 0xc4a9c7de) {
-                        if (sig == 0xb85f50ba) return ACTION_SWAP_PT; // swapExactPtForToken 5
-                        if (sig == 0xbf1bd434) return ACTION_SWAP_YT; // swapSyForExactYt 6
+                    if (sig < 0x97ee279e) {
+                        if (sig == 0x888a2843) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleSy
+                        if (sig == 0x8ee52744) return ACTION_MISC; //callThenRevert
                     } else {
-                        if (sig == 0xc4a9c7de) return ACTION_SWAP_YT; // swapExactTokenForYt 5
-                        if (sig == 0xcb591eb2) return ACTION_ADD_REMOVE_LIQ; // addLiquidityDualTokenAndPt 6
-                        if (sig == 0xc861a898) return ACTION_SWAP_YT; // swapExactPtForYt 7
+                        if (sig == 0x97ee279e) return ACTION_ADD_REMOVE_LIQ; //addLiquidityDualSyAndPt
+                        if (sig == 0xacdb32df) return ACTION_MISC; //approveInf
+                        if (sig == 0xadfca15e) return address(this); //facetFunctionSelectors
                     }
                 }
             } else {
-                if (sig < 0xe15cc098) {
-                    if (sig < 0xd6308fa4) {
-                        if (sig == 0xd617b03b) return ACTION_MISC; // batchExec 5
-                        if (sig == 0xcdffacc6) return address(this); // facetAddress 6
+                if (sig < 0xd0f42385) {
+                    if (sig < 0xbce3faa7) {
+                        if (sig == 0xb00f09d7) return ACTION_ADD_REMOVE_LIQ; //removeLiquidityDualTokenAndPt
+                        if (sig == 0xb7d75b8b) return ACTION_ADD_REMOVE_LIQ; //removeLiquidityDualSyAndPt
                     } else {
-                        if (sig == 0xd6308fa4) return ACTION_SWAP_YT; // swapExactYtForToken 5
-                        if (sig == 0xdfbc814e) return ACTION_ADD_REMOVE_LIQ; // addLiquiditySingleTokenKeepYt 6
-                        if (sig == 0xdd371acd) return ACTION_SWAP_PT; // swapPtForExactSy 7
+                        if (sig == 0xbce3faa7) return ACTION_ADD_REMOVE_LIQ; //removeLiquiditySinglePt
+                        if (sig == 0xc861a898) return ACTION_SWAP_YT; //swapExactPtForYt
+                        if (sig == 0xcdffacc6) return address(this); //facetAddress
                     }
                 } else {
-                    if (sig < 0xf7e375e8) {
-                        if (sig == 0xe6eaba01) return ACTION_ADD_REMOVE_LIQ; // removeLiquidityDualTokenAndPt 5
-                        if (sig == 0xe15cc098) return ACTION_SWAP_YT; // swapYtForExactSy 6
+                    if (sig < 0xf392f08d) {
+                        if (sig == 0xd0f42385) return ACTION_MISC; //mintPyFromToken
+                        if (sig == 0xd91a37b0) return ACTION_SWAP_YT; //swapExactYtForSy
                     } else {
-                        if (sig == 0xfa483e72) return ACTION_SWAP_YT; // swapCallback 5
-                        if (sig == 0xf7e375e8) return ACTION_MINT_REDEEM; // redeemDueInterestAndRewards 6
-                        if (sig == 0xfdd71f43) return ACTION_SWAP_YT; // swapExactSyForYt 7
+                        if (sig == 0xf392f08d) return ACTION_SWAP_PT; //swapExactPtForToken
+                        if (sig == 0xf7e375e8) return ACTION_MISC; //redeemDueInterestAndRewards
+                        if (sig == 0xfa483e72) return ACTION_SWAP_YT; //swapCallback
                     }
                 }
             }
         }
         revert Errors.RouterInvalidAction(sig);
-        // NUM_FUNC: 40 AVG:5.80 STD:0.75 WORST_CASE:7 STOP_BRANCH:3
+        // NUM_FUNC: 38 AVG:4.74 WORST_CASE:6 STOP_BRANCH:4
     }
 
     function facetAddresses() public view returns (address[] memory) {
-        address[] memory res = new address[](6);
-        res[0] = ACTION_ADD_REMOVE_LIQ;
-        res[1] = ACTION_MINT_REDEEM;
-        res[2] = ACTION_SWAP_PT;
-        res[3] = ACTION_SWAP_YT;
+        address[] memory res = new address[](5);
+        res[0] = address(this);
+        res[1] = ACTION_ADD_REMOVE_LIQ;
+        res[2] = ACTION_SWAP_YT;
+        res[3] = ACTION_SWAP_PT;
         res[4] = ACTION_MISC;
-        res[5] = address(this);
         return res;
     }