@etherisc/gif-next 0.0.2-836a512-798 → 0.0.2-839b2a2-792

package/contracts/mock/TestProduct.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {Product} from "../../contracts/components/Product.sol";
+import {NftId, toNftId} from "../../contracts/types/NftId.sol";
+import {Fee, zeroFee} from "../../contracts/types/Fee.sol";
+
+contract TestProduct is Product {
+
+    constructor(address registry, address instance, address token, address pool, Fee memory policyFee)
+        Product(registry, instance, token, pool, policyFee, zeroFee())
+    // solhint-disable-next-line no-empty-blocks
+    {}
+
+    function applyForPolicy(
+        uint256 sumInsuredAmount,
+        uint256 premiumAmount,
+        uint256 lifetime
+    )
+        external
+        returns(NftId nftId)
+    {
+        nftId = _createApplication(
+            msg.sender, // policy holder
+            sumInsuredAmount,
+            premiumAmount,
+            lifetime,
+            toNftId(0) // requested bundle nft id
+        );
+    }
+
+    function underwrite(NftId nftId) external {
+        _underwrite(nftId);
+    }
+
+    function collectPremium(NftId nftId) external {
+        _collectPremium(nftId);
+    }
+}

package/contracts/mock/Usdc.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract USDC is ERC20 {
+
+    // https://etherscan.io/token/0xc719d010b63e5bbf2c0551872cd5316ed26acd83#readContract
+    string public constant NAME = "USDC - DUMMY";
+    string public constant SYMBOL = "USDC";
+    uint8 public constant DECIMALS = 6;
+    uint256 public constant INITIAL_SUPPLY = 10**9 * 10**DECIMALS; // 1 Billion 1'000'000'000
+    // decimals == 18 (openzeppelin erc20 default)
+    constructor()
+        ERC20(NAME, SYMBOL)
+    {
+        _mint(
+            _msgSender(),
+            INITIAL_SUPPLY
+        );   
+    }
+
+    function decimals() public pure override returns(uint8) {
+        return DECIMALS;
+    }
+}

package/contracts/registry/IRegistry.sol

