@etherisc/gif-next 3.0.0-c0923b6f-772-12c20a7-167 → 3.0.0-c458de2-735

package/contracts/product/ClaimServiceManager.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 {ClaimService} from "./ClaimService.sol";
 
@@ -11,20 +11,18 @@ contract ClaimServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address authority, 
-        address registry,
+        address authority,
         bytes32 salt
     ) 
     {
         ClaimService svc = new ClaimService{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);
 
-        _claimService = ClaimService(address(versionable));
+        _claimService = ClaimService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/IPolicyService.sol

@@ -20,7 +20,6 @@ interface IPolicyService is IService {
     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,21 +45,20 @@ contract PolicyService 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);
 
         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);
     }
@@ -74,7 +73,8 @@ contract PolicyService is
         nonReentrant()
     {
         // checks
-        (IInstance instance,,) = _getAndVerifyCallerForPolicy(applicationNftId);
+        (, IInstance instance) = ContractLib.getAndVerifyProductForPolicy(
+            applicationNftId, getRelease());
 
         // 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
-        ) = _getAndVerifyCallerForPolicy(applicationNftId);
+            IPolicy.PolicyInfo memory applicationInfo,
+            IInstance instance
+        ) = _getAndVerifyCallerAndInfoForPolicy(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
-        ) = _getAndVerifyCallerForPolicy(policyNftId);
+            IPolicy.PolicyInfo memory policyInfo,
+            IInstance instance
+        ) = _getAndVerifyCallerAndInfoForPolicy(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
@@ -263,9 +263,10 @@ contract PolicyService is
     {
         // checks
         (
-            IInstance instance,,
-            IPolicy.PolicyInfo memory policyInfo
-        ) = _getAndVerifyCallerForPolicy(policyNftId);
+            , // NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo,
+            IInstance instance
+        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
 
         // effects
         policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
@@ -291,9 +292,10 @@ contract PolicyService is
     {
         // checks
         (
-            IInstance instance,,
-            IPolicy.PolicyInfo memory policyInfo
-        ) = _getAndVerifyCallerForPolicy(policyNftId);
+            , // NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo,
+            IInstance instance
+        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
 
         if (policyInfo.activatedAt.eqz()) {
             revert ErrorPolicyServicePolicyNotActivated(policyNftId);
@@ -333,9 +335,10 @@ contract PolicyService is
     {
         // checks
         (
-            IInstance instance,,
-            IPolicy.PolicyInfo memory policyInfo
-        ) = _getAndVerifyCallerForPolicy(policyNftId);
+            , // NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo,
+            IInstance instance
+        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
 
         // more checks, effects + interactions
         return _expire(
@@ -385,10 +388,10 @@ contract PolicyService is
     {
         // checks
         (
-            IInstance instance,
             NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo
-        ) = _getAndVerifyCallerForPolicy(policyNftId);
+            IPolicy.PolicyInfo memory policyInfo,
+            IInstance instance
+        ) = _getAndVerifyCallerAndInfoForPolicy(policyNftId);
         InstanceReader instanceReader = instance.getInstanceReader();
 
         // check policy is in a closeable state
@@ -418,7 +421,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);
 
@@ -500,7 +503,7 @@ contract PolicyService is
         internal
         virtual
     {
-        address policyHolder = getRegistry().ownerOf(policyNftId);
+        address policyHolder = _getRegistry().ownerOf(policyNftId);
 
         (
             ,
@@ -574,7 +577,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)) {
@@ -606,36 +609,20 @@ contract PolicyService is
         }
     }
 
-
-    function  _getAndVerifyCallerForPolicy(NftId policyNftId)
+    function  _getAndVerifyCallerAndInfoForPolicy(NftId policyNftId)
         internal
         virtual
         view
         returns (
-            IInstance instance,
             NftId productNftId,
-            IPolicy.PolicyInfo memory policyInfo
+            IPolicy.PolicyInfo memory policyInfo,
+            IInstance instance
         )
     {
-        (
-            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);
+        (productNftId, instance) = ContractLib.getAndVerifyProductForPolicy(
+            policyNftId, getRelease());
 
-        if (policyInfo.productNftId != productNftId) {
-            revert ErrorPolicyServicePolicyProductMismatch(
-                policyNftId, 
-                productNftId,
-                policyInfo.productNftId);
-        }
+        policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
     }
 
 

package/contracts/product/PolicyServiceManager.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 {PolicyService} from "./PolicyService.sol";
 
@@ -12,19 +12,17 @@ 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, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(svc), 
             data,
             salt);
 
-        _policyService = PolicyService(address(versionable));
+        _policyService = PolicyService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/PricingService.sol

@@ -36,14 +36,13 @@ contract PricingService 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()));
 
@@ -78,11 +77,11 @@ contract PricingService is
             // verify product
             (
                 IRegistry.ObjectInfo memory registryInfo, 
-                address instanceAddress
-            ) = ContractLib.getInfoAndInstance(getRegistry(), productNftId, false);
+                IInstance instance
+            ) = ContractLib.getInfoAndInstance(productNftId, getRelease(), false);
 
             // get instance reader from local instance variable
-            reader = IInstance(instanceAddress).getInstanceReader();
+            reader = instance.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 {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PricingService} from "./PricingService.sol";
 
@@ -12,19 +12,17 @@ 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, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(pricingSrv), 
             data,
             salt);
 
-        _pricingService = PricingService(address(versionable));
+        _pricingService = PricingService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/Product.sol

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

package/contracts/product/RiskService.sol

@@ -26,15 +26,14 @@ contract RiskService is
         bytes memory data
     )
         internal
-        initializer
         virtual override
+        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);
         _registerInterface(type(IRiskService).interfaceId);
     }
 
@@ -49,7 +48,7 @@ contract RiskService is
         returns (RiskId riskId)
     {
         // checks
-        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
 
         // effects
         riskId = RiskIdLib.toRiskId(productNftId, id);
@@ -80,7 +79,7 @@ contract RiskService is
         restricted()
     {
         // checks
-        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
 
         // effects
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -107,7 +106,7 @@ contract RiskService is
         restricted()
     {
         // checks
-        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
 
         if (!instance.getRiskSet().hasRisk(productNftId, riskId)) {
             revert ErrorRiskServiceUnknownRisk(productNftId, riskId);
@@ -135,7 +134,7 @@ contract RiskService is
         restricted()
     {
         // checks
-        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (NftId productNftId, IInstance instance) = ContractLib.getAndVerifyProduct(getRelease());
         (bool exists, bool active) = instance.getRiskSet().checkRisk(productNftId, riskId);
 
         if (!exists) {
@@ -152,37 +151,6 @@ 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();
     }

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

package/contracts/registry/IRegistry.sol

@@ -19,8 +19,8 @@ interface IRegistry is
     IERC165
 {
 
-    event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogRegistryServiceRegistered(VersionPart majorVersion, ObjectType domain);
+    event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, VersionPart objectVersion, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogRegistryServiceRegistered(VersionPart release, ObjectType domain);
     event LogRegistryChainRegistryRegistered(NftId nftId, uint256 chainId, address chainRegistryAddress);
 
     // initialize
@@ -49,6 +49,7 @@ interface IRegistry is
     error ErrorRegistryCoreTypeRegistration();
 
     // _register()
+    error ErrorRegistryReleaseMismatch(VersionPart objectrelease, VersionPart parentRelease, VersionPart senderRelease);
     error ErrorRegistryGlobalRegistryAsParent(address objectAddress, ObjectType objectType);
     error ErrorRegistryTypeCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
     error ErrorRegistryContractAlreadyRegistered(address objectAddress);
@@ -58,13 +59,10 @@ interface IRegistry is
         NftId nftId;
         NftId parentNftId;
         ObjectType objectType;
+        VersionPart release;
         bool isInterceptor;
         // slot 1
         address objectAddress;
-        // slot 2
-        address initialOwner;
-        // slot 3
-        bytes data;
     }
 
     /// @dev Registers a registry contract for a specified chain.
@@ -72,28 +70,30 @@ interface IRegistry is
     function registerRegistry(
         NftId nftId, 
         uint256 chainId, 
-        address chainRegistryAddress
+        address chainRegistryAddress,
+        VersionPart release
     ) external;
 
     /// @dev Register a service with using the provided domain and version.
     /// The function returns a newly minted service NFT ID.
     /// May only be used to register services.
     function registerService(
-        ObjectInfo memory serviceInfo, 
-        VersionPart serviceVersion, 
-        ObjectType serviceDomain
+        ObjectInfo memory info,
+        address initialOwner,
+        ObjectType domain,
+        bytes memory data
     ) external returns(NftId nftId);
 
     /// @dev Register an object with a known core type.
     /// The function returns a newly minted object NFT ID.
     /// May not be used to register services.
-    function register(ObjectInfo memory info) external returns (NftId nftId);
+    function register(ObjectInfo memory info, address initialOwner, bytes memory data) external returns (NftId nftId);
 
     /// @dev Register an object with a custom type.
     /// The function returns a newly minted object NFT ID.
     /// This function is reserved for GIF releases > 3.
     /// May not be used to register known core types.
-    function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
+    function registerWithCustomType(ObjectInfo memory info, address initialOwner, bytes memory data) external returns (NftId nftId);
 
     function getInitialRelease() external view returns (VersionPart);
 
@@ -126,9 +126,15 @@ interface IRegistry is
 
     function getParentNftId(NftId nftId) external view returns (NftId parentNftId);
 
-    function isObjectType(NftId nftId, ObjectType expectedObjectType) external view returns (bool);
+    function getObjectData(NftId nftId) external view returns (bytes memory data);
 
-    function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool);
+    function getObjectData(address objectAddress) external view returns (bytes memory data);
+
+    function isObjectType(NftId nftId, ObjectType expectedObjectType, VersionPart expectedRelease) external view returns (bool);
+
+    function isObjectType(address contractAddress, ObjectType expectedObjectType, VersionPart expectedRelease) external view returns (bool);
+
+    function getObjectRelease(NftId nftId) external view returns (VersionPart release);
 
     function getObjectAddress(NftId nftId) external view returns (address objectAddress);
 

package/contracts/registry/IRegistryService.sol

@@ -19,13 +19,12 @@ interface IRegistryService is
 {
      error ErrorRegistryServiceNotRegistryOwner();
 
-     error ErrorRegistryServiceNotService(address notService);
-     error ErrorRegistryServiceNotInstance(address notInstance);
-     error ErrorRegistryServiceNotProduct(address notProduct);
-     error ErrorRegistryServiceNotComponent(address notComponent);
-     error ErrorRegistryServiceNotProductLinkedComponent(address notProductLinkedComponent);
+     // _checkInterface()
+     error ErrorRegistryServiceNotContract(address notContract);
+     error ErrorRegistryServiceInterfaceNotSupported(address registerable, bytes4 interfaceId);
 
      error ErrorRegistryServiceRegisterableAddressInvalid(IRegisterable registerable, address found);
+     error ErrorRegistryServiceRegisterableParentInvalid(IRegisterable registerable, NftId expected, NftId found);
      error ErrorRegistryServiceRegisterableTypeInvalid(IRegisterable registerable, ObjectType expected, ObjectType found);
      error ErrorRegistryServiceRegisterableOwnerInvalid(IRegisterable registerable, address expected, address found);
      error ErrorRegistryServiceRegisterableOwnerZero(IRegisterable registerable);   
@@ -40,23 +39,20 @@ interface IRegistryService is
      error ErrorRegistryServiceInvalidInitialOwner(address initialOwner);
      error ErrorRegistryServiceInvalidAddress(address registerableAddress);
 
-     function registerStake(IRegistry.ObjectInfo memory info)
+     function registerStake(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data)
           external returns(NftId nftId); 
 
-     function registerInstance(IRegisterable instance, address owner)
+     function registerInstance(IRegisterable instance, address initialOwner)
           external returns(IRegistry.ObjectInfo memory info); 
 
-     function registerProduct(IComponent product, address owner)
+     function registerComponent(IRegisterable component, NftId parenNftId, ObjectType componentType, address initialOwner)
           external returns(IRegistry.ObjectInfo memory info);
 
-     function registerProductLinkedComponent(IComponent component, ObjectType objectType, address owner)
-          external returns(IRegistry.ObjectInfo memory info);
-
-     function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
+     function registerDistributor(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data) external returns(NftId nftId);
 
-     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
+     function registerPolicy(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data) external returns(NftId nftId);
 
-     function registerBundle(IRegistry.ObjectInfo memory info) external returns(NftId nftId); 
+     function registerBundle(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data) external returns(NftId nftId); 
 
 }
 

package/contracts/registry/IRelease.sol

@@ -23,7 +23,4 @@ interface IRelease {
         bytes32 salt;
     }
 
-    /// @dev Registers a registry contract for a specified chain.
-    /// Only one chain registry may be registered per chain
-    function getRelease() external view returns (VersionPart release);
 }