@gearbox-protocol/periphery-v3 1.0.7 → 1.0.9

package/contracts/data/DataCompressor_2_1.sol

@@ -26,15 +26,14 @@ import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.
 import {IAddressProvider} from "@gearbox-protocol/core-v2/contracts/interfaces/IAddressProvider.sol";
 import {IDataCompressorV2_10} from "../interfaces/IDataCompressorV2_10.sol";
 
-import {CreditAccountData, CreditManagerData, PoolData, TokenBalance, ContractAdapter} from "./Types.sol";
+import {
+    COUNT, QUERY, CreditAccountData, CreditManagerData, PoolData, TokenBalance, ContractAdapter
+} from "./Types.sol";
 
 // EXCEPTIONS
 import {ZeroAddressException} from "@gearbox-protocol/core-v2/contracts/interfaces/IErrors.sol";
 import {LinearInterestModelHelper} from "./LinearInterestModelHelper.sol";
 
-uint256 constant COUNT = 0;
-uint256 constant QUERY = 1;
-
 /// @title Data compressor 2.1.
 /// @notice Collects data from various contracts for use in the dApp
 /// Do not use for data from data compressor for state-changing functions
@@ -46,33 +45,27 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait, Li
 
     /// @dev Returns CreditAccountData for all opened accounts for particular borrower
     /// @param borrower Borrower address
