@etherisc/gif-next 0.0.2-7aa572b-366 → 0.0.2-7ac2b66-931

package/contracts/instance/InstanceService.sol

@@ -171,6 +171,10 @@ contract InstanceService is
     {
         address instanceAddress = msg.sender;
         IInstance(instanceAddress).getInstanceAdmin().setInstanceLocked(locked);
+
+        emit LogInstanceServiceInstanceLocked(
+            getRegistry().getNftIdForAddress(instanceAddress),
+            locked);
     }
 
 
@@ -213,7 +217,7 @@ contract InstanceService is
             TargetManagerLib.getDefaultLockingPeriod(),
             TargetManagerLib.getDefaultRewardRate());
 
-        emit LogInstanceCloned(
+        emit LogInstanceServiceInstanceCreated(
             instanceNftId,
             address(instance));
     }
@@ -299,6 +303,10 @@ contract InstanceService is
 
         upgradedInstanceReaderClone.initializeWithInstance(instanceAddress);
         instance.setInstanceReader(upgradedInstanceReaderClone);
+
+        emit LogInstanceServiceInstanceReaderUpgraded(
+            getRegistry().getNftIdForAddress(instanceAddress),
+            address(upgradedInstanceReaderClone));
     }
 
 
@@ -369,6 +377,10 @@ contract InstanceService is
         if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
 
         _masterInstanceReader = instanceReaderAddress;
+
+        emit LogInstanceServiceMasterInstanceReaderUpgraded(
+            getRegistry().getNftIdForAddress(_masterInstance),
+            instanceReaderAddress);
     }
 
     function getMasterInstanceReader() external virtual view returns (address) {

package/contracts/pool/BundleService.sol

@@ -81,6 +81,8 @@ contract BundleService is
 
         bundleInfo.fee = fee;
         instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
+
+        emit LogBundleServiceBundleFeeUpdated(bundleNftId, fee.fixedFee, fee.fractionalFee);
     }
 
 
@@ -128,7 +130,7 @@ contract BundleService is
         BundleSet bundleManager = instance.getBundleSet();
         bundleManager.add(bundleNftId);
 
-        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId);
+        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime);
     }
 
 
@@ -178,6 +180,8 @@ contract BundleService is
         // effects
         // updated locked amount
         instanceStore.increaseLocked(bundleNftId, collateralAmount);
+
+        emit LogBundleServiceCollateralLocked(bundleNftId, policyNftId, collateralAmount);
     }
 
 
@@ -221,7 +225,7 @@ contract BundleService is
         BundleSet bundleManager = instance.getBundleSet();
         bundleManager.unlock(bundleNftId);
 
-        emit LogBundleServiceBundleActivated(bundleNftId);
+        emit LogBundleServiceBundleUnlocked(bundleNftId);
     }
 
 
@@ -259,6 +263,8 @@ contract BundleService is
             unstakedAmount = balanceAmountWithFees - feeAmount;
             _accountingService.decreaseBundleBalance(instanceStore, bundleNftId, unstakedAmount, feeAmount);
         }
+
+        emit LogBundleServiceBundleClosed(bundleNftId);
     }
 
     /// @inheritdoc IBundleService
@@ -290,6 +296,8 @@ contract BundleService is
             bundleNftId, 
             amount, 
             AmountLib.zero());
+
+        emit LogBundleServiceBundleStaked(bundleNftId, amount);
     }
 
     /// @inheritdoc IBundleService
@@ -331,6 +339,8 @@ contract BundleService is
             bundleNftId, 
             unstakedAmount, 
             AmountLib.zero());
+        
+        emit LogBundleServiceBundleUnstaked(bundleNftId, unstakedAmount);
     }
 
     /// @inheritdoc IBundleService
@@ -385,6 +395,8 @@ contract BundleService is
         _checkNftType(bundleNftId, BUNDLE());
 
         instanceStore.decreaseLocked(bundleNftId, collateralAmount);
+
+        emit LogBundleServiceCollateralReleased(bundleNftId, policyNftId, collateralAmount);
     }
 
 

package/contracts/pool/IBundleService.sol

