@etherisc/gif-next 0.0.2-ead1eb0-841 → 0.0.2-eadf4ad-211

package/contracts/product/ClaimServiceManager.sol

@@ -11,15 +11,18 @@ contract ClaimServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        ClaimService svc = new ClaimService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        ClaimService svc = new ClaimService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(svc), 
-            data);
+            data,
+            salt);
 
         _claimService = ClaimService(address(versionable));
     }

package/contracts/product/PolicyService.sol

@@ -61,11 +61,13 @@ contract PolicyService is
         virtual override
         initializer
     {
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, address(0), owner);
+        initializeService(registryAddress, authority, owner);
 
         VersionPart majorVersion = getVersion().toMajorPart();
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));

package/contracts/product/PolicyServiceManager.sol

@@ -14,32 +14,20 @@ contract PolicyServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with product service implementation 
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        PolicyService svc = new PolicyService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        PolicyService svc = new PolicyService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(svc), 
-            data);
+            data,
+            salt);
 
         _policyService = PolicyService(address(versionable));
-
-        // Registry registry = Registry(registryAddress);
-        // address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
-        // RegistryService registryService = RegistryService(registryServiceAddress);
-        // TODO this must have a role or own nft to register service
-        //registryService.registerService(_productService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_productService));
-
-        // implies that after this constructor call only upgrade functionality is available
-        // _isDeployed = true;
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/PricingService.sol

@@ -45,12 +45,13 @@ contract PricingService is
         virtual override
         initializer()
     {
-        // TODO check this, might no longer be the way, refactor if necessary
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, address(0), owner);
+        initializeService(registryAddress, authority, owner);
         registerInterface(type(IPricingService).interfaceId);
 
         _distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));

package/contracts/product/PricingServiceManager.sol

@@ -12,31 +12,22 @@ contract PricingServiceManager is ProxyManager {
 
     PricingService private _pricingService;
 
-    /// @dev initializes proxy manager with distribution service implementation and deploys instance
+    /// @dev initializes proxy manager with pricing service implementation and deploys instance
     constructor(
-        address registryAddress
+        address authority, 
+        address registryAddress,
+        bytes32 salt
     )
         ProxyManager(registryAddress)
     {
-        PricingService pricingSrv = new PricingService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        PricingService pricingSrv = new PricingService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(pricingSrv), 
-            data);
+            data,
+            salt);
 
         _pricingService = PricingService(address(versionable));
-        
-        // TODO `thi` must have a role or own nft to register service
-        //Registry registry = Registry(registryAddress);
-        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _distributionService.getMajorVersion());
-        //RegistryService registryService = RegistryService(registryServiceAddress);
-        //registryService.registerService(_distributionService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_distributionService));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/ProductService.sol

@@ -56,11 +56,13 @@ contract ProductService is ComponentService, IProductService {
         initializer
         virtual override
     {
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, address(0), owner);
+        initializeService(registryAddress, authority, owner);
 
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
 

package/contracts/product/ProductServiceManager.sol

@@ -14,32 +14,20 @@ contract ProductServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with product service implementation 
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        ProductService svc = new ProductService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        ProductService svc = new ProductService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(svc), 
-            data);
+            data,
+            salt);
 
         _productService = ProductService(address(versionable));
-
-        // Registry registry = Registry(registryAddress);
-        // address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
-        // RegistryService registryService = RegistryService(registryServiceAddress);
-        // TODO this must have a role or own nft to register service
-        //registryService.registerService(_productService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_productService));
-
-        // implies that after this constructor call only upgrade functionality is available
-        // _isDeployed = true;
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/registry/IRegistry.sol

@@ -7,6 +7,7 @@ import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {VersionPart} from "../type/Version.sol";
 import {Timestamp} from "../type/Timestamp.sol";
