@etherisc/gif-next 0.0.2-299fe4a-464 → 0.0.2-2b0ce11-013

package/contracts/instance/service/ProductService.sol

@@ -2,28 +2,42 @@
 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 {IInstance} from "../../instance/IInstance.sol";
-import {IPolicy, IPolicyModule} from "../module/policy/IPolicy.sol";
-import {IPool} from "../module/pool/IPoolModule.sol";
-import {IBundle} from "../module/bundle/IBundle.sol";
+import {IDistributionComponent} from "../../components/IDistributionComponent.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 {ObjectType, INSTANCE, PRODUCT, POLICY} from "../../types/ObjectType.sol";
-import {APPLIED, UNDERWRITTEN, ACTIVE} from "../../types/StateId.sol";
-import {NftId, NftIdLib} from "../../types/NftId.sol";
+import {UFixed, UFixedLib} from "../../types/UFixed.sol";
 import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
-import {Fee, feeIsZero} from "../../types/Fee.sol";
-import {Version, toVersion, toVersionPart} from "../../types/Version.sol";
-
-import {ComponentServiceBase} from "./ComponentServiceBase.sol";
+import {ObjectType, INSTANCE, PRODUCT, POLICY} from "../../types/ObjectType.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/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";
+
+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 {
@@ -31,70 +45,228 @@ contract ProductService is ComponentServiceBase, IProductService {
 
     string public constant NAME = "ProductService";
 
+    address internal _registryAddress;
+
     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);
+
+        _registerInterface(type(IService).interfaceId);
         _registerInterface(type(IProductService).interfaceId);
     }
 
-    function getVersion()
-        public 
-        pure 
-        virtual override (IVersionable, Versionable)
-        returns(Version)
-    {
-        return toVersion(
-            toVersionPart(3),
-            toVersionPart(0),
-            toVersionPart(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 policyFee,
+        Fee memory productFee,
         Fee memory processingFee
     )
         external
         override
     {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        instance.setProductFees(productInfo.nftId, policyFee, processingFee);
+        InstanceReader instanceReader = instance.getInstanceReader();
+        NftId productNftId = productInfo.nftId;
+
+        ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
+        productSetupInfo.productFee = productFee;
+        productSetupInfo.processingFee = processingFee;
+        
+        instance.updateProductSetup(productNftId, productSetupInfo, KEEP_STATE());
+    }
+
+    function createRisk(
+        RiskId riskId,
+        bytes memory data
+    ) 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,
+            riskInfo
+        );
+    }
+
+    function updateRisk(
+        RiskId riskId,
+        bytes memory data
+    ) external {
+        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
+        IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
+        riskInfo.data = data;
+        instance.updateRisk(riskId, riskInfo, KEEP_STATE());
+    }
+
+    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
+        )
+    {
+        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");
+
+        {
+            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);
+    }
+
+
     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,
-            policyNftId,
+        (uint256 premiumAmount,,,,) = calculatePremium(
+            riskId,
             sumInsuredAmount,
-            premiumAmount,
             lifetime,
-            bundleNftId
+            applicationData,
+            bundleNftId,
+            referralId
         );
 
+        // FIXME: this
+        // instance.createPolicyInfo(
+        //     policyNftId,
+        //     productInfo.nftId,
+        //     referralId,
+        //     riskId,
+        //     sumInsuredAmount,
+        //     premiumAmount,
+        //     lifetime,
+        //     bundleNftId
+        // );
+
         // TODO add logging
     }
 
