@pendle/core-v2 0.5.1-beta → 0.5.1-beta-3

package/contracts/core/RouterStatic.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.9;
 
+import "../SuperComposableYield/ISuperComposableYield.sol";
+import "../SuperComposableYield/implementations/IRewardManager.sol";
 import "../interfaces/IPRouterStatic.sol";
 import "../interfaces/IPMarket.sol";
 import "../interfaces/IPYieldContractFactory.sol";
@@ -231,4 +233,20 @@ contract RouterStatic is IPRouterStatic {
             userYOInfo.unclaimedInterest.amount > 0 ||
             userYOInfo.unclaimedRewards.length > 0);
     }
+
+    function getUserSCYInfo(address scy, address user)
+        external
+        view
+        returns (uint256 balance, TokenAmount[] memory rewards)
+    {
+        ISuperComposableYield SCY = ISuperComposableYield(scy);
+        balance = SCY.balanceOf(scy);
+        address[] memory rewardTokens = SCY.getRewardTokens();
+        rewards = new TokenAmount[](rewardTokens.length);
+        for (uint256 i = 0; i < rewardTokens.length; ++i) {
+            address rewardToken = rewardTokens[i];
+            rewards[i].token = rewardToken;
+            (, rewards[i].amount) = IRewardManager(scy).getUserReward(user, rewardToken);
+        }
+    }
 }

package/contracts/interfaces/IPAllAction.sol

@@ -6,4 +6,4 @@ import "./IPActionCore.sol";
 import "./IPActionYT.sol";
 import "./IPRouterStatic.sol";
 
-interface IPAllAction is IPActionCore, IPActionYT, IPRouterStatic {}
+interface IPAllAction is IPActionCore, IPActionYT {}

package/contracts/interfaces/IPRouterStatic.sol

@@ -68,4 +68,52 @@ interface IPRouterStatic {
             bool isYT,
             bool isMarket
         );
+
+    function getUserYOInfo(address token, address user)
+        external
+        view
+        returns (UserYOInfo memory userYOInfo);
+
+    function getYOInfo(address token)
+        external
+        returns (
+            uint256 exchangeRate,
+            uint256 totalSupply,
+            RewardIndex[] memory rewardIndexes
+        );
+
+    function getYO(address token) external view returns (address yt, address ot);
+
+    function getMarketInfo(address market)
+        external
+        view
+        returns (
+            address ot,
+            address scy,
+            MarketState memory state,
+            int256 impliedYield,
+            uint256 exchangeRate
+        );
+
+    function getUserMarketInfo(address market, address user)
+        external
+        view
+        returns (UserMarketInfo memory userMarketInfo);
+
+    function getUserYOPositionsByTokens(address user, address[] calldata tokens)
+        external
+        view
+        returns (UserYOInfo[] memory userYOPositions);
+
+    function getUserMarketPositions(address user, address[] calldata markets)
+        external
+        view
+        returns (UserMarketInfo[] memory userMarketPositions);
+
+    function hasYOPosition(UserYOInfo memory userYOInfo) external pure returns (bool hasPosition);
+
+    function getUserSCYInfo(address scy, address user)
+        external
+        view
+        returns (uint256 balance, TokenAmount[] memory rewards);
 }

package/package.json

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

package/typechain-types/IPAllAction.ts

