@etherisc/gif-next 0.0.2-9b97b55 → 0.0.2-a0d749a

package/contracts/instance/component/IComponent.sol

@@ -1,13 +1,11 @@
 // 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";
 
 interface IComponent {
-
     // TODO decide if enum or uints with constants (as in IRegistry.PRODUCT())
     enum CState {
         Undefined,
@@ -22,74 +20,54 @@ interface IComponent {
     }
 }
 
-
 interface IInstanceLinked {
     // function setInstance(address instance) external;
-    function getInstance() external view returns(IInstance instance);
+    function getInstance() external view returns (IInstance instance);
 }
 
+interface IComponentContract is IRegisterable, IInstanceLinked, IComponent {}
 
-interface IComponentContract is
-    IRegisterable,
-    IInstanceLinked,
-    IComponent
-{ }
+interface IComponentOwnerService is IRegistryLinked {
+    function register(
+        IComponentContract component
+    ) external returns (NftId nftId);
 
-
-interface IComponentOwnerService is IRegistryLinked{
-
-    function register(IComponentContract component) external returns(NftId nftId);
     function lock(IComponentContract component) external;
+
     function unlock(IComponentContract component) external;
 }
 
+interface IComponentModule is IOwnable, IRegistryLinked, IComponent {
+    function registerComponent(
+        IComponentContract component
+    ) external returns (NftId nftId);
 
-interface IComponentModule is
-    IOwnable,
-    IRegistryLinked,
-    IComponent
-{
+    function setComponentInfo(
+        ComponentInfo memory info
+    ) external returns (NftId componentNftId);
 
-    function registerComponent(IComponentContract component)
-        external
-        returns(NftId nftId);
+    function getComponentInfo(
+        NftId nftId
+    ) external view returns (ComponentInfo memory info);
 
-    function setComponentInfo(ComponentInfo memory info)
-        external
-        returns(NftId componentNftId);
+    function getComponentOwner(
+        NftId nftId
+    ) external view returns (address owner);
 
-    function getComponentInfo(NftId nftId)
-        external
-        view
-        returns(ComponentInfo memory info);
+    function getComponentId(
+        address componentAddress
+    ) external view returns (NftId nftId);
 
-    function getComponentOwner(NftId nftId)
-        external
-        view
-        returns(address owner);
+    function getComponentId(uint256 idx) external view returns (NftId nftId);
 
-    function getComponentId(address componentAddress)
-        external
-        view
-        returns(NftId nftId);
+    function getPoolNftId(
+        NftId productNftId
+    ) external view returns (NftId poolNftId);
 
-    function getComponentId(uint256 idx)
-        external
-        view
-        returns(NftId nftId);
-
-    function getPoolNftId(NftId productNftId)
-        external
-        view
-        returns(NftId poolNftId);
-
-    function components()
-        external
-        view
-        returns(uint256 numberOfCompnents);
+    function components() external view returns (uint256 numberOfCompnents);
 
     function getComponentOwnerService()
         external
         view
-        returns(IComponentOwnerService);
-}
+        returns (IComponentOwnerService);
+}

package/contracts/instance/policy/IPolicy.sol

@@ -1,7 +1,6 @@
 // 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";
@@ -9,7 +8,6 @@ import {NftId} from "../../types/NftId.sol";
 
 // TODO check if there is value to introuce IContract and let IPolicy derive from IContract
 interface IPolicy {
-
     enum PolicyState {
         Undefined,
         Applied,
@@ -21,11 +19,9 @@ interface IPolicy {
     struct PolicyInfo {
         NftId nftId;
         PolicyState state; // applied, withdrawn, rejected, active, closed
-
         uint256 sumInsuredAmount;
         uint256 premiumAmount;
         uint256 lifetime; // activatedAt + lifetime >= expiredAt
-
         uint256 createdAt;
         uint256 activatedAt; // time of underwriting
         uint256 expiredAt; // no new claims
@@ -33,12 +29,7 @@ interface IPolicy {
     }
 }
 
-interface IPolicyModule is
-    IOwnable,
-    IRegistryLinked,
-    IPolicy
-{
-
+interface IPolicyModule is IOwnable, IRegistryLinked, IPolicy {
     function createApplication(
         IRegistry.RegistryInfo memory productInfo,
         address applicationOwner,
@@ -46,21 +37,15 @@ interface IPolicyModule is
         uint256 premiumAmount,
         uint256 lifetime,
         NftId bundleNftId
-    )
-        external
-        returns(NftId nftId);
-
-    function activate(NftId nftId)
-        external;
+    ) external returns (NftId nftId);
 
-    function getBundleNftForPolicy(NftId nftId)
-        external
-        view
-        returns(NftId bundleNft);
+    function activate(NftId nftId) external;
 
-    function getPolicyInfo(NftId 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,7 +1,6 @@
 // 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";
 
@@ -9,10 +8,7 @@ import {IProductService} from "../product/IProductService.sol";
 import {IPolicy, IPolicyModule} from "./IPolicy.sol";
 import {NftId, NftIdLib} from "../../types/NftId.sol";
 
-abstract contract PolicyModule is
-    IRegistryLinked,
-    IPolicyModule
-{
+abstract contract PolicyModule is IRegistryLinked, IPolicyModule {
     using NftIdLib for NftId;
 
     mapping(NftId nftId => PolicyInfo info) private _policyInfo;
@@ -22,7 +18,10 @@ abstract contract PolicyModule is
 
     // 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"
+        );
         _;
     }
 
@@ -30,7 +29,6 @@ abstract contract PolicyModule is
         _productService = IProductService(productService);
     }
 
-
     function createApplication(
         IRegistry.RegistryInfo memory productInfo,
         address applicationOwner,
@@ -38,22 +36,20 @@ abstract contract PolicyModule is
         uint256 premiumAmount,
         uint256 lifetime,
         NftId bundleNftId
-    )
-        external
-        override
-        onlyProductService2
-        returns(NftId nftId)
-    {
+    ) external override onlyProductService2 returns (NftId nftId) {
         // TODO add parameter validation
-        if(bundleNftId.gtz()) {
-            IRegistry.RegistryInfo memory bundleInfo = this.getRegistry().getInfo(bundleNftId);
+        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);
+            applicationOwner
+        );
 
         _policyInfo[nftId] = PolicyInfo(
             nftId,
@@ -72,12 +68,7 @@ abstract contract PolicyModule is
         // add logging
     }
 
-
-    function activate(NftId nftId)
-        external
-        override
-        onlyProductService2
-    {
+    function activate(NftId nftId) external override onlyProductService2 {
         PolicyInfo storage info = _policyInfo[nftId];
         info.activatedAt = block.timestamp;
         info.expiredAt = block.timestamp + info.lifetime;
@@ -86,22 +77,15 @@ abstract contract PolicyModule is
         // add logging
     }
 
-
-
-    function getBundleNftForPolicy(NftId nftId)
-        external
-        view
-        returns(NftId bundleNft)
-    {
+    function getBundleNftForPolicy(
+        NftId nftId
+    ) external view returns (NftId bundleNft) {
         return _bundleForPolicy[nftId];
     }
 
-
-    function getPolicyInfo(NftId 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

@@ -5,7 +5,6 @@ import {IOwnable, IRegistry, IRegistryLinked} from "../../registry/IRegistry.sol
 import {NftId} from "../../types/NftId.sol";
 
 interface IPool {
-
     struct PoolInfo {
         NftId nftId;
         address wallet;
@@ -15,27 +14,16 @@ interface IPool {
     }
 }
 
-interface IPoolModule is
-    IOwnable,
-    IRegistryLinked,
-    IPool
-{
-    
-    function underwrite(
-        NftId poolNftId,
-        NftId policyNftId
-    )
-        external;
+interface IPoolModule is IOwnable, IRegistryLinked, IPool {
+    function underwrite(NftId poolNftId, NftId policyNftId) external;
 
     function createPoolInfo(
         NftId nftId,
         address wallet,
         address token
-    )
-        external;
+    ) external;
 
-    function getPoolInfo(NftId nftId)
-        external
-        view
-        returns(PoolInfo memory info);
-}
+    function getPoolInfo(
+        NftId nftId
+    ) external view returns (PoolInfo memory info);
+}

package/contracts/instance/pool/PoolModule.sol

@@ -7,19 +7,20 @@ import {IPolicy, IPolicyModule} from "../policy/IPolicy.sol";
 import {IPoolModule} from "./IPoolModule.sol";
 import {NftId, NftIdLib} from "../../types/NftId.sol";
 
-abstract contract PoolModule is
-    IPoolModule
-{
+abstract contract PoolModule is IPoolModule {
     using NftIdLib for NftId;
-    
-    uint256 public constant INITIAL_CAPITAL = 10000*10**6;
+
+    uint256 public constant INITIAL_CAPITAL = 10000 * 10 ** 6;
 
     mapping(NftId nftId => PoolInfo info) private _poolInfo;
 
     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"
+        );
         _;
     }
 
@@ -31,13 +32,8 @@ abstract contract PoolModule is
         NftId nftId,
         address wallet,
         address token
-    )
-        public
-        override
-    {
-        require(
-            _poolInfo[nftId].nftId.eqz(),
-            "ERROR:PL-001:ALREADY_CREATED");
+    ) public override {
+        require(_poolInfo[nftId].nftId.eqz(), "ERROR:PL-001:ALREADY_CREATED");
 
         _poolInfo[nftId] = PoolInfo(
             nftId,
@@ -46,41 +42,32 @@ abstract contract PoolModule is
             INITIAL_CAPITAL,
             0 // locked capital
         );
-
     }
 
-
     function underwrite(
         NftId poolNftId,
         NftId policyNftId
-    )
-        external
-        override
-        onlyProductService
-    {
+    ) external override onlyProductService {
         PoolInfo storage poolInfo = _poolInfo[poolNftId];
-        require(
-            poolInfo.nftId == poolNftId,
-            "ERROR:PL-002:POOL_UNKNOWN");
+        require(poolInfo.nftId == poolNftId, "ERROR:PL-002:POOL_UNKNOWN");
 
         IPolicyModule policyModule = IPolicyModule(address(this));
-        IPolicy.PolicyInfo memory policyInfo = policyModule.getPolicyInfo(policyNftId);
+        IPolicy.PolicyInfo memory policyInfo = policyModule.getPolicyInfo(
+            policyNftId
+        );
 
         require(
-            poolInfo.capital - poolInfo.lockedCapital >= policyInfo.sumInsuredAmount,
-            "ERROR:PL-003:CAPACITY_TOO_LOW");
+            poolInfo.capital - poolInfo.lockedCapital >=
+                policyInfo.sumInsuredAmount,
+            "ERROR:PL-003:CAPACITY_TOO_LOW"
+        );
 
         poolInfo.lockedCapital += policyInfo.sumInsuredAmount;
     }
 
-
-    function getPoolInfo(NftId 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,30 +1,24 @@
 // 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,
         NftId bundleNftId
-    )
-        external 
-        returns(NftId nftId);
+    ) external returns (NftId nftId);
 
     // function revoke(unit256 nftId) external;
 
     function underwrite(NftId nftId) external;
+
     // function decline(uint256 nftId) external;
     // function expire(uint256 nftId) external;
     function close(NftId nftId) external;
@@ -37,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";
@@ -14,16 +13,10 @@ import {IPoolModule} from "../../instance/pool/IPoolModule.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
-{
+contract ProductService is RegistryLinked, IProductService {
     using NftIdLib for NftId;
-    
-    constructor(address registry) 
-        RegistryLinked(registry)
-    { }
 
+    constructor(address registry) RegistryLinked(registry) {}
 
     function createApplication(
         address applicationOwner,
@@ -31,20 +24,26 @@ contract ProductService is
         uint256 premiumAmount,
         uint256 lifetime,
         NftId bundleNftId
-    )
-        external 
-        override
-        returns(NftId nftId)
-    {
+    ) external override returns (NftId nftId) {
         // 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 == _registry.PRODUCT(), "ERROR_NOT_PRODUCT");
-
-        IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(productInfo.parentNftId);
+        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.gtz(), "ERROR_INSTANCE_UNKNOWN");
-        require(instanceInfo.objectType == _registry.INSTANCE(), "ERROR_NOT_INSTANCE");
+        require(
+            instanceInfo.objectType == _registry.INSTANCE(),
+            "ERROR_NOT_INSTANCE"
+        );
 
         IPolicyModule policyModule = IPolicyModule(instanceInfo.objectAddress);
         nftId = policyModule.createApplication(
@@ -53,34 +52,42 @@ contract ProductService is
             sumInsuredAmount,
             premiumAmount,
             lifetime,
-            bundleNftId);
+            bundleNftId
+        );
 
         // add logging
     }
 
-    function underwrite(NftId nftId)
-        external
-        override
-    {
+    function underwrite(NftId nftId) external override {
         // 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 == _registry.PRODUCT(), "ERROR_NOT_PRODUCT");
-
-        IRegistry.RegistryInfo memory instanceInfo = _registry.getInfo(productInfo.parentNftId);
+        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.gtz(), "ERROR_INSTANCE_UNKNOWN");
-        require(instanceInfo.objectType == _registry.INSTANCE(), "ERROR_NOT_INSTANCE");
+        require(
+            instanceInfo.objectType == _registry.INSTANCE(),
+            "ERROR_NOT_INSTANCE"
+        );
 
         // get responsible pool
-        IComponentModule componentModule = IComponentModule(instanceInfo.objectAddress);
+        IComponentModule componentModule = IComponentModule(
+            instanceInfo.objectAddress
+        );
         NftId poolNftId = componentModule.getPoolNftId(productNftId);
 
         // lock capital (and update pool accounting)
         IPoolModule poolModule = IPoolModule(instanceInfo.objectAddress);
-        poolModule.underwrite(
-            poolNftId,
-            nftId);
+        poolModule.underwrite(poolNftId, nftId);
 
         // activate policy
         IPolicyModule policyModule = IPolicyModule(instanceInfo.objectAddress);
@@ -92,17 +99,14 @@ contract ProductService is
     function close(NftId nftId) external override {}
 }
 
-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;
     }
-
-}
+}