@gearbox-protocol/periphery-v3 1.7.0-next.40 → 1.7.0-next.42

package/contracts/compressors/CreditAccountCompressor.sol

@@ -19,7 +19,7 @@ import {PERCENTAGE_FACTOR} from "@gearbox-protocol/core-v3/contracts/libraries/C
 import {SanityCheckTrait} from "@gearbox-protocol/core-v3/contracts/traits/SanityCheckTrait.sol";
 import {ICreditAccountCompressor} from "../interfaces/ICreditAccountCompressor.sol";
 
-import {IContractsRegister} from "@gearbox-protocol/governance/contracts/interfaces/extensions/IContractsRegister.sol";
+import {IContractsRegister} from "@gearbox-protocol/governance/contracts/interfaces/IContractsRegister.sol";
 import {IAddressProvider} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProvider.sol";
 import {IMarketConfigurator} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfigurator.sol";
 import {IMarketConfiguratorFactory} from
@@ -33,17 +33,18 @@ import {CreditAccountData, TokenInfo} from "../types/CreditAccountState.sol";
 import {CreditAccountFilter, MarketFilter} from "../types/Filters.sol";
 
 import {Contains} from "../libraries/Contains.sol";
-
+import {AP_CREDIT_ACCOUNT_COMPRESSOR} from "../libraries/Literals.sol";
 /// @title  Credit account compressor
 /// @notice Allows to fetch data on all credit accounts matching certain criteria in an efficient manner
 /// @dev    The contract is not gas optimized and is thus not recommended for on-chain use
 /// @dev    Querying functions try to process as many accounts as possible and stop when they get close to gas limit
+
 contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
     using Contains for address[];
 
     /// @notice Contract version
     uint256 public constant override version = 3_10;
-    bytes32 public constant override contractType = "CREDIT_ACCOUNT_COMPRESSOR";
+    bytes32 public constant override contractType = AP_CREDIT_ACCOUNT_COMPRESSOR;
 
     /// @notice Address provider contract address
     address public immutable addressProvider;
