@etherisc/gif-next 0.0.2-d408403-475 → 0.0.2-d60aa51-726

package/contracts/instance/service/ProductService.sol

@@ -3,33 +3,43 @@ 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 {IInstance} from "../IInstance.sol";
+import {IPolicy} from "../module/IPolicy.sol";
+import {IRisk} from "../module/IRisk.sol";
+import {IBundle} from "../module/IBundle.sol";
 import {IProductService} from "./IProductService.sol";
-import {ITreasury, ITreasuryModule, TokenHandler} from "../../instance/module/treasury/ITreasury.sol";
+import {ITreasury} from "../module/ITreasury.sol";
+import {ISetup} from "../module/ISetup.sol";
+
+import {TokenHandler} from "../../shared/TokenHandler.sol";
 
 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 {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
+import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
-import {ReferralId} from "../../types/ReferralId.sol";
+import {ReferralId} from "../../types/Referral.sol";
 import {RiskId} from "../../types/RiskId.sol";
 import {StateId} from "../../types/StateId.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
+import {IService} from "../../shared/IService.sol";
+import {Service} from "../../shared/Service.sol";
 import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IProductService} from "./IProductService.sol";
+import {InstanceReader} from "../InstanceReader.sol";
+import {IPoolService} from "./PoolService.sol";
+import {POOL_SERVICE_NAME} from "./PoolService.sol";
+
+string constant PRODUCT_SERVICE_NAME = "ProductService";
 
 // TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
 contract ProductService is ComponentServiceBase, IProductService {
@@ -37,29 +47,43 @@ contract ProductService is ComponentServiceBase, IProductService {
 
     string public constant NAME = "ProductService";
 
+    address internal _registryAddress;
+    IPoolService internal _poolService;
+
     event LogProductServiceSender(address sender);
 
-    constructor(
-        address registry,
-        NftId registryNftId
-    ) ComponentServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
+    function _initialize(
+        address owner, 
+        bytes memory data
+    )
+        internal
+        initializer
+        virtual override
     {
+        address initialOwner = address(0);
+        (_registryAddress, initialOwner) = abi.decode(data, (address, address));
+
+        _initializeService(_registryAddress, owner);
+
+        _poolService = IPoolService(_registry.getServiceAddress(POOL_SERVICE_NAME, getMajorVersion()));
+
+        _registerInterface(type(IService).interfaceId);
         _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, Service) returns(string memory name) {
         return NAME;
     }
 
+    function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal override {
+        ISetup.ProductSetupInfo memory initialSetup = abi.decode(
+            initialObjData,
+            (ISetup.ProductSetupInfo)
+        );
+        instance.createProductSetup(componentNftId, initialSetup);
+    }
+
     function setFees(
         Fee memory productFee,
         Fee memory processingFee
@@ -68,11 +92,14 @@ contract ProductService is ComponentServiceBase, IProductService {
         override
     {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
         NftId productNftId = productInfo.nftId;
-        ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
-        treasuryInfo.productFee = productFee;
-        treasuryInfo.processingFee = processingFee;
-        instance.setTreasuryInfo(productNftId, treasuryInfo);
+
+        ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
+        productSetupInfo.productFee = productFee;
+        productSetupInfo.processingFee = processingFee;
+        
+        instance.updateProductSetup(productNftId, productSetupInfo, KEEP_STATE());
     }
 
     function createRisk(
@@ -81,22 +108,22 @@ contract ProductService is ComponentServiceBase, IProductService {
     ) external override {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         NftId productNftId = productInfo.nftId;
+        IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
         instance.createRisk(
             riskId,
-            productNftId,
-            data
+            riskInfo
         );
     }
 
-    function setRiskInfo(
+    function updateRisk(
         RiskId riskId,
-        IRisk.RiskInfo memory info
+        bytes memory data
     ) external {
         (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        instance.setRiskInfo(
-            riskId,
-            info
-        );
+        InstanceReader instanceReader = instance.getInstanceReader();
+        IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
+        riskInfo.data = data;
+        instance.updateRisk(riskId, riskInfo, KEEP_STATE());
     }
 
     function updateRiskState(
@@ -104,16 +131,13 @@ contract ProductService is ComponentServiceBase, IProductService {
         StateId state
     ) external {
         (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        instance.updateRiskState(
-            riskId,
-            state
-        );
+        instance.updateRiskState(riskId, state);
     }
 
-    function _getAndVerifyInstanceAndProduct() internal view returns (IProductComponent product) {
+    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
         IRegistry.ObjectInfo memory productInfo;
         (productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        product = IProductComponent(productInfo.objectAddress);
+        product = Product(productInfo.objectAddress);
     }
 
     function calculatePremium(
@@ -135,7 +159,7 @@ contract ProductService is ComponentServiceBase, IProductService {
             uint256 distributionFeeAmount
         )
     {
-        IProductComponent product = _getAndVerifyInstanceAndProduct();
+        Product product = _getAndVerifyInstanceAndProduct();
         uint256 netPremiumAmount = product.calculateNetPremium(
             sumInsuredAmount,
             riskId,
@@ -162,7 +186,7 @@ contract ProductService is ComponentServiceBase, IProductService {
 
     function _calculateFeeAmounts(
         uint256 netPremiumAmount,
-        IProductComponent product,
+        Product product,
         NftId bundleNftId,
         ReferralId referralId
     )
@@ -175,18 +199,31 @@ contract ProductService is ComponentServiceBase, IProductService {
             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");
+        InstanceReader instanceReader;
+        {
+            IInstance instance = product.getInstance();
+            instanceReader = instance.getInstanceReader();
+        }
+        
+        NftId poolNftId = product.getPoolNftId();
+        IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
+        require(bundleInfo.poolNftId == poolNftId,"ERROR:PRS-035:BUNDLE_POOL_MISMATCH");
 
-        (productFeeAmount,) = FeeLib.calculateFee(treasuryInfo.productFee, netPremiumAmount);
-        (poolFeeAmount,) = FeeLib.calculateFee(treasuryInfo.poolFee, netPremiumAmount);
+        {
+            ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(product.getProductNftId());
+            (productFeeAmount,) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
+        }
+        {
+            ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
+            (poolFeeAmount,) = FeeLib.calculateFee(poolSetupInfo.poolFee, netPremiumAmount);
+        }
+        {
+            NftId distributionNftId = product.getDistributionNftId();
+            ISetup.DistributionSetupInfo memory distributionSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
+            (distributionFeeAmount,) = FeeLib.calculateFee(distributionSetupInfo.distributionFee, netPremiumAmount);
+        }
+        
         (bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
-
-        IRegistry.ObjectInfo memory distributionInfo = _registry.getObjectInfo(treasuryInfo.distributionNftId);
-        IDistributionComponent distribution = IDistributionComponent(distributionInfo.objectAddress);
-        distributionFeeAmount = distribution.calculateFeeAmount(referralId, netPremiumAmount);
     }
 
 
@@ -202,11 +239,16 @@ contract ProductService is ComponentServiceBase, IProductService {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         // TODO add validations (see create bundle in pool service)
 
-        policyNftId = this.getRegistry().registerObjectForInstance(
-            productInfo.nftId,
-            POLICY(),
-            applicationOwner,
-            ""
+        policyNftId = getRegistryService().registerPolicy(
+            IRegistry.ObjectInfo(
+                zeroNftId(),
+                productInfo.nftId,
+                POLICY(),
+                false, // intercepting property for policies is defined on product
+                address(0),
+                applicationOwner,
+                ""
+            )
         );
 
         (uint256 premiumAmount,,,,) = calculatePremium(
@@ -218,42 +260,53 @@ contract ProductService is ComponentServiceBase, IProductService {
             referralId
         );
 
-        instance.createPolicyInfo(
-            policyNftId,
+        IPolicy.PolicyInfo memory policyInfo = IPolicy.PolicyInfo(
             productInfo.nftId,
+            bundleNftId,
             referralId,
             riskId,
             sumInsuredAmount,
             premiumAmount,
+            0,
             lifetime,
-            bundleNftId
+            applicationData,
+            "",
+            0,
+            0,
+            0,
+            zeroTimestamp(),
+            zeroTimestamp(),
+            zeroTimestamp()
         );
+        
+        instance.createPolicy(policyNftId, policyInfo);
+        instance.updatePolicyState(policyNftId, APPLIED());
 
         // TODO add logging
     }
 
     function _getAndVerifyUnderwritingSetup(
         IInstance instance,
-        IPolicy.PolicyInfo memory policyInfo
+        InstanceReader instanceReader,
+        IPolicy.PolicyInfo memory policyInfo,
+        ISetup.ProductSetupInfo memory productSetupInfo
     )
         internal
         view
         returns (
-            ITreasury.TreasuryInfo memory treasuryInfo,
             NftId bundleNftId,
             IBundle.BundleInfo memory bundleInfo,
             uint256 collateralAmount
         )
     {
         // check match between policy and bundle (via pool)
-        treasuryInfo = instance.getTreasuryInfo(policyInfo.productNftId);
         bundleNftId = policyInfo.bundleNftId;
-        bundleInfo = instance.getBundleInfo(bundleNftId);
-        require(bundleInfo.poolNftId == treasuryInfo.poolNftId, "POLICY_BUNDLE_MISMATCH");
+        bundleInfo = instanceReader.getBundleInfo(bundleNftId);
+        require(bundleInfo.poolNftId == productSetupInfo.poolNftId, "POLICY_BUNDLE_MISMATCH");
 
         // calculate required collateral
-        NftId poolNftId = treasuryInfo.poolNftId;
-        IPool.PoolInfo memory poolInfo = instance.getPoolInfo(poolNftId);
+        NftId poolNftId = productSetupInfo.poolNftId;
+        ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
 
         // obtain remaining return values
         collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
@@ -270,12 +323,12 @@ contract ProductService is ComponentServiceBase, IProductService {
         returns (IBundle.BundleInfo memory)
     {
         bundleInfo.lockedAmount += collateralAmount;
-        instance.collateralizePolicy(bundleNftId, policyNftId, collateralAmount);
+        // TODO: track policy associated to bundle in bundlemanager (tbd) and how much is locked for it
         return bundleInfo;
     }
 
     function _underwriteByPool(
-        ITreasury.TreasuryInfo memory treasuryInfo,
+        NftId poolNftId,
         NftId policyNftId,
         IPolicy.PolicyInfo memory policyInfo,
         bytes memory bundleFilter,
@@ -283,7 +336,7 @@ contract ProductService is ComponentServiceBase, IProductService {
     )
         internal
     {
-        address poolAddress = _registry.getObjectInfo(treasuryInfo.poolNftId).objectAddress;
+        address poolAddress = getRegistry().getObjectInfo(poolNftId).objectAddress;
         IPoolComponent pool = IPoolComponent(poolAddress);
         pool.underwrite(
             policyNftId, 
@@ -316,28 +369,43 @@ contract ProductService is ComponentServiceBase, IProductService {
             IRegistry.ObjectInfo memory productInfo, 
             IInstance instance
         ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
 
         // check match between policy and calling product
         NftId productNftId = productInfo.nftId;
-        IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
+        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
         require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
-        require(instance.getState(policyNftId.toKey32(POLICY())) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
+        require(instanceReader.getPolicyState(policyNftId) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
 
-        ITreasury.TreasuryInfo memory treasuryInfo;
         NftId bundleNftId;
         IBundle.BundleInfo memory bundleInfo;
         uint256 collateralAmount;
+        uint256 netPremiumAmount = 0; // > 0 if immediate premium payment 
+        {
+            ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
+            IBundle.BundleInfo memory bundleInfo;
+            
+            (
+                bundleNftId,
+                bundleInfo,
+                collateralAmount
+            ) = _getAndVerifyUnderwritingSetup(
+                instance,
+                instanceReader,
+                policyInfo,
+                productSetupInfo
+            );
+        }
 
-        (
-            treasuryInfo,
+
+        // lock bundle collateral
+        bundleInfo = _lockCollateralInBundle(
+            instance,
             bundleNftId,
             bundleInfo,
-            collateralAmount
-        ) = _getAndVerifyUnderwritingSetup(
-            instance,
-            policyInfo
-        );
-
+            policyNftId, 
+            collateralAmount);
+        
         // lock bundle collateral
         bundleInfo = _lockCollateralInBundle(
             instance,
@@ -345,42 +413,36 @@ contract ProductService is ComponentServiceBase, IProductService {
             bundleInfo,
             policyNftId, 
             collateralAmount);
-
-        // set policy state to underwritten
-        instance.updatePolicyState(policyNftId, UNDERWRITTEN());
-
+        StateId newPolicyState = UNDERWRITTEN();
+        
         // optional activation of policy
         if(activateAt > zeroTimestamp()) {
+            newPolicyState = ACTIVE();
             policyInfo.activatedAt = activateAt;
             policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
-
-            instance.updatePolicyState(policyNftId, ACTIVE());
         }
 
         // optional collection of premium
         if(requirePremiumPayment) {
-            uint256 netPremiumAmount = _processPremiumByTreasury(
+            netPremiumAmount = _processPremiumByTreasury(
                 instance, 
                 productInfo.nftId,
-                treasuryInfo, 
                 policyNftId, 
                 policyInfo.premiumAmount);
 
             policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
-            bundleInfo.balanceAmount += netPremiumAmount;
         }
 
-        instance.setPolicyInfo(policyNftId, policyInfo);
-        instance.setBundleInfo(bundleNftId, bundleInfo);
+        _poolService.underwritePolicy(instance, policyNftId, bundleNftId, collateralAmount, netPremiumAmount);
+        instance.updatePolicy(policyNftId, policyInfo, newPolicyState);
 
         // involve pool if necessary
         {
-            NftId poolNftId = treasuryInfo.poolNftId;
-            IPool.PoolInfo memory poolInfo = instance.getPoolInfo(poolNftId);
+            ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(bundleInfo.poolNftId);
 
-            if(poolInfo.isVerifying) {
+            if(poolInfo.isConfirmingApplication) {
                 _underwriteByPool(
-                    treasuryInfo,
+                    bundleInfo.poolNftId,
                     policyNftId,
                     policyInfo,
                     bundleInfo.filter,
@@ -393,7 +455,7 @@ contract ProductService is ComponentServiceBase, IProductService {
     }
 
     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();
     } 
@@ -401,39 +463,37 @@ contract ProductService is ComponentServiceBase, IProductService {
     function collectPremium(NftId policyNftId, Timestamp activateAt) external override {
         // check caller is registered product
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
 
-        // perform actual token transfers
-        IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
-        ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productInfo.nftId);
-
-        uint256 premiumAmount = policyInfo.premiumAmount;
-        _processPremiumByTreasury(instance, productInfo.nftId, treasuryInfo, policyNftId, premiumAmount);
-
-        // policy level book keeping for premium paid
-        policyInfo.premiumPaidAmount += premiumAmount;
+        // TODO: check if not paid
+        // TODO: transfer premium 
+        // TODO: optionally activate
 
-        // optional activation of policy
-        if(activateAt > zeroTimestamp()) {
-            require(
-                policyInfo.activatedAt.eqz(),
-                "ERROR:PRS-030:ALREADY_ACTIVATED");
+        // // perform actual token transfers (this code is probably not complete)
+        // IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        
+        // uint256 premiumAmount = policyInfo.premiumAmount;
+        // _processPremiumByTreasury(instance, productInfo.nftId, policyNftId, premiumAmount);
 
-            policyInfo.activatedAt = activateAt;
-            policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+        // // policy level book keeping for premium paid
+        // policyInfo.premiumPaidAmount += premiumAmount;
 
-            instance.updatePolicyState(policyNftId, ACTIVE());
-        }
+        // instance.updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        instance.setPolicyInfo(policyNftId, policyInfo);
+        // // optional activation of policy
+        // if(activateAt > zeroTimestamp()) {
+        //     activate(policyNftId, activateAt);
+        // }
 
         // TODO add logging
     }
 
-    function activate(NftId policyNftId, Timestamp activateAt) external override {
+    function activate(NftId policyNftId, Timestamp activateAt) public override {
         // check caller is registered product
         (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
 
-        IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
+        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
 
         require(
             policyInfo.activatedAt.eqz(),
@@ -442,8 +502,7 @@ contract ProductService is ComponentServiceBase, IProductService {
         policyInfo.activatedAt = activateAt;
         policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
-        instance.setPolicyInfo(policyNftId, policyInfo);
-        instance.updatePolicyState(policyNftId, ACTIVE());
+        instance.updatePolicy(policyNftId, policyInfo, ACTIVE());
 
         // TODO add logging
     }
@@ -463,14 +522,15 @@ contract ProductService is ComponentServiceBase, IProductService {
         view
         returns (NftId poolNftid)
     {
-        return instance.getTreasuryInfo(productNftId).poolNftId;
+        InstanceReader instanceReader = instance.getInstanceReader();
+        ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
+        return productSetupInfo.poolNftId;
     }
 
 
     function _processPremiumByTreasury(
         IInstance instance,
         NftId productNftId,
-        ITreasury.TreasuryInfo memory treasuryInfo,
         NftId policyNftId,
         uint256 premiumAmount
     )
@@ -479,11 +539,13 @@ contract ProductService is ComponentServiceBase, IProductService {
     {
         // process token transfer(s)
         if(premiumAmount > 0) {
-            TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
-            address policyOwner = _registry.getOwner(policyNftId);
-            address poolWallet = instance.getComponentWallet(treasuryInfo.poolNftId);
+            ISetup.ProductSetupInfo memory productSetupInfo = instance.getInstanceReader().getProductSetupInfo(productNftId);
+            TokenHandler tokenHandler = productSetupInfo.tokenHandler;
+            address policyOwner = getRegistry().ownerOf(policyNftId);
+            ISetup.PoolSetupInfo memory poolSetupInfo = instance.getInstanceReader().getPoolSetupInfo(productSetupInfo.poolNftId);
+            address poolWallet = poolSetupInfo.wallet;
             netPremiumAmount = premiumAmount;
-            Fee memory productFee = treasuryInfo.productFee;
+            Fee memory productFee = productSetupInfo.productFee;
 
             if (FeeLib.feeIsZero(productFee)) {
                 tokenHandler.transfer(
@@ -492,13 +554,12 @@ contract ProductService is ComponentServiceBase, IProductService {
                     premiumAmount
                 );
             } else {
-                (uint256 feeAmount, uint256 netAmount) = instance.calculateFeeAmount(
-                    premiumAmount,
-                    productFee
-                );
-
-                address productWallet = instance.getComponentWallet(productNftId);
-                tokenHandler.transfer(policyOwner, productWallet, feeAmount);
+                (uint256 productFeeAmount, uint256 netAmount) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
+                address productWallet = productSetupInfo.wallet;
+                if (tokenHandler.getToken().allowance(policyOwner, address(tokenHandler)) < premiumAmount) {
+                    revert ErrorIProductServiceInsufficientAllowance(policyOwner, address(tokenHandler), premiumAmount);
+                }
+                tokenHandler.transfer(policyOwner, productWallet, productFeeAmount);
                 tokenHandler.transfer(policyOwner, poolWallet, netAmount);
                 netPremiumAmount = netAmount;
             }

package/contracts/instance/service/ProductServiceManager.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IVersionable} from "../../shared/IVersionable.sol";
+import {ProxyManager} from "../../shared/ProxyManager.sol";
+import {ProductService} from "./ProductService.sol";
+import {Registry} from "../../registry/Registry.sol";
+import {RegistryService} from "../../registry/RegistryService.sol";
+import {VersionLib} from "../../types/Version.sol";
+
+contract ProductServiceManager is ProxyManager {
+
+    ProductService private _productService;
+
+    /// @dev initializes proxy manager with product service implementation 
+    constructor(
+        address registryAddress
+    )
+        ProxyManager()
+    {
+        ProductService svc = new ProductService();
+        bytes memory data = abi.encode(registryAddress, address(this));
+        IVersionable versionable = deploy(
+            address(svc), 
+            data);
+
+        _productService = ProductService(address(versionable));
+
+        // Registry registry = Registry(registryAddress);
+        // address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
+        // RegistryService registryService = RegistryService(registryServiceAddress);
+        // TODO this must have a role or own nft to register service
+        //registryService.registerService(_productService);
+        
+        // TODO no nft to link yet
+        // link ownership of instance service manager ot nft owner of instance service
+        //_linkToNftOwnable(
+        //    address(registryAddress),
+        //    address(_productService));
+
+        // implies that after this constructor call only upgrade functionality is available
+        _isDeployed = true;
+    }
+
+    //--- view functions ----------------------------------------------------//
+    function getProductService()
+        external
+        view
+        returns (ProductService productService)
+    {
+        return _productService;
+    }
+
+}