@etherisc/gif-next 3.0.0-46119ac-539 → 3.0.0-495114d-923

package/contracts/examples/flight/FlightProductAuthorization.sol

@@ -3,19 +3,42 @@ pragma solidity ^0.8.20;
 
 import {IAccess} from "../../../contracts/authorization/IAccess.sol";
 
+import {AccessAdminLib} from "../../authorization/AccessAdminLib.sol";
 import {BasicProductAuthorization} from "../../product/BasicProductAuthorization.sol";
 import {FlightProduct} from "./FlightProduct.sol";
 import {ORACLE} from "../../../contracts/type/ObjectType.sol";
-import {PUBLIC_ROLE} from "../../../contracts/type/RoleId.sol";
+import {RoleId, ADMIN_ROLE, PUBLIC_ROLE} from "../../../contracts/type/RoleId.sol";
 
 
 contract FlightProductAuthorization
     is BasicProductAuthorization
 {
 
-    constructor(string memory poolName)
-        BasicProductAuthorization(poolName)
-    {}
+    uint64 public constant STATISTICS_PROVIDER_ROLE_IDX = 1; // 1st custom role for flight product
+    string public constant STATISTICS_PROVIDER_ROLE_NAME = "StatisticsProviderRole";
+    RoleId public STATISTICS_PROVIDER_ROLE;
+
+
+    constructor(string memory productName)
+        BasicProductAuthorization(productName)
+    { }
+
+
+    function _setupRoles()
+        internal
+        override
+    {
+        STATISTICS_PROVIDER_ROLE = AccessAdminLib.getCustomRoleId(STATISTICS_PROVIDER_ROLE_IDX);
+
+        _addRole(
+            STATISTICS_PROVIDER_ROLE,
+            AccessAdminLib.roleInfo(
+                ADMIN_ROLE(),
+                TargetType.Custom,
+                1, // max member count special case: instance nft owner is sole role owner
+                STATISTICS_PROVIDER_ROLE_NAME));
+    }
+
 
     function _setupTargetAuthorizations()
         internal
@@ -28,13 +51,16 @@ contract FlightProductAuthorization
         functions = _authorizeForTarget(getMainTargetName(), getServiceRole(ORACLE()));
         _authorize(functions, FlightProduct.flightStatusCallback.selector, "flightStatusCallback");
 
-        // 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 statistics provider role 
+        functions = _authorizeForTarget(getMainTargetName(), STATISTICS_PROVIDER_ROLE);
+        _authorize(functions, FlightProduct.createPolicyWithPermit.selector, "createPolicyWithPermit");
 
-        // only owner
-        _authorize(functions, FlightProduct.processFlightStatus.selector, "processFlightStatus");
-        _authorize(functions, FlightProduct.completeSetup.selector, "completeSetup");
+        // authorize public role (additional authz via onlyOwner)
+        functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
+        _authorize(functions, FlightProduct.resendRequest.selector, "resendRequest");
+        _authorize(functions, FlightProduct.processPayoutsAndClosePolicies.selector, "processPayoutsAndClosePolicies");
+        _authorize(functions, FlightProduct.setConstants.selector, "setConstants");
+        _authorize(functions, FlightProduct.setTestMode.selector, "setTestMode");
         _authorize(functions, FlightProduct.setDefaultBundle.selector, "setDefaultBundle");
         _authorize(functions, FlightProduct.approveTokenHandler.selector, "approveTokenHandler");
         _authorize(functions, FlightProduct.setLocked.selector, "setLocked");

package/contracts/examples/flight/FlightProductManager.sol

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IAuthorization} from "../../authorization/IAuthorization.sol";
+import {IVersionable} from "../../upgradeability/IVersionable.sol";
+
+import {NftId} from "../../type/NftId.sol";
+import {ProxyManager} from "../../upgradeability/ProxyManager.sol";
+import {FlightProduct} from "./FlightProduct.sol";
+
+
+contract FlightProductManager is ProxyManager {
+
+    FlightProduct private _flightProduct;
+    bytes32 private _salt = "0x1234";
+
+    /// @dev initializes proxy manager with flight product implementation 
+    constructor(
+        address registry,
+        NftId instanceNftId,
+        string memory componentName,
+        IAuthorization authorization
+    ) 
+    {
+        // FlightProduct prd = new FlightProduct{salt: _salt}();
+        // bytes memory data = abi.encode(
+        //     registry, 
+        //     instanceNftId, 
+        //     componentName, 
+        //     authorization);
+
+        // IVersionable versionable = initialize(
+        //     registry,
+        //     address(prd), 
+        //     data,
+        //     _salt);
+
+        // _flightProduct = FlightProduct(address(versionable));
+    }
+
+    //--- view functions ----------------------------------------------------//
+    function getFlightProduct()
+        external
+        view
+        returns (FlightProduct flightProduct)
+    {
+        return _flightProduct;
+    }
+}

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/instance/InstanceAdmin.sol

