@etherisc/gif-next 3.0.0-06d5e8b-738 → 3.0.0-0b94571-537

package/contracts/examples/flight/FlightProduct.sol

@@ -6,9 +6,11 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 
 import {IAuthorization} from "../../authorization/IAuthorization.sol";
 import {IComponents} from "../../instance/module/IComponents.sol";
+import {IPolicy} from "../../instance/module/IPolicy.sol";
 
 import {Amount, AmountLib} from "../../type/Amount.sol";
 import {ClaimId} from "../../type/ClaimId.sol";
+import {Component} from "../../shared/Component.sol";
 import {FeeLib} from "../../type/Fee.sol";
 import {FlightLib} from "./FlightLib.sol";
 import {FlightMessageVerifier} from "./FlightMessageVerifier.sol";
@@ -21,7 +23,7 @@ import {ReferralLib} from "../../type/Referral.sol";
 import {RiskId, RiskIdLib} from "../../type/RiskId.sol";
 import {RequestId} from "../../type/RequestId.sol";
 import {Seconds, SecondsLib} from "../../type/Seconds.sol";
-import {Str} from "../../type/String.sol";
+import {Str, StrLib} from "../../type/String.sol";
 import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
 
 
@@ -30,68 +32,46 @@ contract FlightProduct is
     Product
 {
 
-    event LogRequestFlightRatings(uint256 requestId, bytes32 carrierFlightNumber, uint256 departureTime, uint256 arrivalTime, bytes32 riskId);
-    event LogRequestFlightStatus(uint256 requestId, uint256 arrivalTime, bytes32 carrierFlightNumber, bytes32 departureYearMonthDay);
-    event LogPayoutTransferred(bytes32 bpKey, uint256 claimId, uint256 payoutId, uint256 amount);
+    event LogFlightPolicyPurchased(NftId policyNftId, string flightData, Amount premiumAmount);
+    event LogFlightPolicyClosed(NftId policyNftId, Amount payoutAmount);
+
     event LogFlightStatusProcessed(RequestId requestId, RiskId riskId, bytes1 status, int256 delayMinutes, uint8 payoutOption);
     event LogFlightPoliciesProcessed(RiskId riskId, uint8 payoutOption, uint256 policiesProcessed, uint256 policiesRemaining);
 
-    // TODO convert error logs to custom errors
-    // event LogError(string error, uint256 index, uint256 stored, uint256 calculated);
-    event LogPolicyExpired(bytes32 bpKey);
-
-    event LogErrorRiskInvalid(RequestId requestId, RiskId riskId);
-    event LogErrorUnprocessableStatus(RequestId requestId, RiskId riskId, bytes1 status);
-    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
-    uint256 public immutable MIN_OBSERVATIONS = 10;
-    // Minimum time before departure for applying
-    Seconds public MIN_TIME_BEFORE_DEPARTURE = SecondsLib.fromDays(14);
-    // Maximum time before departure for applying
-    Seconds public MAX_TIME_BEFORE_DEPARTURE = SecondsLib.fromDays(90);
-    // Maximum duration of flight
-    Seconds public MAX_FLIGHT_DURATION = SecondsLib.fromDays(2);
-    // Check for delay after .. minutes after scheduled arrival
-    Seconds public CHECK_OFFSET = SecondsLib.fromHours(1);
-    // Max time to process claims after departure
-    Seconds public LIFETIME = SecondsLib.fromDays(30);
-
-    // uint256 public constant MIN_PREMIUM = 15 * 10 ** 18; // production
-    // All amounts in cent = multiplier is 10 ** 16!
     Amount public MIN_PREMIUM;
     Amount public MAX_PREMIUM;
     Amount public MAX_PAYOUT;
-    Amount public MAX_TOTAL_PAYOUT; // Maximum risk per flight is 3x max payout.
+    Amount public MAX_TOTAL_PAYOUT; // Maximum risk per flight/risk
 
-    // Maximum cumulated weighted premium per risk
-    uint256 public MARGIN_PERCENT = 30;
-
-    // Maximum number of policies to process in one callback
-    uint8 public MAX_POLICIES_TO_PROCESS = 5;
+    // Minimum time before departure for applying
+    Seconds public MIN_TIME_BEFORE_DEPARTURE;
+    // Maximum time before departure for applying
+    Seconds public MAX_TIME_BEFORE_DEPARTURE;
+    // Maximum duration of flight
+    Seconds public MAX_FLIGHT_DURATION;
+    // Max time to process claims after departure
+    Seconds public LIFETIME;
 
     // ['observations','late15','late30','late45','cancelled','diverted']
     // no payouts for delays of 30' or less
-    uint8[6] public WEIGHT_PATTERN = [0, 0, 0, 30, 50, 50];
-    uint8 public constant MAX_WEIGHT = 50;
+    uint8[6] public WEIGHT_PATTERN;
+    // Minimum number of observations for valid prediction/premium calculation
+    uint256 public MIN_OBSERVATIONS;
+    // Maximum cumulated weighted premium per risk
+    uint256 public MARGIN_PERCENT;
+    // Maximum number of policies to process in one callback
+    uint8 public MAX_POLICIES_TO_PROCESS;
+    // solhint-enable
 
     bool internal _testMode;
 
+    mapping(RiskId riskId => RequestId requestId) internal _requests;
+    mapping(bytes32 encodedRisk => RiskId) internal _risks;
+
     // GIF V3 specifics
     NftId internal _defaultBundleNftId;
     NftId internal _oracleNftId;
-    // solhint-enable
 
 
     struct FlightRisk {
@@ -103,16 +83,15 @@ contract FlightProduct is
         // 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?
         bytes1 status; // 'L'ate, 'C'ancelled, 'D'iverted, ...
         int256 delayMinutes;
         uint8 payoutOption;
         Timestamp statusUpdatedAt;
     }
 
+
     struct ApplicationData {
-        Str flightData;
+        string flightData;
         Timestamp departureTime;
         string departureTimeLocal;
         Timestamp arrivalTime;
@@ -135,7 +114,7 @@ contract FlightProduct is
 
     constructor(
         address registry,
-        NftId instanceNftid,
+        NftId instanceNftId,
         string memory componentName,
         IAuthorization authorization
     )
@@ -144,12 +123,13 @@ contract FlightProduct is
 
         _initialize(
             registry,
-            instanceNftid,
+            instanceNftId,
             componentName,
             authorization,
             initialOwner);
     }
 
+
     //--- external functions ------------------------------------------------//
     //--- unpermissioned functions ------------------------------------------//
 
@@ -160,6 +140,7 @@ contract FlightProduct is
             getNftId()).oracleNftId[0];
     }
 
+
     function calculatePayoutAmounts(
         FlightProduct flightProduct,
         Amount premium, 
@@ -205,7 +186,7 @@ contract FlightProduct is
             policyNftId
         ) = _createPolicy(
             policyHolder,
-            application.flightData,
+            StrLib.toStr(application.flightData),
             application.departureTime,
             application.departureTimeLocal,
             application.arrivalTime,
@@ -215,66 +196,6 @@ contract FlightProduct is
     }
 
 
-    function _createPolicy(
-        address policyHolder,
-        Str flightData, 
-        Timestamp departureTime,
-        string memory departureTimeLocal,
-        Timestamp arrivalTime,
-        string memory arrivalTimeLocal,
-        Amount premiumAmount,
-        uint256[6] memory statistics
-    )
-        internal
-        virtual
-        returns (
-            RiskId riskId,
-            NftId policyNftId
-        )
-    {
-        // checks
-        // disabled for now - using rbac for security
-        FlightLib.checkApplicationData(
-            this,
-            flightData,
-            departureTime,
-            arrivalTime,
-            premiumAmount);
-
-        (riskId, policyNftId) = _prepareApplication(
-            policyHolder, 
-            flightData,
-            departureTime,
-            departureTimeLocal,
-            arrivalTime,
-            arrivalTimeLocal,
-            premiumAmount,
-            statistics);
-
-        _createPolicy(
-            policyNftId, 
-            TimestampLib.zero(), // do not ativate yet 
-            premiumAmount); // max premium amount
-
-        // interactions (token transfer + callback to token holder, if contract)
-        _collectPremium(
-            policyNftId, 
-            departureTime); // activate at scheduled departure time of flight
-
-        // send oracle request for flight status (interacts with flight oracle contract)
-        _sendRequest(
-            _oracleNftId, 
-            abi.encode(
-                FlightOracle.FlightStatusRequest(
-                    riskId,
-                    flightData,
-                    departureTime)),
-            // allow up to 30 days to process the claim
-            arrivalTime.addSeconds(SecondsLib.fromDays(30)), 
-            "flightStatusCallback");
-    }
-
-
     /// @dev Callback for flight status oracle.
     /// Function may only be alled by oracle service.
     function flightStatusCallback(
@@ -292,31 +213,17 @@ contract FlightProduct is
             requestId, 
             response.riskId, 
             response.status, 
-            response.delayMinutes, 
-            MAX_POLICIES_TO_PROCESS);
+            response.delayMinutes);
     }
 
 
