@pendle/core-v2 3.0.0-beta-6 → 3.0.0-beta-7

package/contracts/limit/PendleOrderMixin.sol

@@ -341,7 +341,13 @@ abstract contract PendleOrderMixin is
 
     function _checkSig_doPermit(Order memory order, bytes memory signature)
         internal
-        returns (bytes32, /*orderHash*/ uint256, /*remainingMakerAmount*/ uint256 /*filledMakerAmount*/ )
+        returns (
+            bytes32,
+            /*orderHash*/
+            uint256,
+            /*remainingMakerAmount*/
+            uint256 /*filledMakerAmount*/
+        )
     {
         bytes32 orderHash = hashOrder(order);
         OrderStatus memory status = _status[orderHash];
@@ -392,7 +398,7 @@ abstract contract PendleOrderMixin is
 
             uint256 totalSy = __mintSy_Single(SY, sharedToken, totalMaking);
             for (uint256 i = l; i < r; i = _inc1(i)) {
-                params[i].makingAmount = params[i].makingAmount * totalSy / totalMaking;
+                params[i].makingAmount = (params[i].makingAmount * totalSy) / totalMaking;
             }
         }
     }
@@ -438,7 +444,7 @@ abstract contract PendleOrderMixin is
                 uint256 totalToken = __redeemSy_Single(address(this), SY, sharedToken, totalSy);
                 for (uint256 i = l; i < r; i = _inc1(i)) {
                     address token = params[i].order.token;
-                    toMakers[i] = netSyOuts[i] * totalToken / totalSy;
+                    toMakers[i] = (netSyOuts[i] * totalToken) / totalSy;
                     if (sharedToken != token) {
                         // WNATIVE case
                         _wrap_unwrap_ETH(sharedToken, token, toMakers[i]);
@@ -482,11 +488,13 @@ abstract contract PendleOrderMixin is
         }
     }
 
+    // ! Allow self-fill of orders
     function _transferFromMakers(IERC20 token, FillOrderParams[] memory params, address to, uint256[] memory netIn)
         internal
     {
         uint256 len = params.length;
         for (uint256 i = 0; i < len; i = _inc1(i)) {
+            if (params[i].order.maker == to) continue;
             token.safeTransferFrom(params[i].order.maker, to, netIn[i]);
         }
     }
@@ -501,6 +509,7 @@ abstract contract PendleOrderMixin is
             }
         } else {
             for (uint256 i = 0; i < len; i = _inc1(i)) {
+                if (payer == params[i].order.receiver) continue;
                 token.safeTransferFrom(payer, params[i].order.receiver, netOut[i]);
             }
         }

package/contracts/router/PendleRouterV3.sol

@@ -98,16 +98,14 @@ contract PendleRouterV3 is Proxy, IDiamondLoupe {
             res[6] = 0xfa483e72; // swapCallback
         }
         if (facet == ACTION_SWAP_PT) {
-            res = new bytes4[](6);
+            res = new bytes4[](4);
             res[0] = 0x12c15afc; // swapExactSyForPt
             res[1] = 0x32aea98a; // swapExactTokenForPt
-            res[2] = 0x5d3e105c; // swapTokenToToken
-            res[3] = 0x7a95dddd; // swapExactPtForSy
-            res[4] = 0xa89eba4a; // swapTokenToTokenViaSy
-            res[5] = 0xc245e48d; // swapExactPtForToken
+            res[2] = 0x7a95dddd; // swapExactPtForSy
+            res[3] = 0xc245e48d; // swapExactPtForToken
         }
         if (facet == ACTION_MISC) {
-            res = new bytes4[](11);
+            res = new bytes4[](13);
             res[0] = 0x1a8631b2; // mintPyFromSy
             res[1] = 0x1cf0f536; // callThenRevert
             res[2] = 0x2d8f9d8d; // boostMarkets
@@ -115,10 +113,12 @@ contract PendleRouterV3 is Proxy, IDiamondLoupe {
             res[4] = 0x339748cb; // redeemPyToSy
             res[5] = 0x339a5572; // redeemSyToToken
             res[6] = 0x47f1de22; // redeemPyToToken
-            res[7] = 0x60fc8466; // multicall
-            res[8] = 0x657b87d8; // multicallRevert
-            res[9] = 0xd0f42385; // mintPyFromToken
-            res[10] = 0xf7e375e8; // redeemDueInterestAndRewards
+            res[7] = 0x5d3e105c; // swapTokenToToken
+            res[8] = 0x60fc8466; // multicall
+            res[9] = 0x657b87d8; // multicallRevert
+            res[10] = 0xa89eba4a; // swapTokenToTokenViaSy
+            res[11] = 0xd0f42385; // mintPyFromToken
+            res[12] = 0xf7e375e8; // redeemDueInterestAndRewards
         }
     }
 
@@ -159,7 +159,7 @@ contract PendleRouterV3 is Proxy, IDiamondLoupe {
                         if (sig == 0x587e3950) return ACTION_ADD_REMOVE_LIQ; //removeLiquiditySingleToken
                         if (sig == 0x5a245eef) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleSy
                     } else {
-                        if (sig == 0x5d3e105c) return ACTION_SWAP_PT; //swapTokenToToken
+                        if (sig == 0x5d3e105c) return ACTION_MISC; //swapTokenToToken
                         if (sig == 0x60fc8466) return ACTION_MISC; //multicall
                         if (sig == 0x657b87d8) return ACTION_MISC; //multicallRevert
                     }
@@ -181,7 +181,7 @@ contract PendleRouterV3 is Proxy, IDiamondLoupe {
                         if (sig == 0x9c1010ec) return ACTION_SWAP_YT; //swapExactTokenForYt
                         if (sig == 0x9cb6711e) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleToken
                     } else {
-                        if (sig == 0xa89eba4a) return ACTION_SWAP_PT; //swapTokenToTokenViaSy
+                        if (sig == 0xa89eba4a) return ACTION_MISC; //swapTokenToTokenViaSy
                         if (sig == 0xadfca15e) return address(this); //facetFunctionSelectors
                         if (sig == 0xb00f09d7) return ACTION_ADD_REMOVE_LIQ; //removeLiquidityDualTokenAndPt
                     }

package/deployments/42161-core.json

@@ -18,7 +18,7 @@
     "PENDLE": "0x0c880f6761F1af8d9Aa9C466984b80DAb9a8c9e8",
     "yieldContractFactory": "0x28dE02Ac3c3F5ef427e55c321F73fDc7F192e8E4",
     "marketFactory": "0xf5a7De2D276dbda3EEf1b62A9E718EFf4d29dDC8",
-    "router": "0x10CEaB79805F36fD0BD4E93bf98a7C7d6A99FD77",
+    "router": "0xf3a0618EbB0e407cD6bE17088Cc98a55C5721d29",
     "routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
     "pendleSwap": "0x8e09Aa43885d99701AB047dA2aC98aECC13807B0",
     "routerHelper": "0x462206b11d185ef6F64B41D344325401C37EC335",

package/package.json

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