@@ -15,7 +15,6 @@ interface IRegistryLinked {
 }
 
 interface IRegisterable is IOwnable, IRegistryLinked {
-
     function register() external returns (NftId nftId);
 
     function getNftId() external view returns (NftId nftId);
@@ -34,7 +33,6 @@ interface IRegisterable is IOwnable, IRegistryLinked {
 }
 
 interface IRegistry {
-
     struct RegistryInfo {
         NftId nftId;
         NftId parentNftId;

package/contracts/registry/Registry.sol

@@ -72,8 +72,13 @@ contract Registry is IRegistry {
         _chainNft = IChainNft(chainNft);
     }
 
-    function register(address objectAddress) external override returns(NftId nftId) {
-        require(_nftIdByAddress[objectAddress].eqz(), "ERROR:REG-002:ALREADY_REGISTERED");
+    function register(
+        address objectAddress
+    ) external override returns (NftId nftId) {
+        require(
+            _nftIdByAddress[objectAddress].eqz(),
+            "ERROR:REG-002:ALREADY_REGISTERED"
+        );
 
         IRegisterable registerable = IRegisterable(objectAddress);
         require(

package/contracts/types/Fee.sol

@@ -10,7 +10,10 @@ struct Fee {
 
 // general pure free functions
 /// @dev Converts the uint256 to a NftId.
-function toFee(UFixed fractionalFee, uint256 fixedFee) pure returns (Fee memory fee) {
+function toFee(
+    UFixed fractionalFee,
+    uint256 fixedFee
+) pure returns (Fee memory fee) {
     return Fee(fractionalFee, fixedFee);
 }
 
@@ -24,7 +27,6 @@ function feeIsSame(Fee memory a, Fee memory b) pure returns (bool isSame) {
     return a.fixedFee == b.fixedFee && a.fractionalFee == b.fractionalFee;
 }
 
-
-function feeIsZero(Fee memory fee) pure returns(bool) {
+function feeIsZero(Fee memory fee) pure returns (bool) {
     return fee.fixedFee == 0 && UFixed.unwrap(fee.fractionalFee) == 0;
-}
+}

package/contracts/types/ObjectType.sol

@@ -13,38 +13,95 @@ using {
 
 // general pure free functions
 
+function PROTOCOL() pure returns (ObjectType) {
+    return toObjectType(10);
+}
+
+function CHAIN() pure returns (ObjectType) {
+    return toObjectType(20);
+}
+
+function REGISTRY() pure returns (ObjectType) {
+    return toObjectType(30);
+}
+
+function TOKEN() pure returns (ObjectType) {
+    return toObjectType(40);
+}
+
+function INSTANCE() pure returns (ObjectType) {
+    return toObjectType(50);
+}
+
+function PRODUCT() pure returns (ObjectType) {
+    return toObjectType(60);
+}
+
+function ORACLE() pure returns (ObjectType) {
+    return toObjectType(70);
+}
+
+function POOL() pure returns (ObjectType) {
+    return toObjectType(80);
+}
 
-function PROTOCOL() pure returns(ObjectType) { return toObjectType(10); }
-function CHAIN() pure returns(ObjectType) { return toObjectType(20); }
-function REGISTRY() pure returns(ObjectType) { return toObjectType(30); }
-function TOKEN() pure returns(ObjectType) { return toObjectType(40); }
-function INSTANCE() pure returns(ObjectType) { return toObjectType(50); }
-function PRODUCT() pure returns(ObjectType) { return toObjectType(60); }
-function ORACLE() pure returns(ObjectType) { return toObjectType(70); }
-function POOL() pure returns(ObjectType) { return toObjectType(80); }
-function BUNDLE() pure returns(ObjectType) { return toObjectType(81); }
-function POLICY() pure returns(ObjectType) { return toObjectType(90); }
-function CLAIM() pure returns(ObjectType) { return toObjectType(91); }
-function PAYOUT() pure returns(ObjectType) { return toObjectType(92); }
+function BUNDLE() pure returns (ObjectType) {
+    return toObjectType(81);
+}
+
+function POLICY() pure returns (ObjectType) {
+    return toObjectType(90);
+}
+
+function CLAIM() pure returns (ObjectType) {
+    return toObjectType(91);
+}
+
+function PAYOUT() pure returns (ObjectType) {
+    return toObjectType(92);
+}
 
 /// @dev Converts the uint8 to a ObjectType.
-function toObjectType(uint256 objectType) pure returns(ObjectType) { return ObjectType.wrap(uint8(objectType)); }
+function toObjectType(uint256 objectType) pure returns (ObjectType) {
+    return ObjectType.wrap(uint8(objectType));
+}
 
 /// @dev Return the ObjectType zero (0)
-function zeroObjectType() pure returns(ObjectType) { return ObjectType.wrap(0); }
+function zeroObjectType() pure returns (ObjectType) {
+    return ObjectType.wrap(0);
+}
 
 // pure free functions for operators
-function eqObjectType(ObjectType a, ObjectType b) pure returns(bool isSame) { return ObjectType.unwrap(a) == ObjectType.unwrap(b); }
-function neObjectType(ObjectType a, ObjectType b) pure returns(bool isDifferent) { return ObjectType.unwrap(a) != ObjectType.unwrap(b); }
+function eqObjectType(ObjectType a, ObjectType b) pure returns (bool isSame) {
+    return ObjectType.unwrap(a) == ObjectType.unwrap(b);
+}
+
+function neObjectType(
+    ObjectType a,
+    ObjectType b
+) pure returns (bool isDifferent) {
+    return ObjectType.unwrap(a) != ObjectType.unwrap(b);
+}
 
 // library functions that operate on user defined type
 library ObjectTypeLib {
     /// @dev Converts the NftId to a uint256.
-    function toInt(ObjectType objectType) public pure returns(uint96) { return uint96(ObjectType.unwrap(objectType)); }
+    function toInt(ObjectType objectType) public pure returns (uint96) {
+        return uint96(ObjectType.unwrap(objectType));
+    }
+
     /// @dev Returns true if the value is non-zero (> 0).
-    function gtz(ObjectType a) public pure returns(bool) { return ObjectType.unwrap(a) > 0; }
+    function gtz(ObjectType a) public pure returns (bool) {
+        return ObjectType.unwrap(a) > 0;
+    }
+
     /// @dev Returns true if the value is zero (== 0).
-    function eqz(ObjectType a) public pure returns(bool) { return ObjectType.unwrap(a) == 0; }
+    function eqz(ObjectType a) public pure returns (bool) {
+        return ObjectType.unwrap(a) == 0;
+    }
+
     /// @dev Returns true if the values are equal (==).
-    function eq(ObjectType a, ObjectType b) public pure returns(bool isSame) { return eqObjectType(a, b); }
+    function eq(ObjectType a, ObjectType b) public pure returns (bool isSame) {
+        return eqObjectType(a, b);
+    }
 }

package/contracts/types/StateId.sol

@@ -5,42 +5,87 @@ pragma solidity ^0.8.19;
 type StateId is uint8;
 
 // type bindings
-using {
-    eqStateId as ==,
-    neStateId as !=,
-    StateIdLib.toInt
-} for StateId global;
+using {eqStateId as ==, neStateId as !=, StateIdLib.toInt} for StateId global;
 
 // general pure free functions
-function APPLIED() pure returns(StateId) { return toStateId(10); }
-function REVOKED() pure returns(StateId) { return toStateId(20); }
-function DECLINED() pure returns(StateId) { return toStateId(30); }
-function CONFIRMED() pure returns(StateId) { return toStateId(40); }
-function EXPECTED() pure returns(StateId) { return toStateId(50); }
-function ACTIVE() pure returns(StateId) { return toStateId(100); }
-function PAUSED() pure returns(StateId) { return toStateId(110); }
-function CLOSED() pure returns(StateId) { return toStateId(200); }
-function ARCHIVED() pure returns(StateId) { return toStateId(210); }
-function PAID() pure returns(StateId) { return toStateId(220); }
+function APPLIED() pure returns (StateId) {
+    return toStateId(10);
+}
+
+function REVOKED() pure returns (StateId) {
+    return toStateId(20);
+}
+
+function DECLINED() pure returns (StateId) {
+    return toStateId(30);
+}
+
+function CONFIRMED() pure returns (StateId) {
+    return toStateId(40);
+}
+
+function EXPECTED() pure returns (StateId) {
+    return toStateId(50);
+}
+
+function ACTIVE() pure returns (StateId) {
+    return toStateId(100);
+}
+
+function PAUSED() pure returns (StateId) {
+    return toStateId(110);
+}
+
+function CLOSED() pure returns (StateId) {
+    return toStateId(200);
+}
+
+function ARCHIVED() pure returns (StateId) {
+    return toStateId(210);
+}
+
+function PAID() pure returns (StateId) {
+    return toStateId(220);
+}
 
 /// @dev Converts the uint8 to a StateId.
-function toStateId(uint256 id) pure returns(StateId) { return StateId.wrap(uint8(id)); }
+function toStateId(uint256 id) pure returns (StateId) {
+    return StateId.wrap(uint8(id));
+}
 
 /// @dev Return the StateId zero (0)
-function zeroStateId() pure returns(StateId) { return StateId.wrap(0); }
+function zeroStateId() pure returns (StateId) {
+    return StateId.wrap(0);
+}
 
 // pure free functions for operators
-function eqStateId(StateId a, StateId b) pure returns(bool isSame) { return StateId.unwrap(a) == StateId.unwrap(b); }
-function neStateId(StateId a, StateId b) pure returns(bool isDifferent) { return StateId.unwrap(a) != StateId.unwrap(b); }
+function eqStateId(StateId a, StateId b) pure returns (bool isSame) {
+    return StateId.unwrap(a) == StateId.unwrap(b);
+}
+
+function neStateId(StateId a, StateId b) pure returns (bool isDifferent) {
+    return StateId.unwrap(a) != StateId.unwrap(b);
+}
 
 // library functions that operate on user defined type
 library StateIdLib {
     /// @dev Converts the NftId to a uint256.
-    function toInt(StateId stateId) public pure returns(uint96) { return uint96(StateId.unwrap(stateId)); }
+    function toInt(StateId stateId) public pure returns (uint96) {
+        return uint96(StateId.unwrap(stateId));
+    }
+
     /// @dev Returns true if the value is non-zero (> 0).
-    function gtz(StateId a) public pure returns(bool) { return StateId.unwrap(a) > 0; }
+    function gtz(StateId a) public pure returns (bool) {
+        return StateId.unwrap(a) > 0;
+    }
+
     /// @dev Returns true if the value is zero (== 0).
-    function eqz(StateId a) public pure returns(bool) { return StateId.unwrap(a) == 0; }
+    function eqz(StateId a) public pure returns (bool) {
+        return StateId.unwrap(a) == 0;
+    }
+
     /// @dev Returns true if the values are equal (==).
-    function eq(StateId a, StateId b) public pure returns(bool isSame) { return eqStateId(a, b); }
+    function eq(StateId a, StateId b) public pure returns (bool isSame) {
+        return eqStateId(a, b);
+    }
 }

package/contracts/types/UFixed.sol

@@ -76,21 +76,25 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
 }
 
 library UFixedMathLib {
-    enum Rounding {
-        /// @dev Round down - floor(value)
-        Down,
-        /// @dev Round up - ceil(value)
-        Up,
-        /// @dev Round half up - round(value)
-        HalfUp
-    }
 
     int8 public constant EXP = 18;
     uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
     uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
 
-    /// @dev Default rounding mode used by ftoi is HalfUp
-    Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
+    /// @dev returns the rounding mode DOWN - 0.4 becomes 0, 0.5 becomes 0, 0.6 becomes 0
+    function ROUNDING_DOWN() public pure returns (uint8) {
+        return uint8(0);
+    }
+
+    /// @dev returns the rounding mode UP - 0.4 becomes 1, 0.5 becomes 1, 0.6 becomes 1
+    function ROUNDING_UP() public pure returns (uint8) {
+        return uint8(1);
+    }
+
+    /// @dev returns the rounding mode HALF_UP - 0.4 becomes 0, 0.5 becomes 1, 0.6 becomes 1
+    function ROUNDING_HALF_UP() public pure returns (uint8) {
+        return uint8(2);
+    }
 
     /// @dev returns the decimals precision of the UFixed type
     function decimals() public pure returns (uint256) {
@@ -113,12 +117,12 @@ library UFixedMathLib {
 
     /// @dev Converts a UFixed to a uint256.
     function ftoi(UFixed a) public pure returns (uint256) {
-        return ftoi(a, ROUNDING_DEFAULT);
+        return ftoi(a, ROUNDING_HALF_UP());
     }
 
     /// @dev Converts a UFixed to a uint256 with given rounding mode.
-    function ftoi(UFixed a, Rounding rounding) public pure returns (uint256) {
-        if (rounding == Rounding.HalfUp) {
+    function ftoi(UFixed a, uint8 rounding) public pure returns (uint256) {
+        if (rounding == ROUNDING_HALF_UP()) {
             return
                 Math.mulDiv(
                     UFixed.unwrap(a) + MULTIPLIER_HALF,
@@ -126,7 +130,7 @@ library UFixedMathLib {
                     MULTIPLIER,
                     Math.Rounding.Down
                 );
-        } else if (rounding == Rounding.Down) {
+        } else if (rounding == ROUNDING_DOWN()) {
             return
                 Math.mulDiv(
                     UFixed.unwrap(a),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-836a512-798",
+  "version": "0.0.2-839b2a2-792",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -38,6 +38,8 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "^4.9.3",
-    "@openzeppelin/contracts-upgradeable": "^4.9.3"
+    "@openzeppelin/contracts-upgradeable": "^4.9.3",
+    "ethers": "^6.7.1",
+    "winston": "^3.10.0"
   }
 }