-    /// @dev Manual fallback function for product owner.
-    function processFlightStatus(
-        RequestId requestId,
-        RiskId riskId, 
-        bytes1 status, 
-        int256 delayMinutes,
-        uint8 maxPoliciesToProcess
-    )
+    function resendResponse(RequestId requestId)
         external
         virtual
         restricted()
-        onlyOwner()
     {
-        _processFlightStatus(
-            requestId, 
-            riskId, 
-            status, 
-            delayMinutes, 
-            maxPoliciesToProcess);
-    }    
+        _resendResponse(requestId);
+    }
 
 
     /// @dev Manual fallback function for product owner.
@@ -339,22 +246,30 @@ contract FlightProduct is
 
     /// @dev Call after product registration with the instance
     /// when the product token/tokenhandler is available
-    function completeSetup()
+    function setConstants(
+        Amount minPremium,
+        Amount maxPremium,
+        Amount maxPayout,
+        Amount maxTotalPayout,
+        Seconds minTimeBeforeDeparture,
+        Seconds maxTimeBeforeDeparture,
+        uint8 maxPoliciesToProcess
+    )
         external
         virtual
         restricted()
         onlyOwner()
     {
-        IERC20Metadata token = IERC20Metadata(getToken());
-        uint256 tokenMultiplier = 10 ** token.decimals();
-
-        MIN_PREMIUM = AmountLib.toAmount(15 * tokenMultiplier); 
-        MAX_PREMIUM = AmountLib.toAmount(200 * tokenMultiplier); 
-        MAX_PAYOUT = AmountLib.toAmount(500 * tokenMultiplier); 
-        MAX_TOTAL_PAYOUT = AmountLib.toAmount(3 * MAX_PAYOUT.toInt());
+        MIN_PREMIUM = minPremium; 
+        MAX_PREMIUM = maxPremium; 
+        MAX_PAYOUT = maxPayout; 
+        MAX_TOTAL_PAYOUT = maxTotalPayout;
+
+        MIN_TIME_BEFORE_DEPARTURE = minTimeBeforeDeparture;
+        MAX_TIME_BEFORE_DEPARTURE = maxTimeBeforeDeparture;
+        MAX_POLICIES_TO_PROCESS = maxPoliciesToProcess;
     }
 
-
     function setDefaultBundle(NftId bundleNftId) external restricted() onlyOwner() { _defaultBundleNftId = bundleNftId; }
     function setTestMode(bool testMode) external restricted() onlyOwner() { _testMode = testMode; }
 
@@ -382,6 +297,27 @@ contract FlightProduct is
 
     function getOracleNftId() public view returns (NftId oracleNftId) { return _oracleNftId; }
     function isTestMode() public view returns (bool) { return _testMode; }
+
+
+    function getFlightRisk(
+        RiskId riskId,
+        bool requireRiskExists
+    )
+        public
+        view
+        returns (
+            bool exists,
+            FlightRisk memory flightRisk
+        )
+    {
+        (exists, flightRisk) = FlightLib.getFlightRisk(
+            _getInstanceReader(), 
+            getNftId(), 
+            riskId, 
+            requireRiskExists);
+    }
+
+    function getRequestForRisk(RiskId riskId) public view returns (RequestId requestId) { return _requests[riskId]; }
     function decodeFlightRiskData(bytes memory data) public pure returns (FlightRisk memory) { return abi.decode(data, (FlightRisk)); }
 
     //--- internal functions ------------------------------------------------//
@@ -408,6 +344,70 @@ contract FlightProduct is
     }
 
 
