@etherisc/gif-next 0.0.2-fd4931b-974 → 0.0.2-fd4ee14-428

package/contracts/registry/RegistryService.sol

@@ -15,7 +15,6 @@ import {IDistributionComponent} from "../../contracts/distribution/IDistribution
 import {IVersionable} from "../../contracts/shared/IVersionable.sol";
 import {Versionable} from "../../contracts/shared/Versionable.sol";
 import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
-import {Registerable} from "../../contracts/shared/Registerable.sol";
 
 import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/type/RoleId.sol";
 import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.sol";
@@ -38,11 +37,6 @@ contract RegistryService is
     // TODO update to real hash when registry is stable
     bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
 
-    // From IService
-    function getDomain() public pure override returns(ObjectType serviceDomain) {
-        return REGISTRY(); 
-    }
-
     // from Versionable
 
     /// @dev top level initializer
@@ -197,68 +191,6 @@ contract RegistryService is
         nftId = getRegistry().register(info);
     }
 
-    // from IRegisterable
-
-    // TODO cleanup
-    // function getFunctionConfigs()
-    //     external
-    //     pure
-    //     returns(
-    //         FunctionConfig[] memory config
-    //     )
-    // {
-    //     config = new FunctionConfig[](11);
-
-    //     // order of service registrations MUST be reverse to this array 
-    //     /*config[-1].serviceDomain = STAKE();
-    //     config[-1].selector = RegistryService.registerStake.selector;*/
-
-    //     config[0].serviceDomain = POLICY();
-    //     config[0].authorizedSelectors = new bytes4[](0);
-
-    //     config[1].serviceDomain = APPLICATION();
-    //     config[1].authorizedSelectors = new bytes4[](1);
-    //     config[1].authorizedSelectors[0] = RegistryService.registerPolicy.selector;
-
-    //     config[2].serviceDomain = CLAIM();
-    //     config[2].authorizedSelectors = new bytes4[](0);
-
-    //     config[3].serviceDomain = PRODUCT();
-    //     config[3].authorizedSelectors = new bytes4[](1);
-    //     config[3].authorizedSelectors[0] = RegistryService.registerProduct.selector;
-
-    //     config[4].serviceDomain = POOL();
-    //     config[4].authorizedSelectors = new bytes4[](1);
-    //     config[4].authorizedSelectors[0] = RegistryService.registerPool.selector;
-
-    //     // registration of bundle service must preceed registration of pool service
-    //     config[5].serviceDomain = BUNDLE();
-    //     config[5].authorizedSelectors = new bytes4[](1);
-    //     config[5].authorizedSelectors[0] = RegistryService.registerBundle.selector;
-
-    //     // registration of pricing service must preceed registration of application service
-    //     config[6].serviceDomain = PRICE();
-    //     config[6].authorizedSelectors = new bytes4[](0);
-
-    //     // registration of distribution service must preceed registration of pricing service
-    //     config[7].serviceDomain = DISTRIBUTION();
-    //     config[7].authorizedSelectors = new bytes4[](2);
-    //     config[7].authorizedSelectors[0] = RegistryService.registerDistribution.selector;
-    //     config[7].authorizedSelectors[1] = RegistryService.registerDistributor.selector;
-
-    //     config[8].serviceDomain = COMPONENT();
-    //     config[8].authorizedSelectors = new bytes4[](1);
-    //     config[8].authorizedSelectors[0] = RegistryService.registerComponent.selector;
-
-    //     config[9].serviceDomain = INSTANCE();
-    //     config[9].authorizedSelectors = new bytes4[](1);
-    //     config[9].authorizedSelectors[0] = RegistryService.registerInstance.selector;
-
-    //     config[10].serviceDomain = STAKING();
-    //     config[10].authorizedSelectors = new bytes4[](1);
-    //     config[10].authorizedSelectors[0] = RegistryService.registerStaking.selector;
-    // }
-
     // Internal
 
     function _getAndVerifyContractInfo(
@@ -308,8 +240,9 @@ contract RegistryService is
         internal
         view
     {
-        // enforce instead of check
-        info.objectAddress = address(0);
+        if(info.objectAddress > address(0)) {
+            revert ErrorRegistryServiceObjectAddressNotZero(info.objectType);
+        }
 
         if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
             revert ErrorRegistryServiceObjectTypeInvalid(expectedType, info.objectType);
@@ -325,4 +258,9 @@ contract RegistryService is
             revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
         }
     }
+
+    // From IService
+    function _getDomain() internal override pure returns(ObjectType serviceDomain) {
+        return REGISTRY(); 
+    }
 }

package/contracts/registry/RegistryServiceManager.sol

@@ -1,15 +1,9 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
-import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
-
-import {Registry} from "./Registry.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {ProxyManager} from "../shared/ProxyManager.sol";
 import {RegistryService} from "./RegistryService.sol";
-import {TokenRegistry} from "./TokenRegistry.sol";
-
 
 contract RegistryServiceManager is
     ProxyManager
@@ -37,7 +31,6 @@ contract RegistryServiceManager is
             revert ErrorRegistryAccessManagerRegistryZero();
         }
         
-        // implementation's initializer func `data` argument
         RegistryService srv = new RegistryService{ salt: salt }();
         bytes memory data = abi.encode(registry, authority);
         IVersionable versionable = deployDetermenistic(
@@ -46,18 +39,6 @@ contract RegistryServiceManager is
             salt);
 
         _registryService = RegistryService(address(versionable));
-
-//        _linkToNftOwnable(address(_registryService));
-    }
-
-    // // from IRegisterable
-
-    // // IMPORTANT: registry here and in constructor MUST be the same
-    function linkOwnershipToServiceNft()
-        public
-        onlyOwner
-    {
-        _linkToNftOwnable(address(_registryService));
     }
 
     //--- view functions ----------------------------------------------------//