@etherisc/gif-next 0.0.2-bf75dbb-287 → 0.0.2-bfb44e0-483

package/contracts/registry/IRegistry.sol

@@ -3,29 +3,31 @@ pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {ChainNft} from "./ChainNft.sol";
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 import {VersionPart} from "../types/Version.sol";
+import {Timestamp} from "../types/Timestamp.sol";
 
 interface IRegistry is IERC165 {
 
-    event LogInitialMajorVersionSet(VersionPart majorVersion);
-    event LogMajorVersionSet(VersionPart majorVersionMax);
-    event LogRegistration(ObjectInfo info);
-    event LogServiceNameRegistration(string serviceName, VersionPart majorVersion); 
+    event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
 
-    // setMajorVersion()
-    error NotOwner(address account);
-    error MajorVersionMaxIncreaseInvalid(VersionPart newMajorVersionMax, VersionPart existingMaxMajorVersion);
+    // registerService()
+    error CallerNotReleaseManager();
+    error ServiceAlreadyRegistered(address service);
 
     // register()
-    error NotRegistryService();
+    error CallerNotRegistryService();
+    error ServiceRegistration();
+
+    // registerWithCustomTypes()
+    error CoreTypeRegistration();
+
+    // _register()
     error ZeroParentAddress();
     error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
     error ContractAlreadyRegistered(address objectAddress);
-    error InvalidServiceVersion(VersionPart majorVersion);
-    error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
 
     struct ObjectInfo {
         NftId nftId;
@@ -38,15 +40,29 @@ interface IRegistry is IERC165 {
     }// TODO delete nftId and initialOwner(if not used) from struct
     // TODO strong disagree, keep nftId there (lets keep get object info return object consistent)
 
-    function setMajorVersion(VersionPart newMajorVersionMax) external;
+    struct ReleaseInfo {
+        ObjectType[] domains;
+        Timestamp createdAt;
+        //Timestamp updatedAt;
+    }
+
+    function registerService(
+        ObjectInfo memory serviceInfo, 
+        VersionPart serviceVersion, 
+        ObjectType serviceDomain
+    ) external returns(NftId nftId);
 
     function register(ObjectInfo memory info) external returns (NftId nftId);
 
-    function getMajorVersionMin() external view returns (VersionPart);
+    function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
 
-    function getMajorVersionMax() external view returns (VersionPart);
+    function getInitialVersion() external view returns (VersionPart);
 
-    function getMajorVersion() external view returns (VersionPart);
+    function getNextVersion() external view returns (VersionPart);
+
+    function getLatestVersion() external view returns (VersionPart);
+
+    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory);
 
     function getObjectCount() external view returns (uint256);
 
@@ -68,14 +84,16 @@ interface IRegistry is IERC165 {
 
     function isRegisteredService(address contractAddress) external view returns (bool);
 
-    function getServiceName(NftId nftId) external view returns (string memory name);
+    function isValidRelease(VersionPart version) external view returns (bool);
 
     function getServiceAddress(
-        string memory serviceName, 
-        VersionPart majorVersion
+        ObjectType serviceDomain, 
+        VersionPart releaseVersion
     ) external view returns (address serviceAddress);
 
-    function getChainNft() external view returns (ChainNft);
+    function getReleaseManagerAddress() external view returns (address);
+
+    function getChainNftAddress() external view returns (address);
 
     function getOwner() external view returns (address);
 }

package/contracts/registry/IRegistryService.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
+
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 import {RoleId} from "../types/RoleId.sol";
@@ -8,10 +10,12 @@ import {IService} from "../shared/IService.sol";
 import {IRegistry} from "./IRegistry.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IBaseComponent} from "../components/IBaseComponent.sol";
-
-interface IRegistryService is IService {
+import {IComponent} from "../components/IComponent.sol";
 
+interface IRegistryService is 
+     IService, 
+     IAccessManaged 
+{
      error SelfRegistration();
      error NotRegistryOwner();
 
@@ -28,22 +32,33 @@ interface IRegistryService is IService {
      error InvalidInitialOwner(address initialOwner);
      error InvalidAddress(address registerableAddress);
 
+     struct FunctionConfig
+     {
+          ObjectType serviceDomain;
+          bytes4 selector;
+     }
 
-     function registerService(IService service)  external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+    function getFunctionConfigs()
+        external
+        pure
+        returns(
+            FunctionConfig[] memory config
+        );
 
-     function registerInstance(IRegisterable instance)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data); 
+     // TODO used by service -> add owner arg 
+    function registerInstance(IRegisterable instance, address owner)
+          external returns(IRegistry.ObjectInfo memory info); 
 
-     function registerProduct(IBaseComponent product, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerProduct(IComponent product, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerPool(IBaseComponent pool, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerPool(IComponent pool, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerDistribution(IBaseComponent distribution, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerDistribution(IComponent distribution, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId); // -> easy to upgrade
+     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 
      function registerBundle(IRegistry.ObjectInfo memory info) external returns(NftId nftId); 
 }