@pendle/core-v2 0.15.3-mainnet → 0.16.0-testnet-daily

package/contracts/router/base/ActionBaseMintRedeem.sol

@@ -5,16 +5,20 @@ import "../kyberswap/KyberSwapHelper.sol";
 import "../../core/libraries/TokenHelper.sol";
 import "../../interfaces/IStandardizedYield.sol";
 import "../../interfaces/IPYieldToken.sol";
-import "../../interfaces/IPBulkSeller.sol";
 import "../../core/libraries/Errors.sol";
 
 // solhint-disable no-empty-blocks
 abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
+    using SafeERC20 for IERC20;
+
     bytes internal constant EMPTY_BYTES = abi.encode();
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberScalingLib) KyberSwapHelper(_kyberScalingLib) {}
+    constructor(address _kyberSwapRouter) KyberSwapHelper(_kyberSwapRouter) {}
 
+    /**
+     * @notice swap token to baseToken through Uniswap's forks & use it to mint SY
+     */
     function _mintSyFromToken(
         address receiver,
         address SY,
@@ -22,89 +26,104 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         TokenInput calldata input
     ) internal returns (uint256 netSyOut) {
         _transferIn(input.tokenIn, msg.sender, input.netTokenIn);
-
-        bool requireSwap = input.tokenIn != input.tokenMintSy;
-
-        uint256 netTokenMintSy;
-
-        if (requireSwap) {
-            _kyberswap(input.tokenIn, input.netTokenIn, input.kyberRouter, input.kybercall);
-            netTokenMintSy = _selfBalance(input.tokenMintSy);
-        } else {
-            netTokenMintSy = input.netTokenIn;
+        if (input.tokenIn != input.tokenMintSy) {
+            _kyberswap(input.tokenIn, input.netTokenIn, input.kybercall);
         }
 
-        if (input.bulk != address(0)) {
-            _transferOut(input.tokenMintSy, input.bulk, netTokenMintSy);
-
-            netSyOut = IPBulkSeller(input.bulk).swapExactTokenForSy(
-                receiver,
-                netTokenMintSy,
-                minSyOut
-            );
-        } else {
-            uint256 netNative = input.tokenMintSy == NATIVE ? netTokenMintSy : 0;
+        _safeApproveInf(input.tokenMintSy, SY);
 
-            _safeApproveInf(input.tokenMintSy, SY);
+        uint256 tokenMintSyBal = _selfBalance(input.tokenMintSy);
+        uint256 nativeAmountToAttach = input.tokenMintSy == NATIVE ? tokenMintSyBal : 0;
 
-            netSyOut = IStandardizedYield(SY).deposit{ value: netNative }(
-                receiver,
-                input.tokenMintSy,
-                netTokenMintSy,
-                minSyOut
-            );
-        }
+        netSyOut = IStandardizedYield(SY).deposit{ value: nativeAmountToAttach }(
+            receiver,
+            input.tokenMintSy,
+            tokenMintSyBal,
+            minSyOut
+        );
     }
 
+    /**
+     * @notice redeem SY to baseToken -> swap baseToken to token through Uniswap's forks
+     */
     function _redeemSyToToken(
         address receiver,
         address SY,
         uint256 netSyIn,
-        TokenOutput memory output,
+        TokenOutput calldata output,
         bool doPull
     ) internal returns (uint256 netTokenOut) {
         if (doPull) {
-            _transferFrom(IERC20(SY), msg.sender, _syOrBulk(SY, output), netSyIn);
+            IERC20(SY).safeTransferFrom(msg.sender, SY, netSyIn);
         }
 
-        bool requireSwap = output.tokenRedeemSy != output.tokenOut;
-        address receiverRedeemSy = requireSwap ? address(this) : receiver;
-        uint256 netTokenRedeemed;
-
-        if (output.bulk != address(0)) {
-            netTokenRedeemed = IPBulkSeller(output.bulk).swapExactSyForToken(
-                receiverRedeemSy,
+        if (output.tokenRedeemSy == output.tokenOut) {
+            netTokenOut = IStandardizedYield(SY).redeem(
+                receiver,
                 netSyIn,
-                0
+                output.tokenRedeemSy,
+                output.minTokenOut,
+                true
             );
         } else {
-            netTokenRedeemed = IStandardizedYield(SY).redeem(
-                receiverRedeemSy,
+            uint256 netTokenRedeemed = IStandardizedYield(SY).redeem(
+                address(this),
                 netSyIn,
                 output.tokenRedeemSy,
-                0,
+                1,
                 true
             );
-        }
-
-        if (requireSwap) {
-            _kyberswap(
-                output.tokenRedeemSy,
-                netTokenRedeemed,
-                output.kyberRouter,
-                output.kybercall
-            );
+            _kyberswap(output.tokenRedeemSy, netTokenRedeemed, output.kybercall);
 
             netTokenOut = _selfBalance(output.tokenOut);
 
+            if (netTokenOut < output.minTokenOut)
+                revert Errors.RouterInsufficientTokenOut(netTokenOut, output.minTokenOut);
+
             _transferOut(output.tokenOut, receiver, netTokenOut);
-        } else {
-            netTokenOut = netTokenRedeemed;
         }
+    }
 
-        if (netTokenOut < output.minTokenOut) {
-            revert Errors.RouterInsufficientTokenOut(netTokenOut, output.minTokenOut);
+    /**
+     * @notice swap token to baseToken through Uniswap's forks -> convert to SY -> convert to PT + YT
+     */
+    function _mintPyFromToken(
+        address receiver,
+        address YT,
+        uint256 minPyOut,
+        TokenInput calldata input
+    ) internal returns (uint256 netPyOut) {
+        address SY = IPYieldToken(YT).SY();
+
+        _mintSyFromToken(YT, SY, 1, input);
+
+        netPyOut = IPYieldToken(YT).mintPY(receiver, receiver);
+        if (netPyOut < minPyOut) revert Errors.RouterInsufficientPYOut(netPyOut, minPyOut);
+    }
+
+    /**
+     * @notice redeem PT + YT to SY -> redeem SY to baseToken -> swap baseToken to token through Uniswap's forks.
+        If the YT hasn't expired, both PT & YT will be needed to redeem. Else, only PT is needed
+     */
+    function _redeemPyToToken(
+        address receiver,
+        address YT,
+        uint256 netPyIn,
+        TokenOutput calldata output,
+        bool doPull
+    ) internal returns (uint256 netTokenOut) {
+        address PT = IPYieldToken(YT).PT();
+        address SY = IPYieldToken(YT).SY();
+
+        if (doPull) {
+            bool needToBurnYt = (!IPYieldToken(YT).isExpired());
+            IERC20(PT).safeTransferFrom(msg.sender, YT, netPyIn);
+            if (needToBurnYt) IERC20(YT).safeTransferFrom(msg.sender, YT, netPyIn);
         }
+
+        uint256 amountSyOut = IPYieldToken(YT).redeemPY(SY); // ignore return
+
+        netTokenOut = _redeemSyToToken(receiver, SY, amountSyOut, output, false);
     }
 
     function _mintPyFromSy(
@@ -117,7 +136,7 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         address SY = IPYieldToken(YT).SY();
 
         if (doPull) {
-            _transferFrom(IERC20(SY), msg.sender, YT, netSyIn);
+            IERC20(SY).safeTransferFrom(msg.sender, YT, netSyIn);
         }
 
         netPyOut = IPYieldToken(YT).mintPY(receiver, receiver);
@@ -128,32 +147,18 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         address receiver,
         address YT,
         uint256 netPyIn,
-        uint256 minSyOut
+        uint256 minSyOut,
+        bool doPull
     ) internal returns (uint256 netSyOut) {
         address PT = IPYieldToken(YT).PT();
 
-        _transferFrom(IERC20(PT), msg.sender, YT, netPyIn);
-
-        bool needToBurnYt = (!IPYieldToken(YT).isExpired());
-        if (needToBurnYt) _transferFrom(IERC20(YT), msg.sender, YT, netPyIn);
+        if (doPull) {
+            bool needToBurnYt = (!IPYieldToken(YT).isExpired());
+            IERC20(PT).safeTransferFrom(msg.sender, YT, netPyIn);
+            if (needToBurnYt) IERC20(YT).safeTransferFrom(msg.sender, YT, netPyIn);
+        }
 
         netSyOut = IPYieldToken(YT).redeemPY(receiver);
         if (netSyOut < minSyOut) revert Errors.RouterInsufficientSyOut(netSyOut, minSyOut);
     }
-
-    function _syOrBulk(address SY, TokenOutput memory output)
-        internal
-        pure
-        returns (address addr)
-    {
-        return output.bulk != address(0) ? output.bulk : SY;
-    }
-
-    function _wrapTokenOutput(
-        address tokenOut,
-        uint256 minTokenOut,
-        address bulk
-    ) internal pure returns (TokenOutput memory) {
-        return TokenOutput(tokenOut, minTokenOut, tokenOut, bulk, address(0), EMPTY_BYTES);
-    }
 }

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 = a.market.totalSy.Uint() + netSyIn - netSyFee;
+                uint256 netTotalSy = comp.totalAsset.Uint() + netSyIn - netSyFee;
 
                 // it is desired that
                 // netPtFromSwap / newTotalPt = netSyRemaining / netTotalSy

package/contracts/router/kyberswap/AggregationRouterHelper.sol

@@ -3,16 +3,8 @@
 pragma solidity 0.8.17;
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IMultihopRouter.sol";
-import "./IAggregatorRouterHelper.sol";
-import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
-import "../../core/libraries/BoringOwnableUpgradeable.sol";
 
-contract AggregationRouterHelper is
-    IAggregationRouterHelper,
-    Initializable,
-    UUPSUpgradeable,
-    BoringOwnableUpgradeable
-{
+library AggregationRouterHelper {
     uint256 private constant _PARTIAL_FILL = 0x01;
     uint256 private constant _REQUIRES_EXTRA_ETH = 0x02;
     uint256 private constant _SHOULD_CLAIM = 0x04;
@@ -22,14 +14,6 @@ contract AggregationRouterHelper is
 
     uint256 private constant SLIPPAGE_RANGE = 10; // over 100
 
-    constructor() initializer {}
-
-    function initialize() external initializer {
-        __BoringOwnable_init();
-    }
-
-    function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
-
     enum DexType {
         UNI,
         STABLESWAP,

package/contracts/router/kyberswap/KyberSwapHelper.sol

@@ -25,55 +25,42 @@ pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/utils/Address.sol";
 import "../../core/libraries/TokenHelper.sol";
-import "./IAggregatorRouterHelper.sol";
-import "../../core/libraries/Errors.sol";
+import "./AggregationRouterHelper.sol";
 
 struct TokenInput {
-    // Token/Sy data
     address tokenIn;
     uint256 netTokenIn;
     address tokenMintSy;
-    address bulk;
-    // Kyber data
-    address kyberRouter;
     bytes kybercall;
 }
 
 struct TokenOutput {
-    // Token/Sy data
     address tokenOut;
     uint256 minTokenOut;
     address tokenRedeemSy;
-    address bulk;
-    // Kyber data
-    address kyberRouter;
     bytes kybercall;
 }
 
 abstract contract KyberSwapHelper is TokenHelper {
     using Address for address;
+    address public immutable kyberSwapRouter;
 
-    address public immutable kyberScalingLib;
-
-    constructor(address _kyberScalingLib) {
-        kyberScalingLib = _kyberScalingLib;
+    /// @dev since this contract will be proxied, it must not contains non-immutable variables
+    constructor(address _kyberSwapRouter) {
+        kyberSwapRouter = _kyberSwapRouter;
     }
 
     function _kyberswap(
         address tokenIn,
         uint256 amountIn,
-        address kyberRouter,
         bytes memory rawKybercall
     ) internal {
-        if (kyberRouter == address(0) || rawKybercall.length == 0)
-            revert Errors.RouterKyberSwapDataZero();
-
-        _safeApproveInf(tokenIn, kyberRouter);
+        _safeApproveInf(tokenIn, kyberSwapRouter);
 
-        bytes memory kybercall = IAggregationRouterHelper(kyberScalingLib).getScaledInputData(
+        bytes memory kybercall = AggregationRouterHelper.getScaledInputData(
             rawKybercall,
             amountIn
         );
-        kyberRouter.functionCallWithValue(kybercall, tokenIn == NATIVE ? amountIn : 0);
+        kyberSwapRouter.functionCallWithValue(kybercall, tokenIn == NATIVE ? amountIn : 0);
     }
 }

package/deployments/43113-core.json

@@ -0,0 +1,16 @@
+{
+    "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+    "network": 43113,
+    "splitter": "0x81357A3D4F023745a518E4F07b8714e141f84E0a",
+    "lzEndpoint": "0x93f54D755A063cE7bB9e6Ac47Eccc8e33411d706",
+    "treasury": "0x243b7CFD29AcAF9cDe98C1958902FAA3B1F095D5",
+    "PENDLE": "0xB7609dec1C926204c3B67345cbCd54bc4aa7a940",
+    "yieldContractFactory": "0xfD5EDf66bf3A2E5c2fBd5d4be243c5802e699b6a",
+    "marketFactory": "0x6aE219f9B761D8D94780FE0F3EC7Ab4151842dBD",
+    "router": "0x86E983e99402663bBd50eA6F7e77FaA9219305CC",
+    "routerStatic": "0xaB0Aa804291f7090F423D27e3eaEB5E4434CC731",
+    "vePendle": "0x8391B95F016FFE2a4c32F69B4363ca55470fDfe1",
+    "senderEndpoint": "0x8E7E8bdbaA68bDCcAFC3586d7fDa43bb1310Ec71",
+    "votingController": "0xD6d778846B2d4A013d44fAF346FcdFa34b58E222",
+    "gaugeController": "0x2324819386c3867494c7654Bdc0B6D93B6FecD13"
+}

package/deployments/43113-helper.json

@@ -0,0 +1,3 @@
+{
+    "implicitSwapfeeContract": "0x6d247b1c044fA1E22e6B04fA9F71Baf99EB29A9f"
+}

package/deployments/43113-markets/benqi-market-QI-USDC-FEB-2ND.json

@@ -0,0 +1,8 @@
+{
+    "symbol": "SY-qiUSDC",
+    "SY": "0xFFc4208cC825baD56909C7fbff63BB43286D4c67",
+    "expiry": 1675382400,
+    "PT": "0x7354104DCE0cED4Bbf6c7798a9D52Adb1340B1c0",
+    "YT": "0x869BD2A765c43a9811cc9a8B2ABCE5C78a0aa004",
+    "market": "0x3Ca64162AD9A6D25B37c67FF4b474cb925d2cCA9"
+}

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

@@ -0,0 +1,8 @@
+{
+    "symbol": "SY-qiWETH",
+    "SY": "0xC4907BBd480F53Ae5dA80F723975F8c2125783eC",
+    "expiry": 1669852800,
+    "PT": "0xa1da6AFaE358135b1e9E43aCF0C00d0E2A501F84",
+    "YT": "0x818dd5ad650B064A5314F6df60CDdC2a63272b58",
+    "market": "0xAc92B8B795f9DBb784e97fC69cDBF4167621D458"
+}

package/deployments/43113-testenv.json

@@ -0,0 +1,22 @@
+{
+    "tokens": {
+        "fundKeeper": "0x45e03eB183962884d50eC0Af39B03970333426cb",
+        "faucet": "0xf9d2A793b446D200deC9FBB6f29a9DadcD0521cC",
+        "WAVAX": "0xe43a7aD7C09d8fAE3ADe7361f0b847b23adD5094",
+        "DAI": "0xCd3748CE3Bf75A01D99Bf301668E0748558a592C",
+        "USDC": "0xc2A6b8d7d0FAB3749A6Bda84cEdb58D2d58f045e",
+        "USDT": "0x9BE875cdBB8409DbC1a553c8ddc1FC05cdDF80Ce",
+        "WBTC": "0x82c18D07253603D04d25C8B1F1E60134a59C39ce",
+        "WETH": "0x1e2e40697603CA5b5ffc102c9D7A3310EA3f2Aa3",
+        "qiUSDC": "0xEE3a174F1478198fBc669132B1e2cc13B5686F94",
+        "qiWETH": "0xE5710EC5e4CeB255fb14d2c2BFC93E64d0c30A2c",
+        "qiAVAX": "0xf9aEd3b927dce44C6d53B334Cb759f4D230D9b9c"
+    },
+    "benqi": {
+        "comptroller": "0x4Af3e9CA6f86E655C01f03C13519BcAF867286EE",
+        "QI": "0x63554C4d2038c9B7973190f3E41f5158939Fe972",
+        "interestRateModel": "0xd66C253151539b3bE0a0C11699fB024E054227d4",
+        "qiErc20Impl": "0x184622Dd7B63299F87CBf21f11FF25c9c302fd5d",
+        "oracle": "0x44b789cBC190b7888d438cEb58f1Eb8A3Ae2d897"
+    }
+}

package/deployments/80001-core.json

@@ -0,0 +1,15 @@
+{
+    "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+    "network": 80001,
+    "splitter": "0x335289ccb76C1A11aDB82E2aa2ab39a83DdcC49a",
+    "lzEndpoint": "0xf69186dfBa60DdB133E91E9A4B5673624293d8F8",
+    "treasury": "0xdC1b3B6b2091a3bB2c7439005A24F33a9A4f87Be",
+    "PENDLE": "0x7b5b5105dFBacc2A84d00406FEa5B454a73979a4",
+    "yieldContractFactory": "0xeC1AF9aA4801E44879c5cB800887478d98De37c0",
+    "marketFactory": "0xA91817a07A7A8020972E5115196f59E347C35b99",
+    "router": "0xa96527ddb4353559132db1CB347978fc552ce1FF",
+    "routerStatic": "0x00Da82d7B30D39B896380EDf460425F7556BfDb6",
+    "receiverEndpoint": "0xa0c3840e5FD27f3C51bda5f0b6a75738ddeB6062",
+    "vePendle": "0x1367c812418c67895C2474169F6753272be8B5f4",
+    "gaugeController": "0x98F5Ff866AAfF8A4109380CE2dC02CA6644AD81d"
+}

package/deployments/80001-testenv.json

@@ -0,0 +1,22 @@
+{
+    "tokens": {
+        "fundKeeper": "0x7D301Cc4F91A9eDd8EDE1801344bd6516b5FA3d2",
+        "faucet": "0x35AC4A286F1f1234f09Ff43f42B1f7767c6fAA91",
+        "WAVAX": "0xdF3601014686674e53d1Fa52F7602525483F9122",
+        "DAI": "0x829bF32457394D1f1fA8C1b151cE5017bb04C17D",
+        "USDC": "0x5Ea8c8e02c2D413165C1ADcBb6916B0851f6cd73",
+        "USDT": "0xAFC1ac698E9b54C240e6Ebc7d64200BB84f2E4cd",
+        "WBTC": "0x4d89990738A071B9E597Ea442f2ba58e6EA97184",
+        "WETH": "0x1A6fCc85557BC4fB7B534ed835a03EF056552D52",
+        "qiUSDC": "0x76818c92936662e9b24f74395f38634C35604720",
+        "qiWETH": "0x0b9d0756AeaD1cBc6bC4e9f30FeEa377a73d407F",
+        "qiAVAX": "0x98030D8f342aA21424B07059Cb1405A179A1F668"
+    },
+    "benqi": {
+        "comptroller": "0x0d18d7a0B27CB5C2F33cDc0a087B7182a72e0fAb",
+        "QI": "0x9F10C77EF63a5706e53D82B249D9195BeB5774fd",
+        "interestRateModel": "0xfF334644479e70ae5C9545218574B17e9aF7A5DD",
+        "qiErc20Impl": "0xA3972f97074552de27cF747A126b2c5F36935818",
+        "oracle": "0x324D838b26Eb73786bDBBc53bb0682F1EBB50603"
+    }
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.15.3-mainnet",
+  "version": "0.16.0-testnet-daily",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -44,7 +44,6 @@
   },
   "packageManager": "yarn@3.2.2",
   "dependencies": {
-    "@openzeppelin/contracts": "^4.7.3",
-    "@openzeppelin/contracts-upgradeable": "^4.7.3"
+    "@openzeppelin/contracts": "^4.7.3"
   }
 }