@pendle/core-v2 0.15.0-mainnet → 0.15.2-mainnet

package/contracts/core/libraries/TokenHelper.sol

@@ -17,6 +17,15 @@ abstract contract TokenHelper {
         else if (amount != 0) IERC20(token).safeTransferFrom(from, address(this), amount);
     }
 
+    function _transferFrom(
+        IERC20 token,
+        address from,
+        address to,
+        uint256 amount
+    ) internal {
+        if (amount != 0) token.safeTransferFrom(from, to, amount);
+    }
+
     function _transferOut(
         address token,
         address to,

package/contracts/interfaces/ConvexCurve/IBooster.sol

@@ -10,7 +10,7 @@ interface IBooster {
         external
         view
         returns (
-            address,
+            address lpToken,
             address,
             address,
             address,

package/contracts/interfaces/Curve/ICrvPool.sol

@@ -6,6 +6,12 @@ interface ICrvPool {
 
     function get_virtual_price() external view returns (uint256);
 
+    function lp_token() external view returns (address);
+
+    function fee() external view returns (uint256);
+
+    function admin_fee() external view returns (uint256);
+
     function get_dy(
         int128 i,
         int128 j,
@@ -16,56 +22,31 @@ interface ICrvPool {
         int128 i,
         int128 j,
         uint256 dx,
-        uint256 min_dy, // The amount of i being exchanged.
-        address _receiver
-    ) external returns (uint256);
-
-    function add_liquidity(
-        uint256[] memory _deposit_amount,
-        uint256 _min_amount,
-        address _receiver
+        uint256 min_dy // The amount of i being exchanged.
     ) external returns (uint256);
 
     function add_liquidity(
         uint256[2] memory _deposit_amount,
         uint256 _min_amount
-    ) external;
-
-    function add_liquidity(
-        uint256[3] memory _deposit_amount,
-        uint256 _min_amount
-    ) external;
-
-    function remove_liquidity(
-        uint256 _burn_amount,
-        uint256[] memory _min_amounts,
-        address _receiver
-    ) external returns (uint256[] memory);
+    ) external returns (uint256 lpOut);
 
     function remove_liquidity_one_coin(
         uint256 _burn_amount,
         int128 i,
         uint256 _min_amount
-    ) external;
-
-    function calc_token_amount(uint256[] memory _amounts, bool _is_deposit)
-        external
-        view
-        returns (uint256);
+    ) external returns (uint256 tokenOut);
 
     function calc_token_amount(uint256[2] memory _amounts, bool _is_deposit)
         external
         view
         returns (uint256);
 
-    function calc_token_amount(uint256[3] memory _amounts, bool _is_deposit)
+    function calc_withdraw_one_coin(uint256 _burn_amount, int128 i)
         external
         view
         returns (uint256);
 
+    function balances(uint256 i) external view returns (uint256);
 
-    function calc_withdraw_one_coin(uint256 _burn_amount, int128 i)
-        external
-        view
-        returns (uint256);
+    function A_precise() external view returns (uint256);
 }

package/contracts/interfaces/Curve/ITriCrvPool.sol

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+interface ITriCrvPool {
+    function coins(uint256 i) external view returns (address);
+
+    function get_virtual_price() external view returns (uint256);
+
+    function lp_token() external view returns (address);
+
+    function fee() external view returns (uint256);
+
+    function admin_fee() external view returns (uint256);
+
+    function exchange(
+        int128 i,
+        int128 j,
+        uint256 dx,
+        uint256 min_dy // The amount of i being exchanged.
+    ) external returns (uint256);
+
+    function add_liquidity(
+        uint256[3] memory _deposit_amount,
+        uint256 _min_amount
+    ) external;
+
+    function remove_liquidity_one_coin(
+        uint256 _burn_amount,
+        int128 i,
+        uint256 _min_amount
+    ) external;
+
+    function calc_withdraw_one_coin(uint256 _burn_amount, int128 i)
+        external
+        view
+        returns (uint256);
+
+    function balances(uint256 i) external view returns (uint256);
+
+    function A() external view returns (uint256);
+}

package/contracts/interfaces/ILayerZeroEndpoint.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.5.0;
+
+interface ILayerZeroEndpoint {
+    // @notice send a LayerZero message to the specified address at a LayerZero endpoint.
+    // @param _dstChainId - the destination chain identifier
+    // @param _destination - the address on destination chain (in bytes). address length/format may vary by chains
+    // @param _payload - a custom bytes payload to send to the destination contract
+    // @param _refundAddress - if the source transaction is cheaper than the amount of value passed, refund the additional amount to this address
+    // @param _zroPaymentAddress - the address of the ZRO token holder who would pay for the transaction
+    // @param _adapterParams - parameters for custom functionality. e.g. receive airdropped native gas from the relayer on destination
+    function send(
+        uint16 _dstChainId,
+        bytes calldata _destination,
+        bytes calldata _payload,
+        address payable _refundAddress,
+        address _zroPaymentAddress,
+        bytes calldata _adapterParams
+    ) external payable;
+
+    // @notice gets a quote in source native gas, for the amount that send() requires to pay for message delivery
+    // @param _dstChainId - the destination chain identifier
+    // @param _userApplication - the user app address on this EVM chain
+    // @param _payload - the custom message to send over LayerZero
+    // @param _payInZRO - if false, user app pays the protocol fee in native token
+    // @param _adapterParam - parameters for the adapter service, e.g. send some dust native token to dstChain
+    function estimateFees(
+        uint16 _dstChainId,
+        address _userApplication,
+        bytes calldata _payload,
+        bool _payInZRO,
+        bytes calldata _adapterParam
+    ) external view returns (uint256 nativeFee, uint256 zroFee);
+
+    function setSendVersion(uint16 _newVersion) external;
+
+    function setReceiveVersion(uint16 _newVersion) external;
+}

package/contracts/interfaces/ILayerZeroReceiver.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity >=0.5.0;
+
+interface ILayerZeroReceiver {
+    // @notice LayerZero endpoint will invoke this function to deliver the message on the destination
+    // @param _srcChainId - the source endpoint identifier
+    // @param _srcAddress - the source sending contract address from the source chain
+    // @param _nonce - the ordered message nonce
+    // @param _payload - the signed payload is the UA bytes has encoded to be sent
+    function lzReceive(uint16 _srcChainId, bytes calldata _srcAddress, uint64 _nonce, bytes calldata _payload) external;
+}

package/contracts/interfaces/ILooksFeeSharing.sol

@@ -0,0 +1,5 @@
+pragma solidity 0.8.17;
+
+interface ILooksFeeSharing {
+    function calculateSharesValueInLOOKS(address user) external view returns (uint256);
+}

package/contracts/interfaces/ILooksStaking.sol

@@ -0,0 +1,13 @@
+pragma solidity 0.8.17;
+
+interface ILooksStaking {
+    function totalShares() external view returns (uint256);
+
+    function deposit(uint256 amount) external;
+
+    function userInfo(address user) external view returns (uint256);
+
+    function withdraw(uint256 shares) external;
+
+    function harvestAndSellAndCompound() external;
+}

package/contracts/interfaces/IPActionAddRemoveLiq.sol

@@ -19,7 +19,7 @@ interface IPActionAddRemoveLiq {
         address indexed market,
         address indexed receiver,
         address tokenIn,
-        uint256 tokenUsed,
+        uint256 netTokenUsed,
         uint256 netPtUsed,
         uint256 netLpOut
     );
@@ -110,8 +110,7 @@ interface IPActionAddRemoveLiq {
     function addLiquidityDualTokenAndPt(
         address receiver,
         address market,
-        address tokenIn,
-        uint256 netTokenDesired,
+        TokenInput calldata input,
         uint256 netPtDesired,
         uint256 minLpOut
     )
@@ -159,8 +158,7 @@ interface IPActionAddRemoveLiq {
         address receiver,
         address market,
         uint256 netLpToRemove,
-        address tokenOut,
-        uint256 minTokenOut,
+        TokenOutput calldata output,
         uint256 minPtOut
     ) external returns (uint256 netTokenOut, uint256 netPtOut);
 

package/contracts/interfaces/IPActionMintRedeem.sol

@@ -138,6 +138,7 @@ interface IPActionMintRedeem {
         // key-value pair
         address[] syAddrs;
         address[] tokenRedeemSys;
+        address[] bulks;
         //
     }
 
@@ -146,6 +147,7 @@ interface IPActionMintRedeem {
         address[] tokens;
         bytes[] kybercalls;
         //
+        address kyberRouter;
         address outputToken;
         uint256 minTokenOut;
     }

package/contracts/interfaces/IPBulkSeller.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "../core/BulkSeller/BulkSellerMathCore.sol";
+
+interface IPBulkSeller {
+    function swapExactSyForToken(
+        address receiver,
+        uint256 exactSyIn,
+        uint256 minTokenOut
+    ) external returns (uint256 netTokenOut);
+
+    function swapExactTokenForSy(
+        address receiver,
+        uint256 netTokenIn,
+        uint256 minSyOut
+    ) external returns (uint256 netSyOut);
+
+    function calcSwapExactTokenForSy(uint256 netTokenIn) external view returns (uint256 netSyOut);
+
+    function calcSwapExactSyForToken(uint256 netSyIn) external view returns (uint256 netTokenOut);
+
+    function SY() external view returns (address);
+
+    function token() external view returns (address);
+
+    function readState() external view returns (BulkSellerState memory);
+}

package/contracts/interfaces/IPBulkSellerFactory.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+interface IPBulkSellerFactory {
+    event UpgradedBeacon(address indexed implementation);
+
+    function get(address token, address SY) external view returns (address);
+
+    function isMaintainer(address addr) external view returns (bool);
+
+    function isAdmin(address addr) external view returns (bool);
+}

package/contracts/interfaces/IPBulkSellerSYCallback.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+interface IPBulkSellerCallback {
+    function swapCallback(
+        int256 ptToAccount,
+        int256 syToAccount,
+        bytes calldata data
+    ) external;
+}

package/contracts/interfaces/IPMarketFactory.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.17;
 
 interface IPMarketFactory {
-    event NewMarketConfig(address indexed treasury, uint96 lnFeeRateRoot, uint8 reserveFeePercent);
+    event NewMarketConfig(address indexed treasury, uint88 lnFeeRateRoot, uint8 reserveFeePercent);
 
     event CreateNewMarket(
         address indexed market,

package/contracts/interfaces/IPMsgSendEndpoint.sol

@@ -6,12 +6,14 @@ interface IPMsgSendEndpoint {
     function calcFee(
         address dstAddress,
         uint256 dstChainId,
-        bytes calldata message
+        bytes memory payload,
+        uint256 estimatedGasAmount
     ) external view returns (uint256);
 
     function sendMessage(
         address dstAddress,
         uint256 dstChainId,
-        bytes calldata message
+        bytes calldata payload,
+        uint256 estimatedGasAmount
     ) external payable;
 }

package/contracts/interfaces/IPYieldContractFactory.sol

@@ -30,7 +30,7 @@ interface IPYieldContractFactory {
 
     event SetInterestFeeRate(uint256 newInterestFeeRate);
 
-    event SetRewardFeeRate(uint256 newInterestFeeRate);
+    event SetRewardFeeRate(uint256 newRewardFeeRate);
 
     event SetTreasury(address indexed treasury);
 

package/contracts/interfaces/IStETH.sol

@@ -11,4 +11,10 @@ interface IStETH {
     function burnShares(address _account, uint256 _sharesAmount)
         external
         returns (uint256 newTotalShares);
+    
+    function sharesOf(address account) external view returns (uint256);
+
+    function getTotalShares() external view returns (uint256);
+
+    function getTotalPooledEther() external view returns (uint256);
 }

package/contracts/interfaces/IStandardizedYield.sol

@@ -43,7 +43,7 @@ interface IStandardizedYield is IERC20Metadata {
         uint256 amountTokenOut
     );
 
-    /// @dev check assetInfo for more information
+    /// @dev check `assetInfo()` for more information
     enum AssetType {
         TOKEN,
         LIQUIDITY
@@ -74,9 +74,10 @@ interface IStandardizedYield is IERC20Metadata {
     /**
      * @notice redeems an amount of base tokens by burning some shares
      * @param receiver recipient address
-     * @param amountSharesToRedeem amount of shares to be burned from (`msg.sender`)
+     * @param amountSharesToRedeem amount of shares to be burned
      * @param tokenOut address of the base token to be redeemed
      * @param minTokenOut reverts if amount of base token redeemed is lower than this
+     * @param burnFromInternalBalance if true, burns from balance of `address(this)`, otherwise burns from `msg.sender`
      * @return amountTokenOut amount of base tokens redeemed
      * @dev Emits a {Redeem} event
      *
@@ -105,7 +106,7 @@ interface IStandardizedYield is IERC20Metadata {
      * @param user the user receiving their rewards
      * @return rewardAmounts an array of reward amounts in the same order as `getRewardTokens`
      * @dev
-     * Emits a `ClaimRewardss` event
+     * Emits a `ClaimRewards` event
      * See {getRewardTokens} for list of reward tokens
      */
     function claimRewards(address user) external returns (uint256[] memory rewardAmounts);
@@ -131,8 +132,14 @@ interface IStandardizedYield is IERC20Metadata {
      */
     function yieldToken() external view returns (address);
 
+    /**
+     * @notice returns all tokens that can mint this SY
+     */
     function getTokensIn() external view returns (address[] memory res);
 
+    /**
+     * @notice returns all tokens that can be redeemed by this SY
+     */
     function getTokensOut() external view returns (address[] memory res);
 
     function isValidTokenIn(address token) external view returns (bool);
@@ -150,13 +157,11 @@ interface IStandardizedYield is IERC20Metadata {
         returns (uint256 amountTokenOut);
 
     /**
-    * @notice This function contains information to interpret what the asset is
-    * @notice decimals is the decimals to format asset balances
-    * @notice if asset is an ERC20 token, assetType = 0, assetAddress is the address of the token
-    * @notice if asset is liquidity of an AMM (like sqrt(k) in UniswapV2 forks), assetType = 1,
-    assetAddress is the address of the LP token
-    * @notice assetDecimals is the decimals of the asset
-    */
+     * @notice This function contains information to interpret what the asset is
+     * @return assetType the type of the asset (0 for ERC20 tokens, 1 for AMM liquidity tokens)
+     * @return assetAddress the address of the asset
+     * @return assetDecimals the decimals of the asset
+     */
     function assetInfo()
         external
         view

package/contracts/offchain-helpers/BulkSellerOffchain.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "../core/BulkSeller/BulkSellerMathCore.sol";
+import "../core/BulkSeller/BulkSeller.sol";
+import "hardhat/console.sol";
+
+// upgradable bla bla
+contract BulkSellerOffchain {
+    using BulkSellerMathCore for BulkSellerState;
+    using Math for uint256;
+
+    // rmb to add fee here
+    function calcCurrentRates(IPBulkSeller bulk)
+        external
+        view
+        returns (uint256 rateTokenToSy, uint256 rateSyToToken)
+    {
+        BulkSellerState memory state = bulk.readState();
+        address SY = bulk.SY();
+        address token = bulk.token();
+
+        {
+            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.totalToken.mulDown(state.rateTokenToSy);
+            uint256 netTokenFromSy = IStandardizedYield(SY).previewRedeem(token, hypoTotalSy);
+            rateSyToToken = netTokenFromSy.divDown(hypoTotalSy);
+        }
+    }
+
+    // TODO: pause contract when rate is bad compared to market
+    // TODO: Sound alarm if updates fail
+    // TODO: audit even the typescript code
+    // TODO: add a max with currentRate to guarantee no loss?
+    // TODO: pause immediately if lost enough money
+}