@etherisc/gif-next 3.0.0-0fefe0d-162 → 3.0.0-15742bc-193

package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/String.sol/StrLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b83db860010d36c1a300ed3141eea291.json"
+  "buildInfo": "../../../build-info/7d6dc50a785373abbc8508d79f4075ba.json"
 }

package/contracts/examples/flight/FlightLib.sol

@@ -64,20 +64,25 @@ library FlightLib {
         view
     {
         // solhint-disable
-        require(premiumAmount >= flightProduct.MIN_PREMIUM(), "ERROR:FDD-001:INVALID_PREMIUM");
-        require(premiumAmount <= flightProduct.MAX_PREMIUM(), "ERROR:FDD-002:INVALID_PREMIUM");
-        require(arrivalTime > departureTime, "ERROR:FDD-003:ARRIVAL_BEFORE_DEPARTURE_TIME");
-
-        // TODO decide how to handle demo mode
-        require(
-            arrivalTime <= departureTime.addSeconds(flightProduct.MAX_FLIGHT_DURATION()),
-            "ERROR:FDD-004:INVALID_ARRIVAL/DEPARTURE_TIME");
-        require(
-            TimestampLib.current() >= departureTime.subtractSeconds(flightProduct.MAX_TIME_BEFORE_DEPARTURE()),
-            "ERROR:FDD-005:INVALID_ARRIVAL/DEPARTURE_TIME");
-        require(
-            TimestampLib.current() <= departureTime.subtractSeconds(flightProduct.MIN_TIME_BEFORE_DEPARTURE()),
-            "ERROR:FDD-012:INVALID_ARRIVAL/DEPARTURE_TIME");
+        if (premiumAmount < flightProduct.MIN_PREMIUM()) {
+            revert FlightProduct.ErrorFlightProductPremiumAmountTooSmall(premiumAmount, flightProduct.MIN_PREMIUM());
+        }
+        if (premiumAmount > flightProduct.MAX_PREMIUM()) {
+            revert FlightProduct.ErrorFlightProductPremiumAmountTooLarge(premiumAmount, flightProduct.MAX_PREMIUM());
+        }
+        if (arrivalTime <= departureTime) {
+            revert FlightProduct.ErrorFlightProductArrivalBeforeDepartureTime(departureTime, arrivalTime);
+        }
+
+        if (arrivalTime > departureTime.addSeconds(flightProduct.MAX_FLIGHT_DURATION())) {
+            revert FlightProduct.ErrorFlightProductArrivalAfterMaxFlightDuration(arrivalTime, departureTime, flightProduct.MAX_FLIGHT_DURATION());
+        }
+        if (departureTime < TimestampLib.current().addSeconds(flightProduct.MIN_TIME_BEFORE_DEPARTURE())) {
+            revert FlightProduct.ErrorFlightProductDepartureBeforeMinTimeBeforeDeparture(departureTime, TimestampLib.current(), flightProduct.MIN_TIME_BEFORE_DEPARTURE());
+        }
+        if (departureTime > TimestampLib.current().addSeconds(flightProduct.MAX_TIME_BEFORE_DEPARTURE())) {
+            revert FlightProduct.ErrorFlightProductDepartureAfterMaxTimeBeforeDeparture(departureTime, TimestampLib.current(), flightProduct.MAX_TIME_BEFORE_DEPARTURE());
+        }
         // solhint-enable
     }
 
@@ -161,7 +166,9 @@ library FlightLib {
         returns (uint256 weight)
     {
         // check we have enough observations
-        require(statistics[0] >= flightProduct.MIN_OBSERVATIONS(), "ERROR:FDD-011:LOW_OBSERVATIONS");
+        if (statistics[0] < flightProduct.MIN_OBSERVATIONS()) {
+            revert FlightProduct.ErrorFlightProductNotEnoughObservations(statistics[0], flightProduct.MIN_OBSERVATIONS());
+        }
 
         weight = 0;
         for (uint256 i = 1; i < 6; i++) {
@@ -192,8 +199,12 @@ library FlightLib {
             Amount sumInsuredAmount // simply the max of payoutAmounts 
         )
     {
-        require(premium >= flightProduct.MIN_PREMIUM(), "ERROR:FDD-009:INVALID_PREMIUM");
-        require(premium <= flightProduct.MAX_PREMIUM(), "ERROR:FDD-010:INVALID_PREMIUM");
+        if (premium < flightProduct.MIN_PREMIUM()) { 
+            revert FlightProduct.ErrorFlightProductPremiumAmountTooSmall(premium, flightProduct.MIN_PREMIUM()); 
+        }
+        if (premium > flightProduct.MAX_PREMIUM()) { 
+            revert FlightProduct.ErrorFlightProductPremiumAmountTooLarge(premium, flightProduct.MAX_PREMIUM()); 
+        }
 
         sumInsuredAmount = AmountLib.zero();
         weight = calculateWeight(flightProduct, statistics);

package/contracts/examples/flight/FlightProduct.sol

@@ -44,6 +44,14 @@ contract FlightProduct is
     event LogErrorUnexpectedStatus(RequestId requestId, RiskId riskId, bytes1 status, int256 delayMinutes);
 
     error ErrorApplicationDataSignatureMismatch(address expectedSigner, address actualSigner);
+    error ErrorFlightProductClusterRisk(Amount totalSumInsured, Amount maxTotalPayout);
+    error ErrorFlightProductPremiumAmountTooSmall(Amount premiumAmount, Amount minPremium);
+    error ErrorFlightProductPremiumAmountTooLarge(Amount premiumAmount, Amount maxPremium);
+    error ErrorFlightProductArrivalBeforeDepartureTime(Timestamp departureTime, Timestamp arrivalTime);
+    error ErrorFlightProductArrivalAfterMaxFlightDuration(Timestamp arrivalTime, Timestamp maxArrivalTime, Seconds maxDuration);
+    error ErrorFlightProductDepartureBeforeMinTimeBeforeDeparture(Timestamp departureTime, Timestamp now, Seconds minTimeBeforeDeparture);
+    error ErrorFlightProductDepartureAfterMaxTimeBeforeDeparture(Timestamp departureTime, Timestamp now, Seconds maxTimeBeforeDeparture);
+    error ErrorFlightProductNotEnoughObservations(uint256 observations, uint256 minObservations);
 
     // solhint-disable
     // Minimum observations for valid prediction
@@ -153,6 +161,24 @@ contract FlightProduct is
             getNftId()).oracleNftId[0];
     }
 
+    function calculatePayoutAmounts(
+        FlightProduct flightProduct,
+        Amount premium, 
+        uint256[6] memory statistics
+    ) 
+        external
+        view
+        returns (
+            uint256 weight, 
+            Amount[5] memory payoutAmounts,
+            Amount sumInsuredAmount // simply the max of payoutAmounts 
+        ) 
+    {
+        return FlightLib.calculatePayoutAmounts(
+            flightProduct,
+            premium,
+            statistics);
+    }
 
     /// @dev Creates a policy using a permit for the policy holder.
     /// The policy holder is defined as the owner parameter of the permit data.
@@ -184,10 +210,10 @@ contract FlightProduct is
             application.departureTime,
             application.arrivalTime,
             application.premiumAmount,
-            application.statistics,
-            application.v,
-            application.r,
-            application.s);
+            application.statistics);
+            // application.v,
+            // application.r,
+            // application.s);
     }
 
 
