Merge pull request #3 from Gearbox-protocol/feat--zapperRegistry

Author: 0xmikko

contracts/data/DataCompressor_3_0.sol

@@ -435,7 +435,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
 
         result.supplyRate = pool.supplyRate();
 
-        result.version = uint8(pool.version());
+        result.version = pool.version();
 
         result.quotas = _getQuotas(_pool);
         result.lirm = getLIRMData(pool.interestRateModel());

contracts/data/ZapperRegister.sol

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Holdings, 2023
+pragma solidity ^0.8.10;
+
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {IZapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IZapper.sol";
+import {IZapperRegistry} from "../interfaces/IZapperRegistry.sol";
+import {ACLNonReentrantTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLNonReentrantTrait.sol";
+import {ContractsRegisterTrait} from "@gearbox-protocol/core-v3/contracts/traits/ContractsRegisterTrait.sol";
+
+contract ZapperRegister is ACLNonReentrantTrait, ContractsRegisterTrait, IZapperRegistry {
+    using EnumerableSet for EnumerableSet.AddressSet;
+
+    mapping(address => EnumerableSet.AddressSet) internal _zappersMap;
+
+    constructor(address addressProvider)
+        ACLNonReentrantTrait(addressProvider)
+        ContractsRegisterTrait(addressProvider)
+    {}
+
+    function addZapper(address zapper) external nonZeroAddress(zapper) controllerOnly {
+        address pool = IZapper(zapper).pool();
+        _ensureRegisteredPool(pool);
+
+        EnumerableSet.AddressSet storage zapperSet = _zappersMap[pool];
+        if (!zapperSet.contains(zapper)) {
+            zapperSet.add(zapper);
+            emit AddZapper(zapper);
+        }
+    }
+
+    function removeZapper(address zapper) external nonZeroAddress(zapper) controllerOnly {
+        EnumerableSet.AddressSet storage zapperSet = _zappersMap[IZapper(zapper).pool()];
+        if (zapperSet.contains(zapper)) {
+            zapperSet.remove(zapper);
+            emit RemoveZapper(zapper);
+        }
+    }
+
+    function zappers(address pool) external view override returns (address[] memory) {
+        return _zappersMap[pool].values();
+    }
+}

contracts/interfaces/IZapperRegistry.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Holdings, 2023
+pragma solidity ^0.8.10;
+
+interface IZapperRegistry {
+    event AddZapper(address);
+    event RemoveZapper(address);
+
+    function zappers(address pool) external view returns (address[] memory);
+}

contracts/test/DC_Printer.sol

@@ -9,6 +9,8 @@ import {DataCompressorV2_10} from "../data/DataCompressor_2_1.sol";
 import {DataCompressorV3_00} from "../data/DataCompressor_3_0.sol";
 import {CreditAccountData, CreditManagerData, PoolData, TokenBalance, ContractAdapter} from "../data/Types.sol";
 
+import {NetworkDetector} from "@gearbox-protocol/sdk-gov/contracts/NetworkDetector.sol";
+
 import "forge-std/console.sol";
 
 address constant ap = 0x5BcB06c56e8F28da0b038a373199240ca3F5a2f4;
@@ -17,7 +19,20 @@ contract DCTest {
     DataCompressorV2_10 public dc2;
     DataCompressorV3_00 public dc3;
 
-    function setUp() public {
+    uint256 chainId;
+
+    constructor() {
+        NetworkDetector nd = new NetworkDetector();
+        chainId = nd.chainId();
+    }
+
+    modifier liveTestOnly() {
+        if (chainId == 1) {
+            _;
+        }
+    }
+
+    function setUp() public liveTestOnly {
         dc2 = new DataCompressorV2_10(ap);
         dc3 = new DataCompressorV3_00(ap);
     }
@@ -94,7 +109,7 @@ contract DCTest {
         }
     }
 
-    function test_dc_01_pools() public view {
+    function test_dc_01_pools() public view liveTestOnly {
         PoolData[] memory pools = dc2.getPoolsV1List();
         console.log("V1 pools");
         _printPools(pools);
@@ -104,7 +119,7 @@ contract DCTest {
         _printPools(pools);
     }
 
-    function test_dc_02_credit_managers() public view {
+    function test_dc_02_credit_managers() public view liveTestOnly {
         CreditManagerData[] memory cms = dc2.getCreditManagersV2List();
         console.log("V2 credit managers");
         _printCreditManagers(cms);
@@ -114,7 +129,7 @@ contract DCTest {
         _printCreditManagers(cms);
     }
 
-    function test_dc_03_credit_accounts() public view {
+    function test_dc_03_credit_accounts() public view liveTestOnly {
         CreditAccountData[] memory cas = dc2.getCreditAccountsByBorrower(address(this));
         console.log("V2 credit accounts", cas.length);
     }

package.json

@@ -21,7 +21,11 @@
     "@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",
+   "@gearbox-protocol/integrations-v3": "^1.16.0",
+    "@openzeppelin/contracts": "4.8.3"
+  },
+  "dependencies": {
+   
     "husky": "^8.0.3",
     "lint-staged": "^13.0.3",
     "prettier": "^3.0.3"
@@ -30,5 +34,6 @@
   "lint-staged": {
     "*.sol": "forge fmt",
     "*.{json,md}": "prettier --write"
+
   }
 }

yarn.lock

@@ -965,6 +965,11 @@
     "@gearbox-protocol/sdk" "1.22.1"
     axios "^1.1.3"
 
+"@gearbox-protocol/integrations-v3@^1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@gearbox-protocol/integrations-v3/-/integrations-v3-1.16.0.tgz#62a7fc6b2f73bb10d67ba5eff8368e14eb15920a"
+  integrity sha512-cv70TB4cbtz1rX+LbCMWud85da4+hsRjzYJq/XZ5Qha4DqMZBF7wcco55pbEqp+cZ95hLjjl9J00xEY7JIVuSw==
+
 "@gearbox-protocol/oracles-v3@^1.7.2":
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/@gearbox-protocol/oracles-v3/-/oracles-v3-1.7.2.tgz#5e1804493dbf854e18cc2384012cf8d3f1c15365"