@etherisc/gif-next 0.0.2-9d3eab3-323 → 0.0.2-9dd1984-554

package/contracts/registry/Registry.sol

@@ -2,27 +2,23 @@
 pragma solidity ^0.8.20;
 
 
-import {NftId, toNftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {Version, VersionPart, VersionLib, VersionPartLib} from "../types/Version.sol";
+import {NftId, toNftId, zeroNftId} from "../types/NftId.sol";
+import {VersionPart} from "../types/Version.sol";
 import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
 
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IService} from "../shared/IService.sol";
 import {ERC165} from "../shared/ERC165.sol";
 
 import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
-import {IRegistryService} from "./IRegistryService.sol";
-import {ITransferInterceptor} from "./ITransferInterceptor.sol";
 import {ReleaseManager} from "./ReleaseManager.sol";
 
-// IMPORTANT (OPTION 1)
+// IMPORTANT
 // Each NFT minted by registry is accosiated with:
 // 1) NFT owner
 // 2) registred contract OR object stored in registered (parent) contract
 // Four registration flows:
-// 1) IService address by release manager (SERVICE of type SERVICE aka registry service)
-// 2) IService address by release manager (SERVICE of type !SERVICE aka regular service)
+// 1) IService address by release manager (SERVICE of domain SERVICE aka registry service aka release creation)
+// 2) IService address by release manager (SERVICE of domain !SERVICE aka regular service)
 // 3) IRegisterable address by regular service (INSTANCE, PRODUCT, POOL, DISTRIBUTION, ORACLE)
 // 4) state object by regular service (POLICY, BUNDLE, STAKE)
 
@@ -30,15 +26,15 @@ contract Registry is
     ERC165,
     IRegistry
 {
-    uint256 public constant GIF_MAJOR_VERSION_AT_DEPLOYMENT = 3;
     address public constant NFT_LOCK_ADDRESS = address(0x1);
     uint256 public constant REGISTRY_TOKEN_SEQUENCE_ID = 2;
-    uint256 public constant REGISTRY_SERVICE_TOKEN_SEQUENCE_ID = 3;
     string public constant EMPTY_URI = "";
 
     mapping(NftId nftId => ObjectInfo info) internal _info;
     mapping(address object => NftId nftId) internal _nftIdByAddress;
 
+    mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) _service;
+
     mapping(ObjectType objectType => mapping(
             ObjectType parentType => bool)) internal _isValidContractCombination;
 
@@ -64,12 +60,9 @@ contract Registry is
         _;
     }
 
-    constructor(address releaseManager, VersionPart initialVersion)
+    constructor()
     {
-        require(releaseManager > address(0), "Registry: release manager is 0");
-        require(initialVersion.toInt() > 0, "Registry: initial version is 0");
-
-        _releaseManager = ReleaseManager(releaseManager);
+        _releaseManager = ReleaseManager(msg.sender);
 
         // deploy NFT 
         _chainNft = new ChainNft(address(this));// adds 10kb to deployment size
@@ -84,7 +77,11 @@ contract Registry is
         _registerInterface(type(IRegistry).interfaceId);
     }
 
-    function registerService(ObjectInfo memory info)
+    function registerService(
+        ObjectInfo memory info, 
+        VersionPart version, 
+        ObjectType domain
+    )
         external
         onlyReleaseManager
         returns(NftId nftId)
@@ -95,7 +92,16 @@ contract Registry is
         }
         info.initialOwner = NFT_LOCK_ADDRESS <- if services are access managed
         */
+
+        if(_service[version][domain] > address(0)) {
+            revert ServiceAlreadyRegistered(info.objectAddress);
+        }
+
+        _service[version][domain] = info.objectAddress; // nftId;
+
         nftId = _register(info);
+
+        emit LogServiceRegistration(version, domain);
     }
 
     function register(ObjectInfo memory info)
@@ -132,6 +138,11 @@ contract Registry is
         return _releaseManager.getLatestVersion();
     }
 
