@etherisc/gif-next 0.0.2-b22ff39-218 → 0.0.2-b38343e-249

package/contracts/registry/IRegistry.sol

@@ -1,80 +1,99 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
-import {NftId} from "../types/NftId.sol";
-
-interface IOwnable {
-    function getOwner() external view returns (address owner);
-}
-
-interface IRegistryLinked {
-    event LogDebug(uint256 idx, address module, string comment);
-
-    function getRegistry() external view returns (IRegistry registry);
-}
-
-interface IRegisterable is IOwnable, IRegistryLinked {
-    function register() external returns (NftId nftId);
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-    function getNftId() external view returns (NftId nftId);
+import {NftId} from "../types/NftId.sol";
+import {ObjectType} from "../types/ObjectType.sol";
+import {VersionPart} from "../types/Version.sol";
+import {Timestamp} from "../types/Timestamp.sol";
 
-    function getParentNftId() external view returns (NftId parentNftId);
+interface IRegistry is IERC165 {
 
-    function getType() external view returns (uint256 objectType);
+    event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
 
-    function getData() external view returns (bytes memory data);
+    // registerService()
+    error CallerNotReleaseManager();
+    error ServiceAlreadyRegistered(address service);
 
-    function isRegisterable() external pure returns (bool);
+    // register()
+    error CallerNotRegistryService();
+    error ServiceRegistration();
 
-    function getInitialOwner() external view returns (address initialOwner);
+    // registerWithCustomTypes()
+    error CoreTypeRegistration();
 
-    function isRegistered() external view returns (bool);
-}
+    // _register()
+    error ZeroParentAddress();
+    error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
+    error ContractAlreadyRegistered(address objectAddress);
 
-interface IRegistry {
-    struct RegistryInfo {
+    struct ObjectInfo {
         NftId nftId;
         NftId parentNftId;
-        uint256 objectType;
+        ObjectType objectType;
+        bool isInterceptor;
         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 {
+        ObjectType[] domains;
+        Timestamp createdAt;
+        //Timestamp updatedAt;
     }
 
-    function TOKEN() external pure returns (uint256);
+    function registerService(
+        ObjectInfo memory serviceInfo, 
+        VersionPart serviceVersion, 
+        ObjectType serviceDomain
+    ) external returns(NftId nftId);
 
-    function INSTANCE() external pure returns (uint256);
+    function register(ObjectInfo memory info) external returns (NftId nftId);
 
-    function PRODUCT() external pure returns (uint256);
+    function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
 
-    function ORACLE() external pure returns (uint256);
+    function getInitialVersion() external view returns (VersionPart);
 
-    function POOL() external pure returns (uint256);
+    function getNextVersion() external view returns (VersionPart);
 
-    function POLICY() external pure returns (uint256);
+    function getLatestVersion() external view returns (VersionPart);
 
-    function BUNDLE() external pure returns (uint256);
+    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory);
 
-    function register(address objectAddress) external returns (NftId nftId);
+    function getObjectCount() external view returns (uint256);
 
-    function registerObjectForInstance(
-        NftId parentNftid,
-        uint256 objectType,
-        address initialOwner
-    ) external returns (NftId nftId);
+    function getNftId() external view returns (NftId nftId);
 
-    function getObjectCount() external view returns (uint256);
+    function getNftId(address objectAddress) external view returns (NftId nftId);
+
+    function ownerOf(NftId nftId) external view returns (address);
+
+    function ownerOf(address contractAddress) external view returns (address);
+
+    function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
+
+    function getObjectInfo(address object) external view returns (ObjectInfo memory info);
+
+    function isRegistered(NftId nftId) external view returns (bool);
+
+    function isRegistered(address contractAddress) external view returns (bool);
+
+    function isRegisteredService(address contractAddress) external view returns (bool);
 
-    function getNftId(
-        address objectAddress
-    ) external view returns (NftId nftId);
+    function isValidRelease(VersionPart version) external view returns (bool);
 
-    function getInfo(
-        NftId nftId
-    ) external view returns (RegistryInfo memory info);
+    function getServiceAddress(
+        ObjectType serviceDomain, 
+        VersionPart releaseVersion
+    ) external view returns (address serviceAddress);
 
-    function getOwner(NftId nftId) external view returns (address ownerAddress);
+    function getReleaseManagerAddress() external view returns (address);
 
-    function isRegistered(address objectAddress) external view returns (bool);
+    function getChainNftAddress() external view returns (address);
 
-    function getNftAddress() external view returns (address nft);
-}
+    function getOwner() external view returns (address);
+}

package/contracts/registry/IRegistryService.sol

@@ -0,0 +1,67 @@
+// 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";
+import {IService} from "../shared/IService.sol";
+import {IRegistry} from "./IRegistry.sol";
+
+import {IRegisterable} from "../shared/IRegisterable.sol";
+import {IComponent} from "../components/IComponent.sol";
+
+interface IRegistryService is 
+     IService, 
+     IAccessManaged 
+{
+     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 
+     function registerInstance(IRegisterable instance, address owner)
+          external returns(IRegistry.ObjectInfo memory info); 
+
+     function registerProduct(IComponent product, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
+
+     function registerPool(IComponent pool, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
+
+     function registerDistribution(IComponent distribution, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
+
+     function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
+
+     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
+
+     function registerBundle(IRegistry.ObjectInfo memory info) external returns(NftId nftId); 
+}
+

package/contracts/registry/ITransferInterceptor.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+interface ITransferInterceptor {
+    function nftTransferFrom(address from, address to, uint256 tokenId) external;
+}