@etherisc/gif-next 0.0.2-d64ea51-772 → 0.0.2-d6f24e1-490

package/contracts/instance/service/PoolService.sol

@@ -7,6 +7,7 @@ import {IInstance} from "../../instance/IInstance.sol";
 import {IBundle} from "../../instance/module/IBundle.sol";
 import {TokenHandler} from "../../instance/module/ITreasury.sol";
 import {ISetup} from "../module/ISetup.sol";
+import {IPolicy} from "../module/IPolicy.sol";
 
 import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
@@ -18,17 +19,17 @@ import {POOL_OWNER_ROLE, RoleId} from "../../types/RoleId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 import {KEEP_STATE, StateId} from "../../types/StateId.sol";
-import {zeroTimestamp} from "../../types/Timestamp.sol";
+import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
 
 import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
+import {BundleManager} from "../BundleManager.sol";
 import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IPoolService} from "./IPoolService.sol";
 import {IRegistryService} from "../../registry/IRegistryService.sol";
 import {InstanceService} from "../InstanceService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
 
-
 string constant POOL_SERVICE_NAME = "PoolService";
 
 contract PoolService is 
@@ -134,15 +135,14 @@ contract PoolService is
         // create bundle info in instance
         instance.createBundle(bundleNftId, bundleInfo);
 
-        // TODO add bundle to pool in instance
+        BundleManager bundleManager = instance.getBundleManager();
+        bundleManager.add(bundleNftId);
         
-        // TODO collect capital
-        // _processStakingByTreasury(
-        //     instanceReader,
-        //     zeroNftId(),
-        //     poolNftId,
-        //     bundleNftId,
-        //     stakingAmount);
+        _processStakingByTreasury(
+            instanceReader,
+            poolNftId,
+            bundleNftId,
+            stakingAmount);
 
         // TODO add logging
     }
@@ -176,9 +176,88 @@ contract PoolService is
         instance.updateBundle(bundleNftId, bundleInfo, state);
     } 
 
+    function lockBundle(NftId bundleNftId) 
+        external
+    {
+        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        BundleManager bundleManager = instance.getBundleManager();
+        bundleManager.lock(bundleNftId);
+    }
+
+    function unlockBundle(NftId bundleNftId) 
+        external
+    {
+        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        BundleManager bundleManager = instance.getBundleManager();
+        bundleManager.unlock(bundleNftId);
+    }
+
+    function underwritePolicy(IInstance instance,
+        NftId policyNftId, 
+        NftId bundleNftId, 
+        uint256 collateralAmount,
+        uint256 netPremiumAmount
+    ) 
+        external
+        onlyService 
+    {
+        InstanceReader instanceReader = instance.getInstanceReader();
+        IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
+
+        // lock collateral
+        bundleInfo.lockedAmount += collateralAmount;
+        bundleInfo.balanceAmount += netPremiumAmount;
+
+        instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
+        
+        linkPolicy(instance, policyNftId);
+    }
+
+    /// @dev links policy to bundle
+    function linkPolicy(IInstance instance, NftId policyNftId) 
+        internal
+        onlyService 
+    {
+        InstanceReader instanceReader = instance.getInstanceReader();
+        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+
+        // ensure policy has not yet been activated
+        if (policyInfo.activatedAt.gtz()) {
+            revert BundleManager.ErrorBundleManagerErrorPolicyAlreadyActivated(policyNftId);
+        }
+        
+        BundleManager bundleManager = instance.getBundleManager();
+        bundleManager.linkPolicy(policyNftId);
+    }
+
+        /// @dev unlinks policy from bundle
+    function unlinkPolicy(IInstance instance, NftId policyNftId) 
+        internal
+        onlyService 
+    {
+        InstanceReader instanceReader = instance.getInstanceReader();
+        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+
+        // ensure policy has no open claims
+        if (policyInfo.openClaimsCount > 0) {
+            revert BundleManager.ErrorBundleManagerPolicyWithOpenClaims(
+                policyNftId, 
+                policyInfo.openClaimsCount);
+        }
+
+        // ensure policy is closeable
+        if (policyInfo.expiredAt < TimestampLib.blockTimestamp()
+            || policyInfo.payoutAmount < policyInfo.sumInsuredAmount)
+        {
+            revert BundleManager.ErrorBundleManagerPolicyNotCloseable(policyNftId);
+        }
+        
+        BundleManager bundleManager = instance.getBundleManager();
+        bundleManager.unlinkPolicy(policyNftId);
+    }
+
     function _processStakingByTreasury(
         InstanceReader instanceReader,
-        NftId productNftId,
         NftId poolNftId,
         NftId bundleNftId,
         uint256 stakingAmount
@@ -187,15 +266,22 @@ contract PoolService is
     {
         // process token transfer(s)
         if(stakingAmount > 0) {
-            TokenHandler tokenHandler = TokenHandler(instanceReader.getTokenHandler(productNftId));
-            address bundleOwner = getRegistry().ownerOf(bundleNftId);
             ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
-            
+            TokenHandler tokenHandler = poolInfo.tokenHandler;
+            address bundleOwner = getRegistry().ownerOf(bundleNftId);
+            Fee memory stakingFee = poolInfo.stakingFee;
+
             tokenHandler.transfer(
                 bundleOwner,
                 poolInfo.wallet,
                 stakingAmount
             );
+
+
+            if (! FeeLib.feeIsZero(stakingFee)) {
+                (uint256 stakingFeeAmount, uint256 netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount);
+                // TODO: track staking fees in pool's state (issue #177)
+            }
         }
     }
 }

