@etherisc/gif-next 0.0.2-cc4a5cb-898 → 0.0.2-cd89a0b-062

package/contracts/instance/service/ProductService.sol

@@ -21,13 +21,15 @@ import {UFixed, UFixedMathLib} from "../../types/UFixed.sol";
 import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
 import {ObjectType, INSTANCE, PRODUCT, POLICY} from "../../types/ObjectType.sol";
 import {APPLIED, UNDERWRITTEN, ACTIVE} from "../../types/StateId.sol";
-import {NftId, NftIdLib} from "../../types/NftId.sol";
+import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {ReferralId} from "../../types/ReferralId.sol";
 import {RiskId} from "../../types/RiskId.sol";
 import {StateId} from "../../types/StateId.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
+import {IService} from "../base/IService.sol";
+import {ServiceBase} from "../base/ServiceBase.sol";
 import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IProductService} from "./IProductService.sol";
 
@@ -41,22 +43,15 @@ contract ProductService is ComponentServiceBase, IProductService {
 
     constructor(
         address registry,
-        NftId registryNftId
-    ) ComponentServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
+        NftId registryNftId,
+        address initialOwner
+    ) ComponentServiceBase(registry, registryNftId, initialOwner)
     {
         _registerInterface(type(IProductService).interfaceId);
     }
 
-    function getVersion()
-        public 
-        pure 
-        virtual override (IVersionable, Versionable)
-        returns(Version)
-    {
-        return VersionLib.toVersion(3,0,0);
-    }
 
-    function getName() external pure override returns(string memory name) {
+    function getName() public pure override(IService, ServiceBase) returns(string memory name) {
         return NAME;
     }
 
@@ -184,7 +179,7 @@ contract ProductService is ComponentServiceBase, IProductService {
         (poolFeeAmount,) = FeeLib.calculateFee(treasuryInfo.poolFee, netPremiumAmount);
         (bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
 
-        IRegistry.ObjectInfo memory distributionInfo = _registry.getObjectInfo(treasuryInfo.distributionNftId);
+        IRegistry.ObjectInfo memory distributionInfo = getRegistry().getObjectInfo(treasuryInfo.distributionNftId);
         IDistributionComponent distribution = IDistributionComponent(distributionInfo.objectAddress);
         distributionFeeAmount = distribution.calculateFeeAmount(referralId, netPremiumAmount);
     }
@@ -202,11 +197,16 @@ contract ProductService is ComponentServiceBase, IProductService {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         // TODO add validations (see create bundle in pool service)
 
-        policyNftId = this.getRegistry().registerObjectForInstance(
-            productInfo.nftId,
-            POLICY(),
-            applicationOwner,
-            ""
+        policyNftId = getRegistryService().registerPolicy(
+            IRegistry.ObjectInfo(
+                zeroNftId(),
+                productInfo.nftId,
+                POLICY(),
+                false, // intercepting property for policies is defined on product
+                address(0),
+                applicationOwner,
+                ""
+            )
         );
 
         (uint256 premiumAmount,,,,) = calculatePremium(
@@ -283,7 +283,7 @@ contract ProductService is ComponentServiceBase, IProductService {
     )
         internal
     {
-        address poolAddress = _registry.getObjectInfo(treasuryInfo.poolNftId).objectAddress;
+        address poolAddress = getRegistry().getObjectInfo(treasuryInfo.poolNftId).objectAddress;
         IPoolComponent pool = IPoolComponent(poolAddress);
         pool.underwrite(
             policyNftId, 
@@ -480,7 +480,7 @@ contract ProductService is ComponentServiceBase, IProductService {
         // process token transfer(s)
         if(premiumAmount > 0) {
             TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
-            address policyOwner = _registry.getOwner(policyNftId);
+            address policyOwner = getRegistry().ownerOf(policyNftId);
             address poolWallet = instance.getComponentWallet(treasuryInfo.poolNftId);
             netPremiumAmount = premiumAmount;
             Fee memory productFee = treasuryInfo.productFee;

package/contracts/registry/ChainNft.sol

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
+
+import {ERC721, ERC721Enumerable} from "@openzeppelin5/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
+import {IERC721} from "@openzeppelin5/contracts/token/ERC721/IERC721.sol";
 
-import {ERC721, ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 import {IChainNft} from "./IChainNft.sol";
+import {ITransferInterceptor} from "./ITransferInterceptor.sol";
 
 contract ChainNft is ERC721Enumerable, IChainNft {
     string public constant NAME = "Dezentralized Insurance Protocol Registry";
@@ -11,6 +14,9 @@ contract ChainNft is ERC721Enumerable, IChainNft {
     uint256 public constant PROTOCOL_NFT_ID = 1101;
     uint256 public constant GLOBAL_REGISTRY_ID = 2101;
 
+    // remember interceptors
+    mapping(uint256 tokenId => address interceptor) private _interceptor;
+
     // remember token uri
     mapping(uint256 tokenId => string uri) private _uri;
 
@@ -37,18 +43,36 @@ contract ChainNft is ERC721Enumerable, IChainNft {
         _chainIdInt = block.chainid;
         _chainIdDigits = _countDigits(_chainIdInt);
         _chainIdMultiplier = 10 ** _chainIdDigits;
-        _idNext = 3;
+        _idNext = 4;
     }
 
+    /**
+    * @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);
+    }
+
+
     /**
     * @dev mints the next token to register new objects
+    * non-zero transferInterceptors are recorded and called during nft token transfers.
+    * the contract receiving such a notification may decides to revert or record the transfer
     */
     function mint(
         address to,
+        address interceptor,
         string memory uri
-    ) external override onlyRegistry returns (uint256 tokenId) {
+    ) public onlyRegistry returns (uint256 tokenId) {
         tokenId = _getNextTokenId();
 
+        if (interceptor != address(0)) {
+            _interceptor[tokenId] = interceptor;
+        }
+
         if (bytes(uri).length > 0) {
             _uri[tokenId] = uri;
         }
@@ -57,18 +81,22 @@ contract ChainNft is ERC721Enumerable, IChainNft {
         _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);
+     * @dev amend the open zeppelin transferFrom function by an interceptor call if such an interceptor is defined for the nft token id
+     * this allows distribution, product and pool components to be notified when distributors, policies and bundles are transferred.
+     */
+    function transferFrom(address from, address to, uint256 tokenId) public override (ERC721, IERC721) {
+        super.transferFrom(from, to, tokenId);
+
+        if (_interceptor[tokenId] != address(0)) {
+            ITransferInterceptor(_interceptor[tokenId]).nftTransferFrom(from, to, tokenId);
+        }
     }
 
+
     function burn(uint256 tokenId) external override onlyRegistry {
-        _requireMinted(tokenId);
+        _requireOwned(tokenId);
         _burn(tokenId);
         delete _uri[tokenId];
     }
@@ -79,18 +107,18 @@ contract ChainNft is ERC721Enumerable, IChainNft {
     ) external override onlyRegistry {
         require(bytes(uri).length > 0, "ERROR:CRG-011:URI_EMPTY");
 
-        _requireMinted(tokenId);
+        _requireOwned(tokenId);
         _uri[tokenId] = uri;
     }
 
     function exists(uint256 tokenId) external view override returns (bool) {
-        return _exists(tokenId);
+        return _ownerOf(tokenId) != address(0);
     }
 
     function tokenURI(
         uint256 tokenId
     ) public view override returns (string memory) {
-        _requireMinted(tokenId);
+        _requireOwned(tokenId);
         return _uri[tokenId];
     }
 

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;
+}