@etherisc/gif-next 0.0.2-e6a90b9 → 0.0.2-e6ad61d-739

package/contracts/instance/policy/IPolicy.sol

@@ -1,66 +1,50 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-
 import {IOwnable, IRegistryLinked, IRegisterable, IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
-
 import {IProductService} from "../product/IProductService.sol";
+import {NftId} from "../../types/NftId.sol";
+import {StateId} from "../../types/StateId.sol";
 
 // TODO check if there is value to introuce IContract and let IPolicy derive from IContract
 interface IPolicy {
-
-    enum PolicyState {
-        Undefined,
-        Applied,
-        Rejected,
-        Active,
-        Closed
-    }
-
     struct PolicyInfo {
-        uint256 nftId;
-        PolicyState state; // applied, withdrawn, rejected, active, closed
-
+        NftId nftId;
+        StateId state; // applied, withdrawn, rejected, active, closed
+        // TODO add beneficiary address
         uint256 sumInsuredAmount;
         uint256 premiumAmount;
+        uint256 premiumPaidAmount;
         uint256 lifetime; // activatedAt + lifetime >= expiredAt
-
         uint256 createdAt;
+        uint256 updatedAt;
         uint256 activatedAt; // time of underwriting
         uint256 expiredAt; // no new claims
         uint256 closedAt; // no locked capital
     }
 }
 
-interface IPolicyModule is
-    IOwnable,
-    IRegistryLinked,
-    IPolicy
-{
-
+interface IPolicyModule is IOwnable, IRegistryLinked, IPolicy {
     function createApplication(
         IRegistry.RegistryInfo memory productInfo,
         address applicationOwner,
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
-    )
-        external
-        returns(uint256 nftId);
+        NftId bundleNftId
+    ) external returns (NftId nftId);
 
-    function activate(uint256 nftId)
-        external;
+    // process full premium
+    function processPremium(NftId nftId) external;
 
-    function getBundleNftForPolicy(uint256 nftId)
-        external
-        view
-        returns(uint256 bundleNft);
+    function activate(NftId nftId) external;
 
-    function getPolicyInfo(uint256 nftId)
-        external
-        view
-        returns(PolicyInfo memory info);
+    function getBundleNftForPolicy(
+        NftId nftId
+    ) external view returns (NftId bundleNft);
 
+    function getPolicyInfo(
+        NftId nftId
+    ) external view returns (PolicyInfo memory info);
 }

package/contracts/instance/policy/PolicyModule.sol

@@ -1,66 +1,74 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-
 // import {IOwnable, IRegistryLinked, IRegisterable} from "../../registry/IRegistry.sol";
 import {IRegistry, IRegistryLinked} from "../../registry/IRegistry.sol";
 
+import {LifecycleModule} from "../lifecycle/LifecycleModule.sol";
 import {IProductService} from "../product/IProductService.sol";
 import {IPolicy, IPolicyModule} from "./IPolicy.sol";
+import {ObjectType, POLICY} from "../../types/ObjectType.sol";
+import {ACTIVE} from "../../types/StateId.sol";
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
+import {LifecycleModule} from "../lifecycle/LifecycleModule.sol";
 
-abstract contract PolicyModule is
-    IRegistryLinked,
-    IPolicyModule
-{
+abstract contract PolicyModule is IRegistryLinked, IPolicyModule {
+    using NftIdLib for NftId;
 
-    mapping(uint256 nftId => PolicyInfo info) private _policyInfo;
-    mapping(uint256 nftId => uint256 bundleNftId) private _bundleForPolicy;
+    mapping(NftId nftId => PolicyInfo info) private _policyInfo;
+    mapping(NftId nftId => NftId bundleNftId) private _bundleForPolicy;
 
+    LifecycleModule private _lifecycleModule;
     IProductService private _productService;
 
     // TODO find a better place to avoid dupliation
     modifier onlyProductService2() {
-        require(address(_productService) == msg.sender, "ERROR:POL-001:NOT_PRODUCT_SERVICE");
+        require(
+            address(_productService) == msg.sender,
+            "ERROR:POL-001:NOT_PRODUCT_SERVICE"
+        );
         _;
     }
 
     constructor(address productService) {
+        _lifecycleModule = LifecycleModule(address(this));
         _productService = IProductService(productService);
     }
 
-
     function createApplication(
         IRegistry.RegistryInfo memory productInfo,
         address applicationOwner,
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
-    )
-        external
-        override
-        onlyProductService2
-        returns(uint256 nftId)
-    {
+        NftId bundleNftId
+    ) external override onlyProductService2 returns (NftId nftId) {
         // TODO add parameter validation
-        if(bundleNftId > 0) {
-            IRegistry.RegistryInfo memory bundleInfo = this.getRegistry().getInfo(bundleNftId);
-            IRegistry.RegistryInfo memory poolInfo = this.getRegistry().getInfo(bundleInfo.parentNftId);
+        if (bundleNftId.gtz()) {
+            // IRegistry.RegistryInfo memory bundleInfo = this
+            //     .getRegistry()
+            //     .getInfo(bundleNftId);
+            // IRegistry.RegistryInfo memory poolInfo = this.getRegistry().getInfo(bundleInfo.parentNftId);
         }
 
         nftId = this.getRegistry().registerObjectForInstance(
             productInfo.nftId,
-            this.getRegistry().POLICY(),
-            applicationOwner);
+            POLICY(),
+            applicationOwner
+        );
 
         _policyInfo[nftId] = PolicyInfo(
             nftId,
-            PolicyState.Applied,
+            _lifecycleModule.getInitialState(POLICY()),
             sumInsuredAmount,
             premiumAmount,
+            0, // premium paid amount
             lifetime,
-            block.timestamp,
+            // solhint-disable-next-line not-rely-on-time
+            block.timestamp, // createdAt
+            // solhint-disable-next-line not-rely-on-time
+            block.timestamp, // updatedAt
             0, // activatedAt
             0, // expiredAt
             0 // closedAt
@@ -71,36 +79,36 @@ abstract contract PolicyModule is
         // add logging
     }
 
+    function processPremium(NftId nftId) external override onlyProductService2 {
+        PolicyInfo storage info = _policyInfo[nftId];
+        info.premiumPaidAmount = info.premiumAmount;
+        // solhint-disable-next-line not-rely-on-time
+        info.updatedAt = block.timestamp;
+    }
 
-    function activate(uint256 nftId)
-        external
-        override
-        onlyProductService2
-    {
+    function activate(NftId nftId) external override onlyProductService2 {
         PolicyInfo storage info = _policyInfo[nftId];
+        // solhint-disable-next-line not-rely-on-time
         info.activatedAt = block.timestamp;
+        // solhint-disable-next-line not-rely-on-time
         info.expiredAt = block.timestamp + info.lifetime;
-        info.state = PolicyState.Active;
-
-        // add logging
+        info.state = _lifecycleModule.checkAndLogTransition(
+            nftId,
+            POLICY(),
+            info.state,
+            ACTIVE()
+        );
     }
 
-
-
-    function getBundleNftForPolicy(uint256 nftId)
-        external
-        view
-        returns(uint256 bundleNft)
-    {
+    function getBundleNftForPolicy(
+        NftId nftId
+    ) external view returns (NftId bundleNft) {
         return _bundleForPolicy[nftId];
     }
 
-
-    function getPolicyInfo(uint256 nftId)
-        external
-        view
-        returns(PolicyInfo memory info)
-    {
+    function getPolicyInfo(
+        NftId nftId
+    ) external view returns (PolicyInfo memory info) {
         return _policyInfo[nftId];
     }
 }

package/contracts/instance/pool/IPoolModule.sol

@@ -2,39 +2,22 @@
 pragma solidity ^0.8.19;
 
 import {IOwnable, IRegistry, IRegistryLinked} from "../../registry/IRegistry.sol";
+import {NftId} from "../../types/NftId.sol";
 
 interface IPool {
-
     struct PoolInfo {
-        uint256 nftId;
-        address wallet;
-        address token;
+        NftId nftId;
         uint256 capital;
         uint256 lockedCapital;
     }
 }
 
-interface IPoolModule is
-    IOwnable,
-    IRegistryLinked,
-    IPool
-{
-    
-    function underwrite(
-        uint256 poolNftId,
-        uint256 policyNftId
-    )
-        external;
+interface IPoolModule is IOwnable, IRegistryLinked, IPool {
+    function underwrite(NftId policyNftId, NftId productNftId) external;
 
-    function createPoolInfo(
-        uint256 nftId,
-        address wallet,
-        address token
-    )
-        external;
+    function registerPool(NftId nftId) external;
 
-    function getPoolInfo(uint256 nftId)
-        external
-        view
-        returns(PoolInfo memory info);
-}
+    function getPoolInfo(
+        NftId nftId
+    ) external view returns (PoolInfo memory info);
+}

package/contracts/instance/pool/PoolModule.sol

@@ -4,80 +4,78 @@ pragma solidity ^0.8.19;
 import {IOwnable, IRegistry, IRegistryLinked} from "../../registry/IRegistry.sol";
 import {IProductService} from "../product/IProductService.sol";
 import {IPolicy, IPolicyModule} from "../policy/IPolicy.sol";
+import {ITreasuryModule} from "../treasury/ITreasury.sol";
 import {IPoolModule} from "./IPoolModule.sol";
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
-abstract contract PoolModule is
-    IPoolModule
-{
-    uint256 public constant INITIAL_CAPITAL = 10000*10**6;
+abstract contract PoolModule is IPoolModule {
+    using NftIdLib for NftId;
 
-    mapping(uint256 nftId => PoolInfo info) private _poolInfo;
+    uint256 public constant INITIAL_CAPITAL = 10000 * 10 ** 6;
+    uint256 public constant INITIAL_LOCKED_CAPITAL = 0;
 
+    mapping(NftId nftId => PoolInfo info) private _poolInfo;
+
+    IPolicyModule private _policyModule;
+    ITreasuryModule private _treasuryModule;
     IProductService private _productService;
 
     modifier onlyProductService() {
-        require(address(_productService) == msg.sender, "ERROR:POL-001:NOT_PRODUCT_SERVICE");
+        require(
+            address(_productService) == msg.sender,
+            "ERROR:POL-001:NOT_PRODUCT_SERVICE"
+        );
         _;
     }
 
     constructor(address productService) {
+        _policyModule = IPolicyModule(address(this));
+        _treasuryModule = ITreasuryModule(address(this));
         _productService = IProductService(productService);
     }
 
-    function createPoolInfo(
-        uint256 nftId,
-        address wallet,
-        address token
-    )
-        public
-        override
-    {
-        require(
-            _poolInfo[nftId].nftId == 0,
-            "ERROR:PL-001:ALREADY_CREATED");
+    function registerPool(NftId nftId) public override {
+        require(_poolInfo[nftId].nftId.eqz(), "ERROR:PL-001:ALREADY_CREATED");
 
         _poolInfo[nftId] = PoolInfo(
             nftId,
-            wallet,
-            token,
             INITIAL_CAPITAL,
-            0 // locked capital
+            INITIAL_LOCKED_CAPITAL
         );
-
     }
 
-
     function underwrite(
-        uint256 poolNftId,
-        uint256 policyNftId
-    )
-        external
-        override
-        onlyProductService
-    {
-        PoolInfo storage poolInfo = _poolInfo[poolNftId];
+        NftId policyNftId,
+        NftId productNftId
+    ) external override onlyProductService {
+        IPolicy.PolicyInfo memory policyInfo = _policyModule.getPolicyInfo(
+            policyNftId
+        );
+        require(policyInfo.nftId == policyNftId, "ERROR:PL-002:POLICY_UNKNOWN");
+
+        ITreasuryModule.ProductSetup memory product = _treasuryModule
+            .getProductSetup(productNftId);
         require(
-            poolInfo.nftId == poolNftId,
-            "ERROR:PL-002:POOL_UNKNOWN");
+            product.productNftId == productNftId,
+            "ERROR:PL-003:PRODUCT_SETUP_MISSING"
+        );
 
-        IPolicyModule policyModule = IPolicyModule(address(this));
-        IPolicy.PolicyInfo memory policyInfo = policyModule.getPolicyInfo(policyNftId);
+        NftId poolNftId = product.poolNftId;
+        PoolInfo storage poolInfo = _poolInfo[poolNftId];
+        require(poolInfo.nftId == poolNftId, "ERROR:PL-004:POOL_UNKNOWN");
 
         require(
-            poolInfo.capital - poolInfo.lockedCapital >= policyInfo.sumInsuredAmount,
-            "ERROR:PL-003:CAPACITY_TOO_LOW");
+            poolInfo.capital - poolInfo.lockedCapital >=
+                policyInfo.sumInsuredAmount,
+            "ERROR:PL-005:CAPACITY_TOO_LOW"
+        );
 
         poolInfo.lockedCapital += policyInfo.sumInsuredAmount;
     }
 
-
-    function getPoolInfo(uint256 nftId)
-        external
-        view
-        override
-        returns(PoolInfo memory info)
-    {
+    function getPoolInfo(
+        NftId nftId
+    ) external view override returns (PoolInfo memory info) {
         info = _poolInfo[nftId];
     }
-
-}
+}

package/contracts/instance/product/IProductService.sol

@@ -1,34 +1,29 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-
 import {IOwnable, IRegistryLinked, IRegisterable} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
-
+import {NftId} from "../../types/NftId.sol";
 
 // TODO or name this IProtectionService to have Product be something more generic (loan, savings account, ...)
-interface IProductService is
-    IRegistryLinked
-{
-
+interface IProductService is IRegistryLinked {
     function createApplication(
         address applicationOwner,
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
-    )
-        external 
-        returns(uint256 nftId);
+        NftId bundleNftId
+    ) external returns (NftId nftId);
 
     // function revoke(unit256 nftId) external;
 
-    function underwrite(uint256 nftId) external;
+    function underwrite(NftId nftId) external;
+
     // function decline(uint256 nftId) external;
     // function expire(uint256 nftId) external;
-    function close(uint256 nftId) external;
+    function close(NftId nftId) external;
 
-    // function collectPremium(uint256 nftId, uint256 premiumAmount) external;
+    function collectPremium(NftId nftId) external;
 
     // function createClaim(uint256 nftId, uint256 claimAmount) external;
     // function confirmClaim(uint256 nftId, uint256 claimId, uint256 claimAmount) external;
@@ -36,10 +31,6 @@ interface IProductService is
     // function closeClaim(uint256 nftId, uint256 claimId) external;
 }
 
-
-interface IProductModule is
-    IOwnable,
-    IRegistryLinked
-{
-    function getProductService() external view returns(IProductService);
+interface IProductModule is IOwnable, IRegistryLinked {
+    function getProductService() external view returns (IProductService);
 }

package/contracts/instance/product/ProductService.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-
 // import {IProduct} from "../../components/IProduct.sol";
 // import {IOwnable, IRegistryLinked, IRegisterable, IRegistry} from "../../registry/IRegistry.sol";
 // import {IInstance} from "../IInstance.sol";
@@ -9,39 +8,42 @@ import {IRegistry} from "../../registry/IRegistry.sol";
 import {IPolicyModule} from "../policy/IPolicy.sol";
 import {RegistryLinked} from "../../registry/Registry.sol";
 import {IProductService, IProductModule} from "./IProductService.sol";
-import {IComponentModule} from "../../instance/component/IComponent.sol";
+import {ITreasuryModule} from "../../instance/treasury/ITreasury.sol";
 import {IPoolModule} from "../../instance/pool/IPoolModule.sol";
+import {ObjectType, INSTANCE, PRODUCT} from "../../types/ObjectType.sol";
+import {NftId, NftIdLib} from "../../types/NftId.sol";
 
 // TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
-contract ProductService is
-    RegistryLinked,
-    IProductService
-{
-    constructor(address registry) 
-        RegistryLinked(registry)
-    { }
+contract ProductService is RegistryLinked, IProductService {
+    using NftIdLib for NftId;
 
+    constructor(
+        address registry
+    ) RegistryLinked(registry) // solhint-disable-next-line no-empty-blocks
+    {
+
+    }
 
     function createApplication(
         address applicationOwner,
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
-        uint256 bundleNftId
-    )
-        external 
-        override
-        returns(uint256 nftId)
-    {
+        NftId bundleNftId
+    ) external override returns (NftId nftId) {
         // same as only registered product
-        uint256 productNftId = _registry.getNftId(msg.sender);
-        require(productNftId > 0, "ERROR_PRODUCT_UNKNOWN");
-        IRegistry.RegistryInfo memory productInfo = _registry.getInfo(productNftId);
-        require(productInfo.objectType == _registry.PRODUCT(), "ERROR_NOT_PRODUCT");
-
-        IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(productInfo.parentNftId);
-        require(instanceInfo.nftId > 0, "ERROR_INSTANCE_UNKNOWN");
-        require(instanceInfo.objectType == _registry.INSTANCE(), "ERROR_NOT_INSTANCE");
+        NftId productNftId = _registry.getNftId(msg.sender);
+        require(productNftId.gtz(), "ERROR_PRODUCT_UNKNOWN");
+        IRegistry.RegistryInfo memory productInfo = _registry.getInfo(
+            productNftId
+        );
+        require(productInfo.objectType == PRODUCT(), "ERROR_NOT_PRODUCT");
+
+        IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(
+            productInfo.parentNftId
+        );
+        require(instanceInfo.nftId.gtz(), "ERROR_INSTANCE_UNKNOWN");
+        require(instanceInfo.objectType == INSTANCE(), "ERROR_NOT_INSTANCE");
 
         IPolicyModule policyModule = IPolicyModule(instanceInfo.objectAddress);
         nftId = policyModule.createApplication(
@@ -50,56 +52,85 @@ contract ProductService is
             sumInsuredAmount,
             premiumAmount,
             lifetime,
-            bundleNftId);
+            bundleNftId
+        );
 
         // add logging
     }
 
-    function underwrite(uint256 nftId)
-        external
-        override
-    {
+    function underwrite(NftId policyNftId) external override {
+        // validation
         // same as only registered product
-        uint256 productNftId = _registry.getNftId(msg.sender);
-        require(productNftId > 0, "ERROR_PRODUCT_UNKNOWN");
-        IRegistry.RegistryInfo memory productInfo = _registry.getInfo(productNftId);
-        require(productInfo.objectType == _registry.PRODUCT(), "ERROR_NOT_PRODUCT");
-
-        IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(productInfo.parentNftId);
-        require(instanceInfo.nftId > 0, "ERROR_INSTANCE_UNKNOWN");
-        require(instanceInfo.objectType == _registry.INSTANCE(), "ERROR_NOT_INSTANCE");
-
-        // get responsible pool
-        IComponentModule componentModule = IComponentModule(instanceInfo.objectAddress);
-        uint256 poolNftId = componentModule.getPoolNftId(productNftId);
-
-        // lock capital (and update pool accounting)
-        IPoolModule poolModule = IPoolModule(instanceInfo.objectAddress);
-        poolModule.underwrite(
-            poolNftId,
-            nftId);
+        NftId productNftId = _registry.getNftId(msg.sender);
+        require(productNftId.gtz(), "ERROR_PRODUCT_UNKNOWN");
+        IRegistry.RegistryInfo memory productInfo = _registry.getInfo(
+            productNftId
+        );
+        require(productInfo.objectType == PRODUCT(), "ERROR_NOT_PRODUCT");
+
+        IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(
+            productInfo.parentNftId
+        );
+        require(instanceInfo.nftId.gtz(), "ERROR_INSTANCE_UNKNOWN");
+        require(instanceInfo.objectType == INSTANCE(), "ERROR_NOT_INSTANCE");
+
+        // underwrite policy
+        address instanceAddress = instanceInfo.objectAddress;
+        IPoolModule poolModule = IPoolModule(instanceAddress);
+        poolModule.underwrite(policyNftId, productNftId);
 
         // activate policy
-        IPolicyModule policyModule = IPolicyModule(instanceInfo.objectAddress);
-        policyModule.activate(nftId);
+        IPolicyModule policyModule = IPolicyModule(instanceAddress);
+        policyModule.activate(policyNftId);
 
         // add logging
     }
 
-    function close(uint256 nftId) external override {}
+    function collectPremium(NftId policyNftId) external override {
+        // validation same as other functions, eg underwrite
+        // TODO unify validation into modifier and/or other suitable approaches
+        // same as only registered product
+        NftId productNftId = _registry.getNftId(msg.sender);
+        require(productNftId.gtz(), "ERROR_PRODUCT_UNKNOWN");
+        IRegistry.RegistryInfo memory productInfo = _registry.getInfo(
+            productNftId
+        );
+        require(productInfo.objectType == PRODUCT(), "ERROR_NOT_PRODUCT");
+
+        IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(
+            productInfo.parentNftId
+        );
+        require(instanceInfo.nftId.gtz(), "ERROR_INSTANCE_UNKNOWN");
+        require(instanceInfo.objectType == INSTANCE(), "ERROR_NOT_INSTANCE");
+
+        // process/collect premium: book keeping for policy
+        address instanceAddress = instanceInfo.objectAddress;
+        IPolicyModule policyModule = IPolicyModule(instanceAddress);
+        policyModule.processPremium(policyNftId);
+
+        // process/collect premium: actual token transfer
+        ITreasuryModule treasuryModule = ITreasuryModule(instanceAddress);
+        treasuryModule.processPremium(policyNftId, productNftId);
+
+        // TODO add logging
+    }
+
+    function close(
+        NftId policyNftId
+    ) external override // solhint-disable-next-line no-empty-blocks
+    {
+
+    }
 }
 
-abstract contract ProductModule is
-    IProductModule
-{
+abstract contract ProductModule is IProductModule {
     IProductService private _productService;
 
     constructor(address productService) {
         _productService = IProductService(productService);
     }
 
-    function getProductService() external view returns(IProductService) {
+    function getProductService() external view returns (IProductService) {
         return _productService;
     }
-
-}
+}