@etherisc/gif-next 0.0.2-cc253b3 → 0.0.2-d250c72

package/artifacts/contracts/types/NftId.sol/NftIdLib.json

@@ -3,6 +3,30 @@
   "contractName": "NftIdLib",
   "sourceName": "contracts/types/NftId.sol",
   "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "a",
+          "type": "uint96"
+        },
+        {
+          "internalType": "NftId",
+          "name": "b",
+          "type": "uint96"
+        }
+      ],
+      "name": "eq",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "isSame",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -52,17 +76,17 @@
       "name": "toInt",
       "outputs": [
         {
-          "internalType": "uint256",
+          "internalType": "uint96",
           "name": "",
-          "type": "uint256"
+          "type": "uint96"
         }
       ],
       "stateMutability": "pure",
       "type": "function"
     }
   ],
-  "bytecode": "0x610242610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c806308dc895e1461005057806330b8415f1461008057806352694ee8146100b0575b600080fd5b61006a60048036038101906100659190610175565b6100e0565b60405161007791906101bb565b60405180910390f35b61009a60048036038101906100959190610175565b6100f8565b6040516100a791906101f1565b60405180910390f35b6100ca60048036038101906100c59190610175565b610112565b6040516100d791906101f1565b60405180910390f35b6000816bffffffffffffffffffffffff169050919050565b600080826bffffffffffffffffffffffff16119050919050565b600080826bffffffffffffffffffffffff16149050919050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b61015281610131565b811461015d57600080fd5b50565b60008135905061016f81610149565b92915050565b60006020828403121561018b5761018a61012c565b5b600061019984828501610160565b91505092915050565b6000819050919050565b6101b5816101a2565b82525050565b60006020820190506101d060008301846101ac565b92915050565b60008115159050919050565b6101eb816101d6565b82525050565b600060208201905061020660008301846101e2565b9291505056fea26469706673582212209affa62d114e1cb53bcb21f3612272fd3a48ab7679330e8ca5b746a63a2d60e164736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c806308dc895e1461005057806330b8415f1461008057806352694ee8146100b0575b600080fd5b61006a60048036038101906100659190610175565b6100e0565b60405161007791906101bb565b60405180910390f35b61009a60048036038101906100959190610175565b6100f8565b6040516100a791906101f1565b60405180910390f35b6100ca60048036038101906100c59190610175565b610112565b6040516100d791906101f1565b60405180910390f35b6000816bffffffffffffffffffffffff169050919050565b600080826bffffffffffffffffffffffff16119050919050565b600080826bffffffffffffffffffffffff16149050919050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b61015281610131565b811461015d57600080fd5b50565b60008135905061016f81610149565b92915050565b60006020828403121561018b5761018a61012c565b5b600061019984828501610160565b91505092915050565b6000819050919050565b6101b5816101a2565b82525050565b60006020820190506101d060008301846101ac565b92915050565b60008115159050919050565b6101eb816101d6565b82525050565b600060208201905061020660008301846101e2565b9291505056fea26469706673582212209affa62d114e1cb53bcb21f3612272fd3a48ab7679330e8ca5b746a63a2d60e164736f6c63430008140033",
+  "bytecode": "0x6102e2610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c806308dc895e1461005b57806330b8415f1461008b57806352694ee8146100bb578063c4cade9d146100eb575b600080fd5b610075600480360381019061007091906101df565b61011b565b604051610082919061021b565b60405180910390f35b6100a560048036038101906100a091906101df565b610125565b6040516100b29190610251565b60405180910390f35b6100d560048036038101906100d091906101df565b61013f565b6040516100e29190610251565b60405180910390f35b6101056004803603810190610100919061026c565b610159565b6040516101129190610251565b60405180910390f35b6000819050919050565b600080826bffffffffffffffffffffffff16119050919050565b600080826bffffffffffffffffffffffff16149050919050565b6000610165838361016d565b905092915050565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b6101bc8161019b565b81146101c757600080fd5b50565b6000813590506101d9816101b3565b92915050565b6000602082840312156101f5576101f4610196565b5b6000610203848285016101ca565b91505092915050565b6102158161019b565b82525050565b6000602082019050610230600083018461020c565b92915050565b60008115159050919050565b61024b81610236565b82525050565b60006020820190506102666000830184610242565b92915050565b6000806040838503121561028357610282610196565b5b6000610291858286016101ca565b92505060206102a2858286016101ca565b915050925092905056fea264697066735822122055c506374fbe6d33aafb031778f35f7d28d6e6f8afcfb93598673c7f2a4e119a64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c806308dc895e1461005b57806330b8415f1461008b57806352694ee8146100bb578063c4cade9d146100eb575b600080fd5b610075600480360381019061007091906101df565b61011b565b604051610082919061021b565b60405180910390f35b6100a560048036038101906100a091906101df565b610125565b6040516100b29190610251565b60405180910390f35b6100d560048036038101906100d091906101df565b61013f565b6040516100e29190610251565b60405180910390f35b6101056004803603810190610100919061026c565b610159565b6040516101129190610251565b60405180910390f35b6000819050919050565b600080826bffffffffffffffffffffffff16119050919050565b600080826bffffffffffffffffffffffff16149050919050565b6000610165838361016d565b905092915050565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b6101bc8161019b565b81146101c757600080fd5b50565b6000813590506101d9816101b3565b92915050565b6000602082840312156101f5576101f4610196565b5b6000610203848285016101ca565b91505092915050565b6102158161019b565b82525050565b6000602082019050610230600083018461020c565b92915050565b60008115159050919050565b61024b81610236565b82525050565b60006020820190506102666000830184610242565b92915050565b6000806040838503121561028357610282610196565b5b6000610291858286016101ca565b92505060206102a2858286016101ca565b915050925092905056fea264697066735822122055c506374fbe6d33aafb031778f35f7d28d6e6f8afcfb93598673c7f2a4e119a64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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, eqNftId} from "../../types/NftId.sol";
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
 abstract contract ComponentModule is 
     IRegistryLinked,