+    function _createPolicy(
+        address policyHolder,
+        Str flightData, 
+        Timestamp departureTime,
+        string memory departureTimeLocal,
+        Timestamp arrivalTime,
+        string memory arrivalTimeLocal,
+        Amount premiumAmount,
+        uint256[6] memory statistics
+    )
+        internal
+        virtual
+        returns (
+            RiskId riskId,
+            NftId policyNftId
+        )
+    {
+        // checks
+        // disabled for now - using rbac for security
+        FlightLib.checkApplicationData(
+            this,
+            flightData,
+            departureTime,
+            arrivalTime,
+            premiumAmount);
+
+        (riskId, policyNftId) = _prepareApplication(
+            policyHolder, 
+            flightData,
+            departureTime,
+            departureTimeLocal,
+            arrivalTime,
+            arrivalTimeLocal,
+            premiumAmount,
+            statistics);
+
+        _createPolicy(
+            policyNftId, 
+            TimestampLib.zero(), // do not ativate yet 
+            premiumAmount); // max premium amount
+
+        // interactions (token transfer + callback to token holder, if contract)
+        _collectPremium(
+            policyNftId, 
+            departureTime); // activate at scheduled departure time of flight
+
+        // send oracle request for for new risk to obtain flight status (interacts with flight oracle contract)
+        if (_requests[riskId].eqz()) {
+            _requests[riskId] = _sendRequest(
+                _oracleNftId, 
+                abi.encode(
+                    FlightOracle.FlightStatusRequest(
+                        riskId,
+                        flightData,
+                        departureTime)),
+                // allow up to 30 days to process the claim
+                arrivalTime.addSeconds(SecondsLib.fromDays(30)), 
+                "flightStatusCallback");
+        }
+
+        emit LogFlightPolicyPurchased(policyNftId, flightData.toString(), premiumAmount);
+    }
+
+
     function _prepareApplication(
         address policyHolder,
         Str flightData, 
@@ -508,26 +508,28 @@ contract FlightProduct is
         returns (RiskId riskId)
     {
         bool exists;
-        FlightRisk memory flightRisk;
-        (riskId, exists, flightRisk) = FlightLib.getFlightRisk(
-            _getInstanceReader(), 
-            getNftId(), 
+        FlightRisk memory flightRisk = FlightLib.getFlightRisk(
             flightData, 
             departureTime, 
             departureTimeLocal,
             arrivalTime,
             arrivalTimeLocal);
 
+        bytes32 riskKey = FlightLib.getRiskKey(flightData);
+        exists = _risks[riskKey].gtz();
+
         // create risk, if new
         if (!exists) {
-            bytes32 riskKey = FlightLib.getRiskKey(flightData);
-            _createRisk(riskKey, abi.encode(flightRisk));
+            riskId = _createRisk(abi.encode(flightRisk));
+            _risks[riskKey] = riskId;
+        } else {
+            riskId = _risks[riskKey];
         }
 
-        // check for cluster risk: additional sum insured amount must not exceed MAX_TOTAL_PAYOUT
-        if (flightRisk.sumOfSumInsuredAmounts + sumInsuredAmount > MAX_TOTAL_PAYOUT) {
-            revert ErrorFlightProductClusterRisk(flightRisk.sumOfSumInsuredAmounts + sumInsuredAmount, MAX_TOTAL_PAYOUT);
-        }
+        FlightLib.checkClusterRisk(
+            flightRisk.sumOfSumInsuredAmounts, 
+            sumInsuredAmount, 
+            MAX_TOTAL_PAYOUT);
 
         // update existing risk with additional sum insured amount
         flightRisk.sumOfSumInsuredAmounts = flightRisk.sumOfSumInsuredAmounts + sumInsuredAmount;
@@ -539,40 +541,28 @@ contract FlightProduct is
         RequestId requestId,
         RiskId riskId, 
         bytes1 status, 
-        int256 delayMinutes,
-        uint8 maxPoliciesToProcess
+        int256 delayMinutes
     )
         internal
         virtual
     {
         // check risk exists
-        InstanceReader reader = _getInstanceReader();
-        (
-            bool exists,
-            FlightRisk memory flightRisk
-        ) = FlightLib.getFlightRisk(reader, getNftId(), riskId);
+        (, FlightRisk memory flightRisk) = getFlightRisk(riskId, true);
 
-        if (!exists) {
-            // TODO decide to switch from log to error
-            emit LogErrorRiskInvalid(requestId, riskId);
-            return;
-        } else {
-            // update status, if not yet set
-            if (flightRisk.statusUpdatedAt.eqz()) {
-                flightRisk.status = status;
-                flightRisk.delayMinutes = delayMinutes;
-                flightRisk.payoutOption = FlightLib.checkAndGetPayoutOption(
-                    requestId, riskId, status, delayMinutes);
-                flightRisk.statusUpdatedAt = TimestampLib.current();
-
-                _updateRisk(riskId, abi.encode(flightRisk));
-            }
-            // TODO revert in else case?
+        // update status, if not yet set
+        if (flightRisk.statusUpdatedAt.eqz()) {
+            flightRisk.statusUpdatedAt = TimestampLib.current();
+            flightRisk.status = status;
+            flightRisk.delayMinutes = delayMinutes;
+            flightRisk.payoutOption = FlightLib.checkAndGetPayoutOption(
+                requestId, riskId, status, delayMinutes);
+
+            _updateRisk(riskId, abi.encode(flightRisk));
         }
 
         (,, uint8 payoutOption) = _processPayoutsAndClosePolicies(
             riskId, 
-            maxPoliciesToProcess);
+            MAX_POLICIES_TO_PROCESS);
 
         // logging
         emit LogFlightStatusProcessed(requestId, riskId, status, delayMinutes, payoutOption);
@@ -603,25 +593,29 @@ contract FlightProduct is
         uint256 policiesToProcess = reader.policiesForRisk(riskId);
         uint256 policiesProcessed = policiesToProcess < maxPoliciesToProcess ? policiesToProcess : maxPoliciesToProcess;
 
-        // go trough policies
+        // assemble array with policies to process
+        NftId [] memory policies = new NftId[](policiesProcessed);
         for (uint256 i = 0; i < policiesProcessed; i++) {
-            NftId policyNftId = reader.getPolicyForRisk(riskId, i);
+            policies[i] = reader.getPolicyForRisk(riskId, i);
+        }
 
-            // create payout (if any)
-            if (payoutOption < type(uint8).max) { 
-                bytes memory applicationData = reader.getPolicyInfo(
-                    policyNftId).applicationData;
+        // go through policies
+        for (uint256 i = 0; i < policiesProcessed; i++) {
+            NftId policyNftId = policies[i];
+            Amount payoutAmount = FlightLib.getPayoutAmount(
+                reader.getPolicyInfo(policyNftId).applicationData, 
+                payoutOption);
 
-                _resolvePayout(
-                    policyNftId, 
-                    FlightLib.getPayoutAmount(
-                        applicationData, 
-                        payoutOption)); 
-            }
+            // create claim/payout (if applicable)
+            _resolvePayout(
+                policyNftId, 
+                payoutAmount); 
 
             // expire and close policy
             _expire(policyNftId, TimestampLib.current());
             _close(policyNftId);
+
+            emit LogFlightPolicyClosed(policyNftId, payoutAmount);
         }
 
         // logging
@@ -636,6 +630,11 @@ contract FlightProduct is
         internal
         virtual
     {
+        // no action if no payout
+        if (payoutAmount.eqz()) {
+            return;
+        }
+
         // create confirmed claim
         ClaimId claimId = _submitClaim(policyNftId, payoutAmount, "");
         _confirmClaim(policyNftId, claimId, payoutAmount, "");
@@ -654,7 +653,7 @@ contract FlightProduct is
         address initialOwner
     )
         internal
-        initializer
+        initializer()
     {
         __Product_init(
             registry,
@@ -681,5 +680,11 @@ contract FlightProduct is
             }),
             authorization,
             initialOwner);  // number of oracles
+
+        MAX_FLIGHT_DURATION = SecondsLib.fromDays(2);
+        LIFETIME = SecondsLib.fromDays(30);
+        WEIGHT_PATTERN = [0, 0, 0, 30, 50, 50];
+        MIN_OBSERVATIONS = 10;
+        MARGIN_PERCENT = 30;
     }
 }

