Mutliownable presets (#79)

Arvolear · web-flow · commit ddaf3b00fcb2 · 2023-11-07T17:22:22.000+02:00
* added presets

* refactored names

* versions

* scope fix

* fix name
diff --git a/contracts/contracts-registry/pools/AbstractPoolContractsRegistry.sol b/contracts/contracts-registry/pools/AbstractPoolContractsRegistry.sol
@@ -20,9 +20,6 @@ import {ProxyBeacon} from "./proxy/ProxyBeacon.sol";
  * The registry uses BeaconProxy pattern to provide upgradeability and Dependant pattern to provide dependency
  * injection mechanism into the pools. This module should be used together with the ContractsRegistry module.
  *
- * The users of this module have to override `_onlyPoolFactory()` method and revert in case a wrong msg.sender is
- * trying to add pools into the registry.
- *
  * The contract is meant to be used behind a proxy itself.
  */
 abstract contract AbstractPoolContractsRegistry is Initializable, AbstractDependant {
diff --git a/contracts/contracts-registry/pools/presets/MultiOwnablePoolContractsRegistry.sol b/contracts/contracts-registry/pools/presets/MultiOwnablePoolContractsRegistry.sol
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+import {AbstractPoolContractsRegistry} from "../AbstractPoolContractsRegistry.sol";
+import {MultiOwnable} from "../../../access-control/MultiOwnable.sol";
+
+/**
+ * @notice The MultiOwnable preset of PoolContractsRegistry
+ */
+abstract contract MultiOwnablePoolContractsRegistry is
+    AbstractPoolContractsRegistry,
+    MultiOwnable
+{
+    function __MultiOwnablePoolContractsRegistry_init() public initializer {
+        __MultiOwnable_init();
+        __PoolContractsRegistry_init();
+    }
+
+    function setNewImplementations(
+        string[] calldata names_,
+        address[] calldata newImplementations_
+    ) external onlyOwner {
+        _setNewImplementations(names_, newImplementations_);
+    }
+
+    function injectDependenciesToExistingPools(
+        string calldata name_,
+        uint256 offset_,
+        uint256 limit_
+    ) external onlyOwner {
+        _injectDependenciesToExistingPools(name_, offset_, limit_);
+    }
+
+    function injectDependenciesToExistingPoolsWithData(
+        string calldata name_,
+        bytes calldata data_,
+        uint256 offset_,
+        uint256 limit_
+    ) external onlyOwner {
+        _injectDependenciesToExistingPoolsWithData(name_, data_, offset_, limit_);
+    }
+
+    function addProxyPool(string memory name_, address poolAddress_) public virtual;
+}
diff --git a/contracts/contracts-registry/pools/presets/OwnablePoolContractsRegistry.sol b/contracts/contracts-registry/pools/presets/OwnablePoolContractsRegistry.sol
@@ -40,4 +40,6 @@ abstract contract OwnablePoolContractsRegistry is
     ) external onlyOwner {
         _injectDependenciesToExistingPoolsWithData(name_, data_, offset_, limit_);
     }
+
+    function addProxyPool(string memory name_, address poolAddress_) public virtual;
 }
diff --git a/contracts/contracts-registry/presets/MultiOwnableContractsRegistry.sol b/contracts/contracts-registry/presets/MultiOwnableContractsRegistry.sol
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+import {AbstractContractsRegistry} from "../AbstractContractsRegistry.sol";
+import {MultiOwnable} from "../../access-control/MultiOwnable.sol";
+
+/**
+ * @notice The MultiOwnable preset of ContractsRegistry
+ */
+contract MultiOwnableContractsRegistry is AbstractContractsRegistry, MultiOwnable {
+    function __MultiOwnableContractsRegistry_init() public initializer {
+        __MultiOwnable_init();
+        __ContractsRegistry_init();
+    }
+
+    function injectDependencies(string calldata name_) external onlyOwner {
+        _injectDependencies(name_);
+    }
+
+    function injectDependenciesWithData(
+        string calldata name_,
+        bytes calldata data_
+    ) external onlyOwner {
+        _injectDependenciesWithData(name_, data_);
+    }
+
+    function upgradeContract(
+        string calldata name_,
+        address newImplementation_
+    ) external onlyOwner {
+        _upgradeContract(name_, newImplementation_);
+    }
+
+    function upgradeContractAndCall(
+        string calldata name_,
+        address newImplementation_,
+        bytes calldata data_
+    ) external onlyOwner {
+        _upgradeContractAndCall(name_, newImplementation_, data_);
+    }
+
+    function addContract(string calldata name_, address contractAddress_) external onlyOwner {
+        _addContract(name_, contractAddress_);
+    }
+
+    function addProxyContract(string calldata name_, address contractAddress_) external onlyOwner {
+        _addProxyContract(name_, contractAddress_);
+    }
+
+    function addProxyContractAndCall(
+        string calldata name_,
+        address contractAddress_,
+        bytes calldata data_
+    ) external onlyOwner {
+        _addProxyContractAndCall(name_, contractAddress_, data_);
+    }
+
+    function justAddProxyContract(
+        string calldata name_,
+        address contractAddress_
+    ) external onlyOwner {
+        _justAddProxyContract(name_, contractAddress_);
+    }
+
+    function removeContract(string calldata name_) external onlyOwner {
+        _removeContract(name_);
+    }
+}
diff --git a/contracts/mock/contracts-registry/ContractsRegistryMock.sol b/contracts/mock/contracts-registry/ContractsRegistryMock.sol
@@ -3,16 +3,16 @@ pragma solidity ^0.8.4;
 
 import {OwnableContractsRegistry} from "../../contracts-registry/presets/OwnableContractsRegistry.sol";
 
