@etherisc/gif-next 0.0.2-e37834a-021 → 0.0.2-e46206a-486

package/contracts/instance/module/policy/IPolicy.sol

@@ -5,7 +5,7 @@ import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IInstance} from "../../IInstance.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {NftId} from "../../../types/NftId.sol";
-import {ReferralId} from "../../../types/ReferralId.sol";
+import {ReferralId} from "../../../types/Referral.sol";
 import {RiskId} from "../../../types/RiskId.sol";
 import {StateId} from "../../../types/StateId.sol";
 import {Timestamp} from "../../../types/Timestamp.sol";
@@ -56,7 +56,7 @@ interface IPolicyModule is IPolicy {
     ) external view returns (PolicyInfo memory info);
 
     // repeat registry linked signature
-    function getRegistry() external view returns (IRegistry registry);
+    // function getRegistry() external view returns (IRegistry registry);
 
     // repeat service linked signature to avoid linearization issues
     function getProductService() external  returns(IProductService);

package/contracts/instance/module/policy/PolicyModule.sol

@@ -7,10 +7,10 @@ import {IProductService} from "../../service/IProductService.sol";
 import {IPolicy, IPolicyModule} from "./IPolicy.sol";
 import {ObjectType, POLICY} from "../../../types/ObjectType.sol";
 import {NftId, NftIdLib} from "../../../types/NftId.sol";
-import {ReferralId} from "../../../types/ReferralId.sol";
+import {ReferralId} from "../../../types/Referral.sol";
 import {RiskId} from "../../../types/RiskId.sol";
 import {StateId} from "../../../types/StateId.sol";
-import {Timestamp, blockTimestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
+import {Timestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
 
 import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {ModuleBase} from "../../base/ModuleBase.sol";

package/contracts/instance/module/treasury/ITreasury.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IDistributionComponent} from "../../../components/IDistributionComponent.sol";
 import {IPoolComponent} from "../../../components/IPoolComponent.sol";
 import {IProductComponent} from "../../../components/IProductComponent.sol";

package/contracts/instance/module/treasury/TokenHandler.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {NftId} from "../../../types/NftId.sol";
 

package/contracts/instance/module/treasury/TreasuryModule.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IDistributionComponent} from "../../../components/IDistributionComponent.sol";
 import {IPoolComponent} from "../../../components/IPoolComponent.sol";
 import {IProductComponent} from "../../../components/IProductComponent.sol";
@@ -9,7 +9,7 @@ import {IProductComponent} from "../../../components/IProductComponent.sol";
 import {NftId} from "../../../types/NftId.sol";
 import {TREASURY} from "../../../types/ObjectType.sol";
 import {Fee, FeeLib} from "../../../types/Fee.sol";
-import {UFixed, UFixedMathLib} from "../../../types/UFixed.sol";
+import {UFixed, UFixedLib} from "../../../types/UFixed.sol";
 import {TokenHandler} from "./TokenHandler.sol";
 import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {ITreasuryModule} from "./ITreasury.sol";
@@ -118,7 +118,7 @@ abstract contract TreasuryModule is
     function getUFixed(
         uint256 a
     ) external pure override returns (UFixed) {
-        return UFixedMathLib.toUFixed(a);
+        return UFixedLib.toUFixed(a);
     }
 
     function getUFixed(
@@ -126,6 +126,6 @@ abstract contract TreasuryModule is
         int8 exp
     ) external pure returns (UFixed)
     {
-        return UFixedMathLib.toUFixed(a, exp);
+        return UFixedLib.toUFixed(a, exp);
     }
 }

package/contracts/instance/service/ComponentOwnerService.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
@@ -22,7 +22,7 @@ import {Key32} from "../../types/Key32.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {Fee} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
-import {UFixed, UFixedMathLib} from "../../types/UFixed.sol";
+import {UFixed, UFixedLib} from "../../types/UFixed.sol";
 
 import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IPoolComponent} from "../../components/IPoolComponent.sol";
