@etherisc/gif-next 0.0.2-952752e-374 → 0.0.2-957bd35-589

package/contracts/product/ClaimService.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.20;
 
 import {IClaimService} from "./IClaimService.sol";
-import {IComponents} from "../instance/module/IComponents.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
@@ -14,12 +13,12 @@ import {IRegistry} from "../registry/IRegistry.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
-import {FeeLib} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, CLAIM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
+import {ObjectType, CLAIM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
 import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
+import {ProductStore} from "../instance/ProductStore.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId} from "../type/StateId.sol";
 import {SUBMITTED, KEEP_STATE, DECLINED, REVOKED, CANCELLED, CONFIRMED, CLOSED, EXPECTED, PAID} from "../type/StateId.sol";
@@ -68,14 +67,13 @@ contract ClaimService is
     {
         // checks
         (
-            ,
-            IInstance instance,,
-            InstanceStore instanceStore,
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check policy is in its active period
-        if(policyInfo.activatedAt.eqz() || TimestampLib.blockTimestamp() >= policyInfo.expiredAt) {
+        if(policyInfo.activatedAt.eqz() || TimestampLib.current() >= policyInfo.expiredAt) {
             revert ErrorClaimServicePolicyNotOpen(policyNftId);
         }
 
@@ -84,7 +82,7 @@ contract ClaimService is
         // effects
         // create new claim
         claimId = ClaimIdLib.toClaimId(policyInfo.claimsCount + 1);
-        instanceStore.createClaim(
+        instanceContracts.productStore.createClaim(
             policyNftId, 
             claimId, 
             IPolicy.ClaimInfo({
@@ -100,7 +98,7 @@ contract ClaimService is
         // policy claim amount is only updated when claim is confirmed
         policyInfo.claimsCount += 1;
         policyInfo.openClaimsCount += 1;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimSubmitted(policyNftId, claimId, claimAmount);
     }
@@ -114,6 +112,7 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         // checks
@@ -122,8 +121,7 @@ contract ClaimService is
         (
             NftId productNftId,
             IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
@@ -131,25 +129,25 @@ contract ClaimService is
 
         // effects
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.claimAmount = confirmedAmount;
         claimInfo.processData = data;
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CONFIRMED());
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, CONFIRMED());
 
         // update and save policy info with instance
         policyInfo.claimAmount = policyInfo.claimAmount + confirmedAmount;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         // should policy still be active it needs to become expired
         if (policyInfo.claimAmount >= policyInfo.sumInsuredAmount) {
-            _policyService.expirePolicy(instance, policyNftId, TimestampLib.blockTimestamp());
+            _policyService.expirePolicy(instance, policyNftId, TimestampLib.current());
         }
 
         emit LogClaimServiceClaimConfirmed(policyNftId, claimId, confirmedAmount);
 
         // interactions
         // callback to pool if applicable
-        _processConfirmedClaimByPool(instanceReader, productNftId, policyNftId, claimId, confirmedAmount);
+        _processConfirmedClaimByPool(instanceContracts.instanceReader, productNftId, policyNftId, claimId, confirmedAmount);
 
         // callback to policy holder if applicable
         _policyHolderClaimConfirmed(policyNftId, claimId, confirmedAmount);
@@ -163,27 +161,26 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         _checkNftType(policyNftId, POLICY());
 
         (
-            ,
-            IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.processData = data;
-        claimInfo.closedAt = TimestampLib.blockTimestamp();
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, DECLINED());
+        claimInfo.closedAt = TimestampLib.current();
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, DECLINED());
 
         // update and save policy info with instance
         policyInfo.openClaimsCount -= 1;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimDeclined(policyNftId, claimId);
     }
@@ -195,49 +192,46 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {        
         (
-            ,
-            IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
-        claimInfo.closedAt = TimestampLib.blockTimestamp();
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, REVOKED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, SUBMITTED());
+        claimInfo.closedAt = TimestampLib.current();
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, REVOKED());
 
         // update and save policy info with instance
         policyInfo.openClaimsCount -= 1;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimRevoked(policyNftId, claimId);
     }
 
 
-    function close(
+    function cancelConfirmedClaim(
         NftId policyNftId, 
         ClaimId claimId
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         _checkNftType(policyNftId, POLICY());
         
         (
-            ,
-            IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
-            IPolicy.PolicyInfo memory policyInfo
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, CONFIRMED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, CONFIRMED());
 
         // check claim has no open payouts
         if(claimInfo.openPayoutsCount > 0) {
@@ -247,17 +241,10 @@ contract ClaimService is
                 claimInfo.openPayoutsCount);
         }
 
-        // check claim paid amount matches with claim amount
-        if(claimInfo.paidAmount.toInt() < claimInfo.claimAmount.toInt()) {
-            revert ErrorClaimServiceClaimWithMissingPayouts(
-                policyNftId, 
-                claimId, 
-                claimInfo.claimAmount,
-                claimInfo.paidAmount);
-        }
+        claimInfo.closedAt = TimestampLib.current();
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, CANCELLED());
 
-        claimInfo.closedAt = TimestampLib.blockTimestamp();
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
+        emit LogClaimServiceClaimCancelled(policyNftId, claimId);
     }
 
 
@@ -270,6 +257,7 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
         returns (PayoutId payoutId)
     {
@@ -294,6 +282,7 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
         returns (PayoutId payoutId)
     {
@@ -314,98 +303,82 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
+        returns (Amount netPayoutAmount, Amount processingFeeAmount)
     {
         // checks
         (
-            ,
-            IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
             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);
-        }
-
-        // 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);
-        }
+        IPolicy.ClaimInfo memory claimInfo;
+        address payoutBeneficiary;
+        Amount payoutAmount;
+        
+        {
+            // check that payout exists and is open
+            IPolicy.PayoutInfo memory payoutInfo = instanceContracts.instanceReader.getPayoutInfo(policyNftId, payoutId);
+            payoutBeneficiary = payoutInfo.beneficiary;
+            payoutAmount = payoutInfo.amount;
+            StateId payoutState = instanceContracts.instanceReader.getPayoutState(policyNftId, payoutId);
+            if(payoutState != EXPECTED()) {
+                revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
+            }
 
-        // effects
-        // update and save payout info with instance
-        payoutInfo.paidAt = TimestampLib.blockTimestamp();
-        instanceStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+            // check that payout amount does not violate claim amount
+            claimInfo = instanceContracts.instanceReader.getClaimInfo(policyNftId, payoutId.toClaimId());
+            if(claimInfo.paidAmount + payoutInfo.amount > claimInfo.claimAmount) {
+                revert ErrorClaimServicePayoutExceedsClaimAmount(
+                    policyNftId, 
+                    payoutId.toClaimId(), 
+                    claimInfo.claimAmount, 
+                    claimInfo.paidAmount + payoutInfo.amount);
+            }
 
-        Amount payoutAmount = payoutInfo.amount;
+            // effects
+            // update and save payout info with instance
+            payoutInfo.paidAt = TimestampLib.current();
+            instanceContracts.productStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+        }
 
+        // update and save claim info with instance
         {
             ClaimId claimId = payoutId.toClaimId();
-            IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
             claimInfo.paidAmount = claimInfo.paidAmount.add(payoutAmount);
             claimInfo.openPayoutsCount -= 1;
 
             // check if this payout is closing the linked claim
             // update claim and policy info accordingly
             if(claimInfo.openPayoutsCount == 0 && claimInfo.paidAmount == claimInfo.claimAmount) {
-                claimInfo.closedAt = TimestampLib.blockTimestamp();
-                instanceStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
+                claimInfo.closedAt = TimestampLib.current();
+                instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
 
                 policyInfo.openClaimsCount -= 1;
             } else {
-                instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+                instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
             }
         }
 
         // update and save policy info with instance
         policyInfo.payoutAmount = policyInfo.payoutAmount + payoutAmount;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
-        // inform pool about payout
-        _poolService.processPayout(
-            instance, 
-            address(instanceReader.getComponentInfo(policyInfo.productNftId).token),
-            policyNftId, 
-            policyInfo, 
-            payoutAmount);
-        
-        // transfer payout token and fee
-        {
-            (
-                Amount netPayoutAmount,
-                Amount processingFeeAmount,
-                address beneficiary
-            ) = _calculatePayoutAmount(
-                instanceReader,
-                policyNftId,
-                policyInfo,
-                payoutInfo);
-
-            emit LogClaimServicePayoutProcessed(policyNftId, payoutId, payoutAmount, beneficiary, netPayoutAmount, processingFeeAmount);
-
-            {
-                NftId poolNftId = getRegistry().getObjectInfo(policyInfo.bundleNftId).parentNftId;
-                IComponents.ComponentInfo memory poolInfo = instanceReader.getComponentInfo(poolNftId);
-                poolInfo.tokenHandler.pushToken(
-                    beneficiary, 
-                    netPayoutAmount);
-
-                // TODO add 2nd token tx if processingFeeAmount > 0
-            }
+        emit LogClaimServicePayoutProcessed(policyNftId, payoutId, payoutAmount);
 
-            // callback to policy holder if applicable
-            _policyHolderPayoutExecuted(policyNftId, payoutId, beneficiary, payoutAmount);
-        }
+        // effects + interactions (push tokens to beneficiary, product)
+        // delegate to pool to update book keeping and moving tokens payout
+        (netPayoutAmount, processingFeeAmount) = _poolService.processPayout(
+            instanceContracts.instanceReader,
+            instanceContracts.instanceStore, 
+            policyInfo.productNftId, // product nft id 
+            policyNftId, 
+            policyInfo.bundleNftId, 
+            payoutId,
+            payoutAmount,
+            payoutBeneficiary);
     }
 
     function cancelPayout(
@@ -414,30 +387,28 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
     {
         // checks
         (
-            ,
-            IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
-            IPolicy.PolicyInfo memory policyInfo
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
+        StateId payoutState = instanceContracts.instanceReader.getPayoutState(policyNftId, payoutId);
         if (payoutState != EXPECTED()) {
             revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
         }
 
         // effects
         // update and save payout info with instance
-        instanceStore.updatePayoutState(policyNftId, payoutId, CANCELLED());
+        instanceContracts.productStore.updatePayoutState(policyNftId, payoutId, CANCELLED());
 
         {
             ClaimId claimId = payoutId.toClaimId();
-            IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
+            IPolicy.ClaimInfo memory claimInfo = instanceContracts.instanceReader.getClaimInfo(policyNftId, claimId);
             claimInfo.openPayoutsCount -= 1;
-            instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+            instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
         }
 
         emit LogClaimServicePayoutCancelled(policyNftId, payoutId);
@@ -480,18 +451,16 @@ contract ClaimService is
     {
         // checks
         (
-            ,
-            ,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
-            IPolicy.PolicyInfo memory policyInfo
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
+            // IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
+        IPolicy.ClaimInfo memory claimInfo = instanceContracts.instanceReader.getClaimInfo(policyNftId, claimId);
 
         {
             // check claim state
-            StateId claimState = instanceReader.getClaimState(policyNftId, claimId);
+            StateId claimState = instanceContracts.instanceReader.getClaimState(policyNftId, claimId);
             if (claimState != CONFIRMED()) {
                 revert ErrorClaimServiceClaimNotConfirmed(policyNftId, claimId, claimState);
             }
@@ -512,7 +481,7 @@ contract ClaimService is
             beneficiary = getRegistry().ownerOf(policyNftId);
         }
 
-        instanceStore.createPayout(
+        instanceContracts.productStore.createPayout(
             policyNftId, 
             payoutId, 
             IPolicy.PayoutInfo({
@@ -525,51 +494,14 @@ contract ClaimService is
         // update and save claim info with instance
         claimInfo.payoutsCount += 1;
         claimInfo.openPayoutsCount += 1;
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
 
         emit LogClaimServicePayoutCreated(policyNftId, payoutId, amount, beneficiary);
     }
 
-
-    function _calculatePayoutAmount(
-        InstanceReader instanceReader,
-        NftId policyNftId,
-        IPolicy.PolicyInfo memory policyInfo,
-        IPolicy.PayoutInfo memory payoutInfo
-    )
-        internal
-        view
-        returns (
-            Amount netPayoutAmount,
-            Amount processingFeeAmount,
-            address beneficiary
-        )
-    {
-        Amount payoutAmount = payoutInfo.amount;
-
-        if(payoutAmount.gtz()) {
-            NftId productNftId = policyInfo.productNftId;
-
-            // get pool component info from policy or product
-            NftId poolNftId = getRegistry().getObjectInfo(policyInfo.bundleNftId).parentNftId;
-            IComponents.ComponentInfo memory poolInfo = instanceReader.getComponentInfo(poolNftId);
-
-            netPayoutAmount = payoutAmount;
-
-            if (payoutInfo.beneficiary == address(0)) {
-                beneficiary = getRegistry().ownerOf(policyNftId);
-            } else { 
-                beneficiary = payoutInfo.beneficiary;
-            }
-
-            IComponents.FeeInfo memory feeInfo = instanceReader.getFeeInfo(productNftId);
-            if(FeeLib.gtz(feeInfo.processingFee)) {
-                // TODO calculate and set net payout and processing fees
-            }
-        }
-    }
-
-
+    /// @dev Verifies the caller is a product and the policy is active. 
+    /// Returns the product nft id, instance, instance contracts and policy info.
+    /// in InstanceContracts only the contracts instanceReader, instanceStore and productStore are set.
     function _verifyCallerWithPolicy(
         NftId policyNftId
     )
@@ -579,17 +511,17 @@ contract ClaimService is
         returns (
             NftId productNftId,
             IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         )
     {
-        (productNftId, instance) = _getAndVerifyActiveComponent(PRODUCT());
-        instanceReader = instance.getInstanceReader();
-        instanceStore = instance.getInstanceStore();
+        (productNftId, instance) = _getAndVerifyActiveProduct();
+        instanceContracts.instanceReader = InstanceReader(instance.getInstanceReader());
+        instanceContracts.instanceStore = InstanceStore(instance.getInstanceStore());
+        instanceContracts.productStore = ProductStore(instance.getProductStore());
 
         // check caller(product) policy match
-        policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        policyInfo = instanceContracts.instanceReader.getPolicyInfo(policyNftId);
         if(policyInfo.productNftId != productNftId) {
             revert ErrorClaimServicePolicyProductMismatch(policyNftId, 
             policyInfo.productNftId, 
@@ -597,7 +529,8 @@ contract ClaimService is
         }
     }
 
-    function _getAndVerifyActiveComponent(ObjectType expectedType) 
+
+    function _getAndVerifyActiveProduct() 
         internal 
         view 
         returns (
@@ -672,22 +605,7 @@ contract ClaimService is
         }
     }
 
-
-    function _policyHolderPayoutExecuted(
-        NftId policyNftId, 
-        PayoutId payoutId,
-        address beneficiary,
-        Amount payoutAmount
-    )
-        internal
-    {
-        IPolicyHolder policyHolder = _getPolicyHolder(policyNftId);
-        if(address(policyHolder) != address(0)) {
-            policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
-        }
-    }
-
-
+    // TODO: move to policy helper lib or something
     function _getPolicyHolder(NftId policyNftId)
         internal 
         view 

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,11 +14,34 @@ 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);
-    error ErrorApplicationServiceRiskPaused(RiskId riskId, NftId productNftId);
+    error ErrorApplicationServiceRiskLocked(RiskId riskId, NftId productNftId);
     error ErrorApplicationServiceBundleUnknown(NftId bundleNftId, NftId poolNftId);
     error ErrorApplicationServiceBundleLocked(NftId bundleNftId, NftId poolNftId);
+    error ErrorApplicationServiceReferralInvalid(NftId productNftId, NftId distributionNftId, ReferralId referralId);
+    
 
     /// @dev creates a new application based on the specified attributes
     /// may only be called by a product component

package/contracts/product/IClaimService.sol

@@ -19,15 +19,14 @@ import {Fee} from "../type/Fee.sol";
 interface IClaimService is
     IService
 {
-
     event LogClaimServiceClaimSubmitted(NftId policyNftId, ClaimId claimId, Amount claimAmount);
     event LogClaimServiceClaimConfirmed(NftId policyNftId, ClaimId claimId, Amount confirmedAmount);
     event LogClaimServiceClaimDeclined(NftId policyNftId, ClaimId claimId);
     event LogClaimServiceClaimRevoked(NftId policyNftId, ClaimId claimId);
-    event LogClaimServiceClaimClosed(NftId policyNftId, ClaimId claimId);
+    event LogClaimServiceClaimCancelled(NftId policyNftId, ClaimId claimId);
 
     event LogClaimServicePayoutCreated(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary);
-    event LogClaimServicePayoutProcessed(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary, Amount netAmount, Amount processingFeeAmount);
+    event LogClaimServicePayoutProcessed(NftId policyNftId, PayoutId payoutId, Amount amount);
     event LogClaimServicePayoutCancelled(NftId policyNftId, PayoutId payoutId);
 
     error ErrorClaimServiceBeneficiarySet(NftId policyNftId, PayoutId payoutId, address beneficiary);
@@ -84,9 +83,10 @@ interface IClaimService is
     ) external;
 
 
-    /// @dev closes the specified claim
+    /// @dev cancels a confirmed claim before it has been fully paid out. 
+    /// Can only be called when there are not pending payouts
     /// function can only be called by product, policy needs to match with calling product
-    function close(
+    function cancelConfirmedClaim(
         NftId policyNftId, 
         ClaimId claimId
     ) external;
@@ -126,7 +126,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(