-    function getCreditAccountList(address borrower) external view returns (CreditAccountData[] memory result) {
+    function getCreditAccountsByBorrower(address borrower) external view returns (CreditAccountData[] memory result) {
         // Counts how many opened accounts a borrower has
-        uint256 count;
-        uint256 creditManagersLength = IContractsRegister(contractsRegister).getCreditManagersCount();
+        address[] memory cms = _listCreditManagersV2();
+        uint256 creditManagersLength = cms.length;
+
+        uint256 index;
         unchecked {
-            for (uint256 i = 0; i < creditManagersLength; ++i) {
-                address creditManager = IContractsRegister(contractsRegister).creditManagers(i);
-                if (hasOpenedCreditAccount(creditManager, borrower)) {
-                    ++count;
+            for (uint256 op = COUNT; op <= QUERY; ++op) {
+                if (op == QUERY && index == 0) {
+                    break;
+                } else {
+                    result = new CreditAccountData[](index);
+                    index = 0;
                 }
-            }
-        }
-
-        result = new CreditAccountData[](count);
-
-        // Get data & fill the array
-        count = 0;
-        for (uint256 i = 0; i < creditManagersLength;) {
-            address creditManager = IContractsRegister(contractsRegister).creditManagers(i);
-            unchecked {
-                if (hasOpenedCreditAccount(creditManager, borrower)) {
-                    result[count] = getCreditAccountData(creditManager, borrower);
-
-                    count++;
+                for (uint256 i = 0; i < creditManagersLength; ++i) {
+                    address creditManager = cms[i];
+                    if (hasOpenedCreditAccount(creditManager, borrower)) {
+                        if (op == QUERY) result[index] = getCreditAccountData(creditManager, borrower);
+                        ++index;
+                    }
                 }
-
-                ++i;
             }
         }
     }
@@ -153,12 +146,12 @@ contract DataCompressorV2_10 is IDataCompressorV2_10, ContractsRegisterTrait, Li
     /// @dev Returns CreditManagerData for all Credit Managers
     function getCreditManagersV2List() external view returns (CreditManagerData[] memory result) {
         address[] memory cms = _listCreditManagersV2();
-        uint256 creditManagersCount = cms.length;
+        uint256 creditManagersLength = cms.length;
 
-        result = new CreditManagerData[](creditManagersCount);
+        result = new CreditManagerData[](creditManagersLength);
 
         unchecked {
-            for (uint256 i = 0; i < creditManagersCount; ++i) {
+            for (uint256 i = 0; i < creditManagersLength; ++i) {
                 result[i] = getCreditManagerData(cms[i]);
             }
         }

package/contracts/data/DataCompressor_3_0.sol

@@ -40,6 +40,8 @@ import {AddressProvider} from "@gearbox-protocol/core-v2/contracts/core/AddressP
 import {IDataCompressorV3_00, PriceOnDemand} from "../interfaces/IDataCompressorV3_00.sol";
 
 import {
+    COUNT,
+    QUERY,
     CreditAccountData,
     CreditManagerData,
     PoolData,
@@ -56,9 +58,6 @@ import {
 import "@gearbox-protocol/core-v3/contracts/interfaces/IExceptions.sol";
 import {LinearInterestModelHelper} from "./LinearInterestModelHelper.sol";
 
-uint256 constant COUNT = 0;
-uint256 constant QUERY = 1;
-
 /// @title Data compressor 3.0.
 /// @notice Collects data from various contracts for use in the dApp
 /// Do not use for data from data compressor for state-changing functions
@@ -541,8 +540,14 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         unchecked {
             for (uint256 i; i < len; ++i) {
                 quotas[i].token = quotaTokens[i];
-                (quotas[i].rate,, quotas[i].quotaIncreaseFee, quotas[i].totalQuoted, quotas[i].limit) =
-                    pqk.getTokenQuotaParams(quotaTokens[i]);
+                (
+                    quotas[i].rate,
+                    ,
+                    quotas[i].quotaIncreaseFee,
+                    quotas[i].totalQuoted,
+                    quotas[i].limit,
+                    quotas[i].isActive
+                ) = pqk.getTokenQuotaParams(quotaTokens[i]);
             }
         }
     }
@@ -568,8 +573,14 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
                     address token = quotaTokens[j];
                     quotaParams.token = token;
 
-                    (quotaParams.rate,, quotaParams.quotaIncreaseFee, quotaParams.totalQuoted, quotaParams.limit) =
-                        pqk.getTokenQuotaParams(token);
+                    (
+                        quotaParams.rate,
+                        ,
+                        quotaParams.quotaIncreaseFee,
+                        quotaParams.totalQuoted,
+                        quotaParams.limit,
+                        quotaParams.isActive
+                    ) = pqk.getTokenQuotaParams(token);
 
                     (
                         quotaParams.minRate,

package/contracts/data/Types.sol

@@ -5,6 +5,9 @@ pragma solidity ^0.8.17;
 
 import {ScheduledWithdrawal} from "@gearbox-protocol/core-v3/contracts/interfaces/IWithdrawalManagerV3.sol";
 
+uint256 constant COUNT = 0;
+uint256 constant QUERY = 1;
+
 struct TokenBalance {
     address token;
     uint256 balance;
@@ -21,6 +24,7 @@ struct QuotaInfo {
     uint16 quotaIncreaseFee;
     uint96 totalQuoted;
     uint96 limit;
+    bool isActive;
 }
 
 struct ContractAdapter {
@@ -148,6 +152,7 @@ struct GaugeQuotaParams {
     uint16 quotaIncreaseFee;
     uint96 totalQuoted;
     uint96 limit;
+    bool isActive;
 }
 
 struct GaugeInfo {

package/contracts/interfaces/IDataCompressorV2_10.sol

@@ -9,7 +9,7 @@ import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.
 interface IDataCompressorV2_10 is IVersion {
     /// @dev Returns CreditAccountData for all opened accounts for particular borrower
     /// @param borrower Borrower address
-    function getCreditAccountList(address borrower) external view returns (CreditAccountData[] memory);
+    function getCreditAccountsByBorrower(address borrower) external view returns (CreditAccountData[] memory);
 
     /// @dev Returns whether the borrower has an open credit account with the credit manager
     /// @param creditManager Credit manager to check

package/contracts/test/DC_Printer.sol

@@ -94,7 +94,7 @@ contract DCTest {
         }
     }
 
-    function test_dc_pools() public view {
+    function test_dc_01_pools() public view {
         PoolData[] memory pools = dc2.getPoolsV1List();
         console.log("V1 pools");
         _printPools(pools);
@@ -104,7 +104,7 @@ contract DCTest {
         _printPools(pools);
     }
 
-    function test_dc_credit_managers() public view {
+    function test_dc_02_credit_managers() public view {
         CreditManagerData[] memory cms = dc2.getCreditManagersV2List();
         console.log("V2 credit managers");
         _printCreditManagers(cms);
@@ -113,4 +113,9 @@ contract DCTest {
         console.log("\n\nV3 credit managers");
         _printCreditManagers(cms);
     }
+
+    function test_dc_03_credit_accounts() public view {
+        CreditAccountData[] memory cas = dc2.getCreditAccountsByBorrower(address(this));
+        console.log("V2 credit accounts", cas.length);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/periphery-v3",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "index.js",
   "repository": "git@github.com:Gearbox-protocol/periphery-v3.git",
   "author": "Mikael <26343374+0xmikko@users.noreply.github.com>",
@@ -18,7 +18,7 @@
     "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "17.6.0",
     "@gearbox-protocol/core-v2": "1.19.0-base.14",
-    "@gearbox-protocol/core-v3": "^1.36.5",
+    "@gearbox-protocol/core-v3": "^1.39.0",
     "@gearbox-protocol/oracles-v3": "^1.7.2",
     "@gearbox-protocol/sdk-gov": "^1.5.10",
     "@openzeppelin/contracts": "4.8.3",