@etherisc/gif-next 0.0.2-f9905e1 → 0.0.2-ffba655

package/contracts/instance/component/ComponentModule.sol

@@ -9,7 +9,7 @@ import {IInstance} from "../IInstance.sol";
 import {IComponent, IComponentContract, IComponentModule, IComponentOwnerService} from "./IComponent.sol";
 import {IProductComponent} from "../../components/IProduct.sol";
 import {IPoolModule} from "../pool/IPoolModule.sol";
-
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
 abstract contract ComponentModule is 
     IRegistryLinked,
@@ -17,11 +17,12 @@ abstract contract ComponentModule is
     IAccessCheckRole,
     IComponentModule
 {
+    using NftIdLib for NftId;
 
-    mapping(uint256 nftId => ComponentInfo info) private _componentInfo;
-    mapping(uint256 nftId => uint256 poolNftId) private _poolNftIdForProduct;
-    mapping(address cAddress => uint256 id) private _idByAddress;
-    uint256 [] private _ids;
+    mapping(NftId nftId => ComponentInfo info) private _componentInfo;
+    mapping(NftId nftId => NftId poolNftId) private _poolNftIdForProduct;
+    mapping(address cAddress => NftId nftId) private _nftIdByAddress;
+    NftId[] private _nftIds;
 
     mapping(uint256 cType => bytes32 role) private _componentOwnerRole;
 
@@ -40,7 +41,7 @@ abstract contract ComponentModule is
         external
         override
         onlyComponentOwnerService
-        returns(uint256 nftId)
+        returns(NftId nftId)
     {
         bytes32 typeRole = getRoleForType(component.getType());
         require(
@@ -56,8 +57,8 @@ abstract contract ComponentModule is
         // special case product -> persist product - pool assignment
         if(component.getType() == this.getRegistry().PRODUCT()) {
             IProductComponent product = IProductComponent(address(component));
-            uint256 poolNftId = product.getPoolNftId();
-            require(poolNftId > 0, "ERROR:CMP-005:POOL_UNKNOWN");
+            NftId poolNftId = product.getPoolNftId();
+            require(poolNftId.gtz(), "ERROR:CMP-005:POOL_UNKNOWN");
             // add more validation (type, token, ...)
 
             _poolNftIdForProduct[nftId] = poolNftId;
@@ -73,17 +74,17 @@ abstract contract ComponentModule is
             );
         }
 
-        _idByAddress[address(component)] = nftId;
-        _ids.push(nftId);
+        _nftIdByAddress[address(component)] = nftId;
+        _nftIds.push(nftId);
 
         // add logging
     }
 
-    function getPoolNftId(uint256 productNftId)
+    function getPoolNftId(NftId productNftId)
         external
         view
         override
-        returns(uint256 poolNftId)
+        returns(NftId poolNftId)
     {
         poolNftId = _poolNftIdForProduct[productNftId];
     }
@@ -101,28 +102,28 @@ abstract contract ComponentModule is
     function setComponentInfo(ComponentInfo memory info)
         external
         onlyComponentOwnerService
-        returns(uint256 nftId)
+        returns(NftId nftId)
     {
-        uint256 id = info.nftId;
+        nftId = info.nftId;
         require(
-            id > 0 && _componentInfo[id].nftId == id,
-            "ERROR:CMP-005:COMPONENT_UNKNOWN");
+            nftId.gtz() && _componentInfo[nftId].nftId.eq(nftId),
+            "ERROR:CMP-006:COMPONENT_UNKNOWN");
 
-        _componentInfo[id] = info;
+        _componentInfo[nftId] = info;
 
         // add logging
     }
 
-    function getComponentInfo(uint256 id)
+    function getComponentInfo(NftId nftId)
         external
         override
         view
         returns(ComponentInfo memory)
     {
-        return _componentInfo[id];
+        return _componentInfo[nftId];
     }
 