@@ -12,13 +12,10 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StateId} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
+import {UFixed} from "../type/UFixed.sol";
 
 interface IBundleService is IService {
 
-    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId);
-    event LogBundleServiceBundleActivated(NftId bundleNftId);
-    event LogBundleServiceBundleLocked(NftId bundleNftId);
-
     error ErrorBundleServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, Amount amount);
     error ErrorBundleServiceBundleNotOpen(NftId bundleNftId, StateId state, Timestamp expiredAt);
     error ErrorBundleServiceCapacityInsufficient(NftId bundleNftId, Amount capacityAmount, Amount collateralAmount);
@@ -33,7 +30,16 @@ interface IBundleService is IService {
 
     error ErrorBundleServiceExtensionLifetimeIsZero();
 
+    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime);
+    event LogBundleServiceBundleClosed(NftId bundleNftId);
+    event LogBundleServiceBundleLocked(NftId bundleNftId);
+    event LogBundleServiceBundleUnlocked(NftId bundleNftId);
     event LogBundleServiceBundleExtended(NftId bundleNftId, Seconds lifetimeExtension, Timestamp extendedExpiredAt);
+    event LogBundleServiceBundleFeeUpdated(NftId bundleNftId, Amount fixedFee, UFixed fractionalFee);
+    event LogBundleServiceCollateralLocked(NftId bundleNftId, NftId policyNftId, Amount collateralAmount);
+    event LogBundleServiceCollateralReleased(NftId bundleNftId, NftId policyNftId, Amount collateralAmount);
+    event LogBundleServiceBundleStaked(NftId bundleNftId, Amount amount);
+    event LogBundleServiceBundleUnstaked(NftId bundleNftId, Amount amount);
 
     /// @dev Create a new bundle for the specified attributes.
     function create(

package/contracts/pool/IPoolService.sol

@@ -11,7 +11,6 @@ import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {PayoutId} from "../type/PayoutId.sol";
-import {UFixed} from "../type/UFixed.sol";
 
 interface IPoolService is IService {
 
@@ -29,6 +28,12 @@ interface IPoolService is IService {
 
     event LogPoolServiceProcessFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount);
 
+    event LogPoolServiceApplicationVerified(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount);
+    event LogPoolServiceCollateralLocked(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount, Amount lockedCollateralAmount);
+    event LogPoolServiceCollateralReleased(NftId bundleNftId, NftId policyNftId, Amount remainingCollateralAmount);
+    event LogPoolServiceSaleProcessed(NftId poolNftId, NftId bundleNftId, Amount bundleNetAmount, Amount bundleFeeAmount, Amount poolFeeAmount);
+    event LogPoolServicePayoutProcessed(NftId poolNftId, NftId bundleNftId, NftId policyNftId, PayoutId payoutId, Amount netPayoutAmount, Amount processingFeeAmount, address payoutBeneficiary);
+
     error ErrorPoolServicePoolNotExternallyManaged(NftId poolNftId);
     error ErrorPoolServicePolicyPoolMismatch(NftId policyNftId, NftId productNftId, NftId expectedProductNftId);
     error ErrorPoolServiceBundleOwnerRoleAlreadySet(NftId poolNftId);
@@ -81,7 +86,7 @@ interface IPoolService is IService {
         PayoutId payoutId,
         Amount payoutAmount,
         address payoutBeneficiary
-    ) external;
+    ) external returns (Amount netPayoutAmount, Amount processingFeeAmount);
 
 
     /// @dev increase stakes for bundle

package/contracts/pool/PoolLib.sol

@@ -129,7 +129,7 @@ library PoolLib {
             // calculate processing fees if applicable
             IComponents.FeeInfo memory feeInfo = instanceReader.getFeeInfo(productNftId);
             if(FeeLib.gtz(feeInfo.processingFee)) {
-                // TODO calculate and set net payout and processing fees
+                (processingFeeAmount, netPayoutAmount) = FeeLib.calculateFee(feeInfo.processingFee, payoutAmount);
             }
         }
     }
@@ -271,11 +271,17 @@ library PoolLib {
         address payoutBeneficiary
     )
         external
+        returns (
+            Amount netPayoutAmount,
+            Amount processingFeeAmount
+        )
     {
+        address beneficiary;
+
         (
-            Amount netPayoutAmount,
-            Amount processingFeeAmount,
-            address beneficiary
+            netPayoutAmount,
+            processingFeeAmount,
+            beneficiary
         ) = calculatePayoutAmounts(
             registry,
             instanceReader,

package/contracts/pool/PoolService.sol

@@ -361,6 +361,8 @@ contract PoolService is
             bundleNftId,
             bundleNetAmount, 
             bundleFeeAmount);
+
+        emit LogPoolServiceSaleProcessed(poolNftId, bundleNftId, bundleNetAmount, bundleFeeAmount, poolFeeAmount);
     }
 
 
@@ -419,10 +421,15 @@ contract PoolService is
                 bundleNftId, 
                 totalCollateralAmount);
 
-            // TODO add logging
+            emit LogPoolServiceApplicationVerified(poolNftId, bundleNftId, applicationNftId, totalCollateralAmount);
         }
 
-        // TODO add logging
+        emit LogPoolServiceCollateralLocked(
+            poolNftId,
+            bundleNftId, 
+            applicationNftId, 
+            totalCollateralAmount, 
+            localCollateralAmount);
     }
 
     function processPayout(
@@ -438,6 +445,10 @@ contract PoolService is
         external
         virtual
         restricted()
+        returns (
+            Amount netPayoutAmount,
+            Amount processingFeeAmount
+        )
     {
         // checks
         _checkNftType(policyNftId, POLICY());
@@ -472,7 +483,7 @@ contract PoolService is
             payoutAmount);
 
         // interactions
-        PoolLib.transferTokenAndNotifyPolicyHolder(
+        (netPayoutAmount, processingFeeAmount) = PoolLib.transferTokenAndNotifyPolicyHolder(
             getRegistry(),
             instanceReader, 
             poolTokenHandler,
@@ -481,6 +492,22 @@ contract PoolService is
             payoutId, 
             payoutAmount, 
             payoutBeneficiary);
+        
+        if (processingFeeAmount.gtz()) {
+            _accountingService.increaseProductFeesForPool(
+                instanceStore,
+                productNftId,
+                processingFeeAmount);
+        }
+
+        emit LogPoolServicePayoutProcessed(
+            poolNftId,
+            bundleNftId, 
+            policyNftId, 
+            payoutId, 
+            netPayoutAmount, 
+            processingFeeAmount,
+            payoutBeneficiary);
     }
 
 
@@ -560,6 +587,11 @@ contract PoolService is
             instanceReader.getInstanceNftId(),
             address(instanceReader.getToken(policyInfo.productNftId)),
             remainingCollateralAmount);
+
+        emit LogPoolServiceCollateralReleased(
+            policyInfo.bundleNftId, 
+            policyNftId, 
+            remainingCollateralAmount);
     }
 
 

package/contracts/product/ApplicationService.sol

@@ -185,7 +185,28 @@ contract ApplicationService is
             applicationNftId, 
             applicationInfo);
 
-        // TODO: add logging
+        _emitApplicationCreatedEvent(applicationNftId, applicationOwner, applicationInfo);
+    }
+
+    function _emitApplicationCreatedEvent(
+        NftId applicationNftId,
+        address applicationOwner,
+        IPolicy.PolicyInfo memory applicationInfo
+    )
+        internal
+        virtual
+    {
+        emit LogApplicationServiceApplicationCreated(
+            applicationNftId,
+            applicationInfo.productNftId,
+            applicationInfo.bundleNftId, 
+            applicationInfo.riskId,
+            applicationInfo.referralId,
+            applicationOwner,
+            applicationInfo.sumInsuredAmount,
+            applicationInfo.premiumAmount,
+            applicationInfo.lifetime
+        );
     }
 
     function _createApplicationInfo(
@@ -234,7 +255,10 @@ contract ApplicationService is
     {
         _checkNftType(policyNftId, POLICY());
         _checkNftType(bundleNftId, BUNDLE());
-        // TODO implement
+        
+        // TODO: implement
+
+        emit LogApplicationServiceApplicationRenewed(policyNftId, bundleNftId);
     }
 
 
@@ -254,7 +278,10 @@ contract ApplicationService is
     {
         _checkNftType(applicationNftId, POLICY());
         _checkNftType(bundleNftId, BUNDLE());
-        // TODO implement
+
+        // TODO: implement
+        
+        emit LogApplicationServiceApplicationAdjusted(applicationNftId, bundleNftId, riskId, referralId, sumInsuredAmount, lifetime);
     }
 
     function revoke(NftId applicationNftId)
@@ -267,6 +294,7 @@ contract ApplicationService is
 
         (, IInstance instance) = _getAndVerifyActiveProduct();
         instance.getInstanceStore().updateApplicationState(applicationNftId, REVOKED());
+        emit LogApplicationServiceApplicationRevoked(applicationNftId);
     }
 
     // internal functions

package/contracts/product/ClaimService.sol

@@ -255,6 +255,8 @@ contract ClaimService is
 
         claimInfo.closedAt = TimestampLib.blockTimestamp();
         instanceStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
+
+        emit LogClaimServiceClaimClosed(policyNftId, claimId);
     }
 
 
@@ -315,6 +317,7 @@ contract ClaimService is
         virtual
         restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
+        returns (Amount netPayoutAmount, Amount processingFeeAmount)
     {
         // checks
         (
@@ -324,30 +327,37 @@ contract ClaimService is
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        // check that payout exists and is open
-        IPolicy.PayoutInfo memory payoutInfo = instanceReader.getPayoutInfo(policyNftId, payoutId);
-        StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
-        if(payoutState != EXPECTED()) {
-            revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
-        }
+        IPolicy.ClaimInfo memory claimInfo;
+        address payoutBeneficiary;
+        Amount payoutAmount;
+        
+        {
+            // check that payout exists and is open
+            IPolicy.PayoutInfo memory payoutInfo = instanceReader.getPayoutInfo(policyNftId, payoutId);
+            payoutBeneficiary = payoutInfo.beneficiary;
+            payoutAmount = payoutInfo.amount;
+            StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
+            if(payoutState != EXPECTED()) {
+                revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
+            }
 
-        // check that payout amount does not violate claim amount
-        IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, payoutId.toClaimId());
-        if(claimInfo.paidAmount + payoutInfo.amount > claimInfo.claimAmount) {
-            revert ErrorClaimServicePayoutExceedsClaimAmount(
-                policyNftId, 
-                payoutId.toClaimId(), 
-                claimInfo.claimAmount, 
-                claimInfo.paidAmount + payoutInfo.amount);
-        }
+            // check that payout amount does not violate claim amount
+            claimInfo = instanceReader.getClaimInfo(policyNftId, payoutId.toClaimId());
+            if(claimInfo.paidAmount + payoutInfo.amount > claimInfo.claimAmount) {
+                revert ErrorClaimServicePayoutExceedsClaimAmount(
+                    policyNftId, 
+                    payoutId.toClaimId(), 
+                    claimInfo.claimAmount, 
+                    claimInfo.paidAmount + payoutInfo.amount);
+            }
 
-        // effects
-        // update and save payout info with instance
-        payoutInfo.paidAt = TimestampLib.blockTimestamp();
-        instanceStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+            // effects
+            // update and save payout info with instance
+            payoutInfo.paidAt = TimestampLib.blockTimestamp();
+            instanceStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+        }
 
         // update and save claim info with instance
-        Amount payoutAmount = payoutInfo.amount;
         {
             ClaimId claimId = payoutId.toClaimId();
             // TODO cleanup
@@ -375,7 +385,7 @@ contract ClaimService is
 
         // effects + interactions (push tokens to beneficiary, product)
         // delegate to pool to update book keeping and moving tokens payout
-        _poolService.processPayout(
+        (netPayoutAmount, processingFeeAmount) = _poolService.processPayout(
             instanceReader,
             instanceStore, 
             policyInfo.productNftId, // product nft id 
@@ -383,7 +393,7 @@ contract ClaimService is
             policyInfo.bundleNftId, 
             payoutId,
             payoutAmount,
-            payoutInfo.beneficiary);
+            payoutBeneficiary);
     }
 
     function cancelPayout(

package/contracts/product/IApplicationService.sol

@@ -6,7 +6,6 @@ import {IService} from "../shared/IService.sol";
 
 import {Amount} from "../type/Amount.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType} from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -15,6 +14,26 @@ import {Seconds} from "../type/Seconds.sol";
 /// only product components may call transaction functions
 interface IApplicationService is IService {
     
+    event LogApplicationServiceApplicationCreated(
+        NftId applicationNftId,
+        NftId productNftId,
+        NftId bundleNftId, 
+        RiskId riskId,
+        ReferralId referralId,
+        address applicationOwner,
+        Amount sumInsuredAmount,
+        Amount premiumAmount,
+        Seconds lifetime);
+    event LogApplicationServiceApplicationRenewed(NftId policyNftId, NftId bundleNftId);
+    event LogApplicationServiceApplicationAdjusted(
+        NftId applicationNftId, 
+        NftId bundleNftId, 
+        RiskId riskId, 
+        ReferralId referralId, 
+        Amount sumInsuredAmount, 
+        Seconds lifetime);
+    event LogApplicationServiceApplicationRevoked(NftId applicationNftId);
+
     // _checkLinkedApplicationParameters
     error ErrorApplicationServiceRiskProductMismatch(RiskId riskId, NftId riskProductNftId, NftId productNftId);
     error ErrorApplicationServiceRiskUnknown(RiskId riskId, NftId productNftId);

package/contracts/product/IClaimService.sol

@@ -125,7 +125,7 @@ interface IClaimService is
     function processPayout(
         NftId policyNftId, 
         PayoutId payoutId
-    ) external;
+    ) external returns (Amount netPayoutAmount, Amount processingFeeAmount);
 
     /// @dev cancels the specified payout. no tokens are moved, payout is set to cancelled. 
     function cancelPayout(

package/contracts/product/IPolicyService.sol

@@ -19,6 +19,7 @@ interface IPolicyService is IService {
     event LogPolicyServicePolicyExpirationUpdated(NftId policyNftId, Timestamp expiredAt);
     event LogPolicyServicePolicyClosed(NftId policyNftId);
 
+    error LogPolicyServiceMaxPremiumAmountExceeded(NftId policyNftId, Amount maxPremiumAmount, Amount premiumAmount);
     error ErrorPolicyServicePolicyProductMismatch(NftId applicationNftId, NftId expectedProductNftId, NftId actualProductNftId);
     error ErrorPolicyServicePolicyStateNotApplied(NftId applicationNftId);
     error ErrorPolicyServicePolicyStateNotCollateralized(NftId applicationNftId);
@@ -44,14 +45,21 @@ interface IPolicyService is IService {
     error ErrorPolicyServiceTransferredPremiumMismatch(NftId policyNftId, Amount expectedPremiumAmount, Amount transferredPremiumAmount);
 
     /// @dev creates the policy from {applicationNftId}. 
+    /// @param applicationNftId the application NftId
+    /// @param activateAt the timestamp when the policy should be activated
+    /// @param maxPremiumAmount the maximum premium amount that the policy holder is willing to pay
+    /// During policy creation, the effective premium amount is calculated based on the provided parameters. If this
+    /// amount is higher than the maxPremiumAmount, the function will revert.
     /// After successful completion of the function the policy can be referenced using the application NftId.
     /// Locks the sum insured amount in the pool, but does not transfer tokens. Call collectPremium to transfer tokens. 
     /// Sets the policy state to collateralized.
     /// Optionally activates the policy if activateAt is a non-zero timestamp.
     /// only the related product may create a policy from an application
+    /// @return premiumAmount the effective premium amount
     function createPolicy(
         NftId applicationNftId,
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         external
         returns (Amount premiumAmount);

package/contracts/product/IRiskService.sol

@@ -9,6 +9,10 @@ import {StateId} from "../type/StateId.sol";
 
 interface IRiskService is IService {
 
+    event LogRiskServiceRiskCreated(NftId productNftId, RiskId riskId);
+    event LogRiskServiceRiskUpdated(NftId productNftId, RiskId riskId);
+    event LogRiskServiceRiskStateUpdated(NftId productNftId, RiskId riskId, StateId newState);
+
     error ErrorRiskServiceRiskProductMismatch(RiskId riskId, NftId riskProductNftId, NftId productNftId);
 
     /// @dev Create a new risk with the given id and provided data. 

package/contracts/product/PolicyService.sol

@@ -94,7 +94,8 @@ contract PolicyService is
     /// @inheritdoc IPolicyService
     function createPolicy(
         NftId applicationNftId, // = policyNftId
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         external 
         virtual
@@ -149,7 +150,14 @@ contract PolicyService is
             bundleNftId,
             applicationInfo.referralId);
 
-        premiumAmount = premium.fullPremiumAmount;
+        if (premium.premiumAmount > maxPremiumAmount) {
+            revert LogPolicyServiceMaxPremiumAmountExceeded(
+                applicationNftId, 
+                maxPremiumAmount, 
+                premium.premiumAmount);
+        }
+
+        premiumAmount = premium.premiumAmount;
         instance.getInstanceStore().createPremium(
             applicationNftId,
             premium);

package/contracts/product/Product.sol

@@ -18,7 +18,7 @@ import {COMPONENT, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "..
 import {PayoutId} from "../type/PayoutId.sol";
 import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE, BUNDLE, RISK } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
-import {RiskId, RiskIdLib} from "../type/RiskId.sol";
+import {RiskId} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StateId} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -251,7 +251,8 @@ abstract contract Product is
 
     function _createPolicy(
         NftId applicationNftId,
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         internal
         virtual
@@ -259,7 +260,8 @@ abstract contract Product is
     {
         premiumAmount = _getProductStorage()._policyService.createPolicy(
             applicationNftId, 
-            activateAt);
+            activateAt,
+            maxPremiumAmount);
     }
 
     function _decline(
@@ -443,8 +445,9 @@ abstract contract Product is
     )
         internal
         virtual
+        returns (Amount netPayoutAmount, Amount processingFeeAmount)
     {
-        _getProductStorage()._claimService.processPayout(
+        (netPayoutAmount, processingFeeAmount) = _getProductStorage()._claimService.processPayout(
             policyNftId,
             payoutId);
     }

package/contracts/product/RiskService.sol

@@ -67,6 +67,8 @@ contract RiskService is
         // add risk to RiskSet
         RiskSet riskSet = instance.getRiskSet();
         riskSet.add(riskId);
+
+        emit LogRiskServiceRiskCreated(productNftId, riskId);
     }
 
 
@@ -91,6 +93,8 @@ contract RiskService is
 
         riskInfo.data = data;
         instance.getInstanceStore().updateRisk(riskId, riskInfo, KEEP_STATE());
+
+        emit LogRiskServiceRiskUpdated(productNftId, riskId);
     }
 
 
@@ -118,6 +122,8 @@ contract RiskService is
         } else if (state == PAUSED()) {
             instance.getRiskSet().pause(riskId);
         }
+
+        emit LogRiskServiceRiskStateUpdated(productNftId, riskId, state);
     }
 
     function _getAndVerifyActiveComponent(ObjectType expectedType) 

package/contracts/registry/IRegistry.sol

@@ -19,13 +19,16 @@ interface IRegistry is
     IERC165
 {
 
-    event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
-    event LogChainRegistryRegistration(NftId nftId, uint256 chainId, address chainRegistryAddress);
+    event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogRegistryServiceRegistered(VersionPart majorVersion, ObjectType domain);
+    event LogRegistryChainRegistryRegistered(NftId nftId, uint256 chainId, address chainRegistryAddress);
 
     // initialize
     error ErrorRegistryCallerNotDeployer();
 
+    // register()
+    error ErrorRegistryObjectTypeNotSupported(ObjectType objectType);
+
     // registerRegistry()
     error ErrorRegistryNotOnMainnet(uint256 chainId);
     error ErrorRegistryChainRegistryChainIdZero(NftId nftId);
@@ -36,6 +39,8 @@ interface IRegistry is
     // registerService()
     error ErrorRegistryServiceAddressZero(); 
     error ErrorRegistryServiceVersionZero(address service);
+
+    // TODO cleanup
     //error ErrorRegistryServiceVersionMismatch(address service, VersionPart serviceVersion, VersionPart releaseVersion);
     //error ErrorRegistryServiceVersionNotDeploying(address service, VersionPart version);
     error ErrorRegistryServiceDomainZero(address service, VersionPart version);
@@ -48,7 +53,7 @@ interface IRegistry is
 
     // _register()
     error ErrorRegistryGlobalRegistryAsParent(address objectAddress, ObjectType objectType);
-    error ErrorRegistryTypesCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
+    error ErrorRegistryTypeCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
     error ErrorRegistryContractAlreadyRegistered(address objectAddress);
 
     struct ObjectInfo {