package/contracts/instance/service/ProductService.sol

@@ -323,8 +323,7 @@ contract ProductService is ComponentServiceBase, IProductService {
         returns (IBundle.BundleInfo memory)
     {
         bundleInfo.lockedAmount += collateralAmount;
-        // FIXME: this
-        // instance.collateralizePolicy(bundleNftId, policyNftId, collateralAmount);
+        // TODO: track policy associated to bundle in bundlemanager (tbd) and how much is locked for it
         return bundleInfo;
     }
 
@@ -381,9 +380,11 @@ contract ProductService is ComponentServiceBase, IProductService {
         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,
@@ -396,6 +397,15 @@ contract ProductService is ComponentServiceBase, IProductService {
             );
         }
 
+
+        // lock bundle collateral
+        bundleInfo = _lockCollateralInBundle(
+            instance,
+            bundleNftId,
+            bundleInfo,
+            policyNftId, 
+            collateralAmount);
+        
         // lock bundle collateral
         bundleInfo = _lockCollateralInBundle(
             instance,
@@ -414,28 +424,25 @@ contract ProductService is ComponentServiceBase, IProductService {
 
         // optional collection of premium
         if(requirePremiumPayment) {
-            uint256 netPremiumAmount = _processPremiumByTreasury(
+            netPremiumAmount = _processPremiumByTreasury(
                 instance, 
                 productInfo.nftId,
                 policyNftId, 
                 policyInfo.premiumAmount);
 
             policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
-            bundleInfo.balanceAmount += netPremiumAmount;
         }
 
+        _poolService.underwritePolicy(instance, policyNftId, bundleNftId, collateralAmount, netPremiumAmount);
         instance.updatePolicy(policyNftId, policyInfo, newPolicyState);
-        _poolService.updateBundle(productInfo.parentNftId, bundleNftId, bundleInfo, KEEP_STATE());
 
         // involve pool if necessary
         {
-            NftId poolNftId = bundleInfo.poolNftId;
-            ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
+            ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(bundleInfo.poolNftId);
 
-            // FIXME: use poolInfo.isVerifying ???
-            if(poolInfo.isIntercepting) {
+            if(poolInfo.isConfirmingApplication) {
                 _underwriteByPool(
-                    poolNftId,
+                    bundleInfo.poolNftId,
                     policyNftId,
                     policyInfo,
                     bundleInfo.filter,

package/contracts/types/NftIdSet.sol

@@ -11,35 +11,37 @@ library LibNftIdSet {
         mapping(NftId nftid => uint256 index) at;
     }
 
-    function add(Set storage set, NftId nftId) external returns(bool added) {
-        if (set.at[nftId] == 0) {
-            set.ids.push(nftId);
-            set.at[nftId] = set.ids.length;
-            return true;
-        } else {
-            return false;
+    error ErrorNftIdSetAlreadyAdded(NftId nftId);
+    error ErrorNftIdSetNotInSet(NftId nftId);
+
+
+    function add(Set storage set, NftId nftId) external {
+        if (set.at[nftId] > 0) {
+            revert ErrorNftIdSetAlreadyAdded(nftId);
         }
+
+        set.ids.push(nftId);
+        set.at[nftId] = set.ids.length;
     }
 
-    function remove(Set storage set, NftId nftId) external returns(bool removed) {
+    function remove(Set storage set, NftId nftId) external {
         uint256 nftIdIndex = set.at[nftId];
 
-        if (nftIdIndex > 0) {
-            uint256 toDeleteIndex = nftIdIndex - 1;
-            uint256 lastIndex = set.ids.length - 1;
-
-            if (lastIndex != toDeleteIndex) {
-                NftId lastId = set.ids[lastIndex];
-                set.ids[toDeleteIndex] = lastId;
-                set.at[lastId] = nftIdIndex; // Replace lastValue's index to valueIndex
-            }
-
-            set.ids.pop();
-            delete set.at[nftId];
-            return true;
-        } else {
-            return false;
+        if (nftIdIndex == 0) {
+            revert ErrorNftIdSetNotInSet(nftId);
         }
+
+        uint256 toDeleteIndex = nftIdIndex - 1;
+        uint256 lastIndex = set.ids.length - 1;
+
+        if (lastIndex != toDeleteIndex) {
+            NftId lastId = set.ids[lastIndex];
+            set.ids[toDeleteIndex] = lastId;
+            set.at[lastId] = nftIdIndex; // Replace lastValue's index to valueIndex
+        }
+
+        set.ids.pop();
+        delete set.at[nftId];
     }
 
     function isEmpty(Set storage set) external view returns(bool empty) {
@@ -50,7 +52,7 @@ library LibNftIdSet {
         return set.at[nftId] > 0;
     }
 
-    function getLength(Set storage set) external view returns(uint256 length) {
+    function size(Set storage set) external view returns(uint256 length) {
         return set.ids.length;
     }
 

package/package.json

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

package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/6e730571a8919f24f85e81e92f606870.json"
-}

package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/6e730571a8919f24f85e81e92f606870.json"
-}