@gearbox-protocol/periphery-v3 1.3.15 → 1.3.16

package/contracts/data/{DataCompressor_2_1.sol → DataCompressorV2_1.sol}

@@ -28,7 +28,7 @@ import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.
 import {ACLNonReentrantTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLNonReentrantTrait.sol";
 
 import {IAddressProvider} from "@gearbox-protocol/core-v2/contracts/interfaces/IAddressProvider.sol";
-import {IDataCompressorV2_10} from "../interfaces/IDataCompressorV2_10.sol";
+import {IDataCompressorV2_1} from "../interfaces/IDataCompressorV2_1.sol";
 
 import {
     COUNT,
@@ -48,8 +48,8 @@ import {LinearInterestModelHelper} from "./LinearInterestModelHelper.sol";
 /// @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
-contract DataCompressorV2_10 is
-    IDataCompressorV2_10,
+contract DataCompressorV2_1 is
+    IDataCompressorV2_1,
     ACLNonReentrantTrait,
     ContractsRegisterTrait,
     LinearInterestModelHelper

package/contracts/data/{DataCompressor_3_0.sol → DataCompressorV3.sol}

@@ -39,7 +39,7 @@ import {IUpdatablePriceFeed} from "@gearbox-protocol/core-v2/contracts/interface
 import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.sol";
 
 import {AddressProvider} from "@gearbox-protocol/core-v2/contracts/core/AddressProvider.sol";
-import {IDataCompressorV3_00, PriceOnDemand} from "../interfaces/IDataCompressorV3_00.sol";
+import {IDataCompressorV3, PriceOnDemand} from "../interfaces/IDataCompressorV3.sol";
 import {IZapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IZapper.sol";
 
 import {
@@ -68,9 +68,9 @@ import "forge-std/console.sol";
 /// @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
-contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, LinearInterestModelHelper {
+contract DataCompressorV3 is IDataCompressorV3, ContractsRegisterTrait, LinearInterestModelHelper {
     // Contract version
-    uint256 public constant version = 3_00;
+    uint256 public constant version = 3_01;
 
     IZapperRegister public zapperRegister;
 
@@ -269,22 +269,10 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
             result.totalValue = collateralDebtData.totalValue;
             result.isSuccessful = true;
         } catch {
-            result.priceFeedsNeeded = _getPriceFeedFailedList(pool, result.balances);
+            result.priceFeedsNeeded = _getPriceFeedFailedList(_cm, result.balances);
             result.isSuccessful = false;
         }
 
-        // (result.totalValue,) = creditFacade.calcTotalValue(creditAccount);
-        //  = ICreditAccountV3(creditAccount).cumulativeIndexAtOpen();
-
-        // uint256 debt;
-        // uint256 cumulativeIndexLastUpdate;
-        // uint128 cumulativeQuotaInterest;
-        // uint128 quotaFees;
-        // uint256 enabledTokensMask;
-        // uint16 flags;
-        // uint64 since;
-        // address borrower;
-
         (result.debt, result.cumulativeIndexLastUpdate, result.cumulativeQuotaInterest,,,, result.since,) =
             CreditManagerV3(_cm).creditAccountInfo(_creditAccount);
 

package/contracts/interfaces/{IDataCompressorV2_10.sol → IDataCompressorV2_1.sol}

@@ -6,7 +6,7 @@ pragma solidity ^0.8.10;
 import {CreditAccountData, CreditManagerData, PoolData} from "../data/Types.sol";
 import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.sol";
 
-interface IDataCompressorV2_10 is IVersion {
+interface IDataCompressorV2_1 is IVersion {
     /// @dev Returns CreditAccountData for all opened accounts for particular borrower
     /// @param borrower Borrower address
     function getCreditAccountsByBorrower(address borrower) external view returns (CreditAccountData[] memory);

package/contracts/interfaces/{IDataCompressorV3_00.sol → IDataCompressorV3.sol}

@@ -11,7 +11,7 @@ struct PriceOnDemand {
     bytes callData;
 }
 
-interface IDataCompressorV3_00 is IVersion {
+interface IDataCompressorV3 is IVersion {
     /// @dev Returns CreditAccountData for all opened accounts for particular borrower
     /// @param borrower Borrower address
     /// @param priceUpdates Price updates for price on demand oracles

package/contracts/test/DC_Test.sol

@@ -5,9 +5,9 @@ pragma solidity ^0.8.17;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {DataCompressorV2_10} from "../data/DataCompressor_2_1.sol";
-import {DataCompressorV3_00} from "../data/DataCompressor_3_0.sol";
-import {IDataCompressorV3_00, PriceOnDemand} from "../interfaces/IDataCompressorV3_00.sol";
+import {DataCompressorV2_1} from "../data/DataCompressorV2_1.sol";
+import {DataCompressorV3} from "../data/DataCompressorV3.sol";
+import {IDataCompressorV3, PriceOnDemand} from "../interfaces/IDataCompressorV3.sol";
 import {CreditAccountData, CreditManagerData, PoolData, TokenBalance, ContractAdapter} from "../data/Types.sol";
 
 import {NetworkDetector} from "@gearbox-protocol/sdk-gov/contracts/NetworkDetector.sol";
@@ -17,8 +17,8 @@ import "forge-std/console.sol";
 address constant ap = 0x9ea7b04Da02a5373317D745c1571c84aaD03321D;
 
 contract DCTest {
-    DataCompressorV2_10 public dc2;
-    DataCompressorV3_00 public dc3;
+    DataCompressorV2_1 public dc2;
+    DataCompressorV3 public dc3;
 
     uint256 chainId;
 
@@ -34,8 +34,8 @@ contract DCTest {
     }
 
     function setUp() public liveTestOnly {
-        dc2 = new DataCompressorV2_10(ap);
-        dc3 = new DataCompressorV3_00(ap);
+        dc2 = new DataCompressorV2_1(ap);
+        dc3 = new DataCompressorV3(ap);
     }
 
     function _printPools(PoolData[] memory pools) internal view {
@@ -139,6 +139,6 @@ contract DCTest {
     }
 
     // function test_dc_04_borrower() public liveTestOnly {
-    //     dc3.getCreditAccountsByBorrower(0xffDb339065c91c88e8a3cC6857359B6c2FB78cf5, new PriceOnDemand[](0));
+    //     dc3.getCreditAccountsByBorrower(0xf13df765f3047850Cede5aA9fDF20a12A75f7F70, new PriceOnDemand[](0));
     // }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/periphery-v3",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "main": "index.js",
   "repository": "git@github.com:Gearbox-protocol/periphery-v3.git",
   "author": "Mikael <26343374+0xmikko@users.noreply.github.com>",