@pendle/core-v2 0.16.4-testnet → 0.16.5-testnet

package/contracts/core/BulkSeller/BulkSeller.sol

@@ -155,7 +155,7 @@ contract BulkSeller is IPBulkSeller, Initializable, TokenHelper, ReentrancyGuard
 
     // ----------------- BulkSeller management -----------------
 
-    function increaseReserve(uint256 netTokenIn, uint256 netSyIn) external onlyMaintainer {
+    function increaseReserve(uint256 netTokenIn, uint256 netSyIn) external payable onlyMaintainer {
         BulkSellerState memory state = readState();
 
         state.totalToken += netTokenIn;
@@ -240,11 +240,20 @@ contract BulkSeller is IPBulkSeller, Initializable, TokenHelper, ReentrancyGuard
 
     function _depositToken(uint256 netTokenDeposit) internal returns (uint256 netSyFromToken) {
         _safeApprove(token, SY, netTokenDeposit);
-        return IStandardizedYield(SY).deposit(address(this), token, netTokenDeposit, 0);
+        uint256 nativeToDeposit = token == NATIVE ? netTokenDeposit : 0;
+        return
+            IStandardizedYield(SY).deposit{ value: nativeToDeposit }(
+                address(this),
+                token,
+                netTokenDeposit,
+                0
+            );
     }
 
     function _redeemSy(uint256 netSyRedeem) internal returns (uint256 netTokenFromSy) {
         _transferOut(SY, SY, netSyRedeem);
         return IStandardizedYield(SY).redeem(address(this), netSyRedeem, token, 0, true);
     }
+
+    receive() external payable {}
 }

package/contracts/core/BulkSeller/BulkSellerFactory.sol

@@ -58,6 +58,8 @@ contract BulkSellerFactory is
 
         syToBulkSeller[token][SY] = bulk;
 
+        emit BulkSellerCreated(token, SY, bulk);
+
         return bulk;
     }
 

package/contracts/core/BulkSeller/BulkSellerMathCore.sol

@@ -119,8 +119,8 @@ library BulkSellerMathCore {
 
     function setRate(
         BulkSellerState memory state,
-        uint256 rateTokenToSy,
         uint256 rateSyToToken,
+        uint256 rateTokenToSy,
         uint256 maxDiff
     ) internal pure {
         if (

package/contracts/interfaces/IPBulkSellerFactory.sol

@@ -2,6 +2,8 @@
 pragma solidity 0.8.17;
 
 interface IPBulkSellerFactory {
+    event BulkSellerCreated(address indexed token, address indexed sy, address indexed bulk);
+
     event UpgradedBeacon(address indexed implementation);
 
     function get(address token, address SY) external view returns (address);

package/contracts/offchain-helpers/BulkSellerOffchain.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.17;
 
 import "../core/BulkSeller/BulkSellerMathCore.sol";
 import "../core/BulkSeller/BulkSeller.sol";
+import "hardhat/console.sol";
 
 // upgradable bla bla
 contract BulkSellerOffchain {
@@ -20,17 +21,34 @@ contract BulkSellerOffchain {
         address token = bulk.token();
 
         {
-            uint256 hypoTotalToken = state.totalToken +
-                state.calcSwapExactSyForToken(state.totalSy);
+            uint256 hypoTotalToken = state.totalToken + state.totalSy.mulDown(state.rateSyToToken);
             uint256 netSyFromToken = IStandardizedYield(SY).previewDeposit(token, hypoTotalToken);
 
             rateTokenToSy = netSyFromToken.divDown(hypoTotalToken);
         }
 
         {
-            uint256 hypoTotalSy = state.totalSy + state.calcSwapExactTokenForSy(state.totalToken);
+            uint256 hypoTotalSy = state.totalSy + state.totalToken.mulDown(state.rateTokenToSy);
             uint256 netTokenFromSy = IStandardizedYield(SY).previewRedeem(token, hypoTotalSy);
+            rateSyToToken = netTokenFromSy.divDown(hypoTotalSy);
+        }
+    }
 
+    function calcCurrentRatesWithAmount(
+        IPBulkSeller bulk,
+        uint256 hypoTotalToken,
+        uint256 hypoTotalSy
+    ) external view returns (uint256 rateTokenToSy, uint256 rateSyToToken) {
+        address SY = bulk.SY();
+        address token = bulk.token();
+
+        {
+            uint256 netSyFromToken = IStandardizedYield(SY).previewDeposit(token, hypoTotalToken);
+            rateTokenToSy = netSyFromToken.divDown(hypoTotalToken);
+        }
+
+        {
+            uint256 netTokenFromSy = IStandardizedYield(SY).previewRedeem(token, hypoTotalSy);
             rateSyToToken = netTokenFromSy.divDown(hypoTotalSy);
         }
     }

package/contracts/router/base/MarketApproxLib.sol

@@ -575,7 +575,7 @@ library MarketApproxPtOutLib {
             {
                 uint256 netSyRemaining = a.totalSyIn - netSyIn;
                 uint256 newTotalPt = a.market.totalPt.Uint() - guess;
-                uint256 netTotalSy = comp.totalAsset.Uint() + netSyIn - netSyFee;
+                uint256 netTotalSy = a.market.totalSy.Uint() + netSyIn - netSyFee;
 
                 // it is desired that
                 // netPtFromSwap / newTotalPt = netSyRemaining / netTotalSy

package/deployments/43113-markets/benqi-market-QI-WETH-DEC-1ST.json

@@ -4,5 +4,6 @@
     "expiry": 1669852800,
     "PT": "0xEAa59b2532D7e49b6f8CAC1b4AdAb6a6F868C7eB",
     "YT": "0xb899c25fF3c73127F0B96aDAb9997a703C3Fd88D",
-    "market": "0xA9905Bd9d4813a78c4F9Ed4Ba285b49DE50F7406"
+    "market": "0xA9905Bd9d4813a78c4F9Ed4Ba285b49DE50F7406",
+    "bulkSeller": "0x6A9908669a0D751EE2d8706155eC7CbB0291f09E"
 }

package/package.json

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