@etherisc/gif-next 3.0.0-b45deea-213 → 3.0.0-bd6db59-832

package/contracts/examples/flight/FlightLib.sol

@@ -18,39 +18,17 @@ import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
 
 library FlightLib {
 
-    function checkApplicationDataAndSignature(
+    function checkApplicationData(
         FlightProduct flightProduct,
         Str flightData, 
         Timestamp departureTime,
         Timestamp arrivalTime,
-        Amount premiumAmount,
-        uint256[6] memory statistics,
-        // signature fields
-        uint8 v, 
-        bytes32 r, 
-        bytes32 s
+        Amount premiumAmount
     )
         public
         view
     {
         _checkApplicationData(flightProduct, premiumAmount, arrivalTime, departureTime);
-
-        (
-            address actualSigner,,
-            bool success
-        ) = flightProduct.getFlightMessageVerifier().verifyRatingsHash(
-            flightData,
-            departureTime,
-            arrivalTime,
-            premiumAmount,
-            statistics,
-            v, r, s);
-
-        if (!success) {
-            revert FlightProduct.ErrorApplicationDataSignatureMismatch(
-                flightProduct.getFlightMessageVerifier().getExpectedSigner(),
-                actualSigner);
-        }
     }
 
 
@@ -63,6 +41,8 @@ library FlightLib {
         internal
         view
     {
+        bool testMode = flightProduct.isTestMode();
+
         // solhint-disable
         if (premiumAmount < flightProduct.MIN_PREMIUM()) {
             revert FlightProduct.ErrorFlightProductPremiumAmountTooSmall(premiumAmount, flightProduct.MIN_PREMIUM());
@@ -74,53 +54,20 @@ library FlightLib {
             revert FlightProduct.ErrorFlightProductArrivalBeforeDepartureTime(departureTime, arrivalTime);
         }
 
-        if (arrivalTime > departureTime.addSeconds(flightProduct.MAX_FLIGHT_DURATION())) {
+        // test mode allows the creation for policies that ore not time constrained
+        if (!testMode && 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())) {
+        if (!testMode && 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())) {
+        if (!testMode && departureTime > TimestampLib.current().addSeconds(flightProduct.MAX_TIME_BEFORE_DEPARTURE())) {
             revert FlightProduct.ErrorFlightProductDepartureAfterMaxTimeBeforeDeparture(departureTime, TimestampLib.current(), flightProduct.MAX_TIME_BEFORE_DEPARTURE());
         }
         // solhint-enable
     }
 
 
-    // TODO fix or cleanup
-    // function checkApplication(
-    //     FlightProduct flightProduct,
-    //     Str carrierFlightNumber,
-    //     Timestamp departureTime,
-    //     Timestamp arrivalTime,
-    //     Amount premium
-    // )
-    //     external
-    //     view
-    //     returns (uint256 errors)
-    // {
-    //     // Validate input parameters
-    //     if (premium < flightProduct.MIN_PREMIUM()) { errors = errors | (uint256(1) << 0); }
-    //     if (premium > flightProduct.MAX_PREMIUM()) { errors = errors | (uint256(1) << 1); }
-    //     if (arrivalTime < departureTime) { errors = errors | (uint256(1) << 2); }
-    //     if (arrivalTime > departureTime.addSeconds(flightProduct.MAX_FLIGHT_DURATION())) { errors = errors | (uint256(1) << 3); }
-    //     if (departureTime < TimestampLib.current().addSeconds(flightProduct.MIN_TIME_BEFORE_DEPARTURE())) { errors = errors | (uint256(1) << 4); }
-    //     if (departureTime > TimestampLib.current().addSeconds(flightProduct.MAX_TIME_BEFORE_DEPARTURE())) { errors = errors | (uint256(1) << 5); }
-
-    //     (, bool exists, FlightProduct.FlightRisk memory flightRisk) = getFlightRisk(
-    //         flightProduct.getInstanceReader(), flightProduct.getNftId(), carrierFlightNumber, departureTime, arrivalTime);
-
-    //     if (exists) {
-    //         Amount sumInsured = AmountLib.toAmount(premium.toInt() * flightRisk.premiumMultiplier);
-    //         if (flightRisk.sumOfSumInsuredAmounts + sumInsured > flightProduct.MAX_TOTAL_PAYOUT()) {
-    //             errors = errors | (uint256(1) << 6);
-    //         }
-    //     }
-
-    //     return errors;
-    // }
-
-
     /// @dev calculates payout option based on flight status and delay minutes.
     /// Is not a view function as it emits log evens in case of unexpected status.
     // TODO decide if reverts instead of log events could work too (and convert the function into a view function)
@@ -222,11 +169,36 @@ library FlightLib {
     }
 
 
+    function getPayoutOption(
+        InstanceReader reader,
+        NftId productNftId,
+        RiskId riskId
+    )
+        public
+        view
+        returns (
+            bool exists,
+            bool statusAvailable,
+            uint8 payoutOption
+        )
+    {
+        FlightProduct.FlightRisk memory flightRisk;
+        (exists, flightRisk) = getFlightRisk(
+            reader, 
+            productNftId, 
+            riskId);
+        
+        statusAvailable = flightRisk.statusUpdatedAt.gtz();
+        payoutOption = flightRisk.payoutOption;
+    }
+
+
     function getPayoutAmount(
         bytes memory applicationData, 
         uint8 payoutOption
     )
         public
+        pure
         returns (Amount payoutAmount)
     {
         // retrieve payout amounts from application data
@@ -243,7 +215,9 @@ library FlightLib {
         NftId productNftId, 
         Str flightData,
         Timestamp departureTime, 
-        Timestamp arrivalTime
+        string memory departureTimeLocal,
+        Timestamp arrivalTime,
+        string memory arrivalTimeLocal
     )
         public
         view
@@ -261,10 +235,14 @@ library FlightLib {
             flightRisk = FlightProduct.FlightRisk({
                 flightData: flightData,
                 departureTime: departureTime,
+                departureTimeLocal: departureTimeLocal,
                 arrivalTime: arrivalTime,
+                arrivalTimeLocal: arrivalTimeLocal,
                 sumOfSumInsuredAmounts: AmountLib.toAmount(0),
                 status: bytes1(0),
-                delayMinutes: 0});
+                delayMinutes: 0,
+                payoutOption: uint8(0),
+                statusUpdatedAt: TimestampLib.zero()});
         }
     }
 

package/contracts/examples/flight/FlightOracle.sol

@@ -131,6 +131,10 @@ contract FlightOracle is
         return LibRequestIdSet.getElementAt(_activeRequests, idx);
     }
 
+    function decodeFlightStatusRequestData(bytes memory data) external pure returns (FlightStatusRequest memory) {
+        return abi.decode(data, (FlightStatusRequest));
+    }
+
     //--- internal functions ------------------------------------------------//
 
     /// @dev use case specific handling of oracle requests

package/contracts/examples/flight/FlightOracleAuthorization.sol

@@ -5,17 +5,38 @@ pragma solidity ^0.8.20;
 
 import {IAccess} from "../../../contracts/authorization/IAccess.sol";
 
+import {AccessAdminLib} from "../../authorization/AccessAdminLib.sol";
 import {BasicOracleAuthorization} from "../../oracle/BasicOracleAuthorization.sol";
 import {FlightOracle} from "./FlightOracle.sol";
-import {PUBLIC_ROLE} from "../../../contracts/type/RoleId.sol";
+import {RoleId, ADMIN_ROLE} from "../../../contracts/type/RoleId.sol";
 
 contract FlightOracleAuthorization
     is BasicOracleAuthorization
 {
 
+    uint64 public constant STATUS_PROVIDER_ROLE_IDX = 2; // 2nd custom role for flight oracle
+    string public constant STATUS_PROVIDER_ROLE_NAME = "StatusProviderRole";
+    RoleId public STATUS_PROVIDER_ROLE;
+
     constructor(string memory oracleName, string memory commitHash)
         BasicOracleAuthorization(oracleName, commitHash)
-    {}
+    {  }
+
+
+    function _setupRoles()
+        internal
+        override
+    {
+        STATUS_PROVIDER_ROLE = AccessAdminLib.getCustomRoleId(STATUS_PROVIDER_ROLE_IDX);
+
+        _addRole(
+            STATUS_PROVIDER_ROLE,
+            AccessAdminLib.roleInfo(
+                ADMIN_ROLE(),
+                TargetType.Custom,
+                1, // max member count special case: instance nft owner is sole role owner
+                STATUS_PROVIDER_ROLE_NAME));
+    }
 
 
     function _setupTargetAuthorizations()
@@ -25,9 +46,7 @@ contract FlightOracleAuthorization
         super._setupTargetAuthorizations();
         IAccess.FunctionInfo[] storage functions;
 
-        // TODO IMPORTANT must not be public role for prod!!!
-        // authorize public role (also protected by onlyOwner)
-        functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
+        functions = _authorizeForTarget(getMainTargetName(), STATUS_PROVIDER_ROLE);
         _authorize(functions, FlightOracle.respondWithFlightStatus.selector, "respondWithFlightStatus");
     }
 }