@etherisc/gif-next 3.0.0-2c4b8cb-070 → 3.0.0-2e16ebd-614

package/contracts/pool/PoolLib.sol

@@ -18,6 +18,7 @@ import {ObjectType, BUNDLE, POOL} from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed} from "../type/UFixed.sol";
+import {VersionPart} from "../type/Version.sol";
 
 library PoolLib {
 
@@ -76,7 +77,6 @@ library PoolLib {
 
 
     function calculateStakingAmounts(
-        IRegistry registry,
         InstanceReader instanceReader,
         NftId poolNftId,
         Amount stakingAmount
@@ -88,7 +88,7 @@ library PoolLib {
             Amount netStakingAmount
         )
     {
-        NftId productNftId = registry.getParentNftId(poolNftId);
+        NftId productNftId = ContractLib.getRegistry().getParentNftId(poolNftId);
         Fee memory stakingFee = instanceReader.getFeeInfo(productNftId).stakingFee;
         (
             feeAmount,
@@ -100,7 +100,6 @@ library PoolLib {
 
 
     function calculatePayoutAmounts(
-        IRegistry registry,
         InstanceReader instanceReader,
         NftId productNftId,
         NftId policyNftId,
@@ -121,7 +120,7 @@ library PoolLib {
             netPayoutAmount = payoutAmount;
 
             if (payoutBeneficiary == address(0)) {
-                beneficiary = registry.ownerOf(policyNftId);
+                beneficiary = ContractLib.getRegistry().ownerOf(policyNftId);
             } else { 
                 beneficiary = payoutBeneficiary;
             }
@@ -136,14 +135,13 @@ library PoolLib {
 
 
     function getPolicyHolder(
-        IRegistry registry, 
         NftId policyNftId
     )
         internal 
         view 
         returns (IPolicyHolder policyHolder)
     {
-        address policyHolderAddress = registry.ownerOf(policyNftId);
+        address policyHolderAddress = ContractLib.getRegistry().ownerOf(policyNftId);
         policyHolder = IPolicyHolder(policyHolderAddress);
 
         if (!ContractLib.isPolicyHolder(policyHolderAddress)) {
@@ -151,99 +149,7 @@ library PoolLib {
         }
     }
 
-
-    function checkAndGetPoolInfo(
-        IRegistry registry,
-        address sender,
-        NftId bundleNftId
-    )
-        public
-        view
-        returns (
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
-            NftId instanceNftId,
-            NftId poolNftId,
-            IComponents.PoolInfo memory poolInfo
-        )
-    {
-        checkNftType(registry, bundleNftId, BUNDLE());
-
-        IInstance instance;
-        (poolNftId, instance) = getAndVerifyActivePool(registry, sender);
-        instanceReader = instance.getInstanceReader();
-        instanceStore = instance.getInstanceStore();
-        instanceNftId = instance.getNftId();
-        poolInfo = instanceReader.getPoolInfo(poolNftId);
-
-        if (registry.getParentNftId(bundleNftId) != poolNftId) {
-            revert IPoolService.ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
-        }
-    }
-
-
-    function getAndVerifyActivePool(
-        IRegistry registry,
-        address sender
-    )
-        public
-        view
-        returns (
-            NftId poolNftId,
-            IInstance instance
-        )
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyComponent(
-            registry, 
-            sender,
-            POOL(),
-            true); // only active pools
-
-        poolNftId = info.nftId;
-        instance = IInstance(instanceAddress);
-    }
-
-
-    function getAndVerifyActiveComponent(
-        IRegistry registry,
-        address sender,
-        ObjectType expectedComponentType
-    )
-        public
-        view
-        returns (
-            NftId componentNftId,
-            IInstance instance
-        )
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyComponent(
-            registry, 
-            sender,
-            expectedComponentType,
-            true); // only active components
-
-        componentNftId = info.nftId;
-        instance = IInstance(instanceAddress);
-    }
-
-    function checkNftType(
-        IRegistry registry, 
-        NftId nftId, 
-        ObjectType expectedObjectType
-    ) internal view {
-        if(!registry.isObjectType(nftId, expectedObjectType)) {
-            revert INftOwnable.ErrorNftOwnableInvalidType(nftId, expectedObjectType);
-        }
-    }
-
     function transferTokenAndNotifyPolicyHolder(
-        IRegistry registry,
         InstanceReader instanceReader,
         TokenHandler poolTokenHandler,
         NftId productNftId,
@@ -265,7 +171,6 @@ library PoolLib {
             processingFeeAmount,
             beneficiary
         ) = calculatePayoutAmounts(
-            registry,
             instanceReader,
             productNftId, 
             policyNftId,
@@ -287,7 +192,6 @@ library PoolLib {
 
         // callback to policy holder if applicable
         policyHolderPayoutExecuted(
-            registry,
             policyNftId, 
             payoutId, 
             beneficiary, 
@@ -295,7 +199,6 @@ library PoolLib {
     }
 
     function policyHolderPayoutExecuted(
-        IRegistry registry,
         NftId policyNftId, 
         PayoutId payoutId,
         address beneficiary,
@@ -303,7 +206,7 @@ library PoolLib {
     )
         private
     {
-        IPolicyHolder policyHolder = getPolicyHolder(registry, policyNftId);
+        IPolicyHolder policyHolder = getPolicyHolder(policyNftId);
         if(address(policyHolder) != address(0)) {
             policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
         }

package/contracts/pool/PoolService.sol

@@ -42,19 +42,18 @@ contract PoolService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, 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);
     }
@@ -66,7 +65,11 @@ contract PoolService is
         virtual
         restricted()
     {
-        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
+        (
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPool(getRelease());
+
         InstanceReader instanceReader = instance.getInstanceReader();
         IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
 
@@ -78,15 +81,20 @@ contract PoolService is
     }
 
 
+    // TODO closing bundle here but creating in bundle service
     function closeBundle(NftId bundleNftId)
         external
         restricted()
         virtual
     {
-        _checkNftType(bundleNftId, BUNDLE());
-
-        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
+        // checks
+        (
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPoolForBundle(
+            bundleNftId, getRelease());
 
+        // effects
         // TODO get performance fee for pool (#477)
 
         // releasing collateral in bundle
@@ -95,15 +103,15 @@ contract PoolService is
         _accountingService.decreasePoolBalance(
             instance.getInstanceStore(), 
             poolNftId, 
-            unstakedAmount +  feeAmount, 
+            unstakedAmount + feeAmount, 
             AmountLib.zero());
         
-        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
+        emit LogPoolServiceBundleClosed(poolNftId, bundleNftId);
 
-        if ((unstakedAmount + feeAmount).gtz()){
-            IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);
-            poolComponentInfo.tokenHandler.pushToken(
-                getRegistry().ownerOf(bundleNftId), 
+        if ((unstakedAmount + feeAmount).gtz()) {
+            TokenHandler tokenHandler = instance.getInstanceReader().getTokenHandler(poolNftId);
+            tokenHandler.pushToken(
+                _getRegistry().ownerOf(bundleNftId), 
                 unstakedAmount + feeAmount);
         }
     }
@@ -119,56 +127,25 @@ contract PoolService is
         restricted()
         virtual
     {
-        _checkNftType(policyNftId, POLICY());
+        (
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPoolForPolicy(
+            policyNftId, getRelease());
 
-        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
         InstanceReader instanceReader = instance.getInstanceReader();
-        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);
-        }
+        NftId productNftId = _getRegistry().getParentNftId(poolNftId);
 
-        emit LogPoolServiceProcessFundedClaim(policyNftId, claimId, availableAmount);
+        emit LogPoolServiceProcessFundedClaim(poolNftId, 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 
@@ -179,12 +156,14 @@ contract PoolService is
         ) 
     {
         (
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
-            NftId instanceNftId,
-            NftId poolNftId,
-            IComponents.PoolInfo memory poolInfo
-        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPoolForBundle(
+            bundleNftId, getRelease());
+
+        InstanceReader instanceReader = instance.getInstanceReader();
+        InstanceStore instanceStore = instance.getInstanceStore();
+        IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
 
         {
             Amount currentPoolBalance = instanceReader.getBalanceAmount(poolNftId);
@@ -199,7 +178,6 @@ contract PoolService is
             feeAmount,
             netAmount
         ) = PoolLib.calculateStakingAmounts(
-            getRegistry(),
             instanceReader,
             poolNftId,
             amount);
@@ -213,13 +191,13 @@ contract PoolService is
 
         _bundleService.stake(instanceReader, instanceStore, bundleNftId, netAmount);
 
-        emit LogPoolServiceBundleStaked(instanceNftId, poolNftId, bundleNftId, amount, netAmount);
+        emit LogPoolServiceBundleStaked(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, 
@@ -237,11 +215,13 @@ contract PoolService is
         returns(Amount netAmount) 
     {
         (
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
-            NftId instanceNftId,
-            NftId poolNftId,
-        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPoolForBundle(
+            bundleNftId, getRelease());
+
+        InstanceReader instanceReader = instance.getInstanceReader();
+        InstanceStore instanceStore = instance.getInstanceStore();
 
         // call bundle service for bookkeeping and additional checks
         Amount unstakedAmount = _bundleService.unstake(instanceStore, bundleNftId, amount);
@@ -260,13 +240,13 @@ contract PoolService is
             AmountLib.zero());
 
 
-        emit LogPoolServiceBundleUnstaked(instanceNftId, poolNftId, bundleNftId, unstakedAmount, netAmount);
+        emit LogPoolServiceBundleUnstaked(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, 
@@ -284,7 +264,7 @@ contract PoolService is
         (
             NftId poolNftId,
             IInstance instance
-        ) = _getAndVerifyActivePool();
+        ) = ContractLib.getAndVerifyPool(getRelease());
 
         // check that pool is externally managed
         InstanceReader reader = instance.getInstanceReader();
@@ -292,7 +272,7 @@ contract PoolService is
             revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
         }
 
-        address poolOwner = getRegistry().ownerOf(poolNftId);
+        address poolOwner = _getRegistry().ownerOf(poolNftId);
         emit LogPoolServiceWalletFunded(poolNftId, poolOwner, amount);
 
         PoolLib.pullStakingAmount(
@@ -311,7 +291,7 @@ contract PoolService is
         (
             NftId poolNftId,
             IInstance instance
-        ) = _getAndVerifyActivePool();
+        ) = ContractLib.getAndVerifyPool(getRelease());
 
         // check that pool is externally managed
         InstanceReader reader = instance.getInstanceReader();
@@ -319,7 +299,7 @@ contract PoolService is
             revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
         }
 
-        address poolOwner = getRegistry().ownerOf(poolNftId);
+        address poolOwner = _getRegistry().ownerOf(poolNftId);
         emit LogPoolServiceWalletDefunded(poolNftId, poolOwner, amount);
 
         PoolLib.pushUnstakingAmount(
@@ -340,10 +320,8 @@ contract PoolService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        IRegistry registry = getRegistry();
-        NftId poolNftId = registry.getParentNftId(bundleNftId);
-        (, address instanceAddress) = ContractLib.getInfoAndInstance(registry, poolNftId, true);
-        IInstance instance = IInstance(instanceAddress);
+        NftId poolNftId = _getRegistry().getParentNftId(bundleNftId);
+        (, IInstance instance) = ContractLib.getInfoAndInstance(poolNftId, getRelease(), true);
 
         Amount poolFeeAmount = premium.poolFeeFixAmount + premium.poolFeeVarAmount;
         Amount bundleFeeAmount = premium.bundleFeeFixAmount + premium.bundleFeeVarAmount;
@@ -414,7 +392,7 @@ contract PoolService is
         // pool callback when required
         if (poolIsVerifyingApplications) {
             IPoolComponent pool = IPoolComponent(
-                getRegistry().getObjectAddress(poolNftId));
+                _getRegistry().getObjectAddress(poolNftId));
 
             pool.verifyApplication(
                 applicationNftId, 
@@ -454,7 +432,7 @@ contract PoolService is
         _checkNftType(policyNftId, POLICY());
 
         // effects
-        NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
+        NftId poolNftId = _getRegistry().getParentNftId(bundleNftId);
         
         _accountingService.decreasePoolBalance(
             instanceStore,
@@ -484,7 +462,6 @@ contract PoolService is
 
         // interactions
         (netPayoutAmount, processingFeeAmount) = PoolLib.transferTokenAndNotifyPolicyHolder(
-            getRegistry(),
             instanceReader, 
             poolTokenHandler,
             productNftId, 
@@ -522,9 +499,12 @@ contract PoolService is
         returns (Amount withdrawnAmount) 
     {
         // checks
-        _checkNftType(bundleNftId, BUNDLE());
+        (
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPoolForBundle(
+            bundleNftId, getRelease());
 
-        (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
         InstanceReader reader = instance.getInstanceReader();
         
         // determine withdrawn amount
@@ -550,10 +530,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(bundleNftId, bundleOwner, token, withdrawnAmount);
+            emit LogPoolServiceFeesWithdrawn(poolNftId, bundleNftId, bundleOwner, token, withdrawnAmount);
 
             tokenHandler.pushToken(bundleOwner, withdrawnAmount);
         }
@@ -594,20 +574,6 @@ 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 {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PoolService} from "./PoolService.sol";
 
@@ -12,19 +12,17 @@ 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, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(poolSrv), 
             data,
             salt);
 
-        _poolService = PoolService(address(versionable));
+        _poolService = PoolService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/ApplicationService.sol

@@ -38,14 +38,13 @@ contract ApplicationService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
 
         _distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));
         _pricingService = IPricingService(_getServiceAddress(PRICE()));
@@ -54,7 +53,9 @@ 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,
@@ -108,12 +109,11 @@ contract ApplicationService is
             NftIdLib.zero(),
             productNftId,
             POLICY(),
+            getRelease(),
             false, // intercepting property for policies is defined on product
-            address(0),
-            applicationOwner,
-            "");
+            address(0));
 
-        applicationNftId = _registryService.registerPolicy(objectInfo);
+        applicationNftId = _registryService.registerPolicy(objectInfo, applicationOwner, "");
     }
 
 
@@ -155,7 +155,7 @@ contract ApplicationService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId productNftId, IInstance instance) = _getAndVerifyActiveProduct();
+        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
 
         // check if provided references are valid and linked to calling product contract
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -290,36 +290,15 @@ contract ApplicationService is
         restricted()
         nonReentrant()
     {
-        _checkNftType(applicationNftId, POLICY());
+        (, IInstance instance) = ContractLib.getAndVerifyProductForPolicy(
+            applicationNftId, getRelease());
 
-        (, 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 {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {ApplicationService} from "./ApplicationService.sol";
 
@@ -12,19 +12,17 @@ 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, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(svc), 
             data,
             salt);
 
-        _applicationService = ApplicationService(address(versionable));
+        _applicationService = ApplicationService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//