@etherisc/gif-next 3.0.0-46119ac-539 → 3.0.0-701b106-642

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";
@@ -100,6 +101,27 @@ contract FlightProduct is
         int256 delayMinutes;
     }
 
+    struct ApplicationData {
+        Str flightData;
+        Timestamp departureTime;
+        Timestamp arrivalTime;
+        Amount premiumAmount;
+        uint256[6] statistics;
+        uint8 v;
+        bytes32 r; 
+        bytes32 s;
+    }
+
+    struct PermitData {
+        address owner;
+        address spender;
+        uint256 value;
+        uint256 deadline;
+        uint8 v;
+        bytes32 r;
+        bytes32 s;
+    }
+
 
     constructor(
         address registry,
@@ -131,6 +153,82 @@ 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.arrivalTime,
+            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,
@@ -138,13 +236,13 @@ 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
     )
-        external
+        public
         virtual
         restricted()
         returns (
@@ -153,14 +251,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, 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "3.0.0-46119ac-539",
+  "version": "3.0.0-701b106-642",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {