@pendle/core-v2 0.16.2-testnet → 0.16.3-testnet

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,
@@ -20,52 +26,28 @@ interface ICrvPool {
         address _receiver
     ) external returns (uint256);
 
-    function add_liquidity(
-        uint256[] memory _deposit_amount,
-        uint256 _min_amount,
-        address _receiver
-    ) 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);
-
     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);
-
     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/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;
+        bool[] useBulks;
         //
     }
 
@@ -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/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/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";
+
+// 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.calcSwapExactSyForToken(state.totalSy);
+            uint256 netSyFromToken = IStandardizedYield(SY).previewDeposit(token, hypoTotalToken);
+
+            rateTokenToSy = netSyFromToken.divDown(hypoTotalToken);
+        }
+
+        {
+            uint256 hypoTotalSy = state.totalSy + state.calcSwapExactTokenForSy(state.totalToken);
+            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
+}

package/contracts/offchain-helpers/MarketMathStatic.sol

@@ -140,31 +140,6 @@ library MarketMathStatic {
         priceImpact = calcPriceImpact(market, netPtFromSwap.Int());
     }
 
-    /// @dev netPtFromSwap is the parameter to approx
-    function addLiquiditySingleBaseTokenStatic(
-        address market,
-        address baseToken,
-        uint256 netBaseTokenIn,
-        ApproxParams memory approxParams
-    )
-        external
-        returns (
-            uint256 netLpOut,
-            uint256 netPtFromSwap,
-            uint256 netSyFee,
-            uint256 priceImpact
-        )
-    {
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-
-        return
-            addLiquiditySingleSyStatic(
-                market,
-                SY.previewDeposit(baseToken, netBaseTokenIn),
-                approxParams
-            );
-    }
-
     function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
         external
         view
@@ -174,20 +149,6 @@ library MarketMathStatic {
         (netSyOut, netPtOut) = state.removeLiquidity(netLpToRemove);
     }
 
-    function removeLiquidityDualTokenAndPtStatic(
-        address market,
-        uint256 metLpToRemove,
-        address tokenOut
-    ) external view returns (uint256 netTokenOut, uint256 netPtOut) {
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-
-        uint256 netSyOut;
-        MarketState memory state = IPMarket(market).readState();
-        (netSyOut, netPtOut) = state.removeLiquidity(metLpToRemove);
-
-        netTokenOut = SY.previewRedeem(tokenOut, netSyOut);
-    }
-
     /// @dev netPtFromSwap is the parameter to approx
     function removeLiquiditySinglePtStatic(
         address market,
@@ -243,25 +204,6 @@ library MarketMathStatic {
         }
     }
 
-    function removeLiquiditySingleBaseTokenStatic(
-        address market,
-        uint256 netLpToRemove,
-        address baseToken
-    )
-        external
-        returns (
-            uint256 netBaseTokenOut,
-            uint256 netSyFee,
-            uint256 priceImpact
-        )
-    {
-        uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact) = removeLiquiditySingleSyStatic(market, netLpToRemove);
-
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-        netBaseTokenOut = SY.previewRedeem(baseToken, netSyOut);
-    }
-
     function swapExactPtForSyStatic(address market, uint256 exactPtIn)
         public
         returns (
@@ -335,49 +277,6 @@ library MarketMathStatic {
         priceImpact = calcPriceImpact(market, netPtIn.neg());
     }
 
-    /// @dev netPtOut is the parameter to approx
-    function swapExactBaseTokenForPtStatic(
-        address market,
-        address baseToken,
-        uint256 amountBaseToken,
-        ApproxParams memory approxParams
-    )
-        external
-        returns (
-            uint256 netPtOut,
-            uint256 netSyFee,
-            uint256 priceImpact
-        )
-    {
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-
-        return
-            swapExactSyForPtStatic(
-                market,
-                SY.previewDeposit(baseToken, amountBaseToken),
-                approxParams
-            );
-    }
-
-    function swapExactPtForBaseTokenStatic(
-        address market,
-        uint256 exactPtIn,
-        address baseToken
-    )
-        external
-        returns (
-            uint256 netBaseTokenOut,
-            uint256 netSyFee,
-            uint256 priceImpact
-        )
-    {
-        uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact) = swapExactPtForSyStatic(market, exactPtIn);
-
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-        netBaseTokenOut = SY.previewRedeem(baseToken, netSyOut);
-    }
-
     function swapSyForExactYtStatic(address market, uint256 exactYtOut)
         external
         returns (
@@ -477,49 +376,6 @@ library MarketMathStatic {
         priceImpact = calcPriceImpact(market, netYtIn.Int());
     }
 
-    function swapExactYtForBaseTokenStatic(
-        address market,
-        uint256 exactYtIn,
-        address baseToken
-    )
-        external
-        returns (
-            uint256 netBaseTokenOut,
-            uint256 netSyFee,
-            uint256 priceImpact
-        )
-    {
-        uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact) = swapExactYtForSyStatic(market, exactYtIn);
-
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-        netBaseTokenOut = SY.previewRedeem(baseToken, netSyOut);
-    }
-
-    /// @dev netYtOut is the parameter to approx
-    function swapExactBaseTokenForYtStatic(
-        address market,
-        address baseToken,
-        uint256 amountBaseToken,
-        ApproxParams memory approxParams
-    )
-        external
-        returns (
-            uint256 netYtOut,
-            uint256 netSyFee,
-            uint256 priceImpact
-        )
-    {
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-
-        return
-            swapExactSyForYtStatic(
-                market,
-                SY.previewDeposit(baseToken, amountBaseToken),
-                approxParams
-            );
-    }
-
     // totalPtToSwap is the param to approx
     function swapExactPtForYt(
         address market,