@@ -94,44 +94,87 @@ contract ComponentOwnerService is
         return IRegistryService(service);
     }
 
-    // TODO if user passes type BUNDLE??? -> registerComponent() must catch this
-    function register(	
-        IBaseComponent component,
-        ObjectType componentType 	
+    function registerProduct(	
+        IBaseComponent product
     ) external returns (NftId nftId) {	
 
         // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
         (
             IRegistry.ObjectInfo memory info,
             bytes memory data
-        ) = getRegistryService().registerComponent(component, componentType, msg.sender);	
+        ) = getRegistryService().registerProduct(
+            product,
+            msg.sender);	
 
         NftId instanceNftId = info.parentNftId;
-        address instancAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
-        IInstance instance = IInstance(instancAddress);
-
-        RoleId typeRole = getRoleForType(componentType);
-        if(instance.hasRole(typeRole, msg.sender) == false) {
-            revert MissingTypeRole();
-        } 
-
-        // component type specific registration actions	
-        if (componentType == PRODUCT()) {	
-            _registerProduct(
-                    info.nftId, 
-                    instanceNftId,
-                    instance,
-                    data
-            );
-        } else if (componentType == POOL()) {	
-            _registerPool(
-                info.nftId,
+        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
+        IInstance instance = IInstance(instanceAddress);
+
+        RoleId typeRole = getRoleForType(PRODUCT());
+        // TODO refactor to use access manager infra
+        // if(instance.hasRole(typeRole, msg.sender) == false) {
+        //     revert MissingTypeRole();
+        // }
+        
+        _registerProduct(
+                info.nftId, 
                 instanceNftId,
                 instance,
                 data
-            );
-        }	
-        // TODO add distribution and oracle	
+        );
+    }
+
+    function registerPool(	
+        IBaseComponent pool
+    ) external returns (NftId nftId) {	
+
+        // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
+        (
+            IRegistry.ObjectInfo memory info,
+            bytes memory data
+        ) = getRegistryService().registerPool(
+            pool,
+            msg.sender);	
+
+        NftId instanceNftId = info.parentNftId;
+        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
+        IInstance instance = IInstance(instanceAddress);
+
+        RoleId typeRole = getRoleForType(POOL());
+        // TODO refactor to use access manager infra
+        // if(instance.hasRole(typeRole, msg.sender) == false) {
+        //     revert MissingTypeRole();
+        // } 
+
+        _registerPool(
+            info.nftId,
+            instanceNftId,
+            instance,
+            data
+        );
+    }
+
+    function registerDistribution(	
+        IBaseComponent distribution
+    ) external returns (NftId nftId) {	
+
+        // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
+        (
+            IRegistry.ObjectInfo memory info,
+            bytes memory data
+        ) = getRegistryService().registerDistribution(
+            distribution,
+            msg.sender);	
+
+        NftId instanceNftId = info.parentNftId;
+        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
+        IInstance instance = IInstance(instanceAddress);
+
+        RoleId typeRole = getRoleForType(DISTRIBUTION());
+        // TODO refactor to use access manager infra
+        // if(instance.hasRole(typeRole, msg.sender) == false) {
+        //     revert MissingTypeRole();
+        // }
     }
 
     function lock(
@@ -250,7 +293,7 @@ contract ComponentOwnerService is
             revert InvalidToken();
         } 
 
