@etherisc/gif-next 3.0.0-1a7e54a-113 → 3.0.0-1bd1936-188

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/FlightProduct.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IAuthorization} from "../../authorization/IAuthorization.sol";
@@ -43,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
@@ -92,7 +101,11 @@ contract FlightProduct is
     struct FlightRisk {
         Str flightData; // example: "LX 180 ZRH BKK 20241104"
         Timestamp departureTime;
+        // this field contains static data required by the frontend and is not directly used by the product
+        string departureTimeLocal; // example "2024-10-14T10:10:00.000 Asia/Seoul"
         Timestamp arrivalTime; 
+        // this field contains static data required by the frontend and is not directly used by the product
+        string arrivalTimeLocal; // example "2024-10-14T10:10:00.000 Asia/Seoul"
         Amount sumOfSumInsuredAmounts;
         // uint256 premiumMultiplier; // what is this? UFixed?
         // uint256 weight; // what is this? UFixed?
@@ -100,6 +113,26 @@ contract FlightProduct is
         int256 delayMinutes;
     }
 
+    struct ApplicationData {
+        Str flightData;
+        Timestamp departureTime;
+        string departureTimeLocal;
+        Timestamp arrivalTime;
+        string arrivalTimeLocal;
+        Amount premiumAmount;
+        uint256[6] statistics;
+    }
+
+    struct PermitData {
+        address owner;
+        address spender;
+        uint256 value;
+        uint256 deadline;
+        uint8 v;
+        bytes32 r;
+        bytes32 s;
+    }
+
 
     constructor(
         address registry,
@@ -131,20 +164,100 @@ 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.
+    /// NOTE: This function makes the assumption that the product token
+    /// supports permits. This assumption is not verfied.
+    function createPolicyWithPermit(
+        PermitData memory permit,
+        ApplicationData memory application
+    )
+        external
+        virtual
+        restricted()
+        returns (
+            RiskId riskId,
+            NftId policyNftId
+        )
+    {
+        // process permit data
+        processPermit(permit);
+
+        // create policy
+        address policyHolder = permit.owner;
+        (
+            riskId,
+            policyNftId
+        ) = createPolicy(
+            policyHolder,
+            application.flightData,
+            application.departureTime,
+            application.departureTimeLocal,
+            application.arrivalTime,
+            application.arrivalTimeLocal,
+            application.premiumAmount,
+            application.statistics);
+            // application.v,
+            // application.r,
+            // application.s);
+    }
+
+
+    function processPermit(
+        PermitData memory permit
+    )
+        public
+        virtual
+        restricted()
+    {
+        address tokenAddress = address(getToken());
+
+        // process permit data
+        ERC20Permit(tokenAddress).permit(
+            permit.owner, 
+            permit.spender, 
+            permit.value, 
+            permit.deadline, 
+            permit.v, 
+            permit.r, 
+            permit.s); 
+    }
+
 
     function createPolicy(
         address policyHolder,
         Str flightData, 
         Timestamp departureTime,
+        string memory departureTimeLocal,
         Timestamp arrivalTime,
+        string memory arrivalTimeLocal,
         Amount premiumAmount,
-        uint256[6] memory statistics,
+        uint256[6] memory statistics
         // signature fields
-        uint8 v, 
-        bytes32 r, 
-        bytes32 s
+        // uint8 v, 
+        // bytes32 r, 
+        // bytes32 s
     )
-        external
+        public
         virtual
         restricted()
         returns (
@@ -153,20 +266,23 @@ contract FlightProduct is
         )
     {
         // checks
+        // disabled for now - using rbac for security
         FlightLib.checkApplicationDataAndSignature(
             this,
             flightData,
             departureTime,
             arrivalTime,
             premiumAmount,
-            statistics,
-            v, r, s);
+            statistics);
+            // v, r, s);
 
         (riskId, policyNftId) = _prepareApplication(
             policyHolder, 
             flightData,
             departureTime,
+            departureTimeLocal,
             arrivalTime,
+            arrivalTimeLocal,
             premiumAmount,
             statistics);
 
@@ -198,7 +314,9 @@ contract FlightProduct is
         address policyHolder,
         Str flightData, 
         Timestamp departureTime,
+        string memory departureTimeLocal,
         Timestamp arrivalTime,
+        string memory arrivalTimeLocal,
         Amount premiumAmount,
         uint256[6] memory statistics
     )
@@ -219,7 +337,9 @@ contract FlightProduct is
         ) = _createRiskAndPayoutAmounts(
             flightData,
             departureTime,
+            departureTimeLocal,
             arrivalTime,
+            arrivalTimeLocal,
             premiumAmount,
             statistics);
 
@@ -340,6 +460,9 @@ contract FlightProduct is
         return _oracleNftId;
     }
 
+    function decodeFlightRiskData(bytes memory data) external pure returns (FlightRisk memory) {
+        return abi.decode(data, (FlightRisk));
+    }
 
     //--- internal functions ------------------------------------------------//
 
@@ -347,7 +470,9 @@ contract FlightProduct is
     function _createRiskAndPayoutAmounts(
         Str flightData, 
         Timestamp departureTime,
+        string memory departureTimeLocal,
         Timestamp arrivalTime,
+        string memory arrivalTimeLocal,
         Amount premiumAmount,
         uint256[6] memory statistics
     )
@@ -373,7 +498,9 @@ contract FlightProduct is
         riskId = _checkAndUpdateFlightRisk(
             flightData,
             departureTime,
+            departureTimeLocal,
             arrivalTime,
+            arrivalTimeLocal,
             sumInsuredAmount,
             weight);
     }
@@ -382,7 +509,9 @@ contract FlightProduct is
     function _checkAndUpdateFlightRisk(
         Str flightData,
         Timestamp departureTime,
+        string memory departureTimeLocal,
         Timestamp arrivalTime,
+        string memory arrivalTimeLocal,
         Amount sumInsuredAmount,
         uint256 weight
     )
@@ -397,7 +526,9 @@ contract FlightProduct is
             getNftId(), 
             flightData, 
             departureTime, 
-            arrivalTime);
+            departureTimeLocal,
+            arrivalTime,
+            arrivalTimeLocal);
 
         // create risk, if new
         if (!exists) {
@@ -406,10 +537,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/contracts/examples/flight/FlightUSD.sol

@@ -2,9 +2,10 @@
 pragma solidity ^0.8.20;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 
 /// @dev FireUSD is a stablecoin with 6 decimals and an initial supply of 1 Billion tokens. 
-contract FlightUSD is ERC20 {
+contract FlightUSD is ERC20Permit {
 
     string public constant NAME = "FlightUSD";
     string public constant SYMBOL = "FLTD";
@@ -12,6 +13,7 @@ contract FlightUSD is ERC20 {
     uint256 public constant INITIAL_SUPPLY = 10**12 * 10**DECIMALS; // 1'000'000'000'000
     
     constructor()
+        ERC20Permit(NAME)
         ERC20(NAME, SYMBOL)
     {
         _mint(

package/contracts/shared/IAuthorizedComponent.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IComponent} from "../shared/IComponent.sol";
+import {IAuthorization} from "../authorization/IAuthorization.sol";
+
+/// @dev component base class
+/// component examples are product, distribution, pool and oracle
+interface IAuthorizedComponent is 
+    IComponent
+{
+    /// @dev returns the initial component authorization specification.
+    function getAuthorization() external view returns (IAuthorization authorization);
+
+}

package/contracts/shared/IInstanceLinkedComponent.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
-import {IComponent} from "../shared/IComponent.sol";
+import {IAuthorizedComponent} from "../shared/IAuthorizedComponent.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {NftId} from "../type/NftId.sol";
@@ -11,7 +11,7 @@ import {ObjectType} from "../type/ObjectType.sol";
 /// @dev component base class
 /// component examples are product, distribution, pool and oracle
 interface IInstanceLinkedComponent is 
-    IComponent
+    IAuthorizedComponent
 {
     error ErrorInstanceLinkedComponentTypeMismatch(ObjectType requiredType, ObjectType objectType);
     error ErrorInstanceLinkedComponentNotProduct(NftId nftId, ObjectType objectType);
@@ -24,7 +24,4 @@ interface IInstanceLinkedComponent is
     /// @dev defines the instance to which this component is linked to
     function getInstance() external view returns (IInstance instance);
 
-    /// @dev returns the initial component authorization specification.
-    function getAuthorization() external view returns (IAuthorization authorization);
-
 }

package/contracts/shared/InstanceLinkedComponent.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IAuthorization} from "../authorization/IAuthorization.sol";
+import {IAuthorizedComponent} from "../shared/IAuthorizedComponent.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IComponentService} from "./IComponentService.sol";
 import {IInstance} from "../instance/IInstance.sol";
@@ -46,7 +47,7 @@ abstract contract InstanceLinkedComponent is
     }
 
 
-    /// @inheritdoc IInstanceLinkedComponent
+    /// @inheritdoc IAuthorizedComponent
     function getAuthorization() external view virtual returns (IAuthorization authorization) {
         return _getInstanceLinkedComponentStorage()._initialAuthorization;
     }

package/package.json

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