+    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory)
+    {
+        return _releaseManager.getReleaseInfo(version);
+    }
+
     function getObjectCount() external view override returns (uint256) {
         return _chainNft.totalSupply();
     }
@@ -173,11 +184,11 @@ contract Registry is
     }
 
     function getServiceAddress(
-        ObjectType serviceType, 
+        ObjectType serviceDomain, 
         VersionPart releaseVersion
     ) external view returns (address)
     {
-        return _releaseManager.getService(releaseVersion, serviceType);
+        return _service[releaseVersion][serviceDomain];
     }
 
     function getChainNft() external view override returns (ChainNft) {

package/contracts/registry/RegistryAccessManager.sol

@@ -4,15 +4,11 @@ pragma solidity ^0.8.20;
 import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
-import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
 import {RoleId, RoleIdLib,
         REGISTRY_SERVICE_MANAGER_ROLE,
         REGISTRY_SERVICE_ADMIN_ROLE,
         RELEASE_MANAGER_ROLE} from "../types/RoleId.sol";
 
-import {Registry} from "./Registry.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
-import {IRegistryService} from "./IRegistryService.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {ReleaseManager} from "./ReleaseManager.sol";
 
@@ -37,9 +33,12 @@ import {ReleaseManager} from "./ReleaseManager.sol";
 
 contract RegistryAccessManager is AccessManaged
 {
-    uint64 public constant CUSTOM_ROLE_ID_MIN = 1000000;
+    error NotInitialized();
+    error AlreadyInitialized();
+
+    uint64 public constant UNIQUE_ROLE_ID_MIN = 1000000;
     
-    AccessManager private _accessManager;
+    AccessManager private immutable _accessManager;
     address private _releaseManager;
     address private _tokenRegistry;
 
@@ -48,15 +47,15 @@ contract RegistryAccessManager is AccessManaged
 
     modifier onlyOnce() {
         if(_isInitialized) {
-            revert();
-        }
+            revert AlreadyInitialized();
+        } 
         _;
         _isInitialized = true;
     }
 
     modifier onlyInitialized() {
         if(!_isInitialized) {
-            revert();
+            revert NotInitialized();
         }
         _;
     }
@@ -67,7 +66,7 @@ contract RegistryAccessManager is AccessManaged
         _accessManager = new AccessManager(address(this));
         setAuthority(address(_accessManager));
 
-        _idNext = CUSTOM_ROLE_ID_MIN;
+        _idNext = UNIQUE_ROLE_ID_MIN;
 
         _configureAdminRoleInitial();
 
@@ -76,16 +75,16 @@ contract RegistryAccessManager is AccessManaged
         _grantRole(REGISTRY_SERVICE_MANAGER_ROLE(), manager, 0);
     }
 
