@pendle/core-v2 0.10.1-beta → 0.10.3-testnet

package/build/artifacts/contracts/periphery/BoringOwnableUpgradeable.sol/BoringOwnableUpgradeable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/492a77e993ce31b17542cf37561d3792.json"
+  "buildInfo": "../../../build-info/a12bb976475958b058bd7f38ce51b59e.json"
 }

package/build/artifacts/contracts/periphery/BoringOwnableUpgradeable.sol/BoringOwnableUpgradeableData.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/492a77e993ce31b17542cf37561d3792.json"
+  "buildInfo": "../../../build-info/a12bb976475958b058bd7f38ce51b59e.json"
 }

package/contracts/SuperComposableYield/base-implementations/SCYBaseWithRewards.sol

@@ -72,7 +72,12 @@ abstract contract SCYBaseWithRewards is SCYBase, RewardManager {
         }
     }
 
-    function rewardIndexesCurrent() external override returns (uint256[] memory indexes) {
+    function rewardIndexesCurrent()
+        external
+        override
+        nonReentrant
+        returns (uint256[] memory indexes)
+    {
         _updateRewardIndex();
         return rewardIndexesStored();
     }

package/contracts/core/Market/PendleMarket.sol

@@ -137,8 +137,8 @@ contract PendleMarket is PendleERC20, PendleGauge, IPMarket {
 
         (netScyOut, netPtOut) = market.removeLiquidity(lpToRemove);
 
-        IERC20(SCY).safeTransfer(receiverScy, netScyOut);
-        IERC20(PT).safeTransfer(receiverPt, netPtOut);
+        if (receiverScy != address(this)) IERC20(SCY).safeTransfer(receiverScy, netScyOut);
+        if (receiverPt != address(this)) IERC20(PT).safeTransfer(receiverPt, netPtOut);
 
         _writeState(market);
 
@@ -168,7 +168,7 @@ contract PendleMarket is PendleERC20, PendleGauge, IPMarket {
             block.timestamp
         );
 
-        IERC20(SCY).safeTransfer(receiver, netScyOut);
+        if (receiver != address(this)) IERC20(SCY).safeTransfer(receiver, netScyOut);
         IERC20(SCY).safeTransfer(market.treasury, netScyToReserve);
 
         _writeState(market);
@@ -205,7 +205,7 @@ contract PendleMarket is PendleERC20, PendleGauge, IPMarket {
             block.timestamp
         );
 
-        IERC20(PT).safeTransfer(receiver, exactPtOut);
+        if (receiver != address(this)) IERC20(PT).safeTransfer(receiver, exactPtOut);
         IERC20(SCY).safeTransfer(market.treasury, netScyToReserve);
 
         _writeState(market);

package/contracts/core/actions/ActionAddRemoveLiq.sol

@@ -9,7 +9,8 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
     using Math for uint256;
     using Math for int256;
     using MarketMathCore for MarketState;
-    using MarketApproxLib for MarketState;
+    using MarketApproxPtInLib for MarketState;
+    using MarketApproxPtOutLib for MarketState;
     using SafeERC20 for IERC20;
     using PYIndexLib for IPYieldToken;
 

package/contracts/core/actions/ActionSwapPT.sol

@@ -7,7 +7,8 @@ import "../../interfaces/IPMarket.sol";
 
 contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
     using MarketMathCore for MarketState;
-    using MarketApproxLib for MarketState;
+    using MarketApproxPtInLib for MarketState;
+    using MarketApproxPtOutLib for MarketState;
     using Math for uint256;
     using Math for int256;
     using SafeERC20 for IERC20;

package/contracts/core/actions/ActionSwapYT.sol

@@ -10,7 +10,8 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     using Math for uint256;
     using Math for int256;
     using MarketMathCore for MarketState;
-    using MarketApproxLib for MarketState;
+    using MarketApproxPtInLib for MarketState;
+    using MarketApproxPtOutLib for MarketState;
     using SafeERC20 for ISuperComposableYield;
     using SafeERC20 for IPYieldToken;
     using PYIndexLib for IPYieldToken;
@@ -41,7 +42,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
 
         SCY.safeTransferFrom(msg.sender, address(YT), exactScyIn);
 
-        _swapExactScyForYt(receiver, market, YT, exactScyIn, minYtOut, guessYtOut);
+        netYtOut = _swapExactScyForYt(receiver, market, YT, exactScyIn, minYtOut, guessYtOut);
 
         emit SwapYtAndScy(msg.sender, market, receiver, netYtOut.Int(), exactScyIn.neg());
     }

package/contracts/interfaces/IPActionSwapYT.sol

@@ -16,8 +16,8 @@ interface IPActionSwapYT {
     event SwapYtAndToken(
         address indexed caller,
         address indexed market,
-        address indexed token,
-        address receiver,
+        address indexed receiver,
+        address token,
         int256 netYtToAccount,
         int256 netTokenToAccount
     );