Merge pull request #14 from Gearbox-protocol/fix--update-zappiers

Fix  update zappiers

Author: 0xmikko

contracts/data/DataCompressor_2_1.sol

@@ -31,7 +31,14 @@ import {IAddressProvider} from "@gearbox-protocol/core-v2/contracts/interfaces/I
 import {IDataCompressorV2_10} from "../interfaces/IDataCompressorV2_10.sol";
 
 import {
-    COUNT, QUERY, CreditAccountData, CreditManagerData, PoolData, TokenBalance, ContractAdapter
+    COUNT,
+    QUERY,
+    CreditAccountData,
+    CreditManagerData,
+    PoolData,
+    TokenBalance,
+    ContractAdapter,
+    CreditManagerDebtParams
 } from "./Types.sol";
 
 // EXCEPTIONS
@@ -113,6 +120,7 @@ contract DataCompressorV2_10 is
 
         result.borrower = borrower;
         result.creditManager = _creditManager;
+        result.cmName = cmDescriptions[_creditManager];
         result.creditFacade = address(creditFacade);
         result.addr = creditAccount;
 
@@ -157,6 +165,8 @@ contract DataCompressorV2_10 is
         result.cumulativeIndexLastUpdate = ICreditAccount(creditAccount).cumulativeIndexAtOpen();
 
         result.since = uint64(ICreditAccount(creditAccount).since());
+        (,, uint40 ed,) = creditFacade.params();
+        result.expirationDate = ed;
     }
 
     /// @dev Returns CreditManagerData for all Credit Managers
@@ -186,6 +196,8 @@ contract DataCompressorV2_10 is
         result.addr = _creditManager;
         result.cfVersion = ver;
         result.name = cmDescriptions[_creditManager];
+        result.creditFacade = address(creditFacade);
+        result.creditConfigurator = creditManagerV2.creditConfigurator();
 
         result.underlying = creditManagerV2.underlying();
 
@@ -195,6 +207,9 @@ contract DataCompressorV2_10 is
             result.baseBorrowRate = pool.borrowAPY_RAY();
 
             (uint128 currentTotalDebt, uint128 totalDebtLimit) = creditFacade.totalDebt();
+
+            result.totalDebt = currentTotalDebt;
+            result.totalDebtLimit = totalDebtLimit;
             result.availableToBorrow = pool.creditManagersCanBorrow(_creditManager)
                 ? Math.min(pool.availableLiquidity(), totalDebtLimit - currentTotalDebt)
                 : 0;
@@ -231,9 +246,8 @@ contract DataCompressorV2_10 is
             }
         }
 
-        result.creditFacade = address(creditFacade);
-        result.creditConfigurator = creditManagerV2.creditConfigurator();
         result.degenNFT = creditFacade.degenNFT();