+import {RoleId} from "../type/RoleId.sol";
 
 interface IRegistry is IERC165 {
 
@@ -14,20 +15,20 @@ interface IRegistry is IERC165 {
     event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
 
     // registerService()
-    error CallerNotReleaseManager();
-    error ServiceAlreadyRegistered(address service);
+    error ErrorRegistryCallerNotReleaseManager();
+    error ErrorRegistryDomainZero(address service);
+    error ErrorRegistryDomainAlreadyRegistered(address service, VersionPart version, ObjectType domain);
 
     // register()
-    error CallerNotRegistryService();
-    error ServiceRegistration();
+    error ErrorRegistryCallerNotRegistryService();
 
     // registerWithCustomTypes()
-    error CoreTypeRegistration();
+    error ErrorRegistryCoreTypeRegistration();
 
     // _register()
-    error ZeroParentAddress();
-    error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
-    error ContractAlreadyRegistered(address objectAddress);
+    error ErrorRegistryParentAddressZero();
+    error ErrorRegistryTypesCombinationInvalid(ObjectType objectType, ObjectType parentType);
+    error ErrorRegistryContractAlreadyRegistered(address objectAddress);
 
     struct ObjectInfo {
         NftId nftId;
@@ -37,13 +38,17 @@ interface IRegistry is IERC165 {
         address objectAddress;
         address initialOwner;
         bytes data;
-    }// TODO delete nftId and initialOwner(if not used) from struct
-    // TODO strong disagree, keep nftId there (lets keep get object info return object consistent)
+    }
+
 
     struct ReleaseInfo {
+        VersionPart version;
+        address[] addresses;
+        RoleId[][] serviceRoles;
+        RoleId[][] functionRoles;
+        bytes4[][][] selectors;
         ObjectType[] domains;
-        Timestamp createdAt;
-        //Timestamp updatedAt;
+        Timestamp activatedAt;
     }
 
     function registerService(
@@ -95,6 +100,8 @@ interface IRegistry is IERC165 {
 
     function getReleaseManagerAddress() external view returns (address);
 
+    function getReleaseAccessManagerAddress(VersionPart version) external view returns (address);
+
     function getChainNftAddress() external view returns (address);
 
     function getOwner() external view returns (address);

package/contracts/registry/IRegistryService.sol

@@ -15,36 +15,28 @@ import {IComponent} from "../shared/IComponent.sol";
 interface IRegistryService is 
      IService
 {
-     error SelfRegistration();
-     error NotRegistryOwner();
-
-     error NotService();
-     error NotInstance();
-     error NotProduct();
-     error NotPool();
-     error NotDistribution();
-
-     error UnexpectedRegisterableType(ObjectType expected, ObjectType found);
-     error NotRegisterableOwner(address expectedOwner);
-     error RegisterableOwnerIsZero();   
-     error RegisterableOwnerIsRegistered();
-     error InvalidInitialOwner(address initialOwner);
-     error InvalidAddress(address registerableAddress);
-
-     struct FunctionConfig
-     {
-          ObjectType serviceDomain;
-          bytes4[] selectors;
-     }
-
-     function getFunctionConfigs()
-          external
-          pure
-          returns(
-               FunctionConfig[] memory config
-          );
-
-     // TODO used by service -> add owner arg 
+     error ErrorRegistryServiceNotRegistryOwner();
+
+     error ErrorRegistryServiceNotService(address notService);
+     error ErrorRegistryServiceNotInstance(address notInstance);
+     error ErrorRegistryServiceNotProduct(address notProduct);
+     error ErrorRegistryServiceNotPool(address notPool);
+     error ErrorRegistryServiceNotDistribution(address notDistribution);
+
+     error ErrorRegistryServiceRegisterableAddressInvalid(IRegisterable registerable, address found);
+     error ErrorRegistryServiceRegisterableTypeInvalid(IRegisterable registerable, ObjectType expected, ObjectType found);
+     error ErrorRegistryServiceRegisterableOwnerInvalid(IRegisterable registerable, address expected, address found);
+     error ErrorRegistryServiceRegisterableOwnerZero(IRegisterable registerable);   
+     error ErrorRegistryServiceRegisterableOwnerRegistered(IRegisterable registerable, address owner);
+     error ErrorRegistryServiceRegisterableSelfRegistration(IRegisterable registerable);
+
+     error ErrorRegistryServiceObjectTypeInvalid(ObjectType expected, ObjectType found);
+     error ErrorRegistryServiceObjectOwnerRegistered(ObjectType objectType, address owner);
+     error ErrorRegistryServiceObjectOwnerZero(ObjectType objectType);
+
+     error ErrorRegistryServiceInvalidInitialOwner(address initialOwner);
+     error ErrorRegistryServiceInvalidAddress(address registerableAddress);
+
      function registerInstance(IRegisterable instance, address owner)
           external returns(IRegistry.ObjectInfo memory info); 
 

package/contracts/registry/Registry.sol

@@ -48,14 +48,14 @@ contract Registry is
 
     modifier onlyRegistryService() {
         if(!_releaseManager.isActiveRegistryService(msg.sender)) {
-            revert CallerNotRegistryService();
+            revert ErrorRegistryCallerNotRegistryService();
         }
         _;
     }
 
     modifier onlyReleaseManager() {
         if(msg.sender != address(_releaseManager)) {
-            revert CallerNotReleaseManager();
+            revert ErrorRegistryCallerNotReleaseManager();
         }
         _;
     }
@@ -84,7 +84,16 @@ contract Registry is
         onlyReleaseManager
         returns(NftId nftId)
     {
+        address service = info.objectAddress;
         /* must be guaranteed by release manager
+        if(service == address(0)) {
+            revert();
+        }
+
+        if(version.eqz()) {
+            revert();
+        }
+
         if(info.objectType != SERVICE()) {
             revert();
         }
@@ -94,11 +103,15 @@ contract Registry is
         info.initialOwner == NFT_LOCK_ADDRESS <- if services are access managed
         */
 
-        if(_service[version][domain] > address(0)) {
-            revert ServiceAlreadyRegistered(info.objectAddress);
+        if(domain.eqz()) {
+            revert ErrorRegistryDomainZero(service);
         }
 
-        _service[version][domain] = info.objectAddress; // nftId;
+        if(_service[version][domain] > address(0)) {
+            revert ErrorRegistryDomainAlreadyRegistered(service, version, domain);
+        }
+        
+        _service[version][domain] = service;
 
         nftId = _register(info);
 
@@ -113,23 +126,17 @@ contract Registry is
         ObjectType objectType = info.objectType;
         ObjectType parentType = _info[info.parentNftId].objectType;
 
-        // TODO do not need it here -> SERVICE is no longer part of _coreContractCombinations
-        // no service registrations
-        if(objectType == SERVICE()) {
-            revert ServiceRegistration();
-        }
-
         // only valid core types combinations
         if(info.objectAddress == address(0)) 
         {
             if(_coreObjectCombinations[objectType][parentType] == false) {
-                revert InvalidTypesCombination(objectType, parentType);
+                revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
             }
         }
         else
         {
             if(_coreContractCombinations[objectType][parentType] == false) {
-                revert InvalidTypesCombination(objectType, parentType);
+                revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
             }
         }
 
@@ -145,7 +152,7 @@ contract Registry is
         ObjectType parentType = _info[info.parentNftId].objectType;
 
         if(_coreTypes[objectType]) {
-            revert CoreTypeRegistration();
+            revert ErrorRegistryCoreTypeRegistration();
         }
 
         if(
@@ -153,7 +160,7 @@ contract Registry is
             parentType == REGISTRY() ||
             parentType == SERVICE()
         ) {
-            revert InvalidTypesCombination(objectType, parentType);
+            revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
         }
 
         _register(info);
@@ -189,10 +196,6 @@ contract Registry is
         return _chainNft.totalSupply();
     }
 
-    function getReleaseManagerAddress() external view returns (address) {
-        return address(_releaseManager);
-    }
-
     function getNftId() external view returns (NftId nftId) {
         return _registryNftId;
     }
@@ -244,10 +247,15 @@ contract Registry is
         VersionPart releaseVersion
     ) external view returns (address service)
     {
-        // TODO how can I get service address while release is not validated/activated ?!! -> user will check validity of release on its own
-        //if(_releaseManager.isValidRelease(releaseVersion)) { 
             service =  _service[releaseVersion][serviceDomain]; 
-        //}
+    }
+
+    function getReleaseAccessManagerAddress(VersionPart version) external view returns (address) {
+        return address(_releaseManager.getReleaseAccessManager(version));
+    }
+
+    function getReleaseManagerAddress() external view returns (address) {
+        return address(_releaseManager);
     }
 
     function getChainNftAddress() external view override returns (address) {
@@ -287,7 +295,7 @@ contract Registry is
         // special case: when parentNftId == _chainNft.mint(), check for zero parent address before mint
         // special case: when parentNftId == _chainNft.mint() && objectAddress == initialOwner
         if(parentAddress == address(0)) {
-            revert ZeroParentAddress();
+            revert ErrorRegistryParentAddressZero();
         }
 
         address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
@@ -302,7 +310,7 @@ contract Registry is
             address contractAddress = info.objectAddress;
 
             if(_nftIdByAddress[contractAddress].gtz()) { 
-                revert ContractAlreadyRegistered(contractAddress);
+                revert ErrorRegistryContractAlreadyRegistered(contractAddress);
             }
 
             _nftIdByAddress[contractAddress] = nftId;
@@ -437,30 +445,26 @@ contract Registry is
         _coreTypes[PRODUCT()] = true;
         _coreTypes[POOL()] = true;
         _coreTypes[DISTRIBUTION()] = true;
+        _coreTypes[DISTRIBUTOR()] = true;
+        _coreTypes[ORACLE()] = true;
         _coreTypes[POLICY()] = true;
         _coreTypes[BUNDLE()] = true;
         _coreTypes[STAKE()] = true;
-        
-        // registry as parent, ONLY registry owner
-        //_coreContractCombinations[REGISTRY()][REGISTRY()] = true; // only for global regstry
-        _coreContractCombinations[TOKEN()][REGISTRY()] = true;
-        //_coreContractCombinations[SERVICE()][REGISTRY()] = true;// do not need it here -> registerService() registers exactly this combination
 
-        // registry as parent, ONLY approved
         _coreContractCombinations[INSTANCE()][REGISTRY()] = true;
-
-        // instance as parent, ONLY approved
         _coreContractCombinations[PRODUCT()][INSTANCE()] = true;
         _coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
         _coreContractCombinations[ORACLE()][INSTANCE()] = true;
         _coreContractCombinations[POOL()][INSTANCE()] = true;
 
-        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
+        uint256 registryId = _chainNft.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID);
+        if(registryId == _chainNft.GLOBAL_REGISTRY_ID()) 
+        {// we are global registry
+            _coreObjectCombinations[REGISTRY()][REGISTRY()] = true;
+        }
 
-        // product as parent, ONLY approved
+        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
         _coreObjectCombinations[POLICY()][PRODUCT()] = true;
-
-        // pool as parent, ONLY approved
         _coreObjectCombinations[BUNDLE()][POOL()] = true;
         _coreObjectCombinations[STAKE()][POOL()] = true;
     }