-    function getComponentOwner(uint256 id)
+    function getComponentOwner(NftId nftId)
         external
         view
         returns(address owner)
@@ -133,9 +134,9 @@ abstract contract ComponentModule is
     function getComponentId(address componentAddress)
         external
         view
-        returns(uint256 id)
+        returns(NftId componentNftId)
     {
-        return _idByAddress[componentAddress];
+        return _nftIdByAddress[componentAddress];
     }
 
 
@@ -143,9 +144,9 @@ abstract contract ComponentModule is
         external
         override
         view
-        returns(uint256 id)
+        returns(NftId componentNftId)
     {
-        return _ids[idx];
+        return _nftIds[idx];
     }
 
 
@@ -155,7 +156,7 @@ abstract contract ComponentModule is
         view
         returns(uint256 numberOfCompnents)
     {
-        return _ids.length;
+        return _nftIds.length;
     }
 
     function getRoleForType(uint256 cType)
@@ -183,11 +184,12 @@ contract ComponentOwnerService is
     IComponent,
     IComponentOwnerService
 {
+    using NftIdLib for NftId;
 
     modifier onlyComponentOwner(IComponentContract component) {
-        uint256 nftId = _registry.getNftId(address(component));
+        NftId nftId = _registry.getNftId(address(component));
         require(
-            nftId > 0, 
+            nftId.gtz(), 
             "ERROR:COS-001:COMPONENT_UNKNOWN");
         require(
             msg.sender == _registry.getOwner(nftId),
@@ -200,23 +202,10 @@ contract ComponentOwnerService is
         RegistryLinked(registry)
     { }
 
-
-    // modifier onlyComponentOwnerRole(IComponentContract component) {
-    //     IInstance instance = component.getInstance();
-    //     // TODO add set/getComponentOwnerRole to IComonentModule
-    //     bytes32 typeRole = instance.getComponentTypeRole(component.getType());
-    //     require(
-    //         instance.hasRole(typeRole, msg.sender),
-    //         "ERROR:COS-003:COMPONENT_ROLE_MISSING"
-    //     );
-    //     _;
-    // }
-
-
     function register(IComponentContract component)
         external
         override
-        returns(uint256 nftId)
+        returns(NftId nftId)
     {
         require(
             msg.sender == component.getInitialOwner(), 
@@ -234,7 +223,7 @@ contract ComponentOwnerService is
     {
         IInstance instance = component.getInstance();
         ComponentInfo memory info = instance.getComponentInfo(component.getNftId());
-        require(info.nftId > 0, "ERROR_COMPONENT_UNKNOWN");
+        require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
         // TODO add state change validation
 
         info.state = CState.Locked;
@@ -249,7 +238,7 @@ contract ComponentOwnerService is
     {
         IInstance instance = component.getInstance();
         ComponentInfo memory info = instance.getComponentInfo(component.getNftId());
-        require(info.nftId > 0, "ERROR_COMPONENT_UNKNOWN");
+        require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
         // TODO state change validation
 
         info.state = CState.Active;

package/contracts/instance/component/IComponent.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.19;
 
 import {IOwnable, IRegistryLinked, IRegisterable} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
+import {NftId} from "../../types/NftId.sol";
 
 interface IComponent {
 
@@ -16,7 +17,7 @@ interface IComponent {
 
     // component dynamic info (static info kept in registry)
     struct ComponentInfo {
-        uint256 nftId;
+        NftId nftId;
         CState state;
     }
 }
@@ -37,7 +38,7 @@ interface IComponentContract is
 
 interface IComponentOwnerService is IRegistryLinked{
 
-    function register(IComponentContract component) external returns(uint256 id);
+    function register(IComponentContract component) external returns(NftId nftId);
     function lock(IComponentContract component) external;
     function unlock(IComponentContract component) external;
 }
@@ -51,18 +52,18 @@ interface IComponentModule is
 
     function registerComponent(IComponentContract component)
         external
-        returns(uint256 nftInfo);
+        returns(NftId nftId);
 
     function setComponentInfo(ComponentInfo memory info)
         external
-        returns(uint256 componentId);
+        returns(NftId componentNftId);
 
-    function getComponentInfo(uint256 id)
+    function getComponentInfo(NftId nftId)
         external
         view
         returns(ComponentInfo memory info);
 
-    function getComponentOwner(uint256 id)
+    function getComponentOwner(NftId nftId)
         external
         view
         returns(address owner);
@@ -70,17 +71,17 @@ interface IComponentModule is
     function getComponentId(address componentAddress)
         external
         view
-        returns(uint256 id);
+        returns(NftId nftId);
 
     function getComponentId(uint256 idx)
         external
         view
-        returns(uint256 id);
+        returns(NftId nftId);
 
-    function getPoolNftId(uint256 productNftId)
+    function getPoolNftId(NftId productNftId)
         external
         view
-        returns(uint256 poolNftId);
+        returns(NftId poolNftId);
 
     function components()
         external

package/contracts/instance/policy/IPolicy.sol

@@ -4,8 +4,8 @@ pragma solidity ^0.8.19;
 
 import {IOwnable, IRegistryLinked, IRegisterable, IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
-
 import {IProductService} from "../product/IProductService.sol";
+import {NftId} from "../../types/NftId.sol";
 
 // TODO check if there is value to introuce IContract and let IPolicy derive from IContract
 interface IPolicy {
@@ -19,7 +19,7 @@ interface IPolicy {
     }
 
     struct PolicyInfo {
-        uint256 nftId;
+        NftId nftId;
         PolicyState state; // applied, withdrawn, rejected, active, closed
 
         uint256 sumInsuredAmount;
@@ -45,20 +45,20 @@ interface IPolicyModule is
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
+        NftId bundleNftId
     )
         external
-        returns(uint256 nftId);
+        returns(NftId nftId);
 
-    function activate(uint256 nftId)
+    function activate(NftId nftId)
         external;
 
-    function getBundleNftForPolicy(uint256 nftId)
+    function getBundleNftForPolicy(NftId nftId)
         external
         view
-        returns(uint256 bundleNft);
+        returns(NftId bundleNft);
 
-    function getPolicyInfo(uint256 nftId)
+    function getPolicyInfo(NftId nftId)
         external
         view
         returns(PolicyInfo memory info);

package/contracts/instance/policy/PolicyModule.sol

@@ -7,15 +7,16 @@ import {IRegistry, IRegistryLinked} from "../../registry/IRegistry.sol";
 
 import {IProductService} from "../product/IProductService.sol";
 import {IPolicy, IPolicyModule} from "./IPolicy.sol";
-
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
 abstract contract PolicyModule is
     IRegistryLinked,
     IPolicyModule
 {
+    using NftIdLib for NftId;
 
-    mapping(uint256 nftId => PolicyInfo info) private _policyInfo;
-    mapping(uint256 nftId => uint256 bundleNftId) private _bundleForPolicy;
+    mapping(NftId nftId => PolicyInfo info) private _policyInfo;
+    mapping(NftId nftId => NftId bundleNftId) private _bundleForPolicy;
 
     IProductService private _productService;
 
@@ -36,17 +37,17 @@ abstract contract PolicyModule is
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
+        NftId bundleNftId
     )
         external
         override
         onlyProductService2
-        returns(uint256 nftId)
+        returns(NftId nftId)
     {
         // TODO add parameter validation
-        if(bundleNftId > 0) {
+        if(bundleNftId.gtz()) {
             IRegistry.RegistryInfo memory bundleInfo = this.getRegistry().getInfo(bundleNftId);
-            IRegistry.RegistryInfo memory poolInfo = this.getRegistry().getInfo(bundleInfo.parentNftId);
+            // IRegistry.RegistryInfo memory poolInfo = this.getRegistry().getInfo(bundleInfo.parentNftId);
         }
 
         nftId = this.getRegistry().registerObjectForInstance(
@@ -72,7 +73,7 @@ abstract contract PolicyModule is
     }
 
 
-    function activate(uint256 nftId)
+    function activate(NftId nftId)
         external
         override
         onlyProductService2
@@ -87,16 +88,16 @@ abstract contract PolicyModule is
 
 
 
-    function getBundleNftForPolicy(uint256 nftId)
+    function getBundleNftForPolicy(NftId nftId)
         external
         view
-        returns(uint256 bundleNft)
+        returns(NftId bundleNft)
     {
         return _bundleForPolicy[nftId];
     }
 
 
-    function getPolicyInfo(uint256 nftId)
+    function getPolicyInfo(NftId nftId)
         external
         view
         returns(PolicyInfo memory info)

package/contracts/instance/pool/IPoolModule.sol

@@ -2,11 +2,12 @@
 pragma solidity ^0.8.19;
 
 import {IOwnable, IRegistry, IRegistryLinked} from "../../registry/IRegistry.sol";
+import {NftId} from "../../types/NftId.sol";
 
 interface IPool {
 
     struct PoolInfo {
-        uint256 nftId;
+        NftId nftId;
         address wallet;
         address token;
         uint256 capital;
@@ -21,19 +22,19 @@ interface IPoolModule is
 {
     
     function underwrite(
-        uint256 poolNftId,
-        uint256 policyNftId
+        NftId poolNftId,
+        NftId policyNftId
     )
         external;
 
     function createPoolInfo(
-        uint256 nftId,
+        NftId nftId,
         address wallet,
         address token
     )
         external;
 
-    function getPoolInfo(uint256 nftId)
+    function getPoolInfo(NftId nftId)
         external
         view
         returns(PoolInfo memory info);

package/contracts/instance/pool/PoolModule.sol

@@ -5,13 +5,16 @@ import {IOwnable, IRegistry, IRegistryLinked} from "../../registry/IRegistry.sol
 import {IProductService} from "../product/IProductService.sol";
 import {IPolicy, IPolicyModule} from "../policy/IPolicy.sol";
 import {IPoolModule} from "./IPoolModule.sol";
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
 abstract contract PoolModule is
     IPoolModule
 {
+    using NftIdLib for NftId;
+    
     uint256 public constant INITIAL_CAPITAL = 10000*10**6;
 
-    mapping(uint256 nftId => PoolInfo info) private _poolInfo;
+    mapping(NftId nftId => PoolInfo info) private _poolInfo;
 
     IProductService private _productService;
 
@@ -25,7 +28,7 @@ abstract contract PoolModule is
     }
 
     function createPoolInfo(
-        uint256 nftId,
+        NftId nftId,
         address wallet,
         address token
     )
@@ -33,7 +36,7 @@ abstract contract PoolModule is
         override
     {
         require(
-            _poolInfo[nftId].nftId == 0,
+            _poolInfo[nftId].nftId.eqz(),
             "ERROR:PL-001:ALREADY_CREATED");
 
         _poolInfo[nftId] = PoolInfo(
@@ -48,8 +51,8 @@ abstract contract PoolModule is
 
 
     function underwrite(
-        uint256 poolNftId,
-        uint256 policyNftId
+        NftId poolNftId,
+        NftId policyNftId
     )
         external
         override
@@ -71,7 +74,7 @@ abstract contract PoolModule is
     }
 
 
-    function getPoolInfo(uint256 nftId)
+    function getPoolInfo(NftId nftId)
         external
         view
         override

package/contracts/instance/product/IProductService.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.19;
 
 import {IOwnable, IRegistryLinked, IRegisterable} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
+import {NftId} from "../../types/NftId.sol";
 
 
 // TODO or name this IProtectionService to have Product be something more generic (loan, savings account, ...)
@@ -16,17 +17,17 @@ interface IProductService is
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
+        NftId bundleNftId
     )
         external 
-        returns(uint256 nftId);
+        returns(NftId nftId);
 
     // function revoke(unit256 nftId) external;
 
-    function underwrite(uint256 nftId) external;
+    function underwrite(NftId nftId) external;
     // function decline(uint256 nftId) external;
     // function expire(uint256 nftId) external;
-    function close(uint256 nftId) external;
+    function close(NftId nftId) external;
 
     // function collectPremium(uint256 nftId, uint256 premiumAmount) external;
 

package/contracts/instance/product/ProductService.sol

@@ -11,12 +11,15 @@ import {RegistryLinked} from "../../registry/Registry.sol";
 import {IProductService, IProductModule} from "./IProductService.sol";
 import {IComponentModule} from "../../instance/component/IComponent.sol";
 import {IPoolModule} from "../../instance/pool/IPoolModule.sol";
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
 // TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
 contract ProductService is
     RegistryLinked,
     IProductService
 {
+    using NftIdLib for NftId;
+    
     constructor(address registry) 
         RegistryLinked(registry)
     { }
@@ -27,20 +30,20 @@ contract ProductService is
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
+        NftId bundleNftId
     )
         external 
         override
-        returns(uint256 nftId)
+        returns(NftId nftId)
     {
         // same as only registered product
-        uint256 productNftId = _registry.getNftId(msg.sender);
-        require(productNftId > 0, "ERROR_PRODUCT_UNKNOWN");
+        NftId productNftId = _registry.getNftId(msg.sender);
+        require(productNftId.gtz(), "ERROR_PRODUCT_UNKNOWN");
         IRegistry.RegistryInfo memory productInfo = _registry.getInfo(productNftId);
         require(productInfo.objectType == _registry.PRODUCT(), "ERROR_NOT_PRODUCT");
 
         IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(productInfo.parentNftId);
-        require(instanceInfo.nftId > 0, "ERROR_INSTANCE_UNKNOWN");
+        require(instanceInfo.nftId.gtz(), "ERROR_INSTANCE_UNKNOWN");
         require(instanceInfo.objectType == _registry.INSTANCE(), "ERROR_NOT_INSTANCE");
 
         IPolicyModule policyModule = IPolicyModule(instanceInfo.objectAddress);
@@ -55,23 +58,23 @@ contract ProductService is
         // add logging
     }
 
-    function underwrite(uint256 nftId)
+    function underwrite(NftId nftId)
         external
         override
     {
         // same as only registered product
-        uint256 productNftId = _registry.getNftId(msg.sender);
-        require(productNftId > 0, "ERROR_PRODUCT_UNKNOWN");
+        NftId productNftId = _registry.getNftId(msg.sender);
+        require(productNftId.gtz(), "ERROR_PRODUCT_UNKNOWN");
         IRegistry.RegistryInfo memory productInfo = _registry.getInfo(productNftId);
         require(productInfo.objectType == _registry.PRODUCT(), "ERROR_NOT_PRODUCT");
 
         IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(productInfo.parentNftId);
-        require(instanceInfo.nftId > 0, "ERROR_INSTANCE_UNKNOWN");
+        require(instanceInfo.nftId.gtz(), "ERROR_INSTANCE_UNKNOWN");
         require(instanceInfo.objectType == _registry.INSTANCE(), "ERROR_NOT_INSTANCE");
 
         // get responsible pool
         IComponentModule componentModule = IComponentModule(instanceInfo.objectAddress);
-        uint256 poolNftId = componentModule.getPoolNftId(productNftId);
+        NftId poolNftId = componentModule.getPoolNftId(productNftId);
 
         // lock capital (and update pool accounting)
         IPoolModule poolModule = IPoolModule(instanceInfo.objectAddress);
@@ -86,7 +89,7 @@ contract ProductService is
         // add logging
     }
 
-    function close(uint256 nftId) external override {}
+    function close(NftId nftId) external override {}
 }
 
 abstract contract ProductModule is