@pendle/core-v2 0.7.1-beta → 0.7.1-beta-2

package/contracts/interfaces/IPRouterStatic.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.15;
 
+import "./ISuperComposableYield.sol";
 import "../libraries/math/MarketMathCore.sol";
 
 interface IPRouterStatic {
@@ -9,6 +10,12 @@ interface IPRouterStatic {
         uint256 amount;
     }
 
+    struct AssetAmount {
+        ISuperComposableYield.AssetType assetType;
+        address assetAddress;
+        uint256 amount;
+    }
+
     struct RewardIndex {
         address rewardToken;
         uint256 index;
@@ -28,15 +35,64 @@ interface IPRouterStatic {
         uint256 lpBalance;
         TokenAmount ptBalance;
         TokenAmount scyBalance;
-        TokenAmount assetBalance;
+        AssetAmount assetBalance;
     }
 
+    // ============= SYSTEM INFO =============
+
+    function getPYInfo(address py)
+        external
+        returns (
+            uint256 exchangeRate,
+            uint256 totalSupply,
+            RewardIndex[] memory rewardIndexes
+        );
+
+    function getPendleTokenType(address token)
+        external
+        view
+        returns (
+            bool isPT,
+            bool isYT,
+            bool isMarket
+        );
+
+    function getMarketInfo(address market)
+        external
+        view
+        returns (
+            address pt,
+            address scy,
+            MarketState memory state,
+            int256 impliedYield
+        );
+
+    // ============= USER INFO =============
+
+    function getUserPYPositionsByPYs(address user, address[] calldata pys)
+        external
+        view
+        returns (UserPYInfo[] memory userPYPositions);
+
+    function getUserMarketPositions(address user, address[] calldata markets)
+        external
+        view
+        returns (UserMarketInfo[] memory userMarketPositions);
+
+    function getUserSCYInfo(address scy, address user)
+        external
+        view
+        returns (uint256 balance, TokenAmount[] memory rewards);
+
+    // ============= MARKET ACTIONS =============
+
     function addLiquidityStatic(
         address market,
         uint256 scyDesired,
         uint256 ptDesired
     )
         external
+        view
         returns (
             uint256 netLpOut,
             uint256 scyUsed,
@@ -50,70 +106,34 @@ interface IPRouterStatic {
 
     function swapPtForScyStatic(address market, uint256 exactPtIn)
         external
+        view
         returns (uint256 netScyOut, uint256 netScyFee);
 
     function swapScyForPtStatic(address market, uint256 exactPtOut)
         external
+        view
         returns (uint256 netScyIn, uint256 netScyFee);
 
-    function scyIndex(address market) external returns (SCYIndex index);
+    // ============= OTHER HELPERS =============
 
-    function getPtImpliedYield(address market) external view returns (int256);
+    function scyIndex(address market) external view returns (SCYIndex index);
 
-    function getPendleTokenType(address token)
-        external
-        view
-        returns (
-            bool isPT,
-            bool isYT,
-            bool isMarket
-        );
+    function getPY(address py) external view returns (address pt, address yt);
+
+    function getPtImpliedYield(address market) external view returns (int256);
 
     function getUserPYInfo(address py, address user)
         external
         view
         returns (UserPYInfo memory userPYInfo);
 
-    function getPYInfo(address py)
-        external
-        returns (
-            uint256 exchangeRate,
-            uint256 totalSupply,
-            RewardIndex[] memory rewardIndexes
-        );
-
-    function getPY(address py) external view returns (address yt, address pt);
-
-    function getMarketInfo(address market)
-        external
-        view
-        returns (
-            address pt,
-            address scy,
-            MarketState memory state,
-            int256 impliedYield,
-            uint256 exchangeRate
-        );
-
     function getUserMarketInfo(address market, address user)
         external
         view
         returns (UserMarketInfo memory userMarketInfo);
 
-    function getUserPYPositionsByPYs(address user, address[] calldata pys)
+    function hasPYPosition(UserPYInfo calldata userPYInfo)
         external
-        view
-        returns (UserPYInfo[] memory userPYPositions);
-
-    function getUserMarketPositions(address user, address[] calldata markets)
-        external
-        view
-        returns (UserMarketInfo[] memory userMarketPositions);
-
-    function hasPYPosition(UserPYInfo memory userPYInfo) external pure returns (bool hasPosition);
-
-    function getUserSCYInfo(address scy, address user)
-        external
-        view
-        returns (uint256 balance, TokenAmount[] memory rewards);
+        pure
+        returns (bool hasPosition);
 }

package/contracts/offchain-helpers/RouterStatic.sol

@@ -7,11 +7,12 @@ import "../interfaces/IPRouterStatic.sol";
 import "../interfaces/IPMarket.sol";
 import "../interfaces/IPYieldContractFactory.sol";
 import "../interfaces/IPMarketFactory.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
-contract RouterStatic is IPRouterStatic {
+contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, OwnableUpgradeable {
     using MarketMathCore for MarketState;
     using Math for uint256;
     using Math for int256;
@@ -20,17 +21,125 @@ contract RouterStatic is IPRouterStatic {
     IPYieldContractFactory public immutable yieldContractFactory;
     IPMarketFactory public immutable marketFactory;
 
-    constructor(IPYieldContractFactory _yieldContractFactory, IPMarketFactory _marketFactory) {
+    constructor(IPYieldContractFactory _yieldContractFactory, IPMarketFactory _marketFactory)
+        initializer
+    {
         yieldContractFactory = _yieldContractFactory;
         marketFactory = _marketFactory;
     }
 
+    function initialize() external initializer {
+        __UUPSUpgradeable_init();
+        __Ownable_init();
+    }
+
+    // ============= SYSTEM INFO =============
+
+    function getPYInfo(address py)
+        external
+        returns (
+            uint256 exchangeRate,
+            uint256 totalSupply,
+            RewardIndex[] memory rewardIndexes
+        )
+    {
+        (address yt, ) = getPY(py);
+        IPYieldToken YT = IPYieldToken(yt);
+        exchangeRate = YT.scyIndexCurrent();
+        totalSupply = YT.totalSupply();
+        address[] memory rewardTokens = YT.getRewardTokens();
+        rewardIndexes = new RewardIndex[](rewardTokens.length);
+
+        uint256[] memory indexes = YT.rewardIndexesCurrent();
+        for (uint256 i = 0; i < rewardTokens.length; ++i) {
+            address rewardToken = rewardTokens[i];
+            rewardIndexes[i].rewardToken = rewardToken;
+            rewardIndexes[i].index = indexes[i];
+        }
+    }
+
+    function getPendleTokenType(address token)
+        external
+        view
+        returns (
+            bool isPT,
+            bool isYT,
+            bool isMarket
+        )
+    {
+        if (yieldContractFactory.isPT(token)) isPT = true;
+        else if (yieldContractFactory.isYT(token)) isYT = true;
+        else if (marketFactory.isValidMarket(token)) isMarket = true;
+    }
+
+    function getMarketInfo(address market)
+        external
+        view
+        returns (
+            address pt,
+            address scy,
+            MarketState memory state,
+            int256 impliedYield
+        )
+    {
+        IPMarket _market = IPMarket(market);
+        (ISuperComposableYield SCY, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
+
+        pt = address(PT);
+        scy = address(SCY);
+        state = _market.readState(true);
+        impliedYield = getPtImpliedYield(market);
+    }
+
+    // ============= USER INFO =============
+
+    function getUserPYPositionsByPYs(address user, address[] calldata pys)
+        external
+        view
+        returns (UserPYInfo[] memory userPYPositions)
+    {
+        userPYPositions = new UserPYInfo[](pys.length);
+        for (uint256 i = 0; i < pys.length; ++i) {
+            userPYPositions[i] = getUserPYInfo(pys[i], user);
+        }
+    }
+
+    function getUserMarketPositions(address user, address[] calldata markets)
+        external
+        view
+        returns (UserMarketInfo[] memory userMarketPositions)
+    {
+        userMarketPositions = new UserMarketInfo[](markets.length);
+        for (uint256 i = 0; i < markets.length; ++i) {
+            userMarketPositions[i] = getUserMarketInfo(markets[i], user);
+        }
+    }
+
+    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).userReward(rewardToken, user);
+        }
+    }
+
+    // ============= MARKET ACTIONS =============
+
     function addLiquidityStatic(
         address market,
         uint256 scyDesired,
         uint256 ptDesired
     )
         external
+        view
         returns (
             uint256 netLpOut,
             uint256 scyUsed,
@@ -57,6 +166,7 @@ contract RouterStatic is IPRouterStatic {
 
     function swapPtForScyStatic(address market, uint256 exactPtIn)
         external
+        view
         returns (uint256 netScyOut, uint256 netScyFee)
     {
         MarketState memory state = IPMarket(market).readState(false);
@@ -69,6 +179,7 @@ contract RouterStatic is IPRouterStatic {
 
     function swapScyForPtStatic(address market, uint256 exactPtOut)
         external
+        view
         returns (uint256 netScyIn, uint256 netScyFee)
     {
         MarketState memory state = IPMarket(market).readState(false);
@@ -79,12 +190,24 @@ contract RouterStatic is IPRouterStatic {
         );
     }
 
+    // ============= OTHER HELPERS =============
+
     function scyIndex(address market) public view returns (SCYIndex index) {
         (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
 
         return SCYIndexLib.newIndex(SCY);
     }
 
+    function getPY(address py) public view returns (address pt, address yt) {
+        if (yieldContractFactory.isYT(py)) {
+            pt = IPYieldToken(py).PT();
+            yt = py;
+        } else {
+            pt = py;
+            yt = IPPrincipalToken(py).YT();
+        }
+    }
+
     function getPtImpliedYield(address market) public view returns (int256) {
         MarketState memory state = IPMarket(market).readState(false);
 
@@ -92,20 +215,6 @@ contract RouterStatic is IPRouterStatic {
         return lnImpliedRate.exp();
     }
 
-    function getPendleTokenType(address token)
-        external
-        view
-        returns (
-            bool isPT,
-            bool isYT,
-            bool isMarket
-        )
-    {
-        if (yieldContractFactory.isPT(token)) isPT = true;
-        else if (yieldContractFactory.isYT(token)) isYT = true;
-        else if (marketFactory.isValidMarket(token)) isMarket = true;
-    }
-
     function getUserPYInfo(address py, address user)
         public
         view
@@ -135,119 +244,39 @@ contract RouterStatic is IPRouterStatic {
         }
     }
 
-    function getPYInfo(address py)
-        external
-        returns (
-            uint256 exchangeRate,
-            uint256 totalSupply,
-            RewardIndex[] memory rewardIndexes
-        )
-    {
-        (address yt, ) = getPY(py);
-        IPYieldToken YT = IPYieldToken(yt);
-        exchangeRate = YT.scyIndexCurrent();
-        totalSupply = YT.totalSupply();
-        address[] memory rewardTokens = YT.getRewardTokens();
-        rewardIndexes = new RewardIndex[](rewardTokens.length);
-
-        uint256[] memory indexes = YT.rewardIndexesCurrent();
-        for (uint256 i = 0; i < rewardTokens.length; ++i) {
-            address rewardToken = rewardTokens[i];
-            rewardIndexes[i].rewardToken = rewardToken;
-            rewardIndexes[i].index = indexes[i];
-        }
-    }
-
-    function getPY(address py) public view returns (address pt, address yt) {
-        if (yieldContractFactory.isYT(py)) {
-            yt = py;
-            pt = IPYieldToken(py).PT();
-        } else {
-            yt = IPPrincipalToken(py).YT();
-            pt = py;
-        }
-    }
-
-    function getMarketInfo(address market)
-        external
-        view
-        returns (
-            address pt,
-            address scy,
-            MarketState memory state,
-            int256 impliedYield,
-            uint256 exchangeRate
-        )
-    {
-        IPMarket _market = IPMarket(market);
-        (ISuperComposableYield SCY, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
-
-        pt = address(PT);
-        scy = address(SCY);
-        state = _market.readState(true);
-        impliedYield = getPtImpliedYield(market);
-        exchangeRate = 0; // TODO: get the actual exchange rate
-    }
-
     function getUserMarketInfo(address market, address user)
         public
         view
         returns (UserMarketInfo memory userMarketInfo)
     {
         IPMarket _market = IPMarket(market);
-        userMarketInfo.market = market;
-        userMarketInfo.lpBalance = _market.balanceOf(user);
-        // TODO: Is there a way to convert LP to PT and SCY?
-        (ISuperComposableYield SCY, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
+        uint256 userLp = _market.balanceOf(user);
 
-        userMarketInfo.ptBalance = TokenAmount(address(PT), 0);
-        userMarketInfo.scyBalance = TokenAmount(address(SCY), 0);
-        // TODO: Get this from SCY once it is in the interface
-        userMarketInfo.assetBalance = TokenAmount(address(0), 0);
-    }
+        userMarketInfo.market = market;
+        userMarketInfo.lpBalance = userLp;
 
-    function getUserPYPositionsByPYs(address user, address[] calldata pys)
-        external
-        view
-        returns (UserPYInfo[] memory userPYPositions)
-    {
-        userPYPositions = new UserPYInfo[](pys.length);
-        for (uint256 i = 0; i < pys.length; ++i) {
-            userPYPositions[i] = getUserPYInfo(pys[i], user);
-        }
-    }
+        MarketState memory state = _market.readState(true);
+        uint256 totalLp = uint256(state.totalLp);
+        uint256 userPt = (userLp * uint256(state.totalPt)) / totalLp;
+        uint256 userScy = (userLp * uint256(state.totalScy)) / totalLp;
 
-    function getUserMarketPositions(address user, address[] calldata markets)
-        external
-        view
-        returns (UserMarketInfo[] memory userMarketPositions)
-    {
-        userMarketPositions = new UserMarketInfo[](markets.length);
-        for (uint256 i = 0; i < markets.length; ++i) {
-            userMarketPositions[i] = getUserMarketInfo(markets[i], user);
-        }
+        (ISuperComposableYield SCY, IPPrincipalToken PT, ) = _market.readTokens();
+        userMarketInfo.ptBalance = TokenAmount(address(PT), userPt);
+        userMarketInfo.scyBalance = TokenAmount(address(SCY), userScy);
+        (userMarketInfo.assetBalance.assetType, userMarketInfo.assetBalance.assetAddress, ) = SCY
+            .assetInfo();
+        userMarketInfo.assetBalance.amount = (userScy * SCY.exchangeRate()) / Math.ONE;
     }
 
-    function hasPYPosition(UserPYInfo memory userPYInfo) public pure returns (bool hasPosition) {
+    function hasPYPosition(UserPYInfo calldata userPYInfo) public pure returns (bool hasPosition) {
         hasPosition = (userPYInfo.ytBalance > 0 ||
             userPYInfo.ptBalance > 0 ||
             userPYInfo.unclaimedInterest.amount > 0 ||
             userPYInfo.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).userReward(rewardToken, user);
-        }
-    }
+    // ============= UPGRADES =============
+
+    // solhint-disable-next-line no-empty-blocks
+    function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
 }

package/deployments/43113-core.json

@@ -7,6 +7,8 @@
     "PENDLE": "0xd6403Ff542290C38EE4fCFf48552FA85fbe8539B",
     "yieldContractFactory": "0x0EA46a4C257071352b57E9F6d054fC137F6E14b9",
     "marketFactory": "0x9e7be80205815111617B9578157e130ECd9757e4",
+    "router": "0xb359F0A97Ca269Ae5574dc75be48b0e81eFD1dA2",
+    "routerStatic": "0x860D23ADA1652CEEE1e3c77210CCE068bB4BD4e1",
     "startTime": 1656547200,
     "vePendle": "0x5CA98fBE317f0165499E886286A2737FE5A913E7",
     "votingController": "0xcb0d3d9147845C7F2B77DCFBE4dB8114d928DC93",

package/deployments/80001-core.json

@@ -7,6 +7,8 @@
     "PENDLE": "0x53F435CEC95c597d905f0903a13F4dAbEA8491dB",
     "yieldContractFactory": "0x4e5De6339FC7Ef63c176f9A7e7a8B2aC21744B8D",
     "marketFactory": "0xCAd502Bb55d1A3F79952F969BFF3f011CF30a94a",
+    "router": "0xA972fB7828f0bff8a22f7f8C63b17cfB971BFC0a",
+    "routerStatic": "0x9a8Ff151BDA518ece44Cb1125F368F4C893D63b7",
     "startTime": 1656547200,
     "vePendle": "0x69A23F16974024A1b6A5362ac2A11BFeEEFd5827",
     "gaugeController": "0x847da006F940833bB44709CBa241c99e3c531F38"

package/package.json

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