@etherisc/gif-next 0.0.2-f12cf4d-104 → 0.0.2-f13d67f-541

package/contracts/pool/PoolServiceManager.sol

@@ -17,7 +17,7 @@ contract PoolServiceManager is ProxyManager {
     ) 
     {
         PoolService poolSrv = new PoolService{salt: salt}();
-        bytes memory data = abi.encode(registry, authority);
+        bytes memory data = abi.encode(authority, registry);
         IVersionable versionable = initialize(
             registry,
             address(poolSrv), 

package/contracts/product/ApplicationService.sol

@@ -11,6 +11,7 @@ import {IPricingService} from "./IPricingService.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
 
 import {AmountLib} from "../type/Amount.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {zeroTimestamp} from "../type/Timestamp.sol";
 import {ObjectType, BUNDLE, DISTRIBUTION, PRODUCT, REGISTRY, APPLICATION, POLICY, PRICE} from "../type/ObjectType.sol";
@@ -19,13 +20,12 @@ import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
+import {Service} from "../shared/Service.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 
 
-
 contract ApplicationService is 
-    ComponentVerifyingService, 
+    Service, 
     IApplicationService
 {
     IDistributionService private _distributionService;
@@ -41,11 +41,11 @@ contract ApplicationService is
         initializer()
     {
         (
-            address registryAddress,
-            address authority
+            address authority,
+            address registry
         ) = abi.decode(data, (address, address));
 
-        _initializeService(registryAddress, authority, owner);
+        __Service_init(authority, registry, owner);
 
         _distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));
         _pricingService = IPricingService(_getServiceAddress(PRICE()));
@@ -55,10 +55,10 @@ contract ApplicationService is
     }
 
 
-    function _checkLinkedpplicationParameters(
+    function _checkLinkedApplicationParameters(
         InstanceReader instanceReader,
         NftId productNftId,
-        RiskId rirskId,
+        RiskId riskId,
         ReferralId referralId,
         NftId bundleNftId
     )
@@ -66,17 +66,32 @@ contract ApplicationService is
         virtual
         view
     {
-        IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
-
-        // TODO check riskId with product
-
-        // TODO check referral with distribution
+        // check risk with product
+        (bool exists, bool active) = instanceReader.getRiskSet().checkRisk(productNftId, riskId);
+        if (!exists) { revert ErrorApplicationServiceRiskUnknown(riskId, productNftId); }
+        if (!active) { revert ErrorApplicationServiceRiskLocked(riskId, productNftId); }
+
+        NftId riskProductNftId = instanceReader.getRiskInfo(riskId).productNftId;
+        if (productNftId != riskProductNftId) {
+            revert ErrorApplicationServiceRiskProductMismatch(riskId, riskProductNftId, productNftId);
+        }
 
         // check bundle with pool
-        NftId productPoolNftId = productInfo.poolNftId;
-        NftId bundlePoolNftId = instanceReader.getBundleInfo(bundleNftId).poolNftId;
-        if(bundlePoolNftId != productPoolNftId) {
-            revert ErrorApplicationServiceBundlePoolMismatch(bundleNftId, productPoolNftId, bundlePoolNftId);
+        IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
+        {
+            NftId poolNftId = productInfo.poolNftId;
+            (exists, active) = instanceReader.getBundleSet().checkBundle(poolNftId, bundleNftId);
+            if (!exists) { revert ErrorApplicationServiceBundleUnknown(bundleNftId, poolNftId); }
+            if (!active) { revert ErrorApplicationServiceBundleLocked(bundleNftId, poolNftId); }
+        }
+
+        // check referral with distribution
+        {
+            if (productInfo.hasDistribution && ! referralId.eqz()) {
+                if (!_distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
+                    revert ErrorApplicationServiceReferralInvalid(productNftId, productInfo.distributionNftId, referralId);
+                }
+            }
         }
     }
 
@@ -134,16 +149,17 @@ contract ApplicationService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
         returns (NftId applicationNftId)
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveProduct();
 
         // check if provided references are valid and linked to calling product contract
         InstanceReader instanceReader = instance.getInstanceReader();
-        _checkLinkedpplicationParameters(
+        _checkLinkedApplicationParameters(
             instanceReader,
             productNftId,
             riskId,
@@ -165,11 +181,32 @@ contract ApplicationService is
             applicationData);
 
         // register application with instance
-        instance.getInstanceStore().createApplication(
+        instance.getProductStore().createApplication(
             applicationNftId, 
             applicationInfo);
 
-        // TODO: add logging
+        _emitApplicationCreatedEvent(applicationNftId, applicationOwner, applicationInfo);
+    }
+
+    function _emitApplicationCreatedEvent(
+        NftId applicationNftId,
+        address applicationOwner,
+        IPolicy.PolicyInfo memory applicationInfo
+    )
+        internal
+        virtual
+    {
+        emit LogApplicationServiceApplicationCreated(
+            applicationNftId,
+            applicationInfo.productNftId,
+            applicationInfo.bundleNftId, 
+            applicationInfo.riskId,
+            applicationInfo.referralId,
+            applicationOwner,
+            applicationInfo.sumInsuredAmount,
+            applicationInfo.premiumAmount,
+            applicationInfo.lifetime
+        );
     }
 
     function _createApplicationInfo(
@@ -212,12 +249,16 @@ contract ApplicationService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
         returns (NftId applicationNftId)
     {
         _checkNftType(policyNftId, POLICY());
         _checkNftType(bundleNftId, BUNDLE());
-        // TODO implement
+        
+        // TODO: implement
+
+        emit LogApplicationServiceApplicationRenewed(policyNftId, bundleNftId);
     }
 
 
@@ -232,26 +273,53 @@ contract ApplicationService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
     {
         _checkNftType(applicationNftId, POLICY());
         _checkNftType(bundleNftId, BUNDLE());
-        // TODO implement
+
+        // TODO: implement
+        
+        emit LogApplicationServiceApplicationAdjusted(applicationNftId, bundleNftId, riskId, referralId, sumInsuredAmount, lifetime);
     }
 
     function revoke(NftId applicationNftId)
         external
         virtual
+        restricted()
         nonReentrant()
     {
         _checkNftType(applicationNftId, POLICY());
 
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        instance.getInstanceStore().updateApplicationState(applicationNftId, REVOKED());
+        (, IInstance instance) = _getAndVerifyActiveProduct();
+        instance.getProductStore().updateApplicationState(applicationNftId, REVOKED());
+        emit LogApplicationServiceApplicationRevoked(applicationNftId);
     }
 
     // internal functions
 
+    function _getAndVerifyActiveProduct()
+        internal
+        view
+        returns (
+            NftId productNftId,
+            IInstance instance
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(), 
+            msg.sender,
+            PRODUCT(),
+            true); // only active pools
+
+        productNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
 
     function _getDomain() internal pure override returns(ObjectType) {
         return APPLICATION();

package/contracts/product/ApplicationServiceManager.sol

@@ -17,7 +17,7 @@ contract ApplicationServiceManager is ProxyManager {
     ) 
     {
         ApplicationService svc = new ApplicationService{salt: salt}();
-        bytes memory data = abi.encode(registry, authority);
+        bytes memory data = abi.encode(authority, registry);
         IVersionable versionable = initialize(
             registry,
             address(svc), 

package/contracts/product/BasicProduct.sol

@@ -27,8 +27,8 @@ abstract contract BasicProduct is
         address registry,
         NftId instanceNftId,
         string memory name,
-        address token,
         IComponents.ProductInfo memory productInfo,
+        IComponents.FeeInfo memory feeInfo,
         IAuthorization authorization,
         address initialOwner
     )
@@ -36,14 +36,13 @@ abstract contract BasicProduct is
         virtual
         onlyInitializing()
     {
-        _initializeProduct(
+        __Product_init(
             registry, 
             instanceNftId, 
             name, 
-            token, 
             productInfo,
+            feeInfo,
             authorization, 
-            initialOwner, 
-            ""); // component data
+            initialOwner); 
     }
 }

package/contracts/product/BasicProductAuthorization.sol

@@ -1,31 +1,52 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Authorization} from "../authorization/Authorization.sol";
-import {BasicProduct} from "./BasicProduct.sol"; 
-import {PRODUCT} from "../type/ObjectType.sol";
 import {IAccess} from "../authorization/IAccess.sol";
 import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
-import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
-import {RoleId} from "../type/RoleId.sol";
+import {IProductComponent} from "./IProductComponent.sol";
+
+import {Authorization} from "../authorization/Authorization.sol";
+import {BasicProduct} from "./BasicProduct.sol"; 
+import {COMPONENT, ORACLE, PRODUCT, POLICY} from "../type/ObjectType.sol";
+import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
 
 
 contract BasicProductAuthorization
      is Authorization
 {
-
      constructor(string memory componentName)
-          Authorization(componentName)
+          Authorization(
+               componentName, 
+               PRODUCT(), 
+               3,
+               COMMIT_HASH,
+               TargetType.Component, 
+               true)
      {}
 
-     function _setupTargets()
+     function _setupServiceTargets()
           internal
           virtual override
      {
-          // basic component target
-          _addComponentTargetWithRole(PRODUCT()); 
+          _authorizeServiceDomain(COMPONENT(), address(10));
+          _authorizeServiceDomain(ORACLE(), address(11));
+          _authorizeServiceDomain(POLICY(), address(12));
      }
 
+     function _setupTokenHandlerAuthorizations() internal virtual override {
+          // authorize token handler functions for component service role
+          IAccess.FunctionInfo[] storage functions;
+          functions = _authorizeForTarget(getTokenHandlerName(), getServiceRole(COMPONENT()));
+          _authorize(functions, TokenHandler.approve.selector, "approve");
+          _authorize(functions, TokenHandler.setWallet.selector, "setWallet");
+          _authorize(functions, TokenHandler.pushFeeToken.selector, "pushFeeToken");
+
+          // authorize token handler functions for pool service role
+          functions = _authorizeForTarget(getTokenHandlerName(), getServiceRole(POLICY()));
+          _authorize(functions, TokenHandler.pullToken.selector, "pullToken");
+          _authorize(functions, TokenHandler.pushToken.selector, "pushToken");
+     }
 
      function _setupTargetAuthorizations()
           internal
@@ -34,8 +55,9 @@ contract BasicProductAuthorization
           IAccess.FunctionInfo[] storage functions;
 
           // authorize public role (open access to any account, only allows to lock target)
-          functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
+          functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
           _authorize(functions, BasicProduct.setFees.selector, "setFees");
+          _authorize(functions, IProductComponent.registerComponent.selector, "registerComponent");
           _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
      }
 }