@@ -106,7 +106,7 @@ abstract contract ComponentModule is
     {
         nftId = info.nftId;
         require(
-            nftId.gtz() && eqNftId(_componentInfo[nftId].nftId, nftId),
+            nftId.gtz() && _componentInfo[nftId].nftId.eq(nftId),
             "ERROR:CMP-006:COMPONENT_UNKNOWN");
 
         _componentInfo[nftId] = info;

package/contracts/types/NftId.sol

@@ -12,15 +12,24 @@ using {
 } for NftId global;
 
 // general pure free functions
+/// @dev Converts the uint256 to a NftId.
 function toNftId(uint256 id) pure returns(NftId) { return NftId.wrap(uint96(id)); }
 
+/// @dev Return the NftId zero (0)
+function zeroNftId() pure returns(NftId) { return NftId.wrap(0); }
+
 // pure free functions for operators
 function eqNftId(NftId a, NftId b) pure returns(bool isSame) { return NftId.unwrap(a) == NftId.unwrap(b); }
 function neNftId(NftId a, NftId b) pure returns(bool isDifferent) { return NftId.unwrap(a) != NftId.unwrap(b); }
 
 // library functions that operate on user defined type
 library NftIdLib {
-    function toInt(NftId nftId) public pure returns(uint256) { return uint256(NftId.unwrap(nftId)); }
+    /// @dev Converts the NftId to a uint256.
+    function toInt(NftId nftId) public pure returns(uint96) { return uint96(NftId.unwrap(nftId)); }
+    /// @dev Returns true if the value is non-zero (> 0).
     function gtz(NftId a) public pure returns(bool) { return NftId.unwrap(a) > 0; }
+    /// @dev Returns true if the value is zero (== 0).
     function eqz(NftId a) public pure returns(bool) { return NftId.unwrap(a) == 0; }
+    /// @dev Returns true if the values are equal (==).
+    function eq(NftId a, NftId b) public pure returns(bool isSame) { return eqNftId(a, b); }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-cc253b3",
+  "version": "0.0.2-d250c72",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {