Sprint 2 (#66)

Signed-off-by: Marcos Serradilla Diez <marcos@io.builders>
Signed-off-by: Alberto Molina <alberto@io.builders>
Co-authored-by: Marcos Serradilla Diez <marcos@io.builders>

Author: AlbertoMolinaIoBuilders

contracts/contracts/constants/storagePositions.sol

@@ -210,3 +210,6 @@ pragma solidity 0.8.18;
 
 // keccak256('security.token.standard.businesslogicresolver.storage');
 bytes32 constant _BUSINESS_LOGIC_RESOLVER_STORAGE_POSITION = 0xee633a02a6dacfac8613ddaa3392c5f7367e65b039364b1e3148356be4468439;
+
+// keccak256('security.token.standard.diamond.cut.manager.storage');
+bytes32 constant _DIAMOND_CUT_MANAGER_STORAGE_POSITION = 0x513cea04238a899b11bd2956c2d5e7863b8b3ef2fbd5750604b6755da9ca1cea;

contracts/contracts/factory/Factory.sol

@@ -207,8 +207,10 @@ pragma solidity 0.8.18;
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
 import {IFactory} from '../interfaces/factory/IFactory.sol';
-import {Diamond} from '../diamond/Diamond.sol';
-import {IDiamond} from '../interfaces/diamond/IDiamond.sol';
+import {ResolverProxy} from '../resolver/resolverProxy/ResolverProxy.sol';
+import {
+    IResolverProxy
+} from '../interfaces/resolver/resolverProxy/IResolverProxy.sol';
 import {_DEFAULT_ADMIN_ROLE} from '../layer_1/constants/roles.sol';
 import {IControlList} from '../layer_1/interfaces/controlList/IControlList.sol';
 import {IERC20} from '../layer_1/interfaces/ERC1400/IERC20.sol';
@@ -247,7 +249,7 @@ contract Factory is IFactory, LocalContext {
         _;
     }
 
-    modifier checkAdmins(IDiamond.Rbac[] calldata rbacs) {
+    modifier checkAdmins(IResolverProxy.Rbac[] calldata rbacs) {
         bool adminFound;
 
         // Looking for admin role within initialization rbacas in order to add the factory
@@ -364,9 +366,10 @@ contract Factory is IFactory, LocalContext {
         SecurityData calldata _securityData,
         SecurityType _securityType
     ) private returns (address securityAddress_) {
-        Diamond equity = new Diamond(
+        ResolverProxy equity = new ResolverProxy(
             _securityData.resolver,
-            _securityData.businessLogicKeys,
+            _securityData.resolverProxyConfiguration.key,
+            _securityData.resolverProxyConfiguration.version,
             _securityData.rbacs
         );
 

contracts/contracts/interfaces/factory/IFactory.sol

@@ -206,7 +206,7 @@
 pragma solidity 0.8.18;
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
-import {IDiamond} from '../../interfaces/diamond/IDiamond.sol';
+import {IResolverProxy} from '../resolver/resolverProxy/IResolverProxy.sol';
 import {IBusinessLogicResolver} from '../resolver/IBusinessLogicResolver.sol';
 import {ERC20} from '../../layer_1/ERC1400/ERC20/ERC20.sol';
 import {IBond} from '../../layer_2/interfaces/bond/IBond.sol';
@@ -224,12 +224,17 @@ interface IFactory {
         Equity
     }
 
+    struct ResolverProxyConfiguration {
+        bytes32 key;
+        uint256 version;
+    }
+
     // TODO: Separete common data in new struct
     struct SecurityData {
         bool isMultiPartition;
         IBusinessLogicResolver resolver;
-        bytes32[] businessLogicKeys;
-        IDiamond.Rbac[] rbacs;
+        ResolverProxyConfiguration resolverProxyConfiguration;
+        IResolverProxy.Rbac[] rbacs;
         bool isControllable;
         bool isWhiteList;
         uint256 maxSupply;

contracts/contracts/interfaces/resolver/IBusinessLogicResolver.sol

@@ -204,6 +204,7 @@
 */
 
 pragma solidity 0.8.18;
+import {IDiamondCutManager} from './diamondCutManager/IDiamondCutManager.sol';
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
@@ -218,7 +219,7 @@ pragma solidity 0.8.18;
 /// 		considered fully compatible.
 ///			Registering a business logic (register = update its latest version or add it to the registry) will increase the
 ///			latest version for all Business Logics by 1.
-interface IBusinessLogicResolver {
+interface IBusinessLogicResolver is IDiamondCutManager {
     enum VersionStatus {
         NONE,
         ACTIVATED,

contracts/contracts/interfaces/resolver/diamondCutManager/IDiamondCutManager.sol

@@ -204,16 +204,10 @@
 */
 
 pragma solidity 0.8.18;
+import {IDiamondCut} from './IDiamondCut.sol';
+import {IDiamondLoupe} from './IDiamondLoupe.sol';
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
-interface IDiamond {
-    // When no function exists for function called
-    error FunctionNotFound(bytes4 _functionSelector);
-    error DiamondFacetsNotFound();
-
-    struct Rbac {
-        bytes32 role;
-        address[] members;
-    }
-}
+// solhint-disable-next-line no-empty-blocks
+interface IDiamond is IDiamondCut, IDiamondLoupe {}

…ontracts/interfaces/diamond/IDiamond.sol …aces/resolver/resolverProxy/IDiamond.solcontracts/contracts/interfaces/diamond/IDiamond.sol renamed to contracts/contracts/interfaces/resolver/resolverProxy/IDiamond.sol contracts/contracts/interfaces/diamond/IDiamond.sol renamed to contracts/contracts/interfaces/resolver/resolverProxy/IDiamond.sol

@@ -206,18 +206,27 @@
 pragma solidity 0.8.18;
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
-import {IDiamond} from './IDiamond.sol';
 import {IStaticFunctionSelectors} from './IStaticFunctionSelectors.sol';
-
-interface IDiamondCut is IDiamond, IStaticFunctionSelectors {
-    error InvalidBusinessLogicKey(
-        bytes32 providedBusinesLogicKey,
-        bytes32 contractBusinessLogicKey,
-        address businessLogicAddress
-    );
-    error DiamondFacetNotFoundInRegistry(bytes32 facetKey);
-
-    event FacetsRegistered(bytes32[] businessLogicKeys);
-
-    function registerFacets(bytes32[] calldata _businessLogicKeys) external;
+import {
+    IBusinessLogicResolver
+} from '../../../interfaces/resolver/IBusinessLogicResolver.sol';
+
+interface IDiamondCut is IStaticFunctionSelectors {
+    function updateConfigVersion(uint256 _newVersion) external;
+
+    function updateConfig(
+        bytes32 _newConfigurationId,
+        uint256 _newVersion
+    ) external;
+
+    function updateResolver(
+        IBusinessLogicResolver _newResolver,
+        bytes32 _newConfigurationId,
+        uint256 _newVersion
+    ) external;
+
+    function getConfigInfo()
+        external
+        view
+        returns (address resolver_, bytes32 configurationId_, uint256 version_);
 }

…racts/interfaces/diamond/IDiamondCut.sol …s/resolver/resolverProxy/IDiamondCut.solcontracts/contracts/interfaces/diamond/IDiamondCut.sol renamed to contracts/contracts/interfaces/resolver/resolverProxy/IDiamondCut.sol contracts/contracts/interfaces/diamond/IDiamondCut.sol renamed to contracts/contracts/interfaces/resolver/resolverProxy/IDiamondCut.sol

@@ -208,68 +208,117 @@ pragma solidity 0.8.18;
 
 import {IStaticFunctionSelectors} from './IStaticFunctionSelectors.sol';
 
-// A loupe is a small magnifying glass used to look at diamonds.
-// These functions look at diamonds
+// A loupe is a small magnifying glass used to look at resolverProxys.
+// These functions look at resolverProxys
 /// #### Structs
 /// ```
 ///    struct Facet {
-///        bytes32 facetKey;
+///        bytes32 facetId;
 ///        address facetAddress;
-///        bytes4[] functionSelectors;
+///        bytes4[] selectors;
 ///    }
 ///```
 // HACK: I think that Loupe and Cut should be only one contract.
 interface IDiamondLoupe is IStaticFunctionSelectors {
     struct Facet {
-        bytes32 facetKey;
-        address facetAddress;
-        bytes4[] functionSelectors;
+        bytes32 id;
+        address addr;
+        bytes4[] selectors;
         bytes4[] interfaceIds;
     }
 
     /// @notice Gets all facet addresses and their four byte function selectors.
     /// @return facets_ Facet
     function getFacets() external view returns (Facet[] memory facets_);
 
-    /// @notice Gets all the function selectors supported by a specific facet.
-    /// @param _facetKey The facet key for the resolver.
-    /// @return facetFunctionSelectors_
-    function getFacetFunctionSelectors(
-        bytes32 _facetKey
-    ) external view returns (bytes4[] memory facetFunctionSelectors_);
+    /// @notice Gets facet length.
+    /// @return facetsLength_ Facets length
+    function getFacetsLength() external view returns (uint256 facetsLength_);
+
+    /// @notice Gets all facet addresses and their four byte function selectors.
+    /// @param _pageIndex members to skip : _pageIndex * _pageLength
+    /// @param _pageLength number of members to return
+    /// @return facets_ Facet
+    function getFacetsByPage(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (Facet[] memory facets_);
 
-    /// @notice Get all the facet addresses used by a diamond.
-    /// @return facetKeys_
-    function getFacetKeys() external view returns (bytes32[] memory facetKeys_);
+    /// @notice Gets all the function selectors supported by a specific facet.
+    /// @param _facetId The facet key for the resolver.
+    /// @return facetSelectors_
+    function getFacetSelectors(
+        bytes32 _facetId
+    ) external view returns (bytes4[] memory facetSelectors_);
+
+    /// @notice Gets the function selectors length.
+    /// @param _facetId The facet key for the resolver.
+    /// @return facetSelectorsLength_
+    function getFacetSelectorsLength(
+        bytes32 _facetId
+    ) external view returns (uint256 facetSelectorsLength_);
 
-    /// @notice Get all the facet addresses used by a diamond.
+    /// @notice Gets all the function selectors supported by a specific facet.
+    /// @param _facetId The facet key for the resolver.
+    /// @param _pageIndex members to skip : _pageIndex * _pageLength
+    /// @param _pageLength number of members to return
+    /// @return facetSelectors_
+    function getFacetSelectorsByPage(
+        bytes32 _facetId,
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (bytes4[] memory facetSelectors_);
+
+    /// @notice Get all the facet addresses used by a resolverProxy.
+    /// @return facetIds_
+    function getFacetIds() external view returns (bytes32[] memory facetIds_);
+
+    /// @notice Get all the facet addresses used by a resolverProxy.
+    /// @param _pageIndex members to skip : _pageIndex * _pageLength
+    /// @param _pageLength number of members to return
+    /// @return facetIds_
+    function getFacetIdsByPage(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (bytes32[] memory facetIds_);
+
+    /// @notice Get all the facet addresses used by a resolverProxy.
     /// @return facetAddresses_
     function getFacetAddresses()
         external
         view
         returns (address[] memory facetAddresses_);
 
+    /// @notice Get all the facet addresses used by a resolverProxy.
+    /// @param _pageIndex members to skip : _pageIndex * _pageLength
+    /// @param _pageLength number of members to return
+    /// @return facetAddresses_
+    function getFacetAddressesByPage(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (address[] memory facetAddresses_);
+
     /// @notice Gets the facet key that supports the given selector.
     /// @dev If facet is not found return address(0).
-    /// @param _functionSelector The function selector.
-    /// @return facetKey_ The facet key.
-    function getFacetKeyBySelector(
-        bytes4 _functionSelector
-    ) external view returns (bytes32 facetKey_);
+    /// @param _selector The function selector.
+    /// @return facetId_ The facet key.
+    function getFacetIdBySelector(
+        bytes4 _selector
+    ) external view returns (bytes32 facetId_);
 
     /// @notice Get the information associated with an specific facet.
     /// @dev If facet is not found return empty Facet struct.
-    /// @param _facetKey The facet key for the resolver.
+    /// @param _facetId The facet key for the resolver.
     /// @return facet_ Facet data.
     function getFacet(
-        bytes32 _facetKey
+        bytes32 _facetId
     ) external view returns (Facet memory facet_);
 
     /// @notice Gets the facet that supports the given selector.
     /// @dev If facet is not found return address(0).
-    /// @param _functionSelector The function selector.
+    /// @param _selector The function selector.
     /// @return facetAddress_ The facet address.
     function getFacetAddress(
-        bytes4 _functionSelector
+        bytes4 _selector
     ) external view returns (address facetAddress_);
 }