+        result.isDegenMode = result.degenNFT != address(0);
         {
             bool isIncreaseDebtForbidden;
             (, isIncreaseDebtForbidden,,) = creditFacade.params(); // V2 only: true if increasing debt is forbidden
@@ -265,29 +279,58 @@ contract DataCompressorV2_10 is
         PoolService pool = PoolService(_pool);
 
         result.addr = _pool;
-        result.expectedLiquidity = pool.expectedLiquidity();
-        result.availableLiquidity = pool.availableLiquidity();
-        result.totalBorrowed = pool.totalBorrowed();
-        result.dieselRate_RAY = pool.getDieselRate_RAY();
-        result.baseInterestIndex = pool.calcLinearCumulative_RAY();
-        result.baseInterestRate = pool.borrowAPY_RAY();
         result.underlying = pool.underlyingToken();
         result.dieselToken = pool.dieselToken();
 
         result.symbol = IERC20Metadata(result.dieselToken).symbol();
         result.name = IERC20Metadata(result.dieselToken).name();
 
+        result.baseInterestIndex = pool.calcLinearCumulative_RAY();
+        result.availableLiquidity = pool.availableLiquidity();
+        result.expectedLiquidity = pool.expectedLiquidity();
+
+        result.totalBorrowed = pool.totalBorrowed();
+
+        result.totalSupply = IERC20(result.dieselToken).totalSupply();
+        result.totalAssets = pool.fromDiesel(result.totalSupply);
+
+        result.dieselRate_RAY = pool.getDieselRate_RAY();
+
+        result.baseInterestRate = pool.borrowAPY_RAY();
+
         result.dieselRate_RAY = pool.getDieselRate_RAY();
+
         result.withdrawFee = pool.withdrawFee();
         result.lastBaseInterestUpdate = pool._timestampLU();
         result.baseInterestIndexLU = pool._cumulativeIndex_RAY();
 
-        uint256 dieselSupply = IERC20(result.dieselToken).totalSupply();
-        uint256 totalLP = pool.fromDiesel(dieselSupply);
-        result.supplyRate = totalLP == 0
+        result.supplyRate = result.totalAssets == 0
             ? result.baseInterestRate
-            : (result.baseInterestRate * result.totalBorrowed) * (PERCENTAGE_FACTOR - result.withdrawFee) / totalLP
-                / PERCENTAGE_FACTOR;
+            : (result.baseInterestRate * result.totalBorrowed) * (PERCENTAGE_FACTOR - result.withdrawFee)
+                / result.totalAssets / PERCENTAGE_FACTOR;
+
+        uint256 len = pool.creditManagersCount();
+        result.creditManagerDebtParams = new CreditManagerDebtParams[](len);
+
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                address creditManager = pool.creditManagers(i);
+
+                uint128 currentTotalDebt;
+                uint128 totalDebtLimit;
+                if (_isContractV2(creditManager)) {
+                    (,, ICreditFacadeV2 creditFacade,) = getCreditContracts(creditManager);
+                    (currentTotalDebt, totalDebtLimit) = creditFacade.totalDebt();
+                }
+
+                result.creditManagerDebtParams[i] = CreditManagerDebtParams({
+                    creditManager: creditManager,
+                    borrowed: currentTotalDebt,
+                    limit: pool.creditManagersCanBorrow(creditManager) ? totalDebtLimit : 0,
+                    availableToBorrow: pool.creditManagersCanBorrow(creditManager) ? result.availableLiquidity : 0
+                });
+            }
+        }
 
         result.version = uint8(pool.version());
         result.lirm = getLIRMData(address(pool.interestRateModel()));

contracts/data/DataCompressor_3_0.sol

@@ -187,7 +187,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         ICreditManagerV3 creditManager = ICreditManagerV3(_cm);
         ICreditFacadeV3 creditFacade = _getCreditFacade(address(creditManager));
         // ICreditConfiguratorV3 creditConfigurator = ICreditConfiguratorV3(creditManager.creditConfigurator());
-
+        result.creditFacade = address(creditFacade);
         result.cfVersion = _getVersion(address(creditFacade));
 
         address borrower = _getBorrowerOrRevert(address(creditManager), _creditAccount);
@@ -197,6 +197,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         result.addr = _creditAccount;
 
         result.underlying = _getUnderlying(creditManager);
+        result.cmName = _getName(_cm);
 
         address pool = _getPool(_cm);
         result.baseBorrowRate = _getBaseInterestRate(pool);
@@ -259,6 +260,9 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         returns (CollateralDebtData memory collateralDebtData) {
             result.accruedInterest = collateralDebtData.accruedInterest;
             result.accruedFees = collateralDebtData.accruedFees;
+            result.totalDebtUSD = collateralDebtData.totalDebtUSD;
+            result.totalValueUSD = collateralDebtData.totalValueUSD;
+            result.twvUSD = collateralDebtData.twvUSD;
             result.healthFactor = collateralDebtData.twvUSD * PERCENTAGE_FACTOR / collateralDebtData.totalDebtUSD;
             result.totalValue = collateralDebtData.totalValue;
             result.isSuccessful = true;
@@ -348,6 +352,9 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         result.name = _getName(_cm);
         result.cfVersion = _getVersion(address(creditFacade));
 
+        result.creditFacade = address(creditFacade);
+        result.creditConfigurator = address(creditConfigurator);
+
         result.underlying = _getUnderlying(creditManager);
 
         {
@@ -392,9 +399,8 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
             }
         }
 