@@ -218,11 +244,11 @@ contract FlightProduct is
         Timestamp departureTime,
         Timestamp arrivalTime,
         Amount premiumAmount,
-        uint256[6] memory statistics,
+        uint256[6] memory statistics
         // signature fields
-        uint8 v, 
-        bytes32 r, 
-        bytes32 s
+        // uint8 v, 
+        // bytes32 r, 
+        // bytes32 s
     )
         public
         virtual
@@ -233,14 +259,15 @@ contract FlightProduct is
         )
     {
         // checks
-        FlightLib.checkApplicationDataAndSignature(
-            this,
-            flightData,
-            departureTime,
-            arrivalTime,
-            premiumAmount,
-            statistics,
-            v, r, s);
+        // disabled for now - using rbac for security
+        // FlightLib.checkApplicationDataAndSignature(
+        //     this,
+        //     flightData,
+        //     departureTime,
+        //     arrivalTime,
+        //     premiumAmount,
+        //     statistics,
+        //     v, r, s);
 
         (riskId, policyNftId) = _prepareApplication(
             policyHolder, 
@@ -486,10 +513,9 @@ contract FlightProduct is
         }
 
         // check for cluster risk: additional sum insured amount must not exceed MAX_TOTAL_PAYOUT
-        require (
-            flightRisk.sumOfSumInsuredAmounts + sumInsuredAmount <= MAX_TOTAL_PAYOUT,
-            "ERROR:FDD-006:CLUSTER_RISK"
-        );
+        if (flightRisk.sumOfSumInsuredAmounts + sumInsuredAmount > MAX_TOTAL_PAYOUT) {
+            revert ErrorFlightProductClusterRisk(flightRisk.sumOfSumInsuredAmounts + sumInsuredAmount, MAX_TOTAL_PAYOUT);
+        }
 
         // update existing risk with additional sum insured amount
         flightRisk.sumOfSumInsuredAmounts = flightRisk.sumOfSumInsuredAmounts + sumInsuredAmount;

package/contracts/examples/flight/FlightProductAuthorization.sol

@@ -31,8 +31,9 @@ contract FlightProductAuthorization
         // authorize public role (open access to any account, only allows to lock target)
         functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
         _authorize(functions, FlightProduct.createPolicy.selector, "createPolicy");
+        _authorize(functions, FlightProduct.createPolicyWithPermit.selector, "createPolicyWithPermit");
 
-        // only owner
+        // TODO: only owner
         _authorize(functions, FlightProduct.processFlightStatus.selector, "processFlightStatus");
         _authorize(functions, FlightProduct.completeSetup.selector, "completeSetup");
         _authorize(functions, FlightProduct.setDefaultBundle.selector, "setDefaultBundle");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "3.0.0-0fefe0d-162",
+  "version": "3.0.0-15742bc-193",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {