@etherisc/gif-next 0.0.2-c5049d4-401 → 0.0.2-c52b5b7-438

package/contracts/product/ClaimService.sol

@@ -1,31 +1,37 @@
 // SPDX-License-Identifier: Apache-2.0
 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";
+import {IPoolComponent} from "../pool/IPoolComponent.sol";
+import {IPolicyService} from "../product/IPolicyService.sol";
+import {IPoolService} from "../pool/IPoolService.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
+
 import {Amount, AmountLib} from "../type/Amount.sol";
-import {TimestampLib} from "../type/Timestamp.sol";
-import {ObjectType, CLAIM, PRODUCT, POOL} from "../type/ObjectType.sol";
-import {SUBMITTED, KEEP_STATE, DECLINED, REVOKED, CONFIRMED, CLOSED, PAID} from "../type/StateId.sol";
-import {NftId} from "../type/NftId.sol";
-import {FeeLib} from "../type/Fee.sol";
-import {StateId} from "../type/StateId.sol";
 import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
-import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
+import {FeeLib} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
-import {IClaimService} from "./IClaimService.sol";
-import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
-import {IPoolService} from "../pool/IPoolService.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 {PayoutId, PayoutIdLib} from "../type/PayoutId.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";
+import {TimestampLib} from "../type/Timestamp.sol";
 
 
 contract ClaimService is 
-    ComponentVerifyingService, 
+    Service, 
     IClaimService
 {
 
+    IPolicyService internal _policyService;
     IPoolService internal _poolService;
 
     function _initialize(
@@ -37,12 +43,13 @@ contract ClaimService is
         initializer()
     {
         (
-            address registryAddress,
-            address authority
+            address authority,
+            address registry
         ) = abi.decode(data, (address, address));
 
-        _initializeService(registryAddress, authority, owner);
+        __Service_init(authority, registry, owner);
 
+        _policyService = IPolicyService(getRegistry().getServiceAddress(POLICY(), getVersion().toMajorPart()));
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
 
         _registerInterface(type(IClaimService).interfaceId);
@@ -55,12 +62,15 @@ contract ClaimService is
     )
         external
         virtual
-        nonReentrant()
+        // nonReentrant() // prevents creating a reinsurance claim in a single tx
+        restricted()
         returns (ClaimId claimId)
     {
+        // checks
         (
-            IInstance instance,
-            InstanceReader instanceReader,
+            ,
+            IInstance instance,,
+            InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
@@ -69,18 +79,12 @@ contract ClaimService is
             revert ErrorClaimServicePolicyNotOpen(policyNftId);
         }
 
-        // TODO check claim amount > 0
-        // check policy including this claim is still within sum insured
-        if(policyInfo.payoutAmount + claimAmount > policyInfo.sumInsuredAmount) {
-            revert ErrorClaimServiceClaimExceedsSumInsured(
-                policyNftId, 
-                policyInfo.sumInsuredAmount,
-                AmountLib.toAmount(policyInfo.payoutAmount.toInt() + claimAmount.toInt()));
-        }
+        _checkClaimAmount(policyNftId, policyInfo, claimAmount);
 
+        // effects
         // create new claim
         claimId = ClaimIdLib.toClaimId(policyInfo.claimsCount + 1);
-        instance.getInstanceStore().createClaim(
+        instanceStore.createClaim(
             policyNftId, 
             claimId, 
             IPolicy.ClaimInfo({
@@ -93,10 +97,10 @@ contract ClaimService is
                 closedAt: TimestampLib.zero()}));
 
         // update and save policy info with instance
+        // policy claim amount is only updated when claim is confirmed
         policyInfo.claimsCount += 1;
         policyInfo.openClaimsCount += 1;
-        // policy claim amount is only updated when claim is confirmed
-        instance.getInstanceStore().updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimSubmitted(policyNftId, claimId, claimAmount);
     }
@@ -110,31 +114,43 @@ contract ClaimService is
     )
         external
         virtual
-        nonReentrant()
+        // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
+        // checks
+        _checkNftType(policyNftId, POLICY());
+
         (
+            NftId productNftId,
             IInstance instance,
             InstanceReader instanceReader,
+            InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        // TODO add check for confirmedAmount > 0 and does not lead to exceeding sum insured
+        _checkClaimAmount(policyNftId, policyInfo, confirmedAmount);
 
+        // effects
         // check/update claim info
         IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.claimAmount = confirmedAmount;
         claimInfo.processData = data;
-        instance.getInstanceStore().updateClaim(policyNftId, claimId, claimInfo, CONFIRMED());
-
-        // TODO test if claim results in total claim amount == sum insured amount
-        // should policy still be active it needs to automatically become expired
+        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CONFIRMED());
 
         // update and save policy info with instance
         policyInfo.claimAmount = policyInfo.claimAmount + confirmedAmount;
-        instance.getInstanceStore().updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceStore.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());
+        }
 
         emit LogClaimServiceClaimConfirmed(policyNftId, claimId, confirmedAmount);
 
+        // interactions
+        // callback to pool if applicable
+        _processConfirmedClaimByPool(instanceReader, productNftId, policyNftId, claimId, confirmedAmount);
+
         // callback to policy holder if applicable
         _policyHolderClaimConfirmed(policyNftId, claimId, confirmedAmount);
     }
@@ -147,11 +163,15 @@ contract ClaimService is
     )
         external
         virtual
-        nonReentrant()
+        // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
+        _checkNftType(policyNftId, POLICY());
+
         (
+            ,
             IInstance instance,
             InstanceReader instanceReader,
+            InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
@@ -159,39 +179,40 @@ contract ClaimService is
         IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.processData = data;
         claimInfo.closedAt = TimestampLib.blockTimestamp();
-        instance.getInstanceStore().updateClaim(policyNftId, claimId, claimInfo, DECLINED());
+        instanceStore.updateClaim(policyNftId, claimId, claimInfo, DECLINED());
 
         // update and save policy info with instance
         policyInfo.openClaimsCount -= 1;
-        instance.getInstanceStore().updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimDeclined(policyNftId, claimId);
     }
 
 
-    // TODO add test case
     function revoke(
         NftId policyNftId, 
         ClaimId claimId
     )
         external
         virtual
-        nonReentrant()
-    {
+        // nonReentrant() // prevents creating a reinsurance claim in a single tx
+    {        
         (
+            ,
             IInstance instance,
             InstanceReader instanceReader,
+            InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
         IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.closedAt = TimestampLib.blockTimestamp();
-        instance.getInstanceStore().updateClaim(policyNftId, claimId, claimInfo, REVOKED());
+        instanceStore.updateClaim(policyNftId, claimId, claimInfo, REVOKED());
 
         // update and save policy info with instance
         policyInfo.openClaimsCount -= 1;
-        instance.getInstanceStore().updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimRevoked(policyNftId, claimId);
     }
@@ -203,11 +224,15 @@ contract ClaimService is
     )
         external
         virtual
-        nonReentrant()
+        // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
+        _checkNftType(policyNftId, POLICY());
+        
         (
+            ,
             IInstance instance,
             InstanceReader instanceReader,
+            InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
@@ -232,7 +257,7 @@ contract ClaimService is
         }
 
         claimInfo.closedAt = TimestampLib.blockTimestamp();
-        instance.getInstanceStore().updateClaim(policyNftId, claimId, claimInfo, CLOSED());
+        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
     }
 
 
@@ -245,7 +270,7 @@ contract ClaimService is
     )
         external
         virtual
-        nonReentrant()
+        // nonReentrant() // prevents creating a reinsurance claim in a single tx
         returns (PayoutId payoutId)
     {
         if (beneficiary == address(0)) {
@@ -269,9 +294,11 @@ contract ClaimService is
     )
         external
         virtual
-        nonReentrant()
+        // nonReentrant() // prevents creating a reinsurance payout in a single tx
         returns (PayoutId payoutId)
     {
+        _checkNftType(policyNftId, POLICY());
+        
         return _createPayout(
             policyNftId, 
             claimId, 
@@ -287,77 +314,136 @@ contract ClaimService is
     )
         external
         virtual
-        nonReentrant()
+        // nonReentrant() // prevents creating a reinsurance payout in a single tx
     {
+        // checks
         (
-            IInstance instance,
+            NftId productNftId,,
+            // IInstance instance,
             InstanceReader instanceReader,
+            InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        // TODO add check that payout exists and is open
+        // 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);
+        }
 
+        // effects
         // update and save payout info with instance
         payoutInfo.paidAt = TimestampLib.blockTimestamp();
-        instance.getInstanceStore().updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+        instanceStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
 
-        ClaimId claimId = payoutId.toClaimId();
+        // update and save claim info with instance
         Amount payoutAmount = payoutInfo.amount;
-        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();
-            instance.getInstanceStore().updateClaim(policyNftId, claimId, claimInfo, CLOSED());
-
-            policyInfo.openClaimsCount -= 1;
-        } else {
-            instance.getInstanceStore().updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+        {
+            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());
+
+                policyInfo.openClaimsCount -= 1;
+            } else {
+                instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+            }
         }
 
         // update and save policy info with instance
-        policyInfo.payoutAmount = policyInfo.payoutAmount.add(payoutAmount);
-        instance.getInstanceStore().updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        policyInfo.payoutAmount = policyInfo.payoutAmount + payoutAmount;
+        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
-        // inform pool about payout
-        _poolService.reduceCollateral(
-            instance, 
-            address(instanceReader.getComponentInfo(policyInfo.productNftId).token),
+        emit LogClaimServicePayoutProcessed(policyNftId, payoutId, payoutAmount);
+
+        // effects + interactions (push tokens to beneficiary, product)
+        // delegate to pool to update book keeping and moving tokens payout
+        _poolService.processPayout(
+            instanceReader,
+            instanceStore, 
+            policyInfo.productNftId, // product nft id 
             policyNftId, 
-            policyInfo, 
-            payoutAmount);
+            policyInfo.bundleNftId, 
+            payoutId,
+            payoutAmount,
+            payoutInfo.beneficiary);
+    }
 
-        // transfer payout token and fee
+    function cancelPayout(
+        NftId policyNftId, 
+        PayoutId payoutId
+    )
+        external
+        virtual
+    {
+        // checks
         (
-            Amount netPayoutAmount,
-            Amount processingFeeAmount,
-            address beneficiary
-        ) = _calculatePayoutAmount(
-            instanceReader,
-            policyNftId,
-            policyInfo,
-            payoutInfo);
+            ,
+            IInstance instance,
+            InstanceReader instanceReader,
+            InstanceStore instanceStore,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _verifyCallerWithPolicy(policyNftId);
 
-        emit LogClaimServicePayoutProcessed(policyNftId, payoutId, payoutAmount, beneficiary, netPayoutAmount, processingFeeAmount);
+        StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
+        if (payoutState != EXPECTED()) {
+            revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
+        }
 
-        {
-            NftId poolNftId = getRegistry().getObjectInfo(policyInfo.bundleNftId).parentNftId;
-            IComponents.ComponentInfo memory poolInfo = instanceReader.getComponentInfo(poolNftId);
-            poolInfo.tokenHandler.distributeTokens(poolInfo.wallet, beneficiary, netPayoutAmount);
+        // effects
+        // update and save payout info with instance
+        instanceStore.updatePayoutState(policyNftId, payoutId, CANCELLED());
 
-            // TODO add 2nd token tx if processingFeeAmount > 0
+        {
+            ClaimId claimId = payoutId.toClaimId();
+            IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
+            claimInfo.openPayoutsCount -= 1;
+            instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
         }
 
-        // callback to policy holder if applicable
-        _policyHolderPayoutExecuted(policyNftId, payoutId, beneficiary, payoutAmount);
+        emit LogClaimServicePayoutCancelled(policyNftId, payoutId);
     }
 
     // internal functions
 
+    function _checkClaimAmount(
+        NftId policyNftId,
+        IPolicy.PolicyInfo memory policyInfo,
+        Amount claimAmount
+    )
+        internal
+        pure
+    {
+        // check claim amount > 0
+        if (claimAmount.eqz()) {
+            revert ErrorClaimServiceClaimAmountIsZero(policyNftId);
+        }
+
+        // check policy including this claim is still within sum insured
+        if(policyInfo.claimAmount + claimAmount > policyInfo.sumInsuredAmount) {
+            revert ErrorClaimServiceClaimExceedsSumInsured(
+                policyNftId, 
+                policyInfo.sumInsuredAmount,
+                policyInfo.payoutAmount + claimAmount);
+        }
+    }
 
     function _createPayout(
         NftId policyNftId, 
@@ -370,24 +456,40 @@ contract ClaimService is
         virtual
         returns (PayoutId payoutId)
     {
+        // checks
         (
-            IInstance instance,
+            ,,
             InstanceReader instanceReader,
-            IPolicy.PolicyInfo memory policyInfo
+            InstanceStore instanceStore,
+            // IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
-        StateId claimState = instanceReader.getClaimState(policyNftId, claimId);
 
-        // TODO add checks
-        // claim needs to be open
-        // claim.paidAmount + amount <= claim.claimAmount
+        {
+            // check claim state
+            StateId claimState = instanceReader.getClaimState(policyNftId, claimId);
+            if (claimState != CONFIRMED()) {
+                revert ErrorClaimServiceClaimNotConfirmed(policyNftId, claimId, claimState);
+            }
+
+            // check total payout amount remains within claim limit
+            Amount newPaidAmount = claimInfo.paidAmount + amount;
+            if (newPaidAmount > claimInfo.claimAmount) {
+                revert ErrorClaimServicePayoutExceedsClaimAmount(
+                    policyNftId, claimId, claimInfo.claimAmount, newPaidAmount);
+            }
+        }
 
-        // check/update claim info
+        // effects
         // create payout info with instance
-        uint8 claimNo = claimInfo.payoutsCount + 1;
-        payoutId = PayoutIdLib.toPayoutId(claimId, claimNo);
-        instance.getInstanceStore().createPayout(
+        uint24 payoutNo = claimInfo.payoutsCount + 1;
+        payoutId = PayoutIdLib.toPayoutId(claimId, payoutNo);
+        if (beneficiary == address(0)) {
+            beneficiary = getRegistry().ownerOf(policyNftId);
+        }
+
+        instanceStore.createPayout(
             policyNftId, 
             payoutId, 
             IPolicy.PayoutInfo({
@@ -400,51 +502,9 @@ contract ClaimService is
         // update and save claim info with instance
         claimInfo.payoutsCount += 1;
         claimInfo.openPayoutsCount += 1;
-        instance.getInstanceStore().updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
-
-        // update and save policy info with instance
-        policyInfo.payoutAmount.add(amount);
-        instance.getInstanceStore().updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
 
-        emit LogClaimServicePayoutCreated(policyNftId, payoutId, amount);
-    }
-
-
-    function _calculatePayoutAmount(
-        InstanceReader instanceReader,
-        NftId policyNftId,
-        IPolicy.PolicyInfo memory policyInfo,
-        IPolicy.PayoutInfo memory payoutInfo
-    )
-        internal
-        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.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
-            if(FeeLib.gtz(productInfo.processingFee)) {
-                // TODO calculate and set net payout and processing fees
-            }
-        }
+        emit LogClaimServicePayoutCreated(policyNftId, payoutId, amount, beneficiary);
     }
 
 
@@ -455,14 +515,16 @@ contract ClaimService is
         view
         virtual
         returns (
+            NftId productNftId,
             IInstance instance,
             InstanceReader instanceReader,
+            InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         )
     {
-        NftId productNftId;
-        (productNftId,, instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (productNftId, instance) = _getAndVerifyActiveComponent(PRODUCT());
         instanceReader = instance.getInstanceReader();
+        instanceStore = instance.getInstanceStore();
 
         // check caller(product) policy match
         policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -473,6 +535,29 @@ contract ClaimService is
         }
     }
 
+
+    function _getAndVerifyActiveComponent(ObjectType expectedType) 
+        internal 
+        view 
+        returns (
+            NftId productNftId,
+            IInstance instance
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory info,
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(),
+            msg.sender, // caller
+            PRODUCT(),
+            true); // isActive 
+
+        // get component nft id and instance
+        productNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
     function _verifyClaim(
         InstanceReader instanceReader,
         NftId policyNftId, 
@@ -496,36 +581,37 @@ contract ClaimService is
         claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
     }
 
-
-    function _policyHolderClaimConfirmed(
+    function _processConfirmedClaimByPool(
+        InstanceReader instanceReader, 
+        NftId productNftId, 
         NftId policyNftId, 
-        ClaimId claimId,
-        Amount confirmedAmount
+        ClaimId claimId, 
+        Amount amount
     )
         internal
     {
-        IPolicyHolder policyHolder = _getPolicyHolder(policyNftId);
-        if(address(policyHolder) != address(0)) {
-            policyHolder.claimConfirmed(policyNftId, claimId, confirmedAmount);
+        NftId poolNftId = instanceReader.getProductInfo(productNftId).poolNftId;
+        if (instanceReader.getPoolInfo(poolNftId).isProcessingConfirmedClaims) {
+            address poolAddress = getRegistry().getObjectAddress(poolNftId);
+            IPoolComponent(poolAddress).processConfirmedClaim(policyNftId, claimId, amount);
         }
     }
 
 
-    function _policyHolderPayoutExecuted(
+    function _policyHolderClaimConfirmed(
         NftId policyNftId, 
-        PayoutId payoutId,
-        address beneficiary,
-        Amount payoutAmount
+        ClaimId claimId,
+        Amount confirmedAmount
     )
         internal
     {
         IPolicyHolder policyHolder = _getPolicyHolder(policyNftId);
         if(address(policyHolder) != address(0)) {
-            policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
+            policyHolder.claimConfirmed(policyNftId, claimId, confirmedAmount);
         }
     }
 
-
+    // TODO: move to policy helper lib or something
     function _getPolicyHolder(NftId policyNftId)
         internal 
         view 

package/contracts/product/ClaimServiceManager.sol

@@ -17,7 +17,7 @@ contract ClaimServiceManager is ProxyManager {
     ) 
     {
         ClaimService svc = new ClaimService{salt: salt}();
-        bytes memory data = abi.encode(registry, authority);
+        bytes memory data = abi.encode(authority, registry);
         IVersionable versionable = initialize(
             registry,
             address(svc),