@etherisc/gif-next 0.0.2-a04040f-684 → 0.0.2-a0d433e-961

package/contracts/registry/IRegistry.sol

@@ -1,67 +1,81 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+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";
 
-interface IOwnable {
-    function getOwner() external view returns (address owner);
-}
+interface IRegistry is IERC165 {
 
-interface IRegistryLinked {
-    event LogDebug(uint256 idx, address module, string comment);
+    event LogInitialMajorVersionSet(VersionPart majorVersion);
+    event LogMajorVersionSet(VersionPart majorVersionMax);
+    event LogRegistration(ObjectInfo info);
+    event LogServiceNameRegistration(string serviceName, VersionPart majorVersion); 
 
-    function getRegistry() external view returns (IRegistry registry);
-}
+    // setMajorVersion()
+    error NotOwner(address account);
+    error MajorVersionMaxIncreaseInvalid(VersionPart newMajorVersionMax, VersionPart existingMaxMajorVersion);
 
-interface IRegisterable is IOwnable, IRegistryLinked {
-    function register() external returns (NftId nftId);
+    // register()
+    error NotRegistryService();
+    error ZeroParentAddress();
+    error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
+    error ContractAlreadyRegistered(address objectAddress);
+    error InvalidServiceVersion(VersionPart majorVersion);
+    error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
 
-    function getNftId() external view returns (NftId nftId);
+    struct ObjectInfo {
+        NftId nftId;
+        NftId parentNftId;
+        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)
 
-    function getParentNftId() external view returns (NftId parentNftId);
+    function setMajorVersion(VersionPart newMajorVersionMax) external;
 
-    function getType() external view returns (ObjectType objectType);
+    function register(ObjectInfo memory info) external returns (NftId nftId);
 
-    function getData() external view returns (bytes memory data);
+    function getMajorVersionMin() external view returns (VersionPart);
 
-    function isRegisterable() external pure returns (bool);
+    function getMajorVersionMax() external view returns (VersionPart);
 
-    function getInitialOwner() external view returns (address initialOwner);
+    function getMajorVersion() external view returns (VersionPart);
 
-    function isRegistered() external view returns (bool);
-}
+    function getObjectCount() external view returns (uint256);
 
-interface IRegistry {
-    struct RegistryInfo {
-        NftId nftId;
-        NftId parentNftId;
-        ObjectType objectType;
-        address objectAddress;
-        address initialOwner;
-    }
+    function getNftId() external view returns (NftId nftId);
 
-    function register(address objectAddress) external returns (NftId nftId);
+    function getNftId(address objectAddress) external view returns (NftId nftId);
 
-    function registerObjectForInstance(
-        NftId parentNftid,
-        ObjectType objectType,
-        address initialOwner
-    ) external returns (NftId nftId);
+    function ownerOf(NftId nftId) external view returns (address);
 
-    function getObjectCount() external view returns (uint256);
+    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 getNftId(
-        address objectAddress
-    ) external view returns (NftId nftId);
+    function isRegisteredService(address contractAddress) external view returns (bool);
 
-    function getInfo(
-        NftId nftId
-    ) external view returns (RegistryInfo memory info);
+    function getServiceName(NftId nftId) external view returns (string memory name);
 
-    function getOwner(NftId nftId) external view returns (address ownerAddress);
+    function getServiceAddress(
+        string memory serviceName, 
+        VersionPart majorVersion
+    ) external view returns (address serviceAddress);
 
-    function isRegistered(address objectAddress) external view returns (bool);
+    function getChainNft() external view returns (ChainNft);
 
-    function getNftAddress() external view returns (address nft);
-}
+    function getOwner() external view returns (address);
+}

package/contracts/registry/IRegistryService.sol

@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+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 {IBaseComponent} from "../components/IBaseComponent.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);
+
+
+     function registerService(IService service)  external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+     function registerInstance(IRegisterable instance)
+          external returns(IRegistry.ObjectInfo memory info, bytes memory data); 
+
+     function registerProduct(IBaseComponent product, address owner)
+          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+     function registerPool(IBaseComponent pool, address owner)
+          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+     function registerDistribution(IBaseComponent distribution, address owner)
+          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId); // -> easy to upgrade
+
+     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;
+}