@etherisc/gif-next 0.0.2-de0a1d3-009 → 0.0.2-e37834a-021

package/contracts/registry/IChainNft.sol

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
-import {IERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol";
+import {IERC721Enumerable} from "@openzeppelin5/contracts/token/ERC721/extensions/IERC721Enumerable.sol";
 
 interface IChainNft is IERC721Enumerable {
     function mint(
         address to,
+        address interceptor,
         string memory uri
     ) external returns (uint256 tokenId);
 

package/contracts/registry/IRegistry.sol

@@ -1,57 +1,73 @@
 // 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 {IERC165} from "@openzeppelin5/contracts/utils/introspection/IERC165.sol";
 
+import {IOwnable} from "../shared/IOwnable.sol";
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 import {VersionPart} from "../types/Version.sol";
 import {IChainNft} from "./IChainNft.sol";
 
-interface IRegistry is IERC165 {
+interface IRegistry is IERC165, IOwnable {
+
+    event LogRegistration(NftId indexed nftId, NftId parentNftId, ObjectType objectType, address objectAddress, address initialOwner);
+
+    event LogServiceNameRegistration(string serviceName, VersionPart majorVersion); 
+
+    event LogApproval(NftId indexed nftId, ObjectType objectType);
+
     struct ObjectInfo {
         NftId nftId;
         NftId parentNftId;
         ObjectType objectType;
+        bool isInterceptor;
         address objectAddress;
         address initialOwner;
         bytes data;
-    }
-
-    function register(address objectAddress) external returns (NftId nftId);
+    }// TODO delete nftId and initialOwner(if not used) from struct
 
-    function registerObjectForInstance(
-        NftId parentNftid,
-        ObjectType objectType,
-        address initialOwner,
-        bytes memory data
+    function register(ObjectInfo memory info) external returns (NftId nftId);
+    
+    function registerFrom(
+        address from, 
+        ObjectInfo memory info
     ) external returns (NftId nftId);
 
-    function getServiceAddress(string memory serviceName, VersionPart majorVersion) external view returns (address serviceAddress);
+    function approve(
+        NftId registrar,
+        ObjectType object,
+        ObjectType parent
+    ) external;
 
-    function getObjectCount() external view returns (uint256);
+    function allowance(
+        NftId registrar,
+        ObjectType object
+    ) external view returns (bool);
 
-    function getNftId() external view returns (NftId nftId);
+    function getObjectCount() external view returns (uint256);
 
-    function getNftId(
-        address objectAddress
-    ) external view returns (NftId nftId);
+    //nftIdOf
+    function getNftId(address objectAddress) external view returns (NftId nftId);
 
-    function getObjectInfo(
-        NftId nftId
-    ) external view returns (ObjectInfo memory info);
+    function ownerOf(NftId nftId) external view returns (address);
 
-    function getName(
-        NftId nftId
-    ) external view returns (string memory name);
+    function ownerOf(address contractAddress) external view returns (address);
+    // infoOf()
+    function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
+    // infoOf()
+    function getObjectInfo(address object) external view returns (ObjectInfo memory info);
 
-    function getProtocolOwner() external view returns (address);
+    function isRegistered(NftId nftId) external view returns (bool);
 
-    function getOwner(NftId nftId) external view returns (address ownerAddress);
+    function isRegistered(address contractAddress) external view returns (bool);
 
-    function isRegistered(NftId nftId) external view returns (bool);
+    function getServiceName(NftId nftId) external view returns (string memory name);
 
-    function isRegistered(address objectAddress) external view returns (bool);
+    function getServiceAddress(
+        string memory serviceName, 
+        VersionPart majorVersion
+    ) external view returns (address serviceAddress);
 
     function getChainNft() external view returns (IChainNft);
-}
+}

package/contracts/registry/IRegistryService.sol

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {NftId} from "../../contracts/types/NftId.sol";
+import {ObjectType} from "../../contracts/types/ObjectType.sol";
+import {RoleId} from "../../contracts/types/RoleId.sol";
+import {IService} from "../../contracts/instance/base/IService.sol";
+import {IRegistry} from "../../contracts/registry/IRegistry.sol";
+
+import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
+import {IBaseComponent} from "../../contracts/components/IBaseComponent.sol";
+
+interface IRegistryService is IService {
+
+    function registerToken(address tokenAddress) external returns(NftId nftId);
+
+    function registerService(IService service)  external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+    function registerComponent(IBaseComponent component, ObjectType componentType, address owner) 
+        external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+    function registerInstance(IRegisterable instance)
+        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;
+}