@etherisc/gif-next 0.0.2-e1f23dc-329 → 0.0.2-e3f4f82-063

package/contracts/instance/service/ProductService.sol

@@ -323,7 +323,7 @@ contract ProductService is ComponentServiceBase, IProductService {
         returns (IBundle.BundleInfo memory)
     {
         bundleInfo.lockedAmount += collateralAmount;
-        // FIXME: this
+        // FIXME: track policy in bundle and how much is locked for it
         // instance.collateralizePolicy(bundleNftId, policyNftId, collateralAmount);
         return bundleInfo;
     }
@@ -374,7 +374,6 @@ contract ProductService is ComponentServiceBase, IProductService {
 
         // check match between policy and calling product
         NftId productNftId = productInfo.nftId;
-        // FIXME: this
         IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
         require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
         require(instanceReader.getPolicyState(policyNftId) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
@@ -382,18 +381,20 @@ contract ProductService is ComponentServiceBase, IProductService {
         NftId bundleNftId;
         IBundle.BundleInfo memory bundleInfo;
         uint256 collateralAmount;
-        ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
-
-        (
-            bundleNftId,
-            bundleInfo,
-            collateralAmount
-        ) = _getAndVerifyUnderwritingSetup(
-            instance,
-            instanceReader,
-            policyInfo,
-            productSetupInfo
-        );
+        {
+            ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
+
+            (
+                bundleNftId,
+                bundleInfo,
+                collateralAmount
+            ) = _getAndVerifyUnderwritingSetup(
+                instance,
+                instanceReader,
+                policyInfo,
+                productSetupInfo
+            );
+        }
 
         // lock bundle collateral
         bundleInfo = _lockCollateralInBundle(
@@ -402,9 +403,11 @@ contract ProductService is ComponentServiceBase, IProductService {
             bundleInfo,
             policyNftId, 
             collateralAmount);
+        StateId newPolicyState = UNDERWRITTEN();
         
         // optional activation of policy
         if(activateAt > zeroTimestamp()) {
+            newPolicyState = ACTIVE();
             policyInfo.activatedAt = activateAt;
             policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
         }
@@ -421,7 +424,7 @@ contract ProductService is ComponentServiceBase, IProductService {
             bundleInfo.balanceAmount += netPremiumAmount;
         }
 
-        instance.updatePolicy(policyNftId, policyInfo, UNDERWRITTEN());
+        instance.updatePolicy(policyNftId, policyInfo, newPolicyState);
         _poolService.updateBundle(productInfo.parentNftId, bundleNftId, bundleInfo, KEEP_STATE());
 
         // involve pool if necessary
@@ -429,8 +432,7 @@ contract ProductService is ComponentServiceBase, IProductService {
             NftId poolNftId = bundleInfo.poolNftId;
             ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
 
-            // FIXME: use poolInfo.isVerifying ???
-            if(poolInfo.isIntercepting) {
+            if(poolInfo.isConfirmingApplication) {
                 _underwriteByPool(
                     poolNftId,
                     policyNftId,
@@ -453,51 +455,46 @@ 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
-        // FIXME: this
-        // IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
-        // ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productInfo.nftId);
+        // TODO: check if not paid
+        // TODO: transfer premium 
+        // TODO: optionally activate
 
+        // // 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, treasuryInfo, policyNftId, premiumAmount);
+        // _processPremiumByTreasury(instance, productInfo.nftId, policyNftId, premiumAmount);
 
         // // policy level book keeping for premium paid
         // policyInfo.premiumPaidAmount += premiumAmount;
 
+        // instance.updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+
         // // 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);
-
-        //     instance.updatePolicyState(policyNftId, ACTIVE());
+        //     activate(policyNftId, activateAt);
         // }
 
-        // instance.setPolicyInfo(policyNftId, policyInfo);
-
         // TODO add logging
     }
 
-    // FIXME: this
-    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(),
-        //     "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);
 
-        // instance.setPolicyInfo(policyNftId, policyInfo);
-        // instance.updatePolicyState(policyNftId, ACTIVE());
+        instance.updatePolicy(policyNftId, policyInfo, ACTIVE());
 
         // TODO add logging
     }
@@ -517,8 +514,9 @@ contract ProductService is ComponentServiceBase, IProductService {
         view
         returns (NftId poolNftid)
     {
-        // FIXME: this
-        // return instance.getTreasuryInfo(productNftId).poolNftId;
+        InstanceReader instanceReader = instance.getInstanceReader();
+        ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
+        return productSetupInfo.poolNftId;
     }
 
 
@@ -533,30 +531,30 @@ contract ProductService is ComponentServiceBase, IProductService {
     {
         // process token transfer(s)
         if(premiumAmount > 0) {
-            // 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;
-            // }
+            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 = productSetupInfo.productFee;
+
+            if (FeeLib.feeIsZero(productFee)) {
+                tokenHandler.transfer(
+                    policyOwner,
+                    poolWallet,
+                    premiumAmount
+                );
+            } else {
+                (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;
+            }
         }
 
         // TODO add logging

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-e1f23dc-329",
+  "version": "0.0.2-e3f4f82-063",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {