Merge branch 'next' of https://github.com/Gearbox-protocol/periphery-v3 into next

Van0k · Van0k · commit 1bf1f4086cf7 · 2025-02-13T11:09:53.000+04:00
diff --git a/contracts/compressors/AdapterCompressor.sol b/contracts/compressors/AdapterCompressor.sol
@@ -4,12 +4,12 @@
 pragma solidity ^0.8.17;
 
 import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
+import {IStateSerializer} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IStateSerializer.sol";
 import {AdapterType} from "@gearbox-protocol/sdk-gov/contracts/AdapterType.sol";
 import {AdapterState} from "../types/CreditSuiteData.sol";
 import {IAdapterCompressor} from "../interfaces/IAdapterCompressor.sol";
 import {ICreditConfiguratorV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditConfiguratorV3.sol";
 import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
-import {IStateSerializer} from "../interfaces/IStateSerializer.sol";
 import {AP_ADAPTER_COMPRESSOR} from "../libraries/Literals.sol";
 
 interface ILegacyAdapter {
diff --git a/contracts/compressors/CreditSuiteCompressor.sol b/contracts/compressors/CreditSuiteCompressor.sol
@@ -7,40 +7,43 @@ import {ICreditConfiguratorV3} from "@gearbox-protocol/core-v3/contracts/interfa
 import {CreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/credit/CreditFacadeV3.sol";
 import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
 
-import {BaseLib} from "../libraries/BaseLib.sol";
-
 import {BaseParams, BaseState} from "../types/BaseState.sol";
 import {CreditFacadeState} from "../types/CreditFacadeState.sol";
 import {CollateralToken, CreditManagerState} from "../types/CreditManagerState.sol";
 import {CreditSuiteData} from "../types/CreditSuiteData.sol";
 
 import {AdapterCompressor} from "./AdapterCompressor.sol";
+import {ICreditSuiteCompressor} from "../interfaces/ICreditSuiteCompressor.sol";
 
+import {BaseLib} from "../libraries/BaseLib.sol";
 import {AP_CREDIT_SUITE_COMPRESSOR} from "../libraries/Literals.sol";
 
-contract CreditSuiteCompressor {
-    AdapterCompressor adapterCompressor;
+contract CreditSuiteCompressor is ICreditSuiteCompressor {
+    uint256 public constant override version = 3_10;
+    bytes32 public constant override contractType = AP_CREDIT_SUITE_COMPRESSOR;
 
-    uint256 public constant version = 3_10;
-    bytes32 public constant contractType = AP_CREDIT_SUITE_COMPRESSOR;
+    AdapterCompressor internal immutable _adapterCompressor;
 
     constructor() {
-        adapterCompressor = new AdapterCompressor();
+        // FIXME: this one should be read from the address provider
+        // but it must be deployed before CreditSuiteCompressor then, which is a bit tricky
+        // QUESTION: shall we allow to update it maybe? because it's kinda volatile
+        _adapterCompressor = new AdapterCompressor();
     }
 
-    function getCreditSuiteData(address creditManager) public view returns (CreditSuiteData memory result) {
+    function getCreditSuiteData(address creditManager) external view override returns (CreditSuiteData memory result) {
         result.creditManager = getCreditManagerState(creditManager);
         result.creditFacade = getCreditFacadeState(ICreditManagerV3(creditManager).creditFacade());
         result.creditConfigurator = BaseLib.getBaseState(
             ICreditManagerV3(creditManager).creditConfigurator(), "CREDIT_CONFIGURATOR", address(0)
         );
 
-        result.adapters = adapterCompressor.getAdapters(creditManager);
+        result.adapters = _adapterCompressor.getAdapters(creditManager);
     }
 
     /// @dev Returns CreditManagerData for a particular _cm
     /// @param _cm CreditManager address
-    function getCreditManagerState(address _cm) public view returns (CreditManagerState memory result) {
+    function getCreditManagerState(address _cm) public view override returns (CreditManagerState memory result) {
         ICreditManagerV3 creditManager = ICreditManagerV3(_cm);
         ICreditConfiguratorV3 creditConfigurator = ICreditConfiguratorV3(creditManager.creditConfigurator());
         CreditFacadeV3 creditFacade = CreditFacadeV3(creditManager.creditFacade());
@@ -80,7 +83,7 @@ contract CreditSuiteCompressor {
 
     /// @dev Returns CreditManagerData for a particular _cm
     /// @param _cf CreditFacade address
-    function getCreditFacadeState(address _cf) public view returns (CreditFacadeState memory result) {
+    function getCreditFacadeState(address _cf) public view override returns (CreditFacadeState memory result) {
         CreditFacadeV3 creditFacade = CreditFacadeV3(_cf);
 
         result.baseParams = BaseLib.getBaseParams(_cf, "CREDIT_FACADE", address(0));
diff --git a/contracts/compressors/PoolCompressor.sol b/contracts/compressors/PoolCompressor.sol
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MIT
 // Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2024
+// (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.23;
 
 import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
@@ -18,28 +18,29 @@ import {RateKeeperState, Rate} from "../types/RateKeeperState.sol";
 import {RAY} from "@gearbox-protocol/core-v3/contracts/libraries/Constants.sol";
 import {IRateKeeper} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IRateKeeper.sol";
 
-// Serializers
+import {IPoolCompressor} from "../interfaces/IPoolCompressor.sol";
 import {BaseLib} from "../libraries/BaseLib.sol";
+import {AP_POOL_COMPRESSOR} from "../libraries/Literals.sol";
 import {GaugeSerializer} from "../serializers/pool/GaugeSerializer.sol";
 import {LinearInterestRateModelSerializer} from "../serializers/pool/LinearInterestRateModelSerializer.sol";
 
 /// @title Pool compressor
 /// @notice Collects data from pool related contracts
 /// Do not use for data from data compressor for state-changing functions
-contract PoolCompressor {
+contract PoolCompressor is IPoolCompressor {
     // Contract version
-    uint256 public constant version = 3_10;
-    bytes32 public constant contractType = "POOL_COMPRESSOR";
+    uint256 public constant override version = 3_10;
+    bytes32 public constant override contractType = AP_POOL_COMPRESSOR;
 
-    address public immutable gaugeSerializer;
-    address public immutable linearInterestRateModelSerializer;
+    address internal immutable _gaugeSerializer;
+    address internal immutable _linearInterestRateModelSerializer;
 
     constructor() {
-        gaugeSerializer = address(new GaugeSerializer());
-        linearInterestRateModelSerializer = address(new LinearInterestRateModelSerializer());
+        _gaugeSerializer = address(new GaugeSerializer());
+        _linearInterestRateModelSerializer = address(new LinearInterestRateModelSerializer());
     }
 
-    function getPoolState(address pool) public view returns (PoolState memory result) {
+    function getPoolState(address pool) external view override returns (PoolState memory result) {
         PoolV3 _pool = PoolV3(pool);
         //
         // CONTRACT PARAMETERS
@@ -130,10 +131,15 @@ contract PoolCompressor {
         result.isPaused = _pool.paused();
     }
 
-    function getPoolQuotaKeeperState(address pqk) external view returns (PoolQuotaKeeperState memory result) {
-        IPoolQuotaKeeperV3 _pqk = IPoolQuotaKeeperV3(pqk);
+    function getPoolQuotaKeeperState(address quotaKeeper)
+        external
+        view
+        override
+        returns (PoolQuotaKeeperState memory result)
+    {
+        IPoolQuotaKeeperV3 _pqk = IPoolQuotaKeeperV3(quotaKeeper);
 
-        result.baseParams = BaseLib.getBaseParams(pqk, "POOL_QUOTA_KEEPER", address(0));
+        result.baseParams = BaseLib.getBaseParams(quotaKeeper, "POOL_QUOTA_KEEPER", address(0));
 
         // address rateKeeper;
         result.rateKeeper = _pqk.gauge();
@@ -162,13 +168,13 @@ contract PoolCompressor {
         result.lastQuotaRateUpdate = _pqk.lastQuotaRateUpdate();
     }
 
-    function getRateKeeperState(address rateKeeper) external view returns (RateKeeperState memory result) {
+    function getRateKeeperState(address rateKeeper) external view override returns (RateKeeperState memory result) {
         IRateKeeper _rateKeeper = IRateKeeper(rateKeeper);
 
         address serializer;
         try IVersion(rateKeeper).contractType() {}
         catch {
-            serializer = gaugeSerializer;
+            serializer = _gaugeSerializer;
         }
         result.baseParams = BaseLib.getBaseParams(rateKeeper, "RATE_KEEPER::GAUGE", serializer);
 
@@ -186,16 +192,16 @@ contract PoolCompressor {
         }
     }
 
-    function getInterestRateModelState(address irm) public view returns (BaseState memory) {
+    function getInterestRateModelState(address interestRateModel) external view override returns (BaseState memory) {
         address serializer;
-        try IVersion(irm).contractType() {}
+        try IVersion(interestRateModel).contractType() {}
         catch {
-            serializer = linearInterestRateModelSerializer;
+            serializer = _linearInterestRateModelSerializer;
         }
-        return BaseLib.getBaseState(irm, "IRM::LINEAR", serializer);
+        return BaseLib.getBaseState(interestRateModel, "IRM::LINEAR", serializer);
     }
 
-    function getLossPolicyState(address lossPolicy) public view returns (BaseState memory) {
+    function getLossPolicyState(address lossPolicy) public view override returns (BaseState memory) {
         return BaseLib.getBaseState(lossPolicy, "LOSS_POLICY::DEFAULT", address(0));
     }
 }
diff --git a/contracts/compressors/PriceFeedCompressor.sol b/contracts/compressors/PriceFeedCompressor.sol
@@ -14,7 +14,6 @@ import {BaseLib} from "../libraries/BaseLib.sol";
 import {AP_PRICE_FEED_COMPRESSOR} from "../libraries/Literals.sol";
 
 import {IStateSerializerLegacy} from "../interfaces/IStateSerializerLegacy.sol";
-import {IStateSerializer} from "../interfaces/IStateSerializer.sol";
 import {NestedPriceFeeds} from "../libraries/NestedPriceFeeds.sol";
 import {BoundedPriceFeedSerializer} from "../serializers/oracles/BoundedPriceFeedSerializer.sol";
 import {BPTWeightedPriceFeedSerializer} from "../serializers/oracles/BPTWeightedPriceFeedSerializer.sol";
diff --git a/contracts/interfaces/ICreditSuiteCompressor.sol b/contracts/interfaces/ICreditSuiteCompressor.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
+
+import {CreditSuiteData} from "../types/CreditSuiteData.sol";
+import {CreditManagerState} from "../types/CreditManagerState.sol";
+import {CreditFacadeState} from "../types/CreditFacadeState.sol";
+
+interface ICreditSuiteCompressor is IVersion {
+    function getCreditSuiteData(address creditManager) external view returns (CreditSuiteData memory);
+
+    function getCreditManagerState(address creditManager) external view returns (CreditManagerState memory);
+
+    function getCreditFacadeState(address creditFacade) external view returns (CreditFacadeState memory);
+}
diff --git a/contracts/interfaces/IPoolCompressor.sol b/contracts/interfaces/IPoolCompressor.sol
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2024.
+pragma solidity ^0.8.23;
+
+import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
+
+import {BaseState} from "../types/BaseState.sol";
+import {PoolQuotaKeeperState} from "../types/PoolQuotaKeeperState.sol";
+import {PoolState} from "../types/PoolState.sol";
+import {RateKeeperState} from "../types/RateKeeperState.sol";
+
+interface IPoolCompressor is IVersion {
+    function getPoolState(address pool) external view returns (PoolState memory);
+
+    function getPoolQuotaKeeperState(address quotaKeeper) external view returns (PoolQuotaKeeperState memory);
+
+    function getRateKeeperState(address rateKeeper) external view returns (RateKeeperState memory);
+
+    function getInterestRateModelState(address interestRateModel) external view returns (BaseState memory);
+
+    function getLossPolicyState(address lossPolicy) external view returns (BaseState memory);
+}
diff --git a/contracts/interfaces/IStateSerializer.sol b/contracts/interfaces/IStateSerializer.sol
diff --git a/contracts/libraries/BaseLib.sol b/contracts/libraries/BaseLib.sol
@@ -4,8 +4,8 @@
 pragma solidity ^0.8.17;
 
 import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
+import {IStateSerializer} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IStateSerializer.sol";
 import {BaseParams, BaseState} from "../types/BaseState.sol";
-import {IStateSerializer} from "../interfaces/IStateSerializer.sol";
 import {IStateSerializerLegacy} from "../interfaces/IStateSerializerLegacy.sol";
 
 library BaseLib {
diff --git a/lib/@gearbox-protocol/core-v3 b/lib/@gearbox-protocol/core-v3
@@ -1 +1 @@
-Subproject commit 66f9b8e7be833964c935cd43d1e8002b9f08d9ea
+Subproject commit 29b3c121befd671649791ed8e3961bb44076b8ec
diff --git a/lib/@gearbox-protocol/governance b/lib/@gearbox-protocol/governance
@@ -1 +1 @@
-Subproject commit 89ed0eaf4ab52cf239bd252df2189ac7e65aaebf
+Subproject commit 3d401eda95660bf2881ed7be002b55b53c4933d3
diff --git a/lib/@gearbox-protocol/integrations-v3 b/lib/@gearbox-protocol/integrations-v3
@@ -1 +1 @@
-Subproject commit 0d9636a6d93639aa442f3ce48d8694eee8a95a86
+Subproject commit 1449dc87b2c3768a48a39e256c0c77935d0f366c
diff --git a/lib/@gearbox-protocol/oracles-v3 b/lib/@gearbox-protocol/oracles-v3
@@ -1 +1 @@
-Subproject commit 951b71670465e2f1b86d3140117d6e74cf55ee7a
+Subproject commit f8d10105d5a3d90ac2aa5f0b54e16310c1b5ed43
diff --git a/script/V31Install.sol b/script/V31Install.sol
@@ -129,7 +129,12 @@ contract V31Install is Script, GlobalSetup, AnvilHelper {
 
         _submitProposalAndSign("Activate instance", calls);
 
-        _connectLegacyMarketConfigurator();
+        if (vm.envOr("CONNECT_CHAOS_LABS", true)) {
+            _connectLegacyMarketConfigurator("Chaos Labs", _getChaosLabsLegacyParams());
+        }
+        if (vm.envOr("CONNECT_NEXO", false)) {
+            _connectLegacyMarketConfigurator("Nexo", _getNexoLegacyParams());
+        }
 
         vm.stopBroadcast();
 
@@ -268,17 +273,17 @@ contract V31Install is Script, GlobalSetup, AnvilHelper {
         );
     }
 
-    function _connectLegacyMarketConfigurator() internal {
+    function _connectLegacyMarketConfigurator(string memory curatorName, LegacyParams memory legacyParams) internal {
         address addressProvider = instanceManager.addressProvider();
 
         MarketConfiguratorLegacy marketConfigurator = new MarketConfiguratorLegacy({
             addressProvider_: addressProvider,
             // QUESTION: who?
             admin_: address(0),
             emergencyAdmin_: address(0),
-            curatorName_: "Chaos Labs",
+            curatorName_: curatorName,
             deployGovernor_: false, // NOTE: only for testing
-            legacyParams_: _getLegacyParams()
+            legacyParams_: legacyParams
         });
 
         address contractsRegister = marketConfigurator.contractsRegister();
@@ -306,10 +311,10 @@ contract V31Install is Script, GlobalSetup, AnvilHelper {
             callData: abi.encodeCall(IMarketConfiguratorFactory.addMarketConfigurator, (address(marketConfigurator)))
         });
 
-        _submitProposalAndSign("Connect legacy market configurator", calls);
+        _submitProposalAndSign(string.concat("Connect legacy market configurator for ", curatorName), calls);
     }
 
-    function _getLegacyParams() internal pure returns (LegacyParams memory) {
+    function _getChaosLabsLegacyParams() internal pure returns (LegacyParams memory) {
         // NOTE: when writing an actual migration script, make sure to check that all values are correct,
         // don't just copy-paste from here
         address acl = 0x523dA3a8961E4dD4f6206DBf7E6c749f51796bb3;
@@ -363,6 +368,42 @@ contract V31Install is Script, GlobalSetup, AnvilHelper {
         });
     }
 
+    function _getNexoLegacyParams() internal pure returns (LegacyParams memory) {
+        address acl = 0xd98D75da123813D73c54bCF910BBd7FC0afF24d4;
+        address contractsRegister = 0xFC1952052dC1f439ccF0cBd9af5A02748b0cc1db;
+        address gearStaking = 0x2fcbD02d5B1D52FC78d4c02890D7f4f47a459c33;
+        address zapperRegister = 0x3E75276548a7722AbA517a35c35FB43CF3B0E723;
+
+        // TODO: add proper values
+        address[] memory pausableAdmins = new address[](0);
+        // pausableAdmins[0] = 0xD5C96E5c1E1C84dFD293473fC195BbE7FC8E4840;
+
+        address[] memory unpausableAdmins = new address[](0);
+        // unpausableAdmins[0] = 0xD5C96E5c1E1C84dFD293473fC195BbE7FC8E4840;
+
+        address[] memory emergencyLiquidators = new address[](0);
+        // emergencyLiquidators[0] = 0x7BD9c8161836b1F402233E80F55E3CaE0Fde4d87;
+        // emergencyLiquidators[1] = 0x16040e932b5Ac7A3aB23b88a2f230B4185727b0d;
+
+        // NOTE: these are the PL bot (the only one with special permissions) and three deleverage bots
+        address[] memory bots = new address[](4);
+        bots[0] = 0x0f06c2bD612Ee7D52d4bC76Ce3BD7E95247AF2a9;
+        bots[1] = 0x53fDA9a509020Fc534EfF938Fd01dDa5fFe8560c;
+        bots[2] = 0x82b0adfA8f09b20BB4ed066Bcd4b2a84BEf73D5E;
+        bots[3] = 0x519906cD00222b4a81bf14A7A11fA5FCF455Af42;
+
+        return LegacyParams({
+            acl: acl,
+            contractsRegister: contractsRegister,
+            gearStaking: gearStaking,
+            zapperRegister: zapperRegister,
+            pausableAdmins: pausableAdmins,
+            unpausableAdmins: unpausableAdmins,
+            emergencyLiquidators: emergencyLiquidators,
+            bots: bots
+        });
+    }
+
     function _saveAddresses(string memory path) internal {
         address addressProvider = instanceManager.addressProvider();
 