package/contracts/examples/flight/FlightProductAuthorization.sol

@@ -57,9 +57,10 @@ contract FlightProductAuthorization
 
         // authorize public role (additional authz via onlyOwner)
         functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
-        _authorize(functions, FlightProduct.processFlightStatus.selector, "processFlightStatus");
+        _authorize(functions, FlightProduct.resendResponse.selector, "resendResponse");
         _authorize(functions, FlightProduct.processPayoutsAndClosePolicies.selector, "processPayoutsAndClosePolicies");
-        _authorize(functions, FlightProduct.completeSetup.selector, "completeSetup");
+        _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/unpermissioned/SimpleProduct.sol

@@ -81,13 +81,9 @@ contract SimpleProduct is
 
 
     function createRisk(
-        string memory id,
         bytes memory data
     ) public returns (RiskId) {
-        return _createRisk(
-            bytes32(abi.encodePacked(id)),
-            data
-        );
+        return _createRisk(data);
     }
 
     function updateRisk(

package/contracts/instance/BaseStore.sol

@@ -42,6 +42,8 @@ abstract contract BaseStore is
         metadata.objectType = objectType;
         metadata.state = initialState;
         metadata.updatedIn = blocknumber;
+
+        emit LogBaseStoreMetadataCreated(key32, objectType, initialState);
     }
 
     function _updateState(
@@ -73,6 +75,8 @@ abstract contract BaseStore is
 
         // update metadata
         metadata.updatedIn = BlocknumberLib.current();
+        
+        emit LogBaseStoreMetadataUpdated(key32, oldState, state);
     }
 
     function exists(Key32 key32) public view returns (bool) {