@etherisc/gif-next 3.0.0-a511887-523 → 3.0.0-ab0fcb2-112

package/contracts/authorization/AccessAdmin.sol

@@ -7,7 +7,6 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 import {IAccess} from "./IAccess.sol";
 import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {IAuthorization} from "./IAuthorization.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
 import {IServiceAuthorization} from "./IServiceAuthorization.sol";
 
 import {AccessAdminLib} from "./AccessAdminLib.sol";
@@ -300,11 +299,12 @@ contract AccessAdmin is
     //--- internal/private functions -------------------------------------------------//
 
     function _linkToNftOwnable(address registerable) internal {
-        if (!getRegistry().isRegistered(registerable)) {
+        NftId nftId = _getRegistry().getNftIdForAddress(registerable);
+        if (nftId.eqz()) {
             revert ErrorAccessAdminNotRegistered(registerable);
         }
 
-        _linkedNftId = getRegistry().getNftIdForAddress(registerable);
+        _linkedNftId = nftId;
     }
 
 

package/contracts/authorization/AccessAdminLib.sol

@@ -7,7 +7,7 @@ import {IAccess} from "./IAccess.sol";
 import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {IAuthorization} from "./IAuthorization.sol";
 import {IComponent} from "../shared/IComponent.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IAuthorizedComponent} from "../shared/IAuthorizedComponent.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "./IServiceAuthorization.sol";
@@ -335,10 +335,10 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
         view
         returns (IAuthorization componentAuthorization)
     {
-        checkIsRegistered(address(accessAdmin.getRegistry()), componentAddress, expectedType);
-
         VersionPart expecteRelease = accessAdmin.getRelease();
-        IInstanceLinkedComponent component = IInstanceLinkedComponent(componentAddress);
+        checkIsRegistered(componentAddress, expectedType, expecteRelease);
+
+        IAuthorizedComponent component = IAuthorizedComponent(componentAddress);
         componentAuthorization = component.getAuthorization();
 
         checkAuthorization(
@@ -435,22 +435,25 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
 
 
     function checkIsRegistered( 
-        address registry,
         address target,
-        ObjectType expectedType
+        ObjectType expectedType,
+        VersionPart expectedRelease
     )
         public
         view 
     {
-        checkRegistry(registry);
+        IRegistry.ObjectInfo memory info = ContractLib.getRegistry().getObjectInfo(target);
 
-        ObjectType tagetType = IRegistry(registry).getObjectInfo(target).objectType;
-        if (tagetType.eqz()) {
+        if (info.objectType.eqz()) {
             revert IAccessAdmin.ErrorAccessAdminNotRegistered(target);
         }
 
-        if (tagetType != expectedType) {
-            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, tagetType);
+        if (info.objectType != expectedType) {
+            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, info.objectType);
+        }
+
+        if (info.release != expectedRelease) {
+            revert IAccessAdmin.ErrorAccessAdminTargetReleaseMismatch(target, expectedRelease, info.release);
         }
     }
 

package/contracts/authorization/IAccessAdmin.sol

@@ -57,6 +57,7 @@ interface IAccessAdmin is
     error ErrorAccessAdminTargetNotCreated(address target);
     error ErrorAccessAdminTargetNotRegistered(address target);
     error ErrorAccessAdminTargetTypeMismatch(address target, ObjectType expectedType, ObjectType actualType);
+    error ErrorAccessAdminTargetReleaseMismatch(address target, VersionPart expectedRelease, VersionPart actualRelease);
 
     // check authorization
     error ErrorAccessAdminAlreadyInitialized(address authorization);

package/contracts/distribution/BasicDistribution.sol

@@ -119,7 +119,6 @@ contract BasicDistribution is
     }
 
     function _initializeBasicDistribution(
-        address registry,
         NftId instanceNftId,
         IAuthorization authorization, 
         address initialOwner,
@@ -130,7 +129,6 @@ contract BasicDistribution is
         onlyInitializing()
     {
         __Distribution_init(
-            registry, 
             instanceNftId, 
             authorization,
             false,

package/contracts/distribution/BasicDistributionAuthorization.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IComponent} from "../shared/IComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
 import {BasicDistribution} from "./BasicDistribution.sol"; 

package/contracts/distribution/Distribution.sol

@@ -104,7 +104,6 @@ abstract contract Distribution is
 
 
     function __Distribution_init(
-        address registry,
         NftId productNftId,
         IAuthorization authorization, 
         bool isInterceptor,
@@ -116,7 +115,6 @@ abstract contract Distribution is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
-            registry, 
             productNftId, 
             name, 
             DISTRIBUTION(), 

package/contracts/distribution/DistributionService.sol

@@ -20,8 +20,6 @@ import {KEEP_STATE} from "../type/StateId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-// TODO PoolLib feels wrong, should likely go in a component type independent lib
-import {PoolLib} from "../pool/PoolLib.sol";
 import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Service} from "../shared/Service.sol";
@@ -47,11 +45,10 @@ contract DistributionService is
         onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
 
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
         _componentService = IComponentService(_getServiceAddress(COMPONENT()));
@@ -81,7 +78,7 @@ contract DistributionService is
         (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
 
         {
-            NftId productNftId = getRegistry().getParentNftId(distributionNftId);
+            NftId productNftId = _getRegistry().getParentNftId(distributionNftId);
             IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
 
             UFixed variableDistributionFees = feeInfo.distributionFee.fractionalFee;
@@ -199,7 +196,7 @@ contract DistributionService is
         }
 
         {
-            NftId distributorDistributionNftId = getRegistry().getParentNftId(distributorNftId);
+            NftId distributorDistributionNftId = _getRegistry().getParentNftId(distributorNftId);
             if (distributorDistributionNftId != distributionNftId) {
                 revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
             }
@@ -254,7 +251,7 @@ contract DistributionService is
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
         if (referralIsValid(distributionNftId, referralId)) {
-            IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
+            IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
 
             // update book keeping for referral info
             IDistribution.ReferralInfo memory referralInfo = instance.getInstanceReader().getReferralInfo(referralId);
@@ -275,7 +272,7 @@ contract DistributionService is
         restricted()
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
-        IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
         InstanceReader reader = instance.getInstanceReader();
         InstanceStore store = instance.getInstanceStore();
 
@@ -343,7 +340,7 @@ contract DistributionService is
 
         // transfer amount to distributor
         {
-            address distributor = getRegistry().ownerOf(distributorNftId);
+            address distributor = _getRegistry().ownerOf(distributorNftId);
             emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
             distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
         }
@@ -360,7 +357,7 @@ contract DistributionService is
             return false;
         }
 
-        IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
         IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
 
         if (info.distributorNftId.eqz()) {
@@ -441,7 +438,11 @@ contract DistributionService is
             IInstance instance
         )
     {
-        return PoolLib.getAndVerifyActiveComponent(getRegistry(), msg.sender, DISTRIBUTION());
+        (poolNftId, instance) = ContractLib.getAndVerifyComponent(
+            msg.sender, 
+            DISTRIBUTION(), 
+            getRelease(), 
+            true);
     }
 
 

package/contracts/distribution/DistributionServiceManager.sol

@@ -12,14 +12,12 @@ contract DistributionServiceManager is ProxyManager {
     /// @dev initializes proxy manager with distribution service implementation and deploys instance
     constructor(
         address authority, 
-        address registry,
         bytes32 salt
     ) 
     {
         DistributionService svc = new DistributionService{salt: salt}();
-        bytes memory data = abi.encode(authority, registry);
+        bytes memory data = abi.encode(authority);
         IUpgradeable upgradeable = initialize(
-            registry,
             address(svc), 
             data,
             salt);

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

@@ -0,0 +1,322 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IPolicy} from "../../instance/module/IPolicy.sol";
+import {IPolicyService} from "../../product/IPolicyService.sol";
+
+import {Amount, AmountLib} from "../../type/Amount.sol";
+import {FlightMessageVerifier} from "./FlightMessageVerifier.sol";
+import {FlightProduct} from "./FlightProduct.sol";
+import {InstanceReader} from "../../instance/InstanceReader.sol";
+import {NftId} from "../../type/NftId.sol";
+import {RequestId} from "../../type/RequestId.sol";
+import {RiskId, RiskIdLib} from "../../type/RiskId.sol";
+import {StateId} from "../../type/StateId.sol";
+import {Str} from "../../type/String.sol";
+import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
+
+
+library FlightLib {
+
+    function checkApplicationDataAndSignature(
+        FlightProduct flightProduct,
+        Str flightData, 
+        Timestamp departureTime,
+        Timestamp arrivalTime,
+        Amount premiumAmount,
+        uint256[6] memory statistics
+        // signature fields
+        // 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);
+        // }
+    }
+
+
+    function _checkApplicationData(
+        FlightProduct flightProduct,
+        Amount premiumAmount,
+        Timestamp arrivalTime,
+        Timestamp departureTime
+    )
+        internal
+        view
+    {
+        // solhint-disable
+        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
+    }
+
+
+    // 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)
+    function checkAndGetPayoutOption(
+        RequestId requestId,
+        RiskId riskId, 
+        bytes1 status, 
+        int256 delayMinutes
+    )
+        public
+        returns (uint8 payoutOption)
+    {
+        // default: no payout
+        payoutOption = type(uint8).max;
+
+        // check status
+        if (status != "L" && status != "A" && status != "C" && status != "D") {
+            emit FlightProduct.LogErrorUnprocessableStatus(requestId, riskId, status);
+            return payoutOption;
+        }
+
+        if (status == "A") {
+            // todo: active, reschedule oracle call + 45 min
+            emit FlightProduct.LogErrorUnexpectedStatus(requestId, riskId, status, delayMinutes);
+            return payoutOption;
+        }
+
+        // trigger payout if applicable
+        if (status == "C") { payoutOption = 3; } 
+        else if (status == "D") { payoutOption = 4; } 
+        else if (delayMinutes >= 15 && delayMinutes < 30) { payoutOption = 0; } 
+        else if (delayMinutes >= 30 && delayMinutes < 45) { payoutOption = 1; } 
+        else if (delayMinutes >= 45) { payoutOption = 2; }
+    }
+
+
+    function calculateWeight(
+        FlightProduct flightProduct,
+        uint256[6] memory statistics
+    )
+        public
+        view
+        returns (uint256 weight)
+    {
+        // check we have enough observations
+        if (statistics[0] < flightProduct.MIN_OBSERVATIONS()) {
+            revert FlightProduct.ErrorFlightProductNotEnoughObservations(statistics[0], flightProduct.MIN_OBSERVATIONS());
+        }
+
+        weight = 0;
+        for (uint256 i = 1; i < 6; i++) {
+            weight += flightProduct.WEIGHT_PATTERN(i) * statistics[i] * 10000 / statistics[0];
+        }
+
+        // To avoid div0 in the payout section, we have to make a minimal assumption on weight
+        if (weight == 0) {
+            weight = 100000 / statistics[0];
+        }
+
+        // TODO comment on intended effect
+        weight = (weight * (100 + flightProduct.MARGIN_PERCENT())) / 100;
+    }
+
+
+    // REMARK: each flight may get different payouts depending on the latest statics
+    function calculatePayoutAmounts(
+        FlightProduct flightProduct,
+        Amount premium, 
+        uint256[6] memory statistics
+    )
+        public
+        view
+        returns (
+            uint256 weight, 
+            Amount[5] memory payoutAmounts,
+            Amount sumInsuredAmount // simply the max of payoutAmounts 
+        )
+    {
+        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);
+
+        for (uint256 i = 0; i < 5; i++) {
+            Amount payoutAmount = AmountLib.toAmount(
+                premium.toInt() * flightProduct.WEIGHT_PATTERN(i + 1) * 10000 / weight);
+
+            // cap payout and update sum insured if applicable
+            if (payoutAmount > flightProduct.MAX_PAYOUT()) { payoutAmount = flightProduct.MAX_PAYOUT(); }
+            if (payoutAmount > sumInsuredAmount) { sumInsuredAmount = payoutAmount; }
+
+            payoutAmounts[i] = payoutAmount;
+        }
+    }
+
+
+    function getPayoutAmount(
+        bytes memory applicationData, 
+        uint8 payoutOption
+    )
+        public
+        returns (Amount payoutAmount)
+    {
+        // retrieve payout amounts from application data
+        (, Amount[5] memory payoutAmounts) = abi.decode(
+            applicationData, (Amount, Amount[5]));
+
+        // get payout amount for selected option
+        payoutAmount = payoutAmounts[payoutOption];
+    }
+
+
+    function getFlightRisk(
+        InstanceReader reader,
+        NftId productNftId, 
+        Str flightData,
+        Timestamp departureTime, 
+        Timestamp arrivalTime
+    )
+        public
+        view
+        returns (
+            RiskId riskId,
+            bool exists,
+            FlightProduct.FlightRisk memory flightRisk
+        )
+    {
+        riskId = getRiskId(productNftId, flightData);
+        (exists, flightRisk) = getFlightRisk(reader, productNftId, riskId);
+
+        // create new risk if not existing
+        if (!exists) {
+            flightRisk = FlightProduct.FlightRisk({
+                flightData: flightData,
+                departureTime: departureTime,
+                arrivalTime: arrivalTime,
+                sumOfSumInsuredAmounts: AmountLib.toAmount(0),
+                status: bytes1(0),
+                delayMinutes: 0});
+        }
+    }
+
+
+    function getFlightRisk(
+        InstanceReader reader,
+        NftId productNftId,
+        RiskId riskId
+    )
+        public
+        view
+        returns (
+            bool exists,
+            FlightProduct.FlightRisk memory flightRisk
+        )
+    {
+        // check if risk exists
+        exists = reader.isProductRisk(productNftId, riskId);
+
+        // get risk data if risk exists
+        if (exists) {
+            flightRisk = abi.decode(
+                reader.getRiskInfo(riskId).data, (FlightProduct.FlightRisk));
+        }
+    }
+
+
+    function getRiskId(
+        NftId productNftId,
+        Str flightData
+    )
+        public
+        view 
+        returns (RiskId riskId)
+    {
+        bytes32 riskKey = getRiskKey(flightData);
+        riskId = getRiskId(productNftId, riskKey);
+    }
+
+
+    function getRiskKey(
+        Str flightData
+    )
+        internal
+        pure
+        returns (bytes32 riskKey)
+    {
+        return keccak256(abi.encode(flightData));
+    }
+
+
+    function getRiskId(NftId productNftId, bytes32 riskKey) internal view returns (RiskId riskId) {
+        return RiskIdLib.toRiskId(productNftId, riskKey);
+    }
+}