@etherisc/gif-next 3.0.0-f90c901-018 → 3.0.0-fb87f3a-607

package/contracts/product/BasicProduct.sol

@@ -24,6 +24,7 @@ abstract contract BasicProduct is
     }
 
     function _initializeBasicProduct(
+        address registry,
         NftId instanceNftId,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -36,6 +37,7 @@ abstract contract BasicProduct is
         onlyInitializing()
     {
         __Product_init(
+            registry, 
             instanceNftId, 
             name, 
             productInfo,

package/contracts/product/BasicProductAuthorization.sol

@@ -2,16 +2,15 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IProductComponent} from "./IProductComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
 import {BasicProduct} from "./BasicProduct.sol"; 
-import {COMPONENT, PRODUCT, POLICY} from "../type/ObjectType.sol";
+import {COMPONENT, ORACLE, PRODUCT, POLICY} from "../type/ObjectType.sol";
 import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {VersionPartLib} from "../type/Version.sol";
+
 
 contract BasicProductAuthorization
      is Authorization
@@ -20,7 +19,7 @@ contract BasicProductAuthorization
           Authorization(
                componentName, 
                PRODUCT(), 
-               GIF_INITIAL_RELEASE(),
+               3,
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -31,7 +30,8 @@ contract BasicProductAuthorization
           virtual override
      {
           _authorizeServiceDomain(COMPONENT(), address(10));
-          _authorizeServiceDomain(POLICY(), address(11));
+          _authorizeServiceDomain(ORACLE(), address(11));
+          _authorizeServiceDomain(POLICY(), address(12));
      }
 
      function _setupTokenHandlerAuthorizations() internal virtual override {
@@ -58,7 +58,7 @@ contract BasicProductAuthorization
           functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
           _authorize(functions, BasicProduct.setFees.selector, "setFees");
           _authorize(functions, IProductComponent.registerComponent.selector, "registerComponent");
-          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
      }
 }
 

package/contracts/product/ClaimService.sol

@@ -39,16 +39,17 @@ contract ClaimService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
 
-        _policyService = IPolicyService(_getRegistry().getServiceAddress(POLICY(), getVersion().toMajorPart()));
-        _poolService = IPoolService(_getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
+        _policyService = IPolicyService(getRegistry().getServiceAddress(POLICY(), getVersion().toMajorPart()));
+        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
 
         _registerInterface(type(IClaimService).interfaceId);
     }
@@ -477,7 +478,7 @@ contract ClaimService is
         uint24 payoutNo = claimInfo.payoutsCount + 1;
         payoutId = PayoutIdLib.toPayoutId(claimId, payoutNo);
         if (beneficiary == address(0)) {
-            beneficiary = _getRegistry().ownerOf(policyNftId);
+            beneficiary = getRegistry().ownerOf(policyNftId);
         }
 
         instanceContracts.productStore.createPayout(
@@ -514,7 +515,7 @@ contract ClaimService is
             IPolicy.PolicyInfo memory policyInfo
         )
     {
-        (productNftId, instance) = ContractLib.getAndVerifyProduct(getRelease());
+        (productNftId, instance) = _getAndVerifyActiveProduct();
         instanceContracts.instanceReader = InstanceReader(instance.getInstanceReader());
         instanceContracts.instanceStore = InstanceStore(instance.getInstanceStore());
         instanceContracts.productStore = ProductStore(instance.getProductStore());
@@ -528,6 +529,29 @@ contract ClaimService is
         }
     }
 
+
+    function _getAndVerifyActiveProduct() 
+        internal 
+        view 
+        returns (
+            NftId productNftId,
+            IInstance instance
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory info,
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(),
+            msg.sender, // caller
+            PRODUCT(),
+            true); // isActive 
+
+        // get component nft id and instance
+        productNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
     function _verifyClaim(
         InstanceReader instanceReader,
         NftId policyNftId, 
@@ -562,7 +586,7 @@ contract ClaimService is
     {
         NftId poolNftId = instanceReader.getProductInfo(productNftId).poolNftId;
         if (instanceReader.getPoolInfo(poolNftId).isProcessingConfirmedClaims) {
-            address poolAddress = _getRegistry().getObjectAddress(poolNftId);
+            address poolAddress = getRegistry().getObjectAddress(poolNftId);
             IPoolComponent(poolAddress).processConfirmedClaim(policyNftId, claimId, amount);
         }
     }
@@ -587,7 +611,7 @@ contract ClaimService is
         view 
         returns (IPolicyHolder policyHolder)
     {
-        address policyHolderAddress = _getRegistry().ownerOf(policyNftId);
+        address policyHolderAddress = getRegistry().ownerOf(policyNftId);
         policyHolder = IPolicyHolder(policyHolderAddress);
 
         if (!ContractLib.isPolicyHolder(policyHolderAddress)) {

package/contracts/product/ClaimServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {ClaimService} from "./ClaimService.sol";
 
@@ -11,18 +11,20 @@ contract ClaimServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address authority,
+        address authority, 
+        address registry,
         bytes32 salt
     ) 
     {
         ClaimService svc = new ClaimService{salt: salt}();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _claimService = ClaimService(address(upgradeable));
+        _claimService = ClaimService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/IPolicyService.sol

@@ -13,13 +13,14 @@ interface IPolicyService is IService {
 
     event LogPolicyServicePolicyCreated(NftId policyNftId, Amount premiumAmount, Timestamp activatedAt);
     event LogPolicyServicePolicyDeclined(NftId policyNftId);
-    event LogPolicyServicePolicyPremiumCollected(NftId policyNftId, Amount premiumAmount);
+    event LogPolicyServicePolicyPremiumCollected(NftId policyNftId, NftId productNftId, Amount premiumAmount, Timestamp activateAt);
     event LogPolicyServicePolicyActivated(NftId policyNftId, Timestamp activatedAt);
     event LogPolicyServicePolicyActivatedUpdated(NftId policyNftId, Timestamp activatedAt);
     event LogPolicyServicePolicyExpirationUpdated(NftId policyNftId, Timestamp expiredAt);
     event LogPolicyServicePolicyClosed(NftId policyNftId);
 
     error LogPolicyServiceMaxPremiumAmountExceeded(NftId policyNftId, Amount maxPremiumAmount, Amount premiumAmount);
+    error ErrorPolicyServicePolicyProductMismatch(NftId applicationNftId, NftId expectedProductNftId, NftId actualProductNftId);
     error ErrorPolicyServicePolicyStateNotApplied(NftId applicationNftId);
     error ErrorPolicyServicePolicyStateNotCollateralized(NftId applicationNftId);
     error ErrorPolicyServicePolicyAlreadyActivated(NftId policyNftId);

package/contracts/product/PolicyService.sol

@@ -45,20 +45,21 @@ contract PolicyService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
 
         VersionPart majorVersion = getVersion().toMajorPart();
-        _accountingService = IAccountingService(_getRegistry().getServiceAddress(ACCOUNTING(), majorVersion));
-        _componentService = IComponentService(_getRegistry().getServiceAddress(COMPONENT(), majorVersion));
-        _poolService = IPoolService(_getRegistry().getServiceAddress(POOL(), majorVersion));
-        _distributionService = IDistributionService(_getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
-        _pricingService = IPricingService(_getRegistry().getServiceAddress(PRICE(), majorVersion));
+        _accountingService = IAccountingService(getRegistry().getServiceAddress(ACCOUNTING(), majorVersion));
+        _componentService = IComponentService(getRegistry().getServiceAddress(COMPONENT(), majorVersion));
+        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
+        _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
+        _pricingService = IPricingService(getRegistry().getServiceAddress(PRICE(), majorVersion));
 
         _registerInterface(type(IPolicyService).interfaceId);
     }
@@ -73,8 +74,7 @@ contract PolicyService is
         nonReentrant()
     {
         // checks
-        (, IInstance instance) = ContractLib.getAndVerifyProductForPolicy(
-            applicationNftId, getRelease());
+        (IInstance instance,,) = _getAndVerifyCallerForPolicy(applicationNftId);
 
         // check policy is in state applied
         if (instance.getInstanceReader().getPolicyState(applicationNftId) != APPLIED()) {
@@ -105,10 +105,10 @@ contract PolicyService is
     {
         // checks
         (
+            IInstance instance,
             NftId productNftId,
-            IPolicy.PolicyInfo memory applicationInfo,
-            IInstance instance
-        ) = _getAndVerifyCallerAndInfoForPolicy(applicationNftId);
+            IPolicy.PolicyInfo memory applicationInfo
+        ) = _getAndVerifyCallerForPolicy(applicationNftId);
 
         // check policy is in state applied
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -173,7 +173,7 @@ contract PolicyService is
         }
 
         // link policy to risk and bundle
-        NftId poolNftId = _getRegistry().getParentNftId(bundleNftId);
+        NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
         instance.getRiskSet().linkPolicy(productNftId, riskId, applicationNftId);
         instance.getBundleSet().linkPolicy(poolNftId, bundleNftId, applicationNftId);
 
@@ -198,10 +198,10 @@ contract PolicyService is
     {
         // checks
         (
+            IInstance instance,
             NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo,
-            IInstance instance
-        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
         // check policy is in state collateralized
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -218,7 +218,7 @@ contract PolicyService is
         IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
         instanceReader.getTokenHandler(
             productNftId).checkBalanceAndAllowance(
-                _getRegistry().ownerOf(policyNftId), 
+                getRegistry().ownerOf(policyNftId), 
                 premium.premiumAmount, 
                 false);
 
@@ -226,7 +226,7 @@ contract PolicyService is
         // _checkPremiumBalanceAndAllowance(
         //     tokenHandler.TOKEN(), 
         //     address(tokenHandler),
-        //     _getRegistry().ownerOf(policyNftId), 
+        //     getRegistry().ownerOf(policyNftId), 
         //     premium.premiumAmount);
 
         // effects
@@ -247,7 +247,7 @@ contract PolicyService is
         instance.getProductStore().updatePremiumState(policyNftId, PAID());
 
         // log premium collection before interactions with token
-        emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
+        emit LogPolicyServicePolicyPremiumCollected(policyNftId, policyInfo.productNftId, premium.premiumAmount, activateAt);
 
         // interactions
         _transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);
@@ -263,10 +263,9 @@ contract PolicyService is
     {
         // checks
         (
-            , // NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo,
-            IInstance instance
-        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
         // effects
         policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
@@ -292,10 +291,9 @@ contract PolicyService is
     {
         // checks
         (
-            , // NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo,
-            IInstance instance
-        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
         if (policyInfo.activatedAt.eqz()) {
             revert ErrorPolicyServicePolicyNotActivated(policyNftId);
@@ -335,10 +333,9 @@ contract PolicyService is
     {
         // checks
         (
-            , // NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo,
-            IInstance instance
-        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
         // more checks, effects + interactions
         return _expire(
@@ -388,10 +385,10 @@ contract PolicyService is
     {
         // checks
         (
+            IInstance instance,
             NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo,
-            IInstance instance
-        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
         InstanceReader instanceReader = instance.getInstanceReader();
 
         // check policy is in a closeable state
@@ -421,7 +418,7 @@ contract PolicyService is
         instance.getProductStore().updatePolicy(policyNftId, policyInfo, CLOSED());
 
         // unlink policy from risk and bundle
-        NftId poolNftId = _getRegistry().getParentNftId(bundleNftId);
+        NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
         instance.getRiskSet().unlinkPolicy(productNftId, riskId, policyNftId);
         instance.getBundleSet().unlinkPolicy(poolNftId, bundleNftId, policyNftId);
 
@@ -503,7 +500,7 @@ contract PolicyService is
         internal
         virtual
     {
-        address policyHolder = _getRegistry().ownerOf(policyNftId);
+        address policyHolder = getRegistry().ownerOf(policyNftId);
 
         (
             ,
@@ -577,7 +574,7 @@ contract PolicyService is
         view 
         returns (IPolicyHolder policyHolder)
     {
-        address policyHolderAddress = _getRegistry().ownerOf(policyNftId);
+        address policyHolderAddress = getRegistry().ownerOf(policyNftId);
         policyHolder = IPolicyHolder(policyHolderAddress);
 
         if (!ContractLib.isPolicyHolder(policyHolderAddress)) {
@@ -609,20 +606,36 @@ contract PolicyService is
         }
     }
 
-    function  _getAndVerifyCallerAndInfoForPolicy(NftId policyNftId)
+
+    function  _getAndVerifyCallerForPolicy(NftId policyNftId)
         internal
         virtual
         view
         returns (
+            IInstance instance,
             NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo,
-            IInstance instance
+            IPolicy.PolicyInfo memory policyInfo
         )
     {
-        (productNftId, instance) = ContractLib.getAndVerifyProductForPolicy(
-            policyNftId, getRelease());
-
+        (
+            IRegistry.ObjectInfo memory productInfo, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(), 
+            msg.sender, // caller contract 
+            PRODUCT(), // caller must be product
+            true); // only active caller
+
+        productNftId = productInfo.nftId; // calling product nft id
+        instance = IInstance(instanceAddress);
         policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
+
+        if (policyInfo.productNftId != productNftId) {
+            revert ErrorPolicyServicePolicyProductMismatch(
+                policyNftId, 
+                productNftId,
+                policyInfo.productNftId);
+        }
     }
 
 

package/contracts/product/PolicyServiceLib.sol

@@ -95,13 +95,14 @@ library PolicyServiceLib {
     {
         if (policyState != COLLATERALIZED()) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
-        } 
-        if (TimestampLib.current() < policyInfo.activatedAt) { 
+        }
+
+        if (policyInfo.activatedAt.eqz() || TimestampLib.current() < policyInfo.activatedAt) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         } 
 
         // check expiredAt represents a valid expiry time
-        if (newExpiredAt >= policyInfo.expiredAt) {
+        if (newExpiredAt > policyInfo.expiredAt) {
             revert IPolicyService.ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, newExpiredAt);
         }
 
@@ -110,6 +111,7 @@ library PolicyServiceLib {
         }
     }
 
+
     function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId)
         external 
         view

package/contracts/product/PolicyServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PolicyService} from "./PolicyService.sol";
 
@@ -12,17 +12,19 @@ contract PolicyServiceManager is ProxyManager {
     /// @dev initializes proxy manager with product service implementation 
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     ) 
     {
         PolicyService svc = new PolicyService{salt: salt}();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _policyService = PolicyService(address(upgradeable));
+        _policyService = PolicyService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/PricingService.sol

@@ -36,13 +36,14 @@ contract PricingService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
 
         _distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));
 
@@ -77,11 +78,11 @@ contract PricingService is
             // verify product
             (
                 IRegistry.ObjectInfo memory registryInfo, 
-                IInstance instance
-            ) = ContractLib.getInfoAndInstance(productNftId, getRelease(), false);
+                address instanceAddress
+            ) = ContractLib.getInfoAndInstance(getRegistry(), productNftId, false);
 
             // get instance reader from local instance variable
-            reader = instance.getInstanceReader();
+            reader = IInstance(instanceAddress).getInstanceReader();
 
             NftId riskProductNftId = reader.getRiskInfo(riskId).productNftId;
             if (productNftId != riskProductNftId) {

package/contracts/product/PricingServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PricingService} from "./PricingService.sol";
 
@@ -12,17 +12,19 @@ contract PricingServiceManager is ProxyManager {
     /// @dev initializes proxy manager with pricing service implementation and deploys instance
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     )
     {
         PricingService pricingSrv = new PricingService{salt: salt}();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(pricingSrv), 
             data,
             salt);
 
-        _pricingService = PricingService(address(upgradeable));
+        _pricingService = PricingService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/Product.sol

@@ -134,6 +134,7 @@ abstract contract Product is
 
 
     function __Product_init(
+        address registry,
         NftId instanceNftId,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -146,6 +147,7 @@ abstract contract Product is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
+            registry, 
             instanceNftId, 
             name, 
             PRODUCT(), 

package/contracts/product/RiskService.sol

@@ -26,14 +26,15 @@ contract RiskService is
         bytes memory data
     )
         internal
+        initializer
         virtual override
-        onlyInitializing()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
         _registerInterface(type(IRiskService).interfaceId);
     }
 
@@ -48,7 +49,7 @@ contract RiskService is
         returns (RiskId riskId)
     {
         // checks
-        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         // effects
         riskId = RiskIdLib.toRiskId(productNftId, id);
@@ -79,7 +80,7 @@ contract RiskService is
         restricted()
     {
         // checks
-        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         // effects
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -106,7 +107,7 @@ contract RiskService is
         restricted()
     {
         // checks
-        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         if (!instance.getRiskSet().hasRisk(productNftId, riskId)) {
             revert ErrorRiskServiceUnknownRisk(productNftId, riskId);
@@ -134,7 +135,7 @@ contract RiskService is
         restricted()
     {
         // checks
-        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         (bool exists, bool active) = instance.getRiskSet().checkRisk(productNftId, riskId);
 
         if (!exists) {
@@ -151,6 +152,37 @@ contract RiskService is
         emit LogRiskServiceRiskClosed(productNftId, riskId);
     }
 
+    function _getAndVerifyActiveComponent(ObjectType expectedType) 
+        internal 
+        view 
+        returns (
+            NftId componentNftId,
+            IInstance instance
+        )
+    {
+        IRegistry.ObjectInfo memory info;
+        address instanceAddress;
+        bool isActive = true;
+
+        if (expectedType != COMPONENT()) {
+            (info, instanceAddress) = ContractLib.getAndVerifyComponent(
+                getRegistry(),
+                msg.sender, // caller
+                expectedType,
+                isActive); 
+        } else {
+            (info, instanceAddress) = ContractLib.getAndVerifyAnyComponent(
+                getRegistry(),
+                msg.sender,
+                isActive); 
+        }
+
+        // get component nft id and instance
+        componentNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
+
     function _getDomain() internal pure override returns(ObjectType) {
         return RISK();
     }