-contract ContractsRegistry1 is OwnableContractsRegistry {
-    string public constant CRDEPENDANT_NAME = "CRDEPENDANT";
+contract ContractsRegistryMock is OwnableContractsRegistry {
+    string public constant DEPENDANT_NAME = "DEPENDANT";
     string public constant TOKEN_NAME = "TOKEN";
 
     function mockInit() external {
         __ContractsRegistry_init();
     }
 
-    function getCRDependantContract() external view returns (address) {
-        return getContract(CRDEPENDANT_NAME);
+    function getDependantContract() external view returns (address) {
+        return getContract(DEPENDANT_NAME);
     }
 
     function getTokenContract() external view returns (address) {
diff --git a/contracts/mock/contracts-registry/DependantMock.sol b/contracts/mock/contracts-registry/DependantMock.sol
@@ -3,12 +3,12 @@ pragma solidity ^0.8.4;
 
 import {AbstractDependant} from "../../contracts-registry/AbstractDependant.sol";
 
-import {ContractsRegistry1} from "./ContractsRegistry1.sol";
+import {ContractsRegistryMock} from "./ContractsRegistryMock.sol";
 
-contract CRDependant is AbstractDependant {
+contract DependantMock is AbstractDependant {
     address public token;
 
     function setDependencies(address contractsRegistry_, bytes memory) public override dependant {
-        token = ContractsRegistry1(contractsRegistry_).getTokenContract();
+        token = ContractsRegistryMock(contractsRegistry_).getTokenContract();
     }
 }
diff --git a/contracts/mock/contracts-registry/DependantUpgradeMock.sol b/contracts/mock/contracts-registry/DependantUpgradeMock.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {CRDependant} from "./CRDependant.sol";
+import {DependantMock} from "./DependantMock.sol";
 
-contract CRDependantUpgrade is CRDependant {
+contract DependantUpgradeMock is DependantMock {
     uint256 public dummyValue;
 
     function doUpgrade(uint256 value_) external {
diff --git a/contracts/mock/contracts-registry/pools/ContractsRegistryPoolMock.sol b/contracts/mock/contracts-registry/pools/ContractsRegistryPoolMock.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.4;
 
 import {OwnableContractsRegistry} from "../../../contracts-registry/presets/OwnableContractsRegistry.sol";
 
-contract ContractsRegistry2 is OwnableContractsRegistry {
+contract ContractsRegistryPoolMock is OwnableContractsRegistry {
     string public constant POOL_CONTRACTS_REGISTRY_NAME = "POOL_CONTRACTS_REGISTRY";
     string public constant POOL_FACTORY_NAME = "POOL_FACTORY";
     string public constant TOKEN_NAME = "TOKEN";
diff --git a/contracts/mock/contracts-registry/pools/PoolContractsRegistryMock.sol b/contracts/mock/contracts-registry/pools/PoolContractsRegistryMock.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {ContractsRegistry2} from "./ContractsRegistry2.sol";
+import {ContractsRegistryPoolMock} from "./ContractsRegistryPoolMock.sol";
 
 import {OwnablePoolContractsRegistry} from "../../../contracts-registry/pools/presets/OwnablePoolContractsRegistry.sol";
 
-contract PoolContractsRegistry is OwnablePoolContractsRegistry {
+contract PoolContractsRegistryMock is OwnablePoolContractsRegistry {
     string public constant POOL_1_NAME = "POOL_1";
     string public constant POOL_2_NAME = "POOL_2";
 
@@ -23,10 +23,13 @@ contract PoolContractsRegistry is OwnablePoolContractsRegistry {
     function setDependencies(address contractsRegistry_, bytes memory data_) public override {
         super.setDependencies(contractsRegistry_, data_);
 
-        _poolFactory = ContractsRegistry2(contractsRegistry_).getPoolFactoryContract();
+        _poolFactory = ContractsRegistryPoolMock(contractsRegistry_).getPoolFactoryContract();
     }
 
-    function addProxyPool(string calldata name_, address poolAddress_) external onlyPoolFactory {
+    function addProxyPool(
+        string memory name_,
+        address poolAddress_
+    ) public override onlyPoolFactory {
         _addProxyPool(name_, poolAddress_);
     }
 }
diff --git a/contracts/mock/contracts-registry/pools/PoolMock.sol b/contracts/mock/contracts-registry/pools/PoolMock.sol
@@ -3,12 +3,12 @@ pragma solidity ^0.8.4;
 
 import {AbstractDependant} from "../../../contracts-registry/AbstractDependant.sol";
 
-import {ContractsRegistry2} from "./ContractsRegistry2.sol";
+import {ContractsRegistryPoolMock} from "./ContractsRegistryPoolMock.sol";
 
-contract Pool is AbstractDependant {
+contract PoolMock is AbstractDependant {
     address public token;
 
     function setDependencies(address contractsRegistry_, bytes memory) public override dependant {
-        token = ContractsRegistry2(contractsRegistry_).getTokenContract();
+        token = ContractsRegistryPoolMock(contractsRegistry_).getTokenContract();
     }
 }
diff --git a/contracts/mock/contracts-registry/pools/PoolUpgradeMock.sol b/contracts/mock/contracts-registry/pools/PoolUpgradeMock.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {Pool} from "./Pool.sol";
+import {PoolMock} from "./PoolMock.sol";
 
-contract PoolUpgrade is Pool {
+contract PoolUpgradeMock is PoolMock {
     function addedFunction() external pure returns (uint256) {
         return 42;
     }
diff --git a/contracts/mock/contracts-registry/pools/pool-factory/PoolFactoryMock.sol b/contracts/mock/contracts-registry/pools/pool-factory/PoolFactoryMock.sol
@@ -1,23 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {ContractsRegistry2} from "../ContractsRegistry2.sol";
-import {PoolContractsRegistry} from "../PoolContractsRegistry.sol";
+import {ContractsRegistryPoolMock} from "../ContractsRegistryPoolMock.sol";
+import {PoolContractsRegistryMock} from "../PoolContractsRegistryMock.sol";
 
 import {AbstractPoolFactory} from "../../../../contracts-registry/pools/pool-factory/AbstractPoolFactory.sol";
 
-contract PoolFactory is AbstractPoolFactory {
+contract PoolFactoryMock is AbstractPoolFactory {
     address public poolContractsRegistry;
 
     function setDependencies(address contractsRegistry_, bytes memory data_) public override {
         super.setDependencies(contractsRegistry_, data_);
 
-        poolContractsRegistry = ContractsRegistry2(contractsRegistry_)
+        poolContractsRegistry = ContractsRegistryPoolMock(contractsRegistry_)
             .getPoolContractsRegistryContract();
     }
 
     function deployPool() external {
-        string memory poolType_ = PoolContractsRegistry(poolContractsRegistry).POOL_1_NAME();
+        string memory poolType_ = PoolContractsRegistryMock(poolContractsRegistry).POOL_1_NAME();
 
         address poolProxy_ = _deploy(poolContractsRegistry, poolType_);
 
@@ -26,7 +26,7 @@ contract PoolFactory is AbstractPoolFactory {
     }
 
     function deploy2Pool(string calldata salt_) external {
-        string memory poolType_ = PoolContractsRegistry(poolContractsRegistry).POOL_1_NAME();
+        string memory poolType_ = PoolContractsRegistryMock(poolContractsRegistry).POOL_1_NAME();
 
         address poolProxy_ = _deploy2(poolContractsRegistry, poolType_, bytes32(bytes(salt_)));
 
@@ -38,7 +38,7 @@ contract PoolFactory is AbstractPoolFactory {
         return
             _predictPoolAddress(
                 poolContractsRegistry,
-                PoolContractsRegistry(poolContractsRegistry).POOL_1_NAME(),
+                PoolContractsRegistryMock(poolContractsRegistry).POOL_1_NAME(),
                 bytes32(bytes(salt_))
             );
     }
diff --git a/contracts/mock/contracts-registry/pools/presets/MultiOwnablePoolContractsRegistryMock.sol b/contracts/mock/contracts-registry/pools/presets/MultiOwnablePoolContractsRegistryMock.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+import {MultiOwnablePoolContractsRegistry} from "../../../../contracts-registry/pools/presets/MultiOwnablePoolContractsRegistry.sol";
+
+contract MultiOwnablePoolContractsRegistryMock is MultiOwnablePoolContractsRegistry {
+    function addProxyPool(string memory name_, address poolAddress_) public override {
+        _addProxyPool(name_, poolAddress_);
+    }
+}
diff --git a/contracts/mock/diamond/DummyFacetMock.sol b/contracts/mock/diamond/DummyFacetMock.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {DummyStorage} from "./DummyStorage.sol";
+import {DummyStorageMock} from "./DummyStorageMock.sol";
 
-contract DummyFacet is DummyStorage {
+contract DummyFacetMock is DummyStorageMock {
     function setDummyString(string memory dummyString_) public {
         getDummyFacetStorage().dummyString = dummyString_;
     }
diff --git a/contracts/mock/diamond/DummyInitMock.sol b/contracts/mock/diamond/DummyInitMock.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {DummyFacet} from "./DummyFacet.sol";
+import {DummyFacetMock} from "./DummyFacetMock.sol";
 
-contract DummyInit is DummyFacet {
+contract DummyInitMock is DummyFacetMock {
     event Initialized();
 
     function init() external {
diff --git a/contracts/mock/diamond/DummyStorageMock.sol b/contracts/mock/diamond/DummyStorageMock.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-contract DummyStorage {
+contract DummyStorageMock {
     bytes32 public constant DUMMY_STORAGE_SLOT = keccak256("diamond.standard.dummyfacet.storage");
 
     struct DummyFacetStorage {
diff --git a/contracts/package.json b/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solarity/solidity-lib",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "license": "MIT",
   "author": "Distributed Lab",
   "readme": "README.md",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solarity/solidity-lib",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "license": "MIT",
   "author": "Distributed Lab",
   "description": "Solidity Library by Distributed Lab",
diff --git a/test/contracts-registry/ContractsRegistry.test.ts b/test/contracts-registry/ContractsRegistry.test.ts
diff --git a/test/contracts-registry/pools/PoolContractsRegistry.test.ts b/test/contracts-registry/pools/PoolContractsRegistry.test.ts
diff --git a/test/contracts-registry/pools/pool-factory/PoolFactory.test.ts b/test/contracts-registry/pools/pool-factory/PoolFactory.test.ts
diff --git a/test/contracts-registry/pools/presets/MultiOwnablePoolContractsRegistry.test.ts b/test/contracts-registry/pools/presets/MultiOwnablePoolContractsRegistry.test.ts
diff --git a/test/contracts-registry/presets/MultiOwnableContractsRegistry.test.ts b/test/contracts-registry/presets/MultiOwnableContractsRegistry.test.ts
diff --git a/test/diamond/Diamond.test.ts b/test/diamond/Diamond.test.ts

Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,6 @@ abstract contract OwnablePoolContractsRegistry is`
`40`	`40`	`) external onlyOwner {`
`41`	`41`	`_injectDependenciesToExistingPoolsWithData(name_, data_, offset_, limit_);`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ function addProxyPool(string memory name_, address poolAddress_) public virtual;`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@ pragma solidity ^0.8.4;`
`3`	`3`
`4`	`4`	`import {AbstractDependant} from "../../contracts-registry/AbstractDependant.sol";`
`5`	`5`
`6`		`-import {ContractsRegistry1} from "./ContractsRegistry1.sol";`
	`6`	`+import {ContractsRegistryMock} from "./ContractsRegistryMock.sol";`
`7`	`7`
`8`		`-contract CRDependant is AbstractDependant {`
	`8`	`+contract DependantMock is AbstractDependant {`
`9`	`9`	`address public token;`
`10`	`10`
`11`	`11`	`function setDependencies(address contractsRegistry_, bytes memory) public override dependant {`
`12`		`- token = ContractsRegistry1(contractsRegistry_).getTokenContract();`
	`12`	`+ token = ContractsRegistryMock(contractsRegistry_).getTokenContract();`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@ pragma solidity ^0.8.4;`
`3`	`3`
`4`	`4`	`import {AbstractDependant} from "../../../contracts-registry/AbstractDependant.sol";`
`5`	`5`
`6`		`-import {ContractsRegistry2} from "./ContractsRegistry2.sol";`
	`6`	`+import {ContractsRegistryPoolMock} from "./ContractsRegistryPoolMock.sol";`
`7`	`7`
`8`		`-contract Pool is AbstractDependant {`
	`8`	`+contract PoolMock is AbstractDependant {`
`9`	`9`	`address public token;`
`10`	`10`
`11`	`11`	`function setDependencies(address contractsRegistry_, bytes memory) public override dependant {`
`12`		`- token = ContractsRegistry2(contractsRegistry_).getTokenContract();`
	`12`	`+ token = ContractsRegistryPoolMock(contractsRegistry_).getTokenContract();`
`13`	`13`	`}`
`14`	`14`	`}`