-        result.creditFacade = address(creditFacade);
-        result.creditConfigurator = address(creditConfigurator);
         result.degenNFT = creditFacade.degenNFT();
+        result.isDegenMode = result.degenNFT != address(0);
         // (, result.isIncreaseDebtForbidden,,) = creditFacade.params(); // V2 only: true if increasing debt is forbidden
         result.forbiddenTokenMask = creditFacade.forbiddenTokenMask(); // V2 only: mask which forbids some particular tokens
         result.maxEnabledTokensLength = creditManager.maxEnabledTokens(); // V2 only: a limit on enabled tokens imposed for security
@@ -665,6 +671,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
                 gaugeInfo.addr = gauge;
                 gaugeInfo.pool = _getPool(gauge);
                 (gaugeInfo.symbol, gaugeInfo.name) = _getSymbolAndName(gaugeInfo.pool);
+                gaugeInfo.underlying = IPoolV3(gaugeInfo.pool).asset();
 
                 address[] memory quotaTokens = _getQuotedTokens(pqk);
                 uint256 quotaTokensLen = quotaTokens.length;

contracts/data/LinearInterestModelHelper.sol

@@ -6,24 +6,18 @@ pragma solidity ^0.8.17;
 import {LinearInterestRateModelV3} from "@gearbox-protocol/core-v3/contracts/pool/LinearInterestRateModelV3.sol";
 import {LinearInterestRateModel} from "@gearbox-protocol/core-v2/contracts/pool/LinearInterestRateModel.sol";
 import {LinearModel} from "./Types.sol";
+import "forge-std/console.sol";
 
 contract LinearInterestModelHelper {
     function getLIRMData(address _model) internal view returns (LinearModel memory irm) {
         irm.interestModel = _model;
         irm.version = LinearInterestRateModel(_model).version();
 
-        if (irm.version == 1) {
-            (uint256 U_1, uint256 R_base, uint256 R_slope1, uint256 R_slope2) =
-                LinearInterestRateModel(_model).getModelParameters();
-            irm.U_1 = uint16(U_1);
-            irm.R_base = uint16(R_base);
-            irm.R_slope1 = uint16(R_slope1);
-            irm.R_slope2 = uint16(R_slope2);
-        } else {
-            (irm.U_1, irm.U_2, irm.R_base, irm.R_slope1, irm.R_slope2, irm.R_slope3) =
-                LinearInterestRateModelV3(_model).getModelParameters();
+        console.log(irm.version);
 
-            irm.isBorrowingMoreU2Forbidden = LinearInterestRateModelV3(_model).isBorrowingMoreU2Forbidden();
-        }
+        (irm.U_1, irm.U_2, irm.R_base, irm.R_slope1, irm.R_slope2, irm.R_slope3) =
+            LinearInterestRateModelV3(_model).getModelParameters();
+
+        irm.isBorrowingMoreU2Forbidden = LinearInterestRateModelV3(_model).isBorrowingMoreU2Forbidden();
     }
 }

contracts/data/Types.sol

@@ -46,11 +46,10 @@ struct CreditAccountData {
     address addr;
     address borrower;
     address creditManager;
-    string cmDescription;
+    string cmName;
     address creditFacade;
     address underlying;
     uint256 debt;
-    uint256 cumulativeIndexNow;
     uint256 cumulativeIndexLastUpdate;
     uint128 cumulativeQuotaInterest;
     uint256 accruedInterest;
@@ -177,6 +176,7 @@ struct GaugeInfo {
     address pool;
     string symbol;
     string name;
+    address underlying;
     uint16 currentEpoch;
     bool epochFrozen;
     GaugeQuotaParams[] quotaParams;

contracts/test/DC_Printer.sol

@@ -14,7 +14,7 @@ import {NetworkDetector} from "@gearbox-protocol/sdk-gov/contracts/NetworkDetect
 
 import "forge-std/console.sol";
 
-address constant ap = 0xfb78A83730aBd595A362645368D10fE5a20525a6;
+address constant ap = 0x9ea7b04Da02a5373317D745c1571c84aaD03321D;
 
 contract DCTest {
     DataCompressorV2_10 public dc2;