Merge pull request #1260 from morpho-dao/fix/lens-interface-3

Fix rates lens interface once and for all

Author: Rubilmax

contracts/aave-v2/interfaces/ILens.sol

@@ -182,29 +182,23 @@ interface ILens {
 
     /// RATES ///
 
-    function getAverageSupplyRatePerYear(address _poolToken) external view returns (uint256);
-
-    function getAverageBorrowRatePerYear(address _poolToken) external view returns (uint256);
-
-    function getRatesPerYear(address _poolToken)
+    function getAverageSupplyRatePerYear(address _poolToken)
         external
         view
         returns (
-            uint256 p2pSupplyRate,
-            uint256 p2pBorrowRate,
-            uint256 poolSupplyRate,
-            uint256 poolBorrowRate
+            uint256 avgSupplyRatePerYear,
+            uint256 p2pSupplyAmount,
+            uint256 poolSupplyAmount
         );
 
-    function getCurrentUserSupplyRatePerYear(address _poolToken, address _user)
+    function getAverageBorrowRatePerYear(address _poolToken)
         external
         view
-        returns (uint256);
-
-    function getCurrentUserBorrowRatePerYear(address _poolToken, address _user)
-        external
-        view
-        returns (uint256);
+        returns (
+            uint256 avgBorrowRatePerYear,
+            uint256 p2pBorrowAmount,
+            uint256 poolBorrowAmount
+        );
 
     function getNextUserSupplyRatePerYear(
         address _poolToken,
@@ -233,4 +227,24 @@ interface ILens {
             uint256 balanceOnPool,
             uint256 totalBalance
         );
+
+    function getCurrentUserSupplyRatePerYear(address _poolToken, address _user)
+        external
+        view
+        returns (uint256);
+
+    function getCurrentUserBorrowRatePerYear(address _poolToken, address _user)
+        external
+        view
+        returns (uint256);
+
+    function getRatesPerYear(address _poolToken)
+        external
+        view
+        returns (
+            uint256 p2pSupplyRate,
+            uint256 p2pBorrowRate,
+            uint256 poolSupplyRate,
+            uint256 poolBorrowRate
+        );
 }

contracts/compound/interfaces/ILens.sol

@@ -193,29 +193,23 @@ interface ILens {
 
     /// RATES ///
 
-    function getAverageSupplyRatePerBlock(address _poolToken) external view returns (uint256);
-
-    function getAverageBorrowRatePerBlock(address _poolToken) external view returns (uint256);
-
-    function getRatesPerBlock(address _poolToken)
+    function getAverageSupplyRatePerBlock(address _poolToken)
         external
         view
         returns (
-            uint256 p2pSupplyRate,
-            uint256 p2pBorrowRate,
-            uint256 poolSupplyRate,
-            uint256 poolBorrowRate
+            uint256 avgSupplyRatePerBlock,
+            uint256 p2pSupplyAmount,
+            uint256 poolSupplyAmount
         );
 
-    function getCurrentUserSupplyRatePerBlock(address _poolToken, address _user)
+    function getAverageBorrowRatePerBlock(address _poolToken)
         external
         view
-        returns (uint256);
-
-    function getCurrentUserBorrowRatePerBlock(address _poolToken, address _user)
-        external
-        view
-        returns (uint256);
+        returns (
+            uint256 avgBorrowRatePerBlock,
+            uint256 p2pBorrowAmount,
+            uint256 poolBorrowAmount
+        );
 
     function getNextUserSupplyRatePerBlock(
         address _poolToken,
@@ -245,6 +239,26 @@ interface ILens {
             uint256 totalBalance
         );
 
+    function getCurrentUserSupplyRatePerBlock(address _poolToken, address _user)
+        external
+        view
+        returns (uint256);
+
+    function getCurrentUserBorrowRatePerBlock(address _poolToken, address _user)
+        external
+        view
+        returns (uint256);
+
+    function getRatesPerBlock(address _poolToken)
+        external
+        view
+        returns (
+            uint256 p2pSupplyRate,
+            uint256 p2pBorrowRate,
+            uint256 poolSupplyRate,
+            uint256 poolBorrowRate
+        );
+
     /// REWARDS ///
 
     function getUserUnclaimedRewards(address[] calldata _poolTokens, address _user)