@@ -130,7 +130,6 @@ contract InstanceAdmin is
         _createTarget(target, name, TargetType.Instance, true); 
     }
 
-
     /// @dev Initializes the authorization for the specified component.
     /// Important: The component MUST be registered.
     function initializeComponentAuthorization(

package/contracts/instance/InstanceReader.sol

@@ -34,6 +34,7 @@ import {RiskId} from "../type/RiskId.sol";
 import {RiskSet} from "./RiskSet.sol";
 import {RoleId, INSTANCE_OWNER_ROLE} from "../type/RoleId.sol";
 import {StateId} from "../type/StateId.sol";
+import {Str, StrLib} from "../type/String.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
@@ -466,6 +467,12 @@ contract InstanceReader {
     }
 
 
+    /// @dev Returns the role ID for the given index.
+    function getRoleForName(string memory name) public view returns (RoleId roleId, bool exists) {
+        return _instanceAdmin.getRoleForName(name);
+    }
+
+
     /// @dev Returns the role ID for the instance owner role.
     /// This role may be used as a "root" admin role for other custom roles defined for this instance.
     function getInstanceOwnerRole() public pure returns (RoleId roleId) {
@@ -595,13 +602,18 @@ contract InstanceReader {
     }
 
 
-    function toUFixed(uint256 value, int8 exp) public pure returns (UFixed) {
-        return UFixedLib.toUFixed(value, exp);
+    function toInt(UFixed value) public pure returns (uint256) {
+        return UFixedLib.toInt(value);
     }
 
 
-    function toInt(UFixed value) public pure returns (uint256) {
-        return UFixedLib.toInt(value);
+    function toString(Str str) public pure returns (string memory) {
+        return StrLib.toString(str);
+    }
+
+
+    function toUFixed(uint256 value, int8 exp) public pure returns (UFixed) {
+        return UFixedLib.toUFixed(value, exp);
     }
 
     //--- internal functions ----------------------------------------------------//

package/contracts/oracle/BasicOracle.sol

@@ -22,6 +22,7 @@ contract BasicOracle is
         _respond(requestId, responseData);
     }
 
+
     function _initializeBasicOracle(
         address registry,
         NftId instanceNftId,

package/contracts/oracle/Oracle.sol

@@ -140,10 +140,10 @@ abstract contract Oracle is
         internal
         virtual
     {
-        _getOracleStorage()._oracleService.respond(
-            requestId, responseData);
+        _getOracleStorage()._oracleService.respond(requestId, responseData);
     }
 
+
     function _getOracleStorage() private pure returns (OracleStorage storage $) {
         assembly {
             $.slot := ORACLE_STORAGE_LOCATION_V1

package/contracts/product/PolicyServiceLib.sol

@@ -95,13 +95,14 @@ library PolicyServiceLib {
     {
         if (policyState != COLLATERALIZED()) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
-        } 
-        if (TimestampLib.current() < policyInfo.activatedAt) { 
+        }
+
+        if (policyInfo.activatedAt.eqz() || TimestampLib.current() < policyInfo.activatedAt) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         } 
 
         // check expiredAt represents a valid expiry time
-        if (newExpiredAt >= policyInfo.expiredAt) {
+        if (newExpiredAt > policyInfo.expiredAt) {
             revert IPolicyService.ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, newExpiredAt);
         }
 
@@ -110,6 +111,7 @@ library PolicyServiceLib {
         }
     }
 
+
     function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId)
         external 
         view

package/contracts/registry/RegistryAdmin.sol

@@ -85,7 +85,13 @@ contract RegistryAdmin is
                 registry, 
                 release); 
 
-        _checkAuthorization(authorization, REGISTRY(), release, false, true);
+        AccessAdminLib.checkAuthorization(
+            address(_authorization),
+            authorization, 
+            REGISTRY(), 
+            release, 
+            false, // expectServiceAuthorization
+            false); // checkAlreadyInitialized);
 
         _registry = registry;
         _authorization = IAuthorization(authorization);

package/contracts/registry/ReleaseAdmin.sol

@@ -72,7 +72,14 @@ contract ReleaseAdmin is
                 release);
 
         IServiceAuthorization serviceAuthorization = IServiceAuthorization(authorization);
-        _checkAuthorization(address(serviceAuthorization), RELEASE(), release, true, true);
+        AccessAdminLib.checkAuthorization(
+            address(_authorization),
+            address(serviceAuthorization), 
+            RELEASE(), 
+            release, 
+            true, // expectServiceAuthorization
+            true); // checkAlreadyInitialized);
+
         _serviceAuthorization = serviceAuthorization;
 
         // link nft ownability to registry

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-46119ac-539",
+  "version": "3.0.0-495114d-923",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {