@etherisc/gif-next 0.0.2-f752d2a-551 → 0.0.2-f79a517-071

package/contracts/instance/service/PoolService.sol

@@ -3,16 +3,19 @@ pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../../instance/IInstance.sol";
+import {IBundle} from "../../instance/module/bundle/IBundle.sol";
 import {ITreasury, ITreasuryModule, TokenHandler} from "../../instance/module/treasury/ITreasury.sol";
 
 import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
 
-import {NftId, NftIdLib} from "../../types/NftId.sol";
+import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {POOL, BUNDLE} from "../../types/ObjectType.sol";
 import {Fee} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
+import {IService} from "../base/IService.sol";
+import {ServiceBase} from "../base/ServiceBase.sol";
 import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IPoolService} from "./IPoolService.sol";
 
@@ -24,38 +27,38 @@ contract PoolService is ComponentServiceBase, IPoolService {
 
     constructor(
         address registry,
-        NftId registryNftId
-    ) ComponentServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
+        NftId registryNftId,
+        address initialOwner
+    ) ComponentServiceBase(registry, registryNftId, initialOwner)
     {
         _registerInterface(type(IPoolService).interfaceId);
     }
 
-    function getVersion()
-        public 
-        pure 
-        virtual override (IVersionable, Versionable)
-        returns(Version)
-    {
-        return VersionLib.toVersion(3,0,0);
-    }
-
-    function getName() external pure override returns(string memory name) {
+    function getName() public pure override(IService, ServiceBase) returns(string memory name) {
         return NAME;
     }
 
     function setFees(
+        Fee memory poolFee,
         Fee memory stakingFee,
         Fee memory performanceFee
     )
         external
         override
     {
-        (IRegistry.ObjectInfo memory info, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
-        instance.setPoolFees(info.nftId, stakingFee, performanceFee);
+        (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+
+        NftId productNftId = instance.getProductNftId(poolInfo.nftId);
+        ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
+        treasuryInfo.poolFee = poolFee;
+        treasuryInfo.stakingFee = stakingFee;
+        treasuryInfo.performanceFee = performanceFee;
+        instance.setTreasuryInfo(productNftId, treasuryInfo);
     }
 
     function createBundle(
         address owner, 
+        Fee memory fee, 
         uint256 stakingAmount, 
         uint256 lifetime, 
         bytes calldata filter
@@ -68,16 +71,23 @@ contract PoolService is ComponentServiceBase, IPoolService {
 
         // register bundle with registry
         NftId poolNftId = info.nftId;
-        bundleNftId = _registry.registerObjectForInstance(
-            poolNftId, 
-            BUNDLE(), 
-            owner,
-            "");
+        bundleNftId = getRegistryService().registerBundle(
+            IRegistry.ObjectInfo(
+                zeroNftId(),
+                poolNftId,
+                BUNDLE(),
+                false, // intercepting property for bundles is defined on pool
+                address(0),
+                owner,
+                ""
+            )
+        );
 
         // create bundle info in instance
         instance.createBundleInfo(
             bundleNftId,
             poolNftId,
+            fee,
             stakingAmount,
             lifetime,
             filter);
@@ -98,6 +108,21 @@ contract PoolService is ComponentServiceBase, IPoolService {
         // TODO add logging
     }
 
+    function setBundleFee(
+        NftId bundleNftId,
+        Fee memory fee
+    )
+        external
+        override
+    {
+        (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        IBundle.BundleInfo memory bundleInfo = instance.getBundleInfo(bundleNftId);
+        require(bundleInfo.poolNftId.gtz(), "ERROR:PLS-010:BUNDLE_UNKNOWN");
+        require(poolInfo.nftId == bundleInfo.poolNftId, "ERROR:PLS-011:BUNDLE_POOL_MISMATCH");
+        bundleInfo.fee = fee;
+        instance.setBundleInfo(bundleNftId, bundleInfo);
+    }
+
 
     function _processStakingByTreasury(
         IInstance instance,
@@ -109,9 +134,10 @@ contract PoolService is ComponentServiceBase, IPoolService {
     {
         // process token transfer(s)
         if(stakingAmount > 0) {
-            TokenHandler tokenHandler = instance.getTokenHandler(poolNftId);
-            address bundleOwner = _registry.getOwner(bundleNftId);
-            address poolWallet = instance.getPoolSetup(poolNftId).wallet;
+            NftId productNftId = instance.getProductNftId(poolNftId);
+            TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
+            address bundleOwner = getRegistry().ownerOf(bundleNftId);
+            address poolWallet = instance.getComponentWallet(poolNftId);
 
             tokenHandler.transfer(
                 bundleOwner,

package/contracts/instance/service/ProductService.sol

@@ -2,10 +2,14 @@
 pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../registry/IRegistry.sol";
+import {IProductComponent} from "../../components/IProductComponent.sol";
+import {Product} from "../../components/Product.sol";
 import {IPoolComponent} from "../../components/IPoolComponent.sol";
+import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IInstance} from "../../instance/IInstance.sol";
 import {IPolicy, IPolicyModule} from "../module/policy/IPolicy.sol";
 import {IPool} from "../module/pool/IPoolModule.sol";
+import {IRisk} from "../module/risk/IRisk.sol";
 import {IBundle} from "../module/bundle/IBundle.sol";
 import {IProductService} from "./IProductService.sol";
 import {ITreasury, ITreasuryModule, TokenHandler} from "../../instance/module/treasury/ITreasury.sol";
@@ -14,14 +18,19 @@ import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
 
 import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
-import {UFixed, UFixedMathLib} from "../../types/UFixed.sol";
+import {UFixed, UFixedLib} from "../../types/UFixed.sol";
+import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
 import {ObjectType, INSTANCE, PRODUCT, POLICY} from "../../types/ObjectType.sol";
 import {APPLIED, UNDERWRITTEN, ACTIVE} from "../../types/StateId.sol";
-import {NftId, NftIdLib} from "../../types/NftId.sol";
-import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
+import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
+import {ReferralId} from "../../types/ReferralId.sol";
+import {RiskId} from "../../types/RiskId.sol";
+import {StateId} from "../../types/StateId.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
+import {IService} from "../base/IService.sol";
+import {ServiceBase} from "../base/ServiceBase.sol";
 import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IProductService} from "./IProductService.sol";
 
@@ -35,57 +44,186 @@ contract ProductService is ComponentServiceBase, IProductService {
 
     constructor(
         address registry,
-        NftId registryNftId
-    ) ComponentServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
+        NftId registryNftId,
+        address initialOwner
+    ) ComponentServiceBase(registry, registryNftId, initialOwner)
     {
         _registerInterface(type(IProductService).interfaceId);
     }
 
-    function getVersion()
-        public 
-        pure 
-        virtual override (IVersionable, Versionable)
-        returns(Version)
-    {
-        return VersionLib.toVersion(3,0,0);
-    }
 
-    function getName() external pure override returns(string memory name) {
+    function getName() public pure override(IService, ServiceBase) returns(string memory name) {
         return NAME;
     }
 
     function setFees(
-        Fee memory policyFee,
+        Fee memory productFee,
         Fee memory processingFee
     )
         external
         override
     {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        instance.setProductFees(productInfo.nftId, policyFee, processingFee);
+        NftId productNftId = productInfo.nftId;
+        ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
+        treasuryInfo.productFee = productFee;
+        treasuryInfo.processingFee = processingFee;
+        instance.setTreasuryInfo(productNftId, treasuryInfo);
+    }
+
+    function createRisk(
+        RiskId riskId,
+        bytes memory data
+    ) external override {
+        (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        NftId productNftId = productInfo.nftId;
+        instance.createRisk(
+            riskId,
+            productNftId,
+            data
+        );
+    }
+
+    function setRiskInfo(
+        RiskId riskId,
+        IRisk.RiskInfo memory info
+    ) external {
+        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        instance.setRiskInfo(
+            riskId,
+            info
+        );
+    }
+
+    function updateRiskState(
+        RiskId riskId,
+        StateId state
+    ) external {
+        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        instance.updateRiskState(
+            riskId,
+            state
+        );
+    }
+
+    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
+        IRegistry.ObjectInfo memory productInfo;
+        (productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        product = Product(productInfo.objectAddress);
+    }
+
+    function calculatePremium(
+        RiskId riskId,
+        uint256 sumInsuredAmount,
+        uint256 lifetime,
+        bytes memory applicationData,
+        NftId bundleNftId,
+        ReferralId referralId
+    )
+        public
+        view 
+        override
+        returns (
+            uint256 premiumAmount,
+            uint256 productFeeAmount,
+            uint256 poolFeeAmount,
+            uint256 bundleFeeAmount,
+            uint256 distributionFeeAmount
+        )
+    {
+        Product product = _getAndVerifyInstanceAndProduct();
+        uint256 netPremiumAmount = product.calculateNetPremium(
+            sumInsuredAmount,
+            riskId,
+            lifetime,
+            applicationData
+        );
+
+        (
+            productFeeAmount,
+            poolFeeAmount,
+            bundleFeeAmount,
+            distributionFeeAmount
+        ) = _calculateFeeAmounts(
+            netPremiumAmount,
+            product,
+            bundleNftId,
+            referralId
+        );
+
+        premiumAmount = netPremiumAmount + productFeeAmount;
+        premiumAmount += poolFeeAmount + bundleFeeAmount;
+        premiumAmount += distributionFeeAmount;
+    }
+
+    function _calculateFeeAmounts(
+        uint256 netPremiumAmount,
+        Product product,
+        NftId bundleNftId,
+        ReferralId referralId
+    )
+        internal
+        view
+        returns (
+            uint256 productFeeAmount,
+            uint256 poolFeeAmount,
+            uint256 bundleFeeAmount,
+            uint256 distributionFeeAmount
+        )
+    {
+        IInstance instance = product.getInstance();
+        ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(product.getNftId());
+        IBundle.BundleInfo memory bundleInfo = instance.getBundleInfo(bundleNftId);
+        require(bundleInfo.poolNftId == treasuryInfo.poolNftId,"ERROR:PRS-035:BUNDLE_POOL_MISMATCH");
+
+        (productFeeAmount,) = FeeLib.calculateFee(treasuryInfo.productFee, netPremiumAmount);
+        (poolFeeAmount,) = FeeLib.calculateFee(treasuryInfo.poolFee, netPremiumAmount);
+        (bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
+
+        IRegistry.ObjectInfo memory distributionInfo = getRegistry().getObjectInfo(treasuryInfo.distributionNftId);
+        IDistributionComponent distribution = IDistributionComponent(distributionInfo.objectAddress);
+        distributionFeeAmount = distribution.calculateFeeAmount(referralId, netPremiumAmount);
     }
 
+
     function createApplication(
         address applicationOwner,
+        RiskId riskId,
         uint256 sumInsuredAmount,
-        uint256 premiumAmount,
         uint256 lifetime,
-        NftId bundleNftId
+        bytes memory applicationData,
+        NftId bundleNftId,
+        ReferralId referralId
     ) external override returns (NftId policyNftId) {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        NftId productNftId = productInfo.nftId;
         // TODO add validations (see create bundle in pool service)
 
-        policyNftId = this.getRegistry().registerObjectForInstance(
-            productNftId,
-            POLICY(),
-            applicationOwner,
-            ""
+        policyNftId = getRegistryService().registerPolicy(
+            IRegistry.ObjectInfo(
+                zeroNftId(),
+                productInfo.nftId,
+                POLICY(),
+                false, // intercepting property for policies is defined on product
+                address(0),
+                applicationOwner,
+                ""
+            )
         );
 
-        instance.createApplication(
-            productNftId,
+        (uint256 premiumAmount,,,,) = calculatePremium(
+            riskId,
+            sumInsuredAmount,
+            lifetime,
+            applicationData,
+            bundleNftId,
+            referralId
+        );
+
+        instance.createPolicyInfo(
             policyNftId,
+            productInfo.nftId,
+            referralId,
+            riskId,
             sumInsuredAmount,
             premiumAmount,
             lifetime,
@@ -102,30 +240,29 @@ contract ProductService is ComponentServiceBase, IProductService {
         internal
         view
         returns (
-            ITreasury.ProductSetup memory productSetup,
+            ITreasury.TreasuryInfo memory treasuryInfo,
+            NftId bundleNftId,
             IBundle.BundleInfo memory bundleInfo,
-            uint256 collateralAmount,
-            bool poolIsVerifying,
-            bytes memory bundleFilter
+            uint256 collateralAmount
         )
     {
         // check match between policy and bundle (via pool)
-        productSetup = instance.getProductSetup(policyInfo.productNftId);
-        bundleInfo = instance.getBundleInfo(policyInfo.bundleNftId);
-        require(bundleInfo.poolNftId == productSetup.poolNftId, "POLICY_BUNDLE_MISMATCH");
+        treasuryInfo = instance.getTreasuryInfo(policyInfo.productNftId);
+        bundleNftId = policyInfo.bundleNftId;
+        bundleInfo = instance.getBundleInfo(bundleNftId);
+        require(bundleInfo.poolNftId == treasuryInfo.poolNftId, "POLICY_BUNDLE_MISMATCH");
 
         // calculate required collateral
-        NftId poolNftId = productSetup.poolNftId;
+        NftId poolNftId = treasuryInfo.poolNftId;
         IPool.PoolInfo memory poolInfo = instance.getPoolInfo(poolNftId);
 
         // obtain remaining return values
-        poolIsVerifying = poolInfo.isVerifying;
         collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
-        bundleFilter = bundleInfo.filter;
     }
 
     function _lockCollateralInBundle(
         IInstance instance,
+        NftId bundleNftId, 
         IBundle.BundleInfo memory bundleInfo,
         NftId policyNftId, 
         uint256 collateralAmount
@@ -134,28 +271,39 @@ contract ProductService is ComponentServiceBase, IProductService {
         returns (IBundle.BundleInfo memory)
     {
         bundleInfo.lockedAmount += collateralAmount;
-        instance.collateralizePolicy(bundleInfo.nftId, policyNftId, collateralAmount);
+        instance.collateralizePolicy(bundleNftId, policyNftId, collateralAmount);
         return bundleInfo;
     }
 
     function _underwriteByPool(
-        ITreasury.ProductSetup memory productSetup,
+        ITreasury.TreasuryInfo memory treasuryInfo,
+        NftId policyNftId,
         IPolicy.PolicyInfo memory policyInfo,
         bytes memory bundleFilter,
         uint256 collateralAmount
     )
         internal
     {
-        address poolAddress = _registry.getObjectInfo(productSetup.poolNftId).objectAddress;
+        address poolAddress = getRegistry().getObjectInfo(treasuryInfo.poolNftId).objectAddress;
         IPoolComponent pool = IPoolComponent(poolAddress);
         pool.underwrite(
-            policyInfo.nftId, 
-            policyInfo.data, 
+            policyNftId, 
+            policyInfo.applicationData, 
             bundleFilter,
             collateralAmount);
     }
 
 
+    function revoke(
+        NftId policyNftId
+    )
+        external
+        override
+    {
+        require(false, "ERROR:PRS-234:NOT_YET_IMPLEMENTED");
+    }
+
+
     function underwrite(
         NftId policyNftId,
         bool requirePremiumPayment,
@@ -174,14 +322,18 @@ contract ProductService is ComponentServiceBase, IProductService {
         NftId productNftId = productInfo.nftId;
         IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
         require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
-        require(policyInfo.state == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
+        require(instance.getState(policyNftId.toKey32(POLICY())) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
+
+        ITreasury.TreasuryInfo memory treasuryInfo;
+        NftId bundleNftId;
+        IBundle.BundleInfo memory bundleInfo;
+        uint256 collateralAmount;
 
         (
-            ITreasury.ProductSetup memory productSetup,
-            IBundle.BundleInfo memory bundleInfo,
-            uint256 collateralAmount,
-            bool poolIsVerifying,
-            bytes memory bundleFilter
+            treasuryInfo,
+            bundleNftId,
+            bundleInfo,
+            collateralAmount
         ) = _getAndVerifyUnderwritingSetup(
             instance,
             policyInfo
@@ -190,15 +342,28 @@ contract ProductService is ComponentServiceBase, IProductService {
         // lock bundle collateral
         bundleInfo = _lockCollateralInBundle(
             instance,
+            bundleNftId,
             bundleInfo,
             policyNftId, 
             collateralAmount);
 
-        // collect premium
+        // set policy state to underwritten
+        instance.updatePolicyState(policyNftId, UNDERWRITTEN());
+
+        // optional activation of policy
+        if(activateAt > zeroTimestamp()) {
+            policyInfo.activatedAt = activateAt;
+            policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+
+            instance.updatePolicyState(policyNftId, ACTIVE());
+        }
+
+        // optional collection of premium
         if(requirePremiumPayment) {
             uint256 netPremiumAmount = _processPremiumByTreasury(
                 instance, 
-                productSetup, 
+                productInfo.nftId,
+                treasuryInfo, 
                 policyNftId, 
                 policyInfo.premiumAmount);
 
@@ -206,38 +371,30 @@ contract ProductService is ComponentServiceBase, IProductService {
             bundleInfo.balanceAmount += netPremiumAmount;
         }
 
-        // set policy state to underwritten
-        // TODO add require for state change
-        policyInfo.state = UNDERWRITTEN();
-        policyInfo.updatedIn = blockNumber();
-
-        // optional activation of policy
-        if(activateAt > zeroTimestamp()) {
-            policyInfo.activatedAt = activateAt;
-            policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
-
-            // TODO add require for state change
-            policyInfo.state = ACTIVE();
-        }
-
-        instance.setPolicyInfo(policyInfo);
-        instance.setBundleInfo(bundleInfo);
-
-        // integrate pool component
-        if(poolIsVerifying) {
-            _underwriteByPool(
-                productSetup,
-                policyInfo,
-                bundleFilter,
-                collateralAmount
-            );
+        instance.setPolicyInfo(policyNftId, policyInfo);
+        instance.setBundleInfo(bundleNftId, bundleInfo);
+
+        // involve pool if necessary
+        {
+            NftId poolNftId = treasuryInfo.poolNftId;
+            IPool.PoolInfo memory poolInfo = instance.getPoolInfo(poolNftId);
+
+            if(poolInfo.isVerifying) {
+                _underwriteByPool(
+                    treasuryInfo,
+                    policyNftId,
+                    policyInfo,
+                    bundleInfo.filter,
+                    collateralAmount
+                );
+            }
         }
 
         // TODO add logging
     }
 
     function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
-        UFixed sumInsuredUFixed = UFixedMathLib.toUFixed(sumInsuredAmount);
+        UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
         UFixed collateralUFixed =  collateralizationLevel * sumInsuredUFixed;
         return collateralUFixed.toInt();
     } 
@@ -248,14 +405,13 @@ contract ProductService is ComponentServiceBase, IProductService {
 
         // perform actual token transfers
         IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
-        ITreasury.ProductSetup memory product = instance.getProductSetup(productInfo.nftId);
+        ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productInfo.nftId);
 
         uint256 premiumAmount = policyInfo.premiumAmount;
-        _processPremiumByTreasury(instance, product, policyNftId, premiumAmount);
+        _processPremiumByTreasury(instance, productInfo.nftId, treasuryInfo, policyNftId, premiumAmount);
 
         // policy level book keeping for premium paid
         policyInfo.premiumPaidAmount += premiumAmount;
-        policyInfo.updatedIn = blockNumber();
 
         // optional activation of policy
         if(activateAt > zeroTimestamp()) {
@@ -266,11 +422,10 @@ contract ProductService is ComponentServiceBase, IProductService {
             policyInfo.activatedAt = activateAt;
             policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
-            // TODO add require for state change
-            policyInfo.state = ACTIVE();
+            instance.updatePolicyState(policyNftId, ACTIVE());
         }
 
-        instance.setPolicyInfo(policyInfo);
+        instance.setPolicyInfo(policyNftId, policyInfo);
 
         // TODO add logging
     }
@@ -288,10 +443,8 @@ contract ProductService is ComponentServiceBase, IProductService {
         policyInfo.activatedAt = activateAt;
         policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
-        // TODO add require for state change
-        policyInfo.state = ACTIVE();
-
-        instance.setPolicyInfo(policyInfo);
+        instance.setPolicyInfo(policyNftId, policyInfo);
+        instance.updatePolicyState(policyNftId, ACTIVE());
 
         // TODO add logging
     }
@@ -311,12 +464,14 @@ contract ProductService is ComponentServiceBase, IProductService {
         view
         returns (NftId poolNftid)
     {
-        return instance.getProductSetup(productNftId).poolNftId;
+        return instance.getTreasuryInfo(productNftId).poolNftId;
     }
 
+
     function _processPremiumByTreasury(
         IInstance instance,
-        ITreasury.ProductSetup memory product,
+        NftId productNftId,
+        ITreasury.TreasuryInfo memory treasuryInfo,
         NftId policyNftId,
         uint256 premiumAmount
     )
@@ -325,13 +480,13 @@ contract ProductService is ComponentServiceBase, IProductService {
     {
         // process token transfer(s)
         if(premiumAmount > 0) {
-            TokenHandler tokenHandler = instance.getTokenHandler(product.productNftId);
-            address policyOwner = _registry.getOwner(policyNftId);
-            address poolWallet = instance.getPoolSetup(product.poolNftId).wallet;
+            TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
+            address policyOwner = getRegistry().ownerOf(policyNftId);
+            address poolWallet = instance.getComponentWallet(treasuryInfo.poolNftId);
             netPremiumAmount = premiumAmount;
-            Fee memory policyFee = product.policyFee;
+            Fee memory productFee = treasuryInfo.productFee;
 
-            if (FeeLib.feeIsZero(policyFee)) {
+            if (FeeLib.feeIsZero(productFee)) {
                 tokenHandler.transfer(
                     policyOwner,
                     poolWallet,
@@ -340,10 +495,11 @@ contract ProductService is ComponentServiceBase, IProductService {
             } else {
                 (uint256 feeAmount, uint256 netAmount) = instance.calculateFeeAmount(
                     premiumAmount,
-                    policyFee
+                    productFee
                 );
 
-                tokenHandler.transfer(policyOwner, product.wallet, feeAmount);
+                address productWallet = instance.getComponentWallet(productNftId);
+                tokenHandler.transfer(policyOwner, productWallet, feeAmount);
                 tokenHandler.transfer(policyOwner, poolWallet, netAmount);
                 netPremiumAmount = netAmount;
             }