@@ -26,16 +26,11 @@ export interface IPAllActionInterface extends utils.Interface {
   contractName: "IPAllAction";
   functions: {
     "addLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "addLiquidityStatic(address,uint256,uint256)": FunctionFragment;
-    "getOtImpliedYield(address)": FunctionFragment;
-    "getPendleTokenType(address)": FunctionFragment;
     "mintScyFromRawToken(uint256,address,uint256,address,address[])": FunctionFragment;
     "mintYoFromRawToken(uint256,address,uint256,address,address[])": FunctionFragment;
     "redeemScyToRawToken(address,uint256,uint256,address,address[])": FunctionFragment;
     "redeemYoToRawToken(address,uint256,uint256,address,address[])": FunctionFragment;
     "removeLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "removeLiquidityStatic(address,uint256)": FunctionFragment;
-    "scyIndex(address)": FunctionFragment;
     "swapExactOtForRawToken(uint256,address,address[],address,uint256)": FunctionFragment;
     "swapExactOtForScy(address,address,uint256,uint256)": FunctionFragment;
     "swapExactRawTokenForOt(uint256,address,address[],address,uint256,uint256,uint256,uint256)": FunctionFragment;
@@ -45,10 +40,8 @@ export interface IPAllActionInterface extends utils.Interface {
     "swapExactYtForRawToken(uint256,address,address[],address,uint256)": FunctionFragment;
     "swapExactYtForScy(address,address,uint256,uint256)": FunctionFragment;
     "swapOtForExactScy(address,address,uint256,uint256,uint256,uint256,uint256)": FunctionFragment;
-    "swapOtForScyStatic(address,uint256)": FunctionFragment;
     "swapScyForExactOt(address,address,uint256,uint256)": FunctionFragment;
     "swapScyForExactYt(address,address,uint256,uint256)": FunctionFragment;
-    "swapScyForOtStatic(address,uint256)": FunctionFragment;
     "swapYtForExactScy(address,address,uint256,uint256,uint256,uint256,uint256)": FunctionFragment;
   };
 
@@ -56,18 +49,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "addLiquidity",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
-  encodeFunctionData(
-    functionFragment: "addLiquidityStatic",
-    values: [string, BigNumberish, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getOtImpliedYield",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getPendleTokenType",
-    values: [string]
-  ): string;
   encodeFunctionData(
     functionFragment: "mintScyFromRawToken",
     values: [BigNumberish, string, BigNumberish, string, string[]]
@@ -88,11 +69,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "removeLiquidity",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
-  encodeFunctionData(
-    functionFragment: "removeLiquidityStatic",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "scyIndex", values: [string]): string;
   encodeFunctionData(
     functionFragment: "swapExactOtForRawToken",
     values: [BigNumberish, string, string[], string, BigNumberish]
@@ -171,10 +147,6 @@ export interface IPAllActionInterface extends utils.Interface {
       BigNumberish
     ]
   ): string;
-  encodeFunctionData(
-    functionFragment: "swapOtForScyStatic",
-    values: [string, BigNumberish]
-  ): string;
   encodeFunctionData(
     functionFragment: "swapScyForExactOt",
     values: [string, string, BigNumberish, BigNumberish]
@@ -183,10 +155,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "swapScyForExactYt",
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
-  encodeFunctionData(
-    functionFragment: "swapScyForOtStatic",
-    values: [string, BigNumberish]
-  ): string;
   encodeFunctionData(
     functionFragment: "swapYtForExactScy",
     values: [
@@ -204,18 +172,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "addLiquidity",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "addLiquidityStatic",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getOtImpliedYield",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getPendleTokenType",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "mintScyFromRawToken",
     data: BytesLike
@@ -236,11 +192,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "removeLiquidity",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "removeLiquidityStatic",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "scyIndex", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "swapExactOtForRawToken",
     data: BytesLike
@@ -277,10 +228,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "swapOtForExactScy",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "swapOtForScyStatic",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "swapScyForExactOt",
     data: BytesLike
@@ -289,10 +236,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "swapScyForExactYt",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "swapScyForOtStatic",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "swapYtForExactScy",
     data: BytesLike
@@ -338,29 +281,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    addLiquidityStatic(
-      market: string,
-      scyDesired: BigNumberish,
-      otDesired: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    getOtImpliedYield(
-      market: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    getPendleTokenType(
-      token: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, boolean, boolean] & {
-        isOT: boolean;
-        isYT: boolean;
-        isMarket: boolean;
-      }
-    >;
-
     mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
       SCY: string,
@@ -406,19 +326,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquidityStatic(
-      market: string,
-      lpToRemove: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netScyOut: BigNumber; netOtOut: BigNumber }
-    >;
-
-    scyIndex(
-      market: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     swapExactOtForRawToken(
       exactOtIn: BigNumberish,
       receiver: string,
@@ -510,12 +417,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapOtForScyStatic(
-      market: string,
-      exactOtIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     swapScyForExactOt(
       receiver: string,
       market: string,
@@ -532,12 +433,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapScyForOtStatic(
-      market: string,
-      exactOtOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     swapYtForExactScy(
       receiver: string,
       market: string,
@@ -559,29 +454,6 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  addLiquidityStatic(
-    market: string,
-    scyDesired: BigNumberish,
-    otDesired: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  getOtImpliedYield(
-    market: string,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  getPendleTokenType(
-    token: string,
-    overrides?: CallOverrides
-  ): Promise<
-    [boolean, boolean, boolean] & {
-      isOT: boolean;
-      isYT: boolean;
-      isMarket: boolean;
-    }
-  >;
-
   mintScyFromRawToken(
     netRawTokenIn: BigNumberish,
     SCY: string,
@@ -627,19 +499,6 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquidityStatic(
-    market: string,
-    lpToRemove: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, BigNumber] & { netScyOut: BigNumber; netOtOut: BigNumber }
-  >;
-
-  scyIndex(
-    market: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   swapExactOtForRawToken(
     exactOtIn: BigNumberish,
     receiver: string,
@@ -731,12 +590,6 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapOtForScyStatic(
-    market: string,
-    exactOtIn: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   swapScyForExactOt(
     receiver: string,
     market: string,
@@ -753,12 +606,6 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapScyForOtStatic(
-    market: string,
-    exactOtOut: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   swapYtForExactScy(
     receiver: string,
     market: string,
@@ -780,35 +627,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[BigNumber, BigNumber, BigNumber]>;
 
-    addLiquidityStatic(
-      market: string,
-      scyDesired: BigNumberish,
-      otDesired: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
-        netLpOut: BigNumber;
-        scyUsed: BigNumber;
-        otUsed: BigNumber;
-      }
-    >;
-
-    getOtImpliedYield(
-      market: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getPendleTokenType(
-      token: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, boolean, boolean] & {
-        isOT: boolean;
-        isYT: boolean;
-        isMarket: boolean;
-      }
-    >;
-
     mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
       SCY: string,
@@ -854,16 +672,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[BigNumber, BigNumber]>;
 
-    removeLiquidityStatic(
-      market: string,
-      lpToRemove: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netScyOut: BigNumber; netOtOut: BigNumber }
-    >;
-
-    scyIndex(market: string, overrides?: CallOverrides): Promise<BigNumber>;
-
     swapExactOtForRawToken(
       exactOtIn: BigNumberish,
       receiver: string,
@@ -955,14 +763,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapOtForScyStatic(
-      market: string,
-      exactOtIn: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netScyOut: BigNumber; netScyFee: BigNumber }
-    >;
-
     swapScyForExactOt(
       receiver: string,
       market: string,
@@ -979,14 +779,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapScyForOtStatic(
-      market: string,
-      exactOtOut: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netScyIn: BigNumber; netScyFee: BigNumber }
-    >;
-
     swapYtForExactScy(
       receiver: string,
       market: string,
@@ -1011,23 +803,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    addLiquidityStatic(
-      market: string,
-      scyDesired: BigNumberish,
-      otDesired: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    getOtImpliedYield(
-      market: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getPendleTokenType(
-      token: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
       SCY: string,
@@ -1073,17 +848,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquidityStatic(
-      market: string,
-      lpToRemove: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    scyIndex(
-      market: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     swapExactOtForRawToken(
       exactOtIn: BigNumberish,
       receiver: string,
@@ -1175,12 +939,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapOtForScyStatic(
-      market: string,
-      exactOtIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     swapScyForExactOt(
       receiver: string,
       market: string,
@@ -1197,12 +955,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapScyForOtStatic(
-      market: string,
-      exactOtOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     swapYtForExactScy(
       receiver: string,
       market: string,
@@ -1225,23 +977,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    addLiquidityStatic(
-      market: string,
-      scyDesired: BigNumberish,
-      otDesired: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getOtImpliedYield(
-      market: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getPendleTokenType(
-      token: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
       SCY: string,
@@ -1287,17 +1022,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquidityStatic(
-      market: string,
-      lpToRemove: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    scyIndex(
-      market: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     swapExactOtForRawToken(
       exactOtIn: BigNumberish,
       receiver: string,
@@ -1389,12 +1113,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapOtForScyStatic(
-      market: string,
-      exactOtIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     swapScyForExactOt(
       receiver: string,
       market: string,
@@ -1411,12 +1129,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapScyForOtStatic(
-      market: string,
-      exactOtOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     swapYtForExactScy(
       receiver: string,
       market: string,