@@ -105,30 +277,30 @@ 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
         )
     {
+        // FIXME: this
         // 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");
-
-        // calculate required collateral
-        NftId poolNftId = productSetup.poolNftId;
-        IPool.PoolInfo memory poolInfo = instance.getPoolInfo(poolNftId);
-
-        // obtain remaining return values
-        poolIsVerifying = poolInfo.isVerifying;
-        collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
-        bundleFilter = bundleInfo.filter;
+        // 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 = treasuryInfo.poolNftId;
+        // ISetup.PoolSetupInfo memory poolInfo = instance.getPoolInfo(poolNftId);
+
+        // // obtain remaining return values
+        // collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
     }
 
     function _lockCollateralInBundle(
         IInstance instance,
+        NftId bundleNftId, 
         IBundle.BundleInfo memory bundleInfo,
         NftId policyNftId, 
         uint256 collateralAmount
@@ -137,29 +309,40 @@ contract ProductService is ComponentServiceBase, IProductService {
         returns (IBundle.BundleInfo memory)
     {
         bundleInfo.lockedAmount += collateralAmount;
-        bundleInfo.updatedIn = blockNumber();
-        instance.collateralizePolicy(bundleInfo.nftId, policyNftId, collateralAmount);
+        // FIXME: this
+        // 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,
@@ -176,72 +359,82 @@ contract ProductService is ComponentServiceBase, IProductService {
 
         // check match between policy and calling product
         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");
-
-        (
-            ITreasury.ProductSetup memory productSetup,
-            IBundle.BundleInfo memory bundleInfo,
-            uint256 collateralAmount,
-            bool poolIsVerifying,
-            bytes memory bundleFilter
-        ) = _getAndVerifyUnderwritingSetup(
-            instance,
-            policyInfo
-        );
-
-        // lock bundle collateral
-        bundleInfo = _lockCollateralInBundle(
-            instance,
-            bundleInfo,
-            policyNftId, 
-            collateralAmount);
-
-        // collect premium
-        if(requirePremiumPayment) {
-            uint256 netPremiumAmount = _processPremiumByTreasury(
-                instance, 
-                productSetup, 
-                policyNftId, 
-                policyInfo.premiumAmount);
-
-            policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
-            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
-            );
-        }
+        // FIXME: this
+        // IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
+        // require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
+        // 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;
+
+        // (
+        //     treasuryInfo,
+        //     bundleNftId,
+        //     bundleInfo,
+        //     collateralAmount
+        // ) = _getAndVerifyUnderwritingSetup(
+        //     instance,
+        //     policyInfo
+        // );
+
+        // // lock bundle collateral
+        // bundleInfo = _lockCollateralInBundle(
+        //     instance,
+        //     bundleNftId,
+        //     bundleInfo,
+        //     policyNftId, 
+        //     collateralAmount);
+
+        // // 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, 
+        //         productInfo.nftId,
+        //         treasuryInfo, 
+        //         policyNftId, 
+        //         policyInfo.premiumAmount);
+
+        //     policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
+        //     bundleInfo.balanceAmount += netPremiumAmount;
+        // }
+
+        // instance.setPolicyInfo(policyNftId, policyInfo);
+        // instance.setBundleInfo(bundleNftId, bundleInfo);
+
+        // // involve pool if necessary
+        // {
+        //     NftId poolNftId = treasuryInfo.poolNftId;
+        //     ISetup.PoolSetupInfo 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();
     } 
@@ -251,51 +444,49 @@ contract ProductService is ComponentServiceBase, IProductService {
         (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
 
         // perform actual token transfers
-        IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
-        ITreasury.ProductSetup memory product = instance.getProductSetup(productInfo.nftId);
+        // FIXME: this
+        // IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
+        // ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productInfo.nftId);
 
-        uint256 premiumAmount = policyInfo.premiumAmount;
-        _processPremiumByTreasury(instance, product, policyNftId, premiumAmount);
+        // uint256 premiumAmount = policyInfo.premiumAmount;
+        // _processPremiumByTreasury(instance, productInfo.nftId, treasuryInfo, policyNftId, premiumAmount);
 
-        // policy level book keeping for premium paid
-        policyInfo.premiumPaidAmount += premiumAmount;
-        policyInfo.updatedIn = blockNumber();
+        // // policy level book keeping for premium paid
+        // policyInfo.premiumPaidAmount += premiumAmount;
 
-        // optional activation of policy
-        if(activateAt > zeroTimestamp()) {
-            require(
-                policyInfo.activatedAt.eqz(),
-                "ERROR:PRS-030:ALREADY_ACTIVATED");
+        // // optional activation of policy
+        // if(activateAt > zeroTimestamp()) {
+        //     require(
+        //         policyInfo.activatedAt.eqz(),
+        //         "ERROR:PRS-030:ALREADY_ACTIVATED");
 
-            policyInfo.activatedAt = activateAt;
-            policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+        //     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
     }
 
+    // FIXME: this
     function activate(NftId policyNftId, Timestamp activateAt) external override {
         // check caller is registered product
         (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
 
-        IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
+        // IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
 
-        require(
-            policyInfo.activatedAt.eqz(),
-            "ERROR:PRS-020:ALREADY_ACTIVATED");
+        // require(
+        //     policyInfo.activatedAt.eqz(),
+        //     "ERROR:PRS-020:ALREADY_ACTIVATED");
 
-        policyInfo.activatedAt = activateAt;
-        policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+        // 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
     }
@@ -315,12 +506,15 @@ contract ProductService is ComponentServiceBase, IProductService {
         view
         returns (NftId poolNftid)
     {
-        return instance.getProductSetup(productNftId).poolNftId;
+        // FIXME: this
+        // return instance.getTreasuryInfo(productNftId).poolNftId;
     }
 
+
     function _processPremiumByTreasury(
         IInstance instance,
-        ITreasury.ProductSetup memory product,
+        NftId productNftId,
+        ITreasury.TreasuryInfo memory treasuryInfo,
         NftId policyNftId,
         uint256 premiumAmount
     )
@@ -329,28 +523,30 @@ contract ProductService is ComponentServiceBase, IProductService {
     {
         // process token transfer(s)
         if(premiumAmount > 0) {
-            TokenHandler tokenHandler = product.tokenHandler;
-            address policyOwner = _registry.getOwner(policyNftId);
-            address poolWallet = instance.getPoolSetup(product.poolNftId).wallet;
-            netPremiumAmount = premiumAmount;
-            Fee memory policyFee = product.policyFee;
-
-            if (feeIsZero(policyFee)) {
-                tokenHandler.transfer(
-                    policyOwner,
-                    poolWallet,
-                    premiumAmount
-                );
-            } else {
-                (uint256 feeAmount, uint256 netAmount) = instance.calculateFeeAmount(
-                    premiumAmount,
-                    policyFee
-                );
-
-                tokenHandler.transfer(policyOwner, product.wallet, feeAmount);
-                tokenHandler.transfer(policyOwner, poolWallet, netAmount);
-                netPremiumAmount = netAmount;
-            }
+            // FIXME: this
+            // TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
+            // address policyOwner = getRegistry().ownerOf(policyNftId);
+            // address poolWallet = instance.getComponentWallet(treasuryInfo.poolNftId);
+            // netPremiumAmount = premiumAmount;
+            // Fee memory productFee = treasuryInfo.productFee;
+
+            // if (FeeLib.feeIsZero(productFee)) {
+            //     tokenHandler.transfer(
+            //         policyOwner,
+            //         poolWallet,
+            //         premiumAmount
+            //     );
+            // } else {
+            //     (uint256 feeAmount, uint256 netAmount) = instance.calculateFeeAmount(
+            //         premiumAmount,
+            //         productFee
+            //     );
+
+            //     address productWallet = instance.getComponentWallet(productNftId);
+            //     tokenHandler.transfer(policyOwner, productWallet, feeAmount);
+            //     tokenHandler.transfer(policyOwner, poolWallet, netAmount);
+            //     netPremiumAmount = netAmount;
+            // }
         }
 
         // TODO add logging