-        if(UFixedMathLib.eqz(info.collateralizationLevel)) { 
+        if(UFixedLib.eqz(info.collateralizationLevel)) { 
             revert CollateralizationLevelIsZero();
         }
 

package/contracts/instance/service/IProductService.sol

@@ -5,7 +5,7 @@ import {IRisk} from "../module/risk/IRisk.sol";
 import {IService} from "../base/IService.sol";
 
 import {NftId} from "../../types/NftId.sol";
-import {ReferralId} from "../../types/ReferralId.sol";
+import {ReferralId} from "../../types/Referral.sol";
 import {RiskId} from "../../types/RiskId.sol";
 import {StateId} from "../../types/StateId.sol";
 import {Timestamp} from "../../types/Timestamp.sol";

package/contracts/instance/service/ProductService.sol

@@ -18,13 +18,13 @@ import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
 
 import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
-import {UFixed, UFixedMathLib} from "../../types/UFixed.sol";
+import {UFixed, UFixedLib} 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, zeroNftId} from "../../types/NftId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
-import {ReferralId} from "../../types/ReferralId.sol";
+import {ReferralId} from "../../types/Referral.sol";
 import {RiskId} from "../../types/RiskId.sol";
 import {StateId} from "../../types/StateId.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
@@ -394,7 +394,7 @@ contract ProductService is ComponentServiceBase, IProductService {
     }
 
     function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
-        UFixed sumInsuredUFixed = UFixedMathLib.toUFixed(sumInsuredAmount);
+        UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
         UFixed collateralUFixed =  collateralizationLevel * sumInsuredUFixed;
         return collateralUFixed.toInt();
     } 

package/contracts/registry/ChainNft.sol

@@ -1,19 +1,28 @@
 // SPDX-License-Identifier: Apache-2.0
 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 {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
-import {IChainNft} from "./IChainNft.sol";
 import {ITransferInterceptor} from "./ITransferInterceptor.sol";
 
-contract ChainNft is ERC721Enumerable, IChainNft {
-    string public constant NAME = "Dezentralized Insurance Protocol Registry";
-    string public constant SYMBOL = "DIPR";
+contract ChainNft is ERC721Enumerable {
+
+    // constants
+    string public constant NAME = "Dezentralized Insurance Protocol NFT";
+    string public constant SYMBOL = "DIPNFT";
 
     uint256 public constant PROTOCOL_NFT_ID = 1101;
     uint256 public constant GLOBAL_REGISTRY_ID = 2101;
 
+    // custom errors
+    error CallerNotRegistry(address caller);
+    error RegistryAddressZero();
+    error NftUriEmpty();
+    error NftUriAlreadySet();
+
+    // contract state
+
     // remember interceptors
     mapping(uint256 tokenId => address interceptor) private _interceptor;
 
@@ -31,17 +40,24 @@ contract ChainNft is ERC721Enumerable, IChainNft {
     uint256 internal _totalMinted;
 
     modifier onlyRegistry() {
-        require(msg.sender == _registry, "ERROR:NFT-001:CALLER_NOT_REGISTRY");
+        if (msg.sender != _registry) { revert CallerNotRegistry(msg.sender); }
         _;
     }
 
     constructor(address registry) ERC721(NAME, SYMBOL) {
-        require(registry != address(0), "ERROR:NFT-010:REGISTRY_ZERO");
+        if (registry == address(0)) { revert RegistryAddressZero(); }
 
         _registry = registry;
-
         _chainIdInt = block.chainid;
-        _chainIdDigits = _countDigits(_chainIdInt);
+        _chainIdDigits = 0;
+
+        // count digis
+        uint256 num = _chainIdInt;
+        while (num != 0) {
+            _chainIdDigits++;
+            num /= 10;
+        }
+
         _chainIdMultiplier = 10 ** _chainIdDigits;
         _idNext = 4;
     }
@@ -77,8 +93,8 @@ contract ChainNft is ERC721Enumerable, IChainNft {
             _uri[tokenId] = uri;
         }
 
-        _safeMint(to, tokenId);
         _totalMinted++;
+        _safeMint(to, tokenId);
     }
 
 
@@ -95,7 +111,7 @@ contract ChainNft is ERC721Enumerable, IChainNft {
     }
 
 
-    function burn(uint256 tokenId) external override onlyRegistry {
+    function burn(uint256 tokenId) external onlyRegistry {
         _requireOwned(tokenId);
         _burn(tokenId);
         delete _uri[tokenId];
@@ -104,29 +120,36 @@ contract ChainNft is ERC721Enumerable, IChainNft {
     function setURI(
         uint256 tokenId,
         string memory uri
-    ) external override onlyRegistry {
-        require(bytes(uri).length > 0, "ERROR:CRG-011:URI_EMPTY");
+    ) external onlyRegistry {
+        if (bytes(uri).length == 0) { revert NftUriEmpty(); }
+        if (bytes(_uri[tokenId]).length > 0) { revert NftUriAlreadySet(); }
 
         _requireOwned(tokenId);
         _uri[tokenId] = uri;
     }
 
-    function exists(uint256 tokenId) external view override returns (bool) {
+    function exists(uint256 tokenId) external view returns (bool) {
         return _ownerOf(tokenId) != address(0);
     }
 
     function tokenURI(
         uint256 tokenId
     ) public view override returns (string memory) {
+        // gif generally does not revert for view functions
+        // this is an exception to keep the openzeppelin nft semantics
         _requireOwned(tokenId);
         return _uri[tokenId];
     }
 
-    function getRegistryAddress() external view override returns (address) {
+    function getInterceptor(uint256 tokenId) external view returns (address) {
+        return _interceptor[tokenId];
+    }
+
+    function getRegistryAddress() external view returns (address) {
         return _registry;
     }
 
-    function totalMinted() external view override returns (uint256) {
+    function totalMinted() external view returns (uint256) {
         return _totalMinted;
     }
 
@@ -176,12 +199,4 @@ contract ChainNft is ERC721Enumerable, IChainNft {
         id = calculateTokenId(_idNext);
         _idNext++;
     }
-
-    function _countDigits(uint256 num) private pure returns (uint256 count) {
-        count = 0;
-        while (num != 0) {
-            count++;
-            num /= 10;
-        }
-    }
 }

package/contracts/registry/IRegistry.sol

@@ -1,21 +1,19 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC165} from "@openzeppelin5/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {IOwnable} from "../shared/IOwnable.sol";
+import {ChainNft} from "./ChainNft.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, IOwnable {
+interface IRegistry is IERC165 {
 
-    event LogRegistration(NftId indexed nftId, NftId parentNftId, ObjectType objectType, address objectAddress, address initialOwner);
+    event LogRegistration(ObjectInfo info);
 
     event LogServiceNameRegistration(string serviceName, VersionPart majorVersion); 
 
-    event LogApproval(NftId indexed nftId, ObjectType objectType);
 
     struct ObjectInfo {
         NftId nftId;
@@ -29,33 +27,17 @@ interface IRegistry is IERC165, IOwnable {
 
     function register(ObjectInfo memory info) external returns (NftId nftId);
     
-    function registerFrom(
-        address from, 
-        ObjectInfo memory info
-    ) external returns (NftId nftId);
-
-    function approve(
-        NftId registrar,
-        ObjectType object,
-        ObjectType parent
-    ) external;
-
-    function allowance(
-        NftId registrar,
-        ObjectType object
-    ) external view returns (bool);
 
     function getObjectCount() external view returns (uint256);
 
-    //nftIdOf
     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);
-    // infoOf()
+
     function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
-    // infoOf()
+
     function getObjectInfo(address object) external view returns (ObjectInfo memory info);
 
     function isRegistered(NftId nftId) external view returns (bool);
@@ -69,5 +51,7 @@ interface IRegistry is IERC165, IOwnable {
         VersionPart majorVersion
     ) external view returns (address serviceAddress);
 
-    function getChainNft() external view returns (IChainNft);
+    function getChainNft() external view returns (ChainNft);
+
+    function getOwner() external view returns (address);
 }

package/contracts/registry/IRegistryService.sol

@@ -16,12 +16,18 @@ interface IRegistryService is IService {
 
     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 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);