-    // TODO need release manager authorization to configure roles for service functions and to grant those roles
     function initialize(address releaseManager, address tokenRegistry)
         external 
         restricted // GIF_ADMIN_ROLE
         onlyOnce
     {
-        if(
-            _releaseManager > address(0) ||
-            _tokenRegistry > address(0))
-        { revert(); }
+        require(
+            ReleaseManager(releaseManager).authority() == address(_accessManager),
+            "RegistryAccessManager: release manager authority is invalid");
+        require(tokenRegistry > address(0), "RegistryAccessManager: token registry is 0");
+        //require(tokenRegistry.authority() == address(_accessManager));
 
         _releaseManager = releaseManager;
         _tokenRegistry = tokenRegistry;
@@ -108,13 +107,14 @@ contract RegistryAccessManager is AccessManaged
         onlyInitialized
         returns(RoleId)
     {
+        // TODO questionable check...
         // target is not part of `runtime`
-        if(
-            target == address(this) ||
-            target == address(_accessManager) || 
-            target == _releaseManager || 
-            target == _tokenRegistry)
-        { revert(); }
+        //if(
+        //    target == address(this) ||
+        //    target == address(_accessManager) || 
+        //    target == _releaseManager || 
+        //    target == _tokenRegistry)
+        //{ return TargetInvalid(); }
 
         RoleId roleId = _getNextRoleId();
 
@@ -154,14 +154,14 @@ contract RegistryAccessManager is AccessManaged
     {
         bytes4[] memory functionSelector = new bytes4[](1);
 
-        // REGISTRY_SERVICE_ADMIN_ROLE for RegistryServiceProxyManager
+        // for RegistryServiceProxyManager
         // TODO upgrading with releaseManager.upgrade()->proxy.upgrade()???
         //functionSelector[0] = RegistryServiceManager.upgrade.selector;
         //_setTargetFunctionRole(address(this), functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
 
-        // REGISTRY_SERVICE_ADMIN_ROLE for TokenRegistry
+        // for TokenRegistry
 
-        // REGISTRY_SERVICE_ADMIN_ROLE for ReleaseManager
+        // for ReleaseManager
         functionSelector[0] = ReleaseManager.createNextRelease.selector;
         _setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
         //functionSelector[0] = ReleaseManager.activateNextRelease.selector;
@@ -172,15 +172,15 @@ contract RegistryAccessManager is AccessManaged
     {
         bytes4[] memory functionSelector = new bytes4[](1);
 
-        // REGISTRY_SERVICE_MANAGER_ROLE for TokenRegistry
+        // for TokenRegistry
         functionSelector[0] = TokenRegistry.setActive.selector;
         _setTargetFunctionRole(address(_tokenRegistry), functionSelector, REGISTRY_SERVICE_MANAGER_ROLE());
 
-        // REGISTRY_SERVICE_MANAGER_ROLE for ReleaseManager
+        // for ReleaseManager
         functionSelector[0] = ReleaseManager.registerService.selector;
         _setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_MANAGER_ROLE());
 
-        // set REGISTRY_SERVICE_ADMIN_ROLE as admin for REGISTRY_SERVICE_MANAGER_ROLE
+        // set admin
         _setRoleAdmin(REGISTRY_SERVICE_MANAGER_ROLE(), REGISTRY_SERVICE_ADMIN_ROLE());
     }
 

package/contracts/registry/RegistryService.sol

@@ -8,7 +8,7 @@ import {IRegistry} from "./IRegistry.sol";
 import {IInstance} from "../instance/IInstance.sol";
 
 import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
-import {IBaseComponent} from "../../contracts/components/IBaseComponent.sol";
+import {IComponent} from "../../contracts/components/IComponent.sol";
 import {IPoolComponent} from "../../contracts/components/IPoolComponent.sol";
 import {IProductComponent} from "../../contracts/components/IProductComponent.sol";
 import {IDistributionComponent} from "../../contracts/components/IDistributionComponent.sol";
@@ -62,7 +62,7 @@ contract RegistryService is
         return (info, data);
     }
 
-    function registerProduct(IBaseComponent product, address owner)
+    function registerProduct(IComponent product, address owner)
         external
         restricted
         returns(
@@ -78,13 +78,11 @@ contract RegistryService is
         (info, data) = _getAndVerifyContractInfo(product, PRODUCT(), owner);
 
         info.nftId = _registry.register(info);
-        // TODO unsafe, let component or its owner derive nftId latter, when state assumptions and modifications of GIF contracts are finished  
-        product.linkToRegisteredNftId();
 
         return (info, data);  
     }
 
-    function registerPool(IBaseComponent pool, address owner)
+    function registerPool(IComponent pool, address owner)
         external
         restricted
         returns(
@@ -99,12 +97,11 @@ contract RegistryService is
         (info, data) = _getAndVerifyContractInfo(pool, POOL(), owner);
 
         info.nftId = _registry.register(info);
-        pool.linkToRegisteredNftId();
 
         return (info, data);  
     }
 
-    function registerDistribution(IBaseComponent distribution, address owner)
+    function registerDistribution(IComponent distribution, address owner)
         external
         restricted
         returns(
@@ -118,8 +115,7 @@ contract RegistryService is
 
         (info, data) = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
 
-        info.nftId = _registry.register(info); 
-        distribution.linkToRegisteredNftId();
+        info.nftId = _registry.register(info);
 
         return (info, data);  
     }
@@ -156,7 +152,7 @@ contract RegistryService is
 
     // From IService
     function getDomain() public pure override(IService, Service) returns(ObjectType serviceDomain) {
-        return SERVICE(); 
+        return REGISTRY(); 
     }
 
     // from Versionable
@@ -194,34 +190,28 @@ contract RegistryService is
 
         FunctionConfig[] memory config = new FunctionConfig[](6);
 
-        // registerInstance() have no restriction
-        config[0].serviceDomain = INSTANCE();
-        config[0].selector = new bytes4[](1);
-        config[0].selector[0] = RegistryService.registerInstance.selector;
+        // order of service registrations MUST be reverse to this array 
+        /*config[-1].serviceDomain = STAKE();
+        config[-1].selector = RegistryService.registerStake.selector;*/
 
-        config[1].serviceDomain = POOL();
-        config[1].selector = new bytes4[](1);
-        config[1].selector[0] = RegistryService.registerPool.selector;
+        config[0].serviceDomain = POLICY();
+        config[0].selector = RegistryService.registerPolicy.selector;
 
-        config[2].serviceDomain = DISTRIBUTION();
-        config[2].selector = new bytes4[](1);
-        config[2].selector[0] = RegistryService.registerDistribution.selector;
+        config[1].serviceDomain = BUNDLE();
+        config[1].selector = RegistryService.registerBundle.selector;
 
-        config[3].serviceDomain = PRODUCT();
-        config[3].selector = new bytes4[](1);
-        config[3].selector[0] = RegistryService.registerProduct.selector;
+        config[2].serviceDomain = PRODUCT();
+        config[2].selector = RegistryService.registerProduct.selector;
 
-        config[4].serviceDomain = POLICY();
-        config[4].selector = new bytes4[](1);
-        config[4].selector[0] = RegistryService.registerPolicy.selector;
+        config[3].serviceDomain = POOL();
+        config[3].selector = RegistryService.registerPool.selector;
 
-        config[5].serviceDomain = BUNDLE();
-        config[5].selector = new bytes4[](1);
-        config[5].selector[0] = RegistryService.registerBundle.selector;
+        config[4].serviceDomain = DISTRIBUTION();
+        config[4].selector = RegistryService.registerDistribution.selector;
 
-        /*config[6].serviceDomain = STAKE();
-        config[6].selector = new bytes4[](1);
-        config[6].selector[0] = RegistryService.registerStake.selector;*/
+        // registerInstance() have no restriction
+        config[5].serviceDomain = INSTANCE();
+        config[5].selector = RegistryService.registerInstance.selector;
 
         data = abi.encode(config);
     }

package/contracts/registry/RegistryServiceManager.sol

@@ -17,7 +17,7 @@ contract RegistryServiceManager is
 {
     bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
 
-    RegistryService private immutable _registryService; 
+    RegistryService private immutable _registryService;
 
     /// @dev initializes proxy manager with registry service implementation and deploys registry
     constructor(
@@ -25,6 +25,9 @@ contract RegistryServiceManager is
         address registry) // used by implementation 
         ProxyManager()
     {
+        require(initialAuthority > address(0), "RegistryServiceManager: initial authority is 0");
+        require(registry > address(0), "RegistryServiceManager: registry is 0");
+        
         // implementation's initializer func `data` argument
         bytes memory initializationData = abi.encode(
             initialAuthority,
@@ -35,7 +38,6 @@ contract RegistryServiceManager is
             initializationData);
 
         _registryService = RegistryService(address(versionable));
-
     }
 
     // from IRegisterable