@etherisc/gif-next 0.0.2-a4b0112-987 → 0.0.2-a84e908-436

package/contracts/registry/ChainNft.sol

@@ -8,6 +8,9 @@ contract ChainNft is ERC721Enumerable, IChainNft {
     string public constant NAME = "Dezentralized Insurance Protocol Registry";
     string public constant SYMBOL = "DIPR";
 
+    uint256 public constant PROTOCOL_NFT_ID = 1101;
+    uint256 public constant GLOBAL_REGISTRY_ID = 2101;
+
     // remember token uri
     mapping(uint256 tokenId => string uri) private _uri;
 
@@ -34,27 +37,34 @@ contract ChainNft is ERC721Enumerable, IChainNft {
         _chainIdInt = block.chainid;
         _chainIdDigits = _countDigits(_chainIdInt);
         _chainIdMultiplier = 10 ** _chainIdDigits;
-
-        // on mainnet/goerli start /1 (reserved for protocol nft) on other chains with 2
-        if (block.chainid == 1 || block.chainid == 5) {
-            _idNext = 1;
-        } else {
-            _idNext = 2;
-        }
+        _idNext = 3;
     }
 
+    /**
+    * @dev mints the next token to register new objects
+    */
     function mint(
         address to,
         string memory uri
     ) external override onlyRegistry returns (uint256 tokenId) {
         tokenId = _getNextTokenId();
-        _totalMinted++;
-
-        _safeMint(to, tokenId);
 
         if (bytes(uri).length > 0) {
             _uri[tokenId] = uri;
         }
+
+        _safeMint(to, tokenId);
+        _totalMinted++;
+    }
+
+    /**
+    * @dev mints a token for a specified token id
+    * not part of the IRegistry interface only needed for
+    * initial registry setup (protocol and global registry objects)
+    */
+    function mint(address to, uint256 tokenId) external onlyRegistry {
+        _totalMinted++;
+        _safeMint(to, tokenId);
     }
 
     function burn(uint256 tokenId) external override onlyRegistry {
@@ -92,36 +102,50 @@ contract ChainNft is ERC721Enumerable, IChainNft {
         return _totalMinted;
     }
 
-    // requirement: each chain registry produces token ids that
-    // are guaranteed to not collide with any token id genereated
-    // on a different chain
-    //
-    // format concat(counter,chainid,2 digits for len-of-chain-id)
-    // restriction chainid up to 99 digits
-    // decode: from right to left:
-    // - 2 right most digits encode length of chainid
-    // - move number of digits to left as determined above (-> chainid)
-    // - the reminder to the left is the counter
-    // examples
-    // 1101
-    // ^^ ^
-    // || +- 1-digit chain id
-    // |+-- chain id = 1 (mainnet)
-    // +-- 1st token id on mainnet
-    // (1 * 10 ** 1 + 1) * 100 + 1
-    // 42987654321010
-    // ^ ^          ^
-    // | |          +- 10-digit chain id
-    // | +-- chain id = 9876543210 (hypothetical chainid)
-    // +-- 42nd token id on this chain
-    // (42 * 10 ** 10 + 9876543210) * 100 + 10
-    // (index * 10 ** digits + chainid) * 100 + digits (1 < digits < 100)
-
-    function _getNextTokenId() private returns (uint256 id) {
+    /**
+    * @dev token id calculation based on an index value that is supposed
+    * to increase with every minted token
+    *
+    * requirement: each chain registry produces token ids that
+    * are guaranteed to not collide with any token id genereated
+    * on a different chain
+    *
+    * format concat(counter,chainid,2 digits for len-of-chain-id)
+    * restriction chainid up to 99 digits
+    * decode: from right to left:
+    * - 2 right most digits encode length of chainid
+    * - move number of digits to left as determined above (-> chainid)
+    * - the reminder to the left is the counter
+    *
+    * special cases
+    * 1101 -> decentralized insurance protocol
+    * 2102 -> global registry
+    * 2xxxxx -> chain registry, where xxxxx = <chain-part> 
+    *
+    * examples
+    * 1101
+    * ^^ ^
+    * || +- 1-digit chain id
+    * |+-- chain id = 1 (mainnet)
+    * +-- 1st token id on mainnet
+    * (1 * 10 ** 1 + 1) * 100 + 1
+    * 42987654321010
+    * ^ ^          ^
+    * | |          +- 10-digit chain id
+    * | +-- chain id = 9876543210 (hypothetical chainid)
+    * +-- 42nd token id on this chain
+    * (42 * 10 ** 10 + 9876543210) * 100 + 10
+    * (index * 10 ** digits + chainid) * 100 + digits (1 < digits < 100)
+    */
+    function calculateTokenId(uint256 idIndex) public view returns (uint256 id) {
         id =
-            (_idNext * _chainIdMultiplier + _chainIdInt) *
+            (idIndex * _chainIdMultiplier + _chainIdInt) *
             100 +
             _chainIdDigits;
+    }
+
+    function _getNextTokenId() private returns (uint256 id) {
+        id = calculateTokenId(_idNext);
         _idNext++;
     }
 

package/contracts/registry/IRegistry.sol

@@ -1,44 +1,21 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.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 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);
-
-    function getNftId() external view returns (NftId nftId);
-
-    function getParentNftId() external view returns (NftId parentNftId);
-
-    function getType() external view returns (ObjectType objectType);
-
-    function getData() external view returns (bytes memory data);
-
-    function isRegisterable() external pure returns (bool);
-
-    function getInitialOwner() external view returns (address initialOwner);
-
-    function isRegistered() external view returns (bool);
-}
-
-interface IRegistry {
-    struct RegistryInfo {
+interface IRegistry is IERC165 {
+    struct ObjectInfo {
         NftId nftId;
         NftId parentNftId;
         ObjectType objectType;
         address objectAddress;
         address initialOwner;
+        bytes data;
     }
 
     function register(address objectAddress) external returns (NftId nftId);
@@ -46,22 +23,32 @@ interface IRegistry {
     function registerObjectForInstance(
         NftId parentNftid,
         ObjectType objectType,
-        address initialOwner
+        address initialOwner,
+        bytes memory data
     ) external returns (NftId nftId);
 
     function getObjectCount() external view returns (uint256);
 
-    function getNftId(
-        address objectAddress
-    ) external view returns (NftId nftId);
+    //function getNftId() external view returns (NftId nftId);
 
-    function getInfo(
-        NftId nftId
-    ) external view returns (RegistryInfo memory info);
+    function getNftId(address objectAddress) external view returns (NftId nftId);
 
     function getOwner(NftId nftId) external view returns (address ownerAddress);
 
+    function getName(NftId nftId) external view returns (string memory name);
+
+    function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
+
+    function isRegistered(NftId nftId) external view returns (bool);
+
     function isRegistered(address objectAddress) external view returns (bool);
 
-    function getNftAddress() external view returns (address nft);
+    function getServiceAddress(
+        string memory serviceName, 
+        VersionPart majorVersion
+    ) external view returns (address serviceAddress);
+
+    function getProtocolOwner() external view returns (address);
+
+    function getChainNft() external view returns (IChainNft);
 }

package/contracts/registry/IRegistryLinked.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {IRegistry} from "../registry/IRegistry.sol";
+
+interface IRegistryLinked {
+    function getRegistry() external view returns (IRegistry registry);
+}