@@ -270,7 +271,7 @@ contract CreditAccountCompressor is ICreditAccountCompressor, SanityCheckTrait {
         data.creditFacade = ICreditManagerV3(creditManager).creditFacade();
         data.underlying = ICreditManagerV3(creditManager).underlying();
         data.owner = ICreditManagerV3(creditManager).getBorrowerOrRevert(creditAccount);
-        data.expirationDate = ICreditFacadeV3(creditManager).expirationDate();
+        data.expirationDate = ICreditFacadeV3(data.creditFacade).expirationDate();
 
         CollateralDebtData memory cdd =
             ICreditManagerV3(creditManager).calcDebtAndCollateral(creditAccount, CollateralCalcTask.DEBT_ONLY);

package/contracts/compressors/CreditSuiteCompressor.sol

@@ -16,9 +16,14 @@ import {CreditSuiteData} from "../types/CreditSuiteData.sol";
 
 import {AdapterCompressor} from "./AdapterCompressor.sol";
 
+import {AP_CREDIT_SUITE_COMPRESSOR} from "../libraries/Literals.sol";
+
 contract CreditSuiteCompressor {
     AdapterCompressor adapterCompressor;
 
+    uint256 public constant version = 3_10;
+    bytes32 public constant contractType = AP_CREDIT_SUITE_COMPRESSOR;
+
     constructor() {
         adapterCompressor = new AdapterCompressor();
     }

package/contracts/compressors/MarketCompressor.sol

@@ -10,8 +10,8 @@ import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/I
 import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
 import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
 
-import {IACL} from "@gearbox-protocol/governance/contracts/interfaces/extensions/IACL.sol";
-import {IContractsRegister} from "@gearbox-protocol/governance/contracts/interfaces/extensions/IContractsRegister.sol";
+import {IACL} from "@gearbox-protocol/governance/contracts/interfaces/IACL.sol";
+import {IContractsRegister} from "@gearbox-protocol/governance/contracts/interfaces/IContractsRegister.sol";
 import {IAddressProvider} from "@gearbox-protocol/governance/contracts/interfaces/IAddressProvider.sol";
 import {IMarketConfigurator} from "@gearbox-protocol/governance/contracts/interfaces/IMarketConfigurator.sol";
 import {IMarketConfiguratorFactory} from
@@ -41,6 +41,13 @@ import {PoolState} from "../types/PoolState.sol";
 import {PriceOracleState} from "../types/PriceOracleState.sol";
 
 import {IMarketCompressor} from "../interfaces/IMarketCompressor.sol";
+import {
+    AP_MARKET_COMPRESSOR,
+    AP_POOL_COMPRESSOR,
+    AP_TOKEN_COMPRESSOR,
+    AP_PRICE_FEED_COMPRESSOR,
+    AP_CREDIT_SUITE_COMPRESSOR
+} from "../libraries/Literals.sol";
 
 /// @title Data compressor 3.0.
 /// @notice Collects data from various contracts for use in the dApp
@@ -49,7 +56,7 @@ contract MarketCompressor is IMarketCompressor {
     using Contains for address[];
 
     uint256 public constant version = 3_10;
-    bytes32 public constant contractType = "MARKET_COMPRESSOR";
+    bytes32 public constant contractType = AP_MARKET_COMPRESSOR;
 
     address public immutable addressProvider;
     address public immutable marketConfiguratorFactory;
@@ -64,15 +71,22 @@ contract MarketCompressor is IMarketCompressor {
         address configurator;
     }
 
-    constructor(address addressProvider_, address priceOracleCompressorAddress) {
+    constructor(address addressProvider_) {
         addressProvider = addressProvider_;
+
+        // TODO: change to normal discovery
+
         marketConfiguratorFactory =
             IAddressProvider(addressProvider_).getAddressOrRevert(AP_MARKET_CONFIGURATOR_FACTORY, NO_VERSION_CONTROL);
 
-        poolCompressor = new PoolCompressor();
-        tokenCompressor = new TokenCompressor();
-        creditSuiteCompressor = new CreditSuiteCompressor();
-        priceOracleCompressor = PriceFeedCompressor(priceOracleCompressorAddress);
+        poolCompressor = PoolCompressor(IAddressProvider(addressProvider_).getAddressOrRevert(AP_POOL_COMPRESSOR, 3_10));
+        tokenCompressor =
+            TokenCompressor(IAddressProvider(addressProvider_).getAddressOrRevert(AP_TOKEN_COMPRESSOR, 3_10));
+        creditSuiteCompressor = CreditSuiteCompressor(
+            IAddressProvider(addressProvider_).getAddressOrRevert(AP_CREDIT_SUITE_COMPRESSOR, 3_10)
+        );
+        priceOracleCompressor =
+            PriceFeedCompressor(IAddressProvider(addressProvider_).getAddressOrRevert(AP_PRICE_FEED_COMPRESSOR, 3_10));
     }
 
     function getMarkets(MarketFilter memory filter) external view returns (MarketData[] memory result) {
@@ -170,7 +184,7 @@ contract MarketCompressor is IMarketCompressor {
 
     function _getLossPolicy(address pool, address configurator) internal view returns (address) {
         address contractsRegister = IMarketConfigurator(configurator).contractsRegister();
-        return IContractsRegister(contractsRegister).getLossLiquidator(pool);
+        return IContractsRegister(contractsRegister).getLossPolicy(pool);
     }
 
     /// @dev Pools discovery

package/contracts/libraries/Literals.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.17;
+
+bytes32 constant AP_MARKET_COMPRESSOR = "MARKET_COMPRESSOR";
+bytes32 constant AP_POOL_COMPRESSOR = "POOL_COMPRESSOR";
+bytes32 constant AP_TOKEN_COMPRESSOR = "TOKEN_COMPRESSOR";
+bytes32 constant AP_PRICE_FEED_COMPRESSOR = "PRICE_FEED_COMPRESSOR";
+bytes32 constant AP_CREDIT_ACCOUNT_COMPRESSOR = "CREDIT_ACCOUNT_COMPRESSOR";
+bytes32 constant AP_CREDIT_SUITE_COMPRESSOR = "CREDIT_SUITE_COMPRESSOR";

package/contracts/migration/MarketConfigurator.sol

@@ -26,7 +26,7 @@ contract MarketConfigurator {
 
     constructor(string memory name_, address acl_, address contractsRegister_, address treasury_) {
         name = name_;
-        acl = address(new ACL());
+        acl = address(new ACL(address(this)));
         contractsRegister = address(new ContractsRegister(acl));
         treasury = treasury_;
 

package/contracts/test/ForkTest.sol

@@ -43,7 +43,7 @@ abstract contract ForkTest is Test {
 
         addressProvider = IAddressProvider(vm.envAddress("FORK_ADDRESS_PROVIDER"));
 
-        acl = new ACL();
+        acl = new ACL(address(this));
         aclLegacy = IACLLegacy(addressProvider.getAddressOrRevert(AP_ACL, NO_VERSION_CONTROL));
         register = IContractsRegister(addressProvider.getAddressOrRevert(AP_CONTRACTS_REGISTER, NO_VERSION_CONTROL));
         configurator = Ownable(address(aclLegacy)).owner();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/periphery-v3",
-  "version": "1.7.0-next.40",
+  "version": "1.7.0-next.42",
   "main": "index.js",
   "repository": "git@github.com:Gearbox-protocol/periphery-v3.git",
   "author": "Mikael <26343374+0xmikko@users.noreply.github.com>",
@@ -20,7 +20,8 @@
     "@commitlint/config-conventional": "17.6.0",
     "@gearbox-protocol/sdk-gov": "^2.18.2",
     "@openzeppelin/contracts": "^4.9.3",
-    "@redstone-finance/evm-connector": "^0.6.1",
+    "@redstone-finance/evm-connector": "^0.2.5",
+    "@wagmi/cli": "^2.2.0",
     "ds-test": "dapphub/ds-test",
     "forge-std": "foundry-rs/forge-std"
   },
@@ -33,5 +34,6 @@
   "lint-staged": {
     "*.sol": "forge fmt",
     "*.{json,md}": "prettier --write"
-  }
+  },
+  "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
 }