@etherisc/gif-next 3.0.0-f90c901-018 → 3.0.0-fbbe3fc-042

package/contracts/pool/PoolService.sol

@@ -42,18 +42,19 @@ contract PoolService 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);
 
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
         _bundleService = IBundleService(_getServiceAddress(BUNDLE()));
         _componentService = IComponentService(_getServiceAddress(COMPONENT()));
-        _staking = IStaking(_getRegistry().getStakingAddress());
+        _staking = IStaking(getRegistry().getStakingAddress());
 
         _registerInterface(type(IPoolService).interfaceId);
     }
@@ -65,11 +66,7 @@ contract PoolService is
         virtual
         restricted()
     {
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPool(getRelease());
-
+        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
         InstanceReader instanceReader = instance.getInstanceReader();
         IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
 
@@ -81,20 +78,15 @@ contract PoolService is
     }
 
 
-    // TODO closing bundle here but creating in bundle service
     function closeBundle(NftId bundleNftId)
         external
         restricted()
         virtual
     {
-        // checks
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
+
+        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
 
-        // effects
         // TODO get performance fee for pool (#477)
 
         // releasing collateral in bundle
@@ -103,15 +95,15 @@ contract PoolService is
         _accountingService.decreasePoolBalance(
             instance.getInstanceStore(), 
             poolNftId, 
-            unstakedAmount + feeAmount, 
+            unstakedAmount +  feeAmount, 
             AmountLib.zero());
         
-        emit LogPoolServiceBundleClosed(poolNftId, bundleNftId);
+        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
 
-        if ((unstakedAmount + feeAmount).gtz()) {
-            TokenHandler tokenHandler = instance.getInstanceReader().getTokenHandler(poolNftId);
-            tokenHandler.pushToken(
-                _getRegistry().ownerOf(bundleNftId), 
+        if ((unstakedAmount + feeAmount).gtz()){
+            IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);
+            poolComponentInfo.tokenHandler.pushToken(
+                getRegistry().ownerOf(bundleNftId), 
                 unstakedAmount + feeAmount);
         }
     }
@@ -127,25 +119,56 @@ contract PoolService is
         restricted()
         virtual
     {
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForPolicy(
-            policyNftId, getRelease());
+        _checkNftType(policyNftId, POLICY());
 
+        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
         InstanceReader instanceReader = instance.getInstanceReader();
-        NftId productNftId = _getRegistry().getParentNftId(poolNftId);
+        NftId productNftId = getRegistry().getParentNftId(poolNftId);
+
+        // check policy matches with calling pool
+        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        if(policyInfo.productNftId != productNftId) {
+            revert ErrorPoolServicePolicyPoolMismatch(
+                policyNftId, 
+                policyInfo.productNftId, 
+                productNftId);
+        }
 
-        emit LogPoolServiceProcessFundedClaim(poolNftId, policyNftId, claimId, availableAmount);
+        emit LogPoolServiceProcessFundedClaim(policyNftId, claimId, availableAmount);
 
-        // TODO reading the whole struct for just 1 check
         // callback to product component if applicable
         if (instanceReader.getProductInfo(productNftId).isProcessingFundedClaims) {
-            address productAddress = _getRegistry().getObjectAddress(productNftId);
+            address productAddress = getRegistry().getObjectAddress(productNftId);
             IProductComponent(productAddress).processFundedClaim(policyNftId, claimId, availableAmount);
         }
     }
 
+
+    // function _checkAndGetPoolInfo(NftId bundleNftId)
+    //     internal
+    //     view
+    //     returns (
+    //         InstanceReader instanceReader,
+    //         InstanceStore instanceStore,
+    //         NftId instanceNftId,
+    //         NftId poolNftId,
+    //         IComponents.PoolInfo memory poolInfo
+    //     )
+    // {
+    //     _checkNftType(bundleNftId, BUNDLE());
+
+    //     (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
+    //     instanceReader = instance.getInstanceReader();
+    //     instanceStore = instance.getInstanceStore();
+    //     instanceNftId = instance.getNftId();
+    //     poolInfo = instanceReader.getPoolInfo(poolNftId);
+
+    //     if (getRegistry().getParentNftId(bundleNftId) != poolNftId) {
+    //         revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
+    //     }
+    // }
+
+
     /// @inheritdoc IPoolService
     function stake(NftId bundleNftId, Amount amount) 
         external 
@@ -156,14 +179,12 @@ contract PoolService is
         ) 
     {
         (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
-
-        InstanceReader instanceReader = instance.getInstanceReader();
-        InstanceStore instanceStore = instance.getInstanceStore();
-        IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
+            InstanceReader instanceReader,
+            InstanceStore instanceStore,
+            NftId instanceNftId,
+            NftId poolNftId,
+            IComponents.PoolInfo memory poolInfo
+        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
 
         {
             Amount currentPoolBalance = instanceReader.getBalanceAmount(poolNftId);
@@ -178,6 +199,7 @@ contract PoolService is
             feeAmount,
             netAmount
         ) = PoolLib.calculateStakingAmounts(
+            getRegistry(),
             instanceReader,
             poolNftId,
             amount);
@@ -191,13 +213,13 @@ contract PoolService is
 
         _bundleService.stake(instanceReader, instanceStore, bundleNftId, netAmount);
 
-        emit LogPoolServiceBundleStaked(poolNftId, bundleNftId, amount, netAmount);
+        emit LogPoolServiceBundleStaked(instanceNftId, poolNftId, bundleNftId, amount, netAmount);
 
         // only collect staking amount when pool is not externally managed
         if (!poolInfo.isExternallyManaged) {
 
             // collect tokens from bundle owner
-            address bundleOwner = _getRegistry().ownerOf(bundleNftId);
+            address bundleOwner = getRegistry().ownerOf(bundleNftId);
             PoolLib.pullStakingAmount(
                 instanceReader,
                 poolNftId, 
@@ -215,13 +237,11 @@ contract PoolService is
         returns(Amount netAmount) 
     {
         (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
-
-        InstanceReader instanceReader = instance.getInstanceReader();
-        InstanceStore instanceStore = instance.getInstanceStore();
+            InstanceReader instanceReader,
+            InstanceStore instanceStore,
+            NftId instanceNftId,
+            NftId poolNftId,
+        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
 
         // call bundle service for bookkeeping and additional checks
         Amount unstakedAmount = _bundleService.unstake(instanceStore, bundleNftId, amount);
@@ -240,13 +260,13 @@ contract PoolService is
             AmountLib.zero());
 
 
-        emit LogPoolServiceBundleUnstaked(poolNftId, bundleNftId, unstakedAmount, netAmount);
+        emit LogPoolServiceBundleUnstaked(instanceNftId, poolNftId, bundleNftId, unstakedAmount, netAmount);
 
         // only distribute staking amount when pool is not externally managed
         if (!instanceReader.getPoolInfo(poolNftId).isExternallyManaged) {
 
             // transfer amount to bundle owner
-            address bundleOwner = _getRegistry().ownerOf(bundleNftId);
+            address bundleOwner = getRegistry().ownerOf(bundleNftId);
             PoolLib.pushUnstakingAmount(
                 instanceReader,
                 poolNftId, 
@@ -264,7 +284,7 @@ contract PoolService is
         (
             NftId poolNftId,
             IInstance instance
-        ) = ContractLib.getAndVerifyPool(getRelease());
+        ) = _getAndVerifyActivePool();
 
         // check that pool is externally managed
         InstanceReader reader = instance.getInstanceReader();
@@ -272,7 +292,7 @@ contract PoolService is
             revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
         }
 
-        address poolOwner = _getRegistry().ownerOf(poolNftId);
+        address poolOwner = getRegistry().ownerOf(poolNftId);
         emit LogPoolServiceWalletFunded(poolNftId, poolOwner, amount);
 
         PoolLib.pullStakingAmount(
@@ -291,7 +311,7 @@ contract PoolService is
         (
             NftId poolNftId,
             IInstance instance
-        ) = ContractLib.getAndVerifyPool(getRelease());
+        ) = _getAndVerifyActivePool();
 
         // check that pool is externally managed
         InstanceReader reader = instance.getInstanceReader();
@@ -299,7 +319,7 @@ contract PoolService is
             revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
         }
 
-        address poolOwner = _getRegistry().ownerOf(poolNftId);
+        address poolOwner = getRegistry().ownerOf(poolNftId);
         emit LogPoolServiceWalletDefunded(poolNftId, poolOwner, amount);
 
         PoolLib.pushUnstakingAmount(
@@ -320,8 +340,10 @@ contract PoolService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        NftId poolNftId = _getRegistry().getParentNftId(bundleNftId);
-        (, IInstance instance) = ContractLib.getInfoAndInstance(poolNftId, getRelease(), true);
+        IRegistry registry = getRegistry();
+        NftId poolNftId = registry.getParentNftId(bundleNftId);
+        (, address instanceAddress) = ContractLib.getInfoAndInstance(registry, poolNftId, true);
+        IInstance instance = IInstance(instanceAddress);
 
         Amount poolFeeAmount = premium.poolFeeFixAmount + premium.poolFeeVarAmount;
         Amount bundleFeeAmount = premium.bundleFeeFixAmount + premium.bundleFeeVarAmount;
@@ -392,7 +414,7 @@ contract PoolService is
         // pool callback when required
         if (poolIsVerifyingApplications) {
             IPoolComponent pool = IPoolComponent(
-                _getRegistry().getObjectAddress(poolNftId));
+                getRegistry().getObjectAddress(poolNftId));
 
             pool.verifyApplication(
                 applicationNftId, 
@@ -432,7 +454,7 @@ contract PoolService is
         _checkNftType(policyNftId, POLICY());
 
         // effects
-        NftId poolNftId = _getRegistry().getParentNftId(bundleNftId);
+        NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
         
         _accountingService.decreasePoolBalance(
             instanceStore,
@@ -462,6 +484,7 @@ contract PoolService is
 
         // interactions
         (netPayoutAmount, processingFeeAmount) = PoolLib.transferTokenAndNotifyPolicyHolder(
+            getRegistry(),
             instanceReader, 
             poolTokenHandler,
             productNftId, 
@@ -499,12 +522,9 @@ contract PoolService is
         returns (Amount withdrawnAmount) 
     {
         // checks
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
 
+        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
         InstanceReader reader = instance.getInstanceReader();
         
         // determine withdrawn amount
@@ -530,10 +550,10 @@ contract PoolService is
         // interactions
         // transfer amount to bundle owner
         {
-            address bundleOwner = _getRegistry().ownerOf(bundleNftId);
+            address bundleOwner = getRegistry().ownerOf(bundleNftId);
             TokenHandler tokenHandler = reader.getTokenHandler(poolNftId);
             address token = address(tokenHandler.TOKEN());
-            emit LogPoolServiceFeesWithdrawn(poolNftId, bundleNftId, bundleOwner, token, withdrawnAmount);
+            emit LogPoolServiceFeesWithdrawn(bundleNftId, bundleOwner, token, withdrawnAmount);
 
             tokenHandler.pushToken(bundleOwner, withdrawnAmount);
         }
@@ -574,6 +594,20 @@ contract PoolService is
             remainingCollateralAmount);
     }
 
+
+    function _getAndVerifyActivePool()
+        internal
+        virtual
+        view
+        returns (
+            NftId poolNftId,
+            IInstance instance
+        )
+    {
+        return PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
+    }
+
+
     function _getDomain() internal pure override returns(ObjectType) {
         return POOL();
     }

package/contracts/pool/PoolServiceManager.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 {PoolService} from "./PoolService.sol";
 
@@ -12,17 +12,19 @@ contract PoolServiceManager is ProxyManager {
     /// @dev initializes proxy manager with pool service implementation 
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     ) 
     {
         PoolService poolSrv = new PoolService{salt: salt}();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(poolSrv), 
             data,
             salt);
 
-        _poolService = PoolService(address(upgradeable));
+        _poolService = PoolService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/ApplicationService.sol

@@ -38,13 +38,14 @@ contract ApplicationService 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()));
         _pricingService = IPricingService(_getServiceAddress(PRICE()));
@@ -53,9 +54,7 @@ contract ApplicationService is
         _registerInterface(type(IApplicationService).interfaceId);
     }
 
-    // TODO product - bundle - risk - refferal - distribution
-    // checkBundle() is faster then checking with registry but first need to know poolNftId
-    // check pool, get its nftIdf and instance -> instacne.getBundleSet.checkBundle(bundsleNftId) ???? 
+
     function _checkLinkedApplicationParameters(
         InstanceReader instanceReader,
         NftId productNftId,
@@ -109,11 +108,12 @@ contract ApplicationService is
             NftIdLib.zero(),
             productNftId,
             POLICY(),
-            getRelease(),
             false, // intercepting property for policies is defined on product
-            address(0));
+            address(0),
+            applicationOwner,
+            "");
 
-        applicationNftId = _registryService.registerPolicy(objectInfo, applicationOwner, "");
+        applicationNftId = _registryService.registerPolicy(objectInfo);
     }
 
 
@@ -155,7 +155,7 @@ contract ApplicationService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveProduct();
 
         // check if provided references are valid and linked to calling product contract
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -290,15 +290,36 @@ contract ApplicationService is
         restricted()
         nonReentrant()
     {
-        (, IInstance instance) = ContractLib.getAndVerifyProductForPolicy(
-            applicationNftId, getRelease());
+        _checkNftType(applicationNftId, POLICY());
 
+        (, 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

@@ -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 {ApplicationService} from "./ApplicationService.sol";
 
@@ -12,17 +12,19 @@ contract ApplicationServiceManager is ProxyManager {
     /// @dev initializes proxy manager with service implementation 
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     ) 
     {
         ApplicationService svc = new ApplicationService{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);
 
-        _applicationService = ApplicationService(address(upgradeable));
+        _applicationService = ApplicationService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

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)) {