@etherisc/gif-next 3.0.0-1a7e54a-113 → 3.0.0-1b49bd6-565

package/contracts/examples/fire/FirePool.sol

@@ -16,7 +16,6 @@ contract FirePool is
     BasicPool
 {   
     constructor(
-        address registry,
         NftId fireProductNftId,
         string memory componentName,
         IAuthorization authorization
@@ -24,7 +23,6 @@ contract FirePool is
     {
         address initialOwner = msg.sender;
         _intialize(
-            registry,
             fireProductNftId,
             componentName,
             IComponents.PoolInfo({
@@ -41,7 +39,6 @@ contract FirePool is
     }
 
     function _intialize(
-        address registry,
         NftId fireProductNftId,
         string memory componentName,
         IComponents.PoolInfo memory poolInfo,
@@ -52,7 +49,6 @@ contract FirePool is
         initializer
     {
         _initializeBasicPool(
-            registry,
             fireProductNftId,
             componentName,
             poolInfo,

package/contracts/examples/fire/FireProduct.sol

@@ -65,7 +65,6 @@ contract FireProduct is
     mapping(uint256 fireId => mapping (NftId policyId => bool claimed)) private _claimed;
 
     constructor(
-        address registry,
         NftId instanceNftid,
         string memory componentName,
         IAuthorization authorization
@@ -74,7 +73,6 @@ contract FireProduct is
         address initialOwner = msg.sender;
 
         _initialize(
-            registry,
             instanceNftid,
             componentName,
             authorization,
@@ -82,7 +80,6 @@ contract FireProduct is
     }
 
     function _initialize(
-        address registry,
         NftId instanceNftId,
         string memory componentName,
         IAuthorization authorization,
@@ -92,7 +89,6 @@ contract FireProduct is
         initializer
     {
         _initializeBasicProduct(
-            registry,
             instanceNftId,
             componentName,
             IComponents.ProductInfo({

package/contracts/examples/flight/FlightLib.sol

@@ -24,33 +24,33 @@ library FlightLib {
         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
         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);
-        }
+        // (
+        //     address actualSigner,,
+        //     bool success
+        // ) = flightProduct.getFlightMessageVerifier().verifyRatingsHash(
+        //     flightData,
+        //     departureTime,
+        //     arrivalTime,
+        //     premiumAmount,
+        //     statistics,
+        //     v, r, s);
+
+        // if (!success) {
+        //     revert FlightProduct.ErrorApplicationDataSignatureMismatch(
+        //         flightProduct.getFlightMessageVerifier().getExpectedSigner(),
+        //         actualSigner);
+        // }
     }
 
 
@@ -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/FlightOracle.sol

@@ -38,7 +38,6 @@ contract FlightOracle is
 
 
     constructor(
-        address registry,
         NftId productNftId,
         string memory componentName,
         IAuthorization authorization
@@ -46,7 +45,6 @@ contract FlightOracle is
     {
         address initialOwner = msg.sender;
         initialize(
-            registry,
             productNftId,
             authorization,
             initialOwner,
@@ -56,7 +54,6 @@ contract FlightOracle is
 
 
     function initialize(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -67,7 +64,6 @@ contract FlightOracle is
         initializer()
     {
         _initializeBasicOracle(
-            registry,
             productNftId,
             authorization,
             initialOwner,

package/contracts/examples/flight/FlightPool.sol

@@ -20,7 +20,6 @@ contract FlightPool is
     BasicPool
 {   
     constructor(
-        address registry,
         NftId productNftId,
         string memory componentName,
         IAuthorization authorization
@@ -28,7 +27,6 @@ contract FlightPool is
     {
         address initialOwner = msg.sender;
         _intialize(
-            registry,
             productNftId,
             componentName,
             IComponents.PoolInfo({
@@ -45,7 +43,6 @@ contract FlightPool is
     }
 
     function _intialize(
-        address registry,
         NftId productNftId,
         string memory componentName,
         IComponents.PoolInfo memory poolInfo,
@@ -56,7 +53,6 @@ contract FlightPool is
         initializer
     {
         _initializeBasicPool(
-            registry,
             productNftId,
             componentName,
             poolInfo,

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
@@ -100,9 +109,29 @@ 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,
         NftId instanceNftid,
         string memory componentName,
         IAuthorization authorization,
@@ -112,7 +141,6 @@ contract FlightProduct is
         address initialOwner = msg.sender;
 
         _initialize(
-            registry,
             instanceNftid,
             componentName,
             authorization,
@@ -131,6 +159,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 +242,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 +257,15 @@ 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, 
@@ -340,6 +445,9 @@ contract FlightProduct is
         return _oracleNftId;
     }
 
+    function decodeFlightRiskData(bytes memory data) external pure returns (FlightRisk memory) {
+        return abi.decode(data, (FlightRisk));
+    }
 
     //--- internal functions ------------------------------------------------//
 
@@ -406,10 +514,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;
@@ -507,7 +614,6 @@ contract FlightProduct is
 
 
     function _initialize(
-        address registry,
         NftId instanceNftId,
         string memory componentName,
         IAuthorization authorization,
@@ -517,7 +623,6 @@ contract FlightProduct is
         initializer
     {
         _initializeBasicProduct(
-            registry,
             instanceNftId,
             componentName,
             IComponents.ProductInfo({

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/examples/unpermissioned/SimpleDistribution.sol

@@ -17,14 +17,12 @@ contract SimpleDistribution is
 {
     
     constructor(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner
     ) 
     {
         initialize(
-            registry,
             productNftId,
             authorization,
             initialOwner,
@@ -32,7 +30,6 @@ contract SimpleDistribution is
     }
 
     function initialize(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -43,7 +40,6 @@ contract SimpleDistribution is
         initializer()
     {
         _initializeBasicDistribution(
-            registry,
             productNftId,
             authorization,
             initialOwner,

package/contracts/examples/unpermissioned/SimpleOracle.sol

@@ -31,14 +31,12 @@ contract SimpleOracle is
     event LogSimpleOracleSyncResponseSent(RequestId requestId, string responseText);
 
     constructor(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner
     ) 
     {
         initialize(
-            registry,
             productNftId,
             authorization,
             initialOwner,
@@ -47,7 +45,6 @@ contract SimpleOracle is
     }
 
     function initialize(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -58,7 +55,6 @@ contract SimpleOracle is
         initializer()
     {
         _initializeBasicOracle(
-            registry,
             productNftId,
             authorization,
             initialOwner,

package/contracts/examples/unpermissioned/SimplePool.sol

@@ -17,7 +17,6 @@ contract SimplePool is
 {
     
     constructor(
-        address registry,
         NftId productNftId,
         IComponents.PoolInfo memory poolInfo,
         IAuthorization authorization,
@@ -25,7 +24,6 @@ contract SimplePool is
     ) 
     {
         initialize(
-            registry,
             productNftId,
             poolInfo,
             authorization,
@@ -35,7 +33,6 @@ contract SimplePool is
 
 
     function initialize(
-        address registry,
         NftId productNftId,
         IComponents.PoolInfo memory poolInfo,
         IAuthorization authorization,
@@ -46,7 +43,6 @@ contract SimplePool is
         initializer()
     {
         _initializeBasicPool(
-            registry,
             productNftId,
             "SimplePool",
             poolInfo,

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -34,7 +34,6 @@ contract SimpleProduct is
     IOracleService private _oracleService;
 
     constructor(
-        address registry,
         NftId instanceNftId,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -44,7 +43,6 @@ contract SimpleProduct is
     )
     {
         initialize(
-            registry,
             instanceNftId,
             name,
             productInfo,
@@ -55,7 +53,6 @@ contract SimpleProduct is
 
 
     function initialize(
-        address registry,
         NftId instanceNftid,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -68,7 +65,6 @@ contract SimpleProduct is
         initializer()
     {
         _initializeBasicProduct(
-            registry,
             instanceNftid,
             name,
             productInfo,

package/contracts/instance/Instance.sol

@@ -26,8 +26,6 @@ contract Instance is
     IInstance,
     Registerable
 {
-    bool private _initialized;
-
     IComponentService internal _componentService;
     IInstanceService internal _instanceService;
 
@@ -59,8 +57,6 @@ contract Instance is
 
     function initialize(
         InstanceContracts memory instanceContracts,
-        IRegistry registry, 
-        VersionPart release,
         address initialOwner,
         bool tokenRegistryDisabled // only disable for testing
     ) 
@@ -74,9 +70,9 @@ contract Instance is
         _instanceAdmin = instanceContracts.instanceAdmin;
 
         // setup instance object info
+        IRegistry registry = _getRegistry();
         __Registerable_init({
             authority: instanceContracts.instanceAdmin.authority(),
-            registry: address(registry), 
             parentNftId: registry.getNftId(), 
             objectType: INSTANCE(), 
             isInterceptor: false, 
@@ -93,19 +89,19 @@ contract Instance is
         // initialize instance supporting contracts
         _instanceStore.initialize();
         _productStore.initialize();
-        _bundleSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
-        _riskSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
+        _bundleSet.initialize(instanceContracts.instanceAdmin.authority());
+        _riskSet.initialize(instanceContracts.instanceAdmin.authority());
         _instanceReader.initialize();
 
         _componentService = IComponentService(
-            getRegistry().getServiceAddress(
+            registry.getServiceAddress(
                 COMPONENT(), 
-                release));
+                getRelease()));
 
         _instanceService = IInstanceService(
-            getRegistry().getServiceAddress(
+            registry.getServiceAddress(
                 INSTANCE(), 
-                release));
+                getRelease()));
 
         _tokenRegistryDisabled = tokenRegistryDisabled;