@etherisc/gif-next 3.0.0-9a6ca4b-922 → 3.0.0-a511887-523

package/contracts/oracle/OracleServiceManager.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 {OracleService} from "./OracleService.sol";
 
@@ -18,13 +18,13 @@ contract OracleServiceManager is ProxyManager {
     {
         OracleService svc = new OracleService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _oracleService = OracleService(address(versionable));
+        _oracleService = OracleService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/BasicPoolAuthorization.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPoolComponent} from "./IPoolComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
@@ -10,8 +10,9 @@ import {BasicPool} from "./BasicPool.sol";
 import {COMPONENT, POOL} from "../type/ObjectType.sol";
 import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
 import {RoleId} 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 BasicPoolAuthorization
      is Authorization
@@ -21,7 +22,7 @@ contract BasicPoolAuthorization
           Authorization(
                poolName, 
                POOL(), 
-               3,
+               GIF_INITIAL_RELEASE(),
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -70,7 +71,7 @@ contract BasicPoolAuthorization
           _authorize(functions, BasicPool.unstake.selector, "unstake");
           _authorize(functions, BasicPool.extend.selector, "extend");
 
-          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
           _authorize(functions, BasicPool.withdrawBundleFees.selector, "withdrawBundleFees");
 
           // authorize pool service

package/contracts/pool/BundleService.sol

@@ -41,7 +41,7 @@ contract BundleService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,
@@ -105,11 +105,11 @@ contract BundleService is
                 NftIdLib.zero(), 
                 poolNftId,
                 BUNDLE(),
+                getRelease(),
                 false, // intercepting property for bundles is defined on pool
-                address(0),
-                owner,
-                "" // bundle data to be stored in registry
-            )
+                address(0)),
+            owner,
+            "" // bundle data to be stored in registry
         );
 
         // create bundle info in instance

package/contracts/pool/BundleServiceManager.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 {BundleService} from "./BundleService.sol";
 
@@ -18,13 +18,13 @@ contract BundleServiceManager is ProxyManager {
     {
         BundleService svc = new BundleService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _bundleService = BundleService(address(versionable));
+        _bundleService = BundleService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

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 {
 
@@ -155,7 +156,8 @@ library PoolLib {
     function checkAndGetPoolInfo(
         IRegistry registry,
         address sender,
-        NftId bundleNftId
+        NftId bundleNftId,
+        VersionPart release
     )
         public
         view
@@ -167,7 +169,7 @@ library PoolLib {
             IComponents.PoolInfo memory poolInfo
         )
     {
-        checkNftType(registry, bundleNftId, BUNDLE());
+        checkNftType(registry, bundleNftId, BUNDLE(), release);
 
         IInstance instance;
         (poolNftId, instance) = getAndVerifyActivePool(registry, sender);
@@ -235,9 +237,10 @@ library PoolLib {
     function checkNftType(
         IRegistry registry, 
         NftId nftId, 
-        ObjectType expectedObjectType
+        ObjectType expectedObjectType,
+        VersionPart expectedRelease
     ) internal view {
-        if(!registry.isObjectType(nftId, expectedObjectType)) {
+        if(!registry.isObjectType(nftId, expectedObjectType, expectedRelease)) {
             revert INftOwnable.ErrorNftOwnableInvalidType(nftId, expectedObjectType);
         }
     }

package/contracts/pool/PoolService.sol

@@ -42,7 +42,7 @@ contract PoolService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,
@@ -184,7 +184,7 @@ contract PoolService is
             NftId instanceNftId,
             NftId poolNftId,
             IComponents.PoolInfo memory poolInfo
-        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
+        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId, getRelease());
 
         {
             Amount currentPoolBalance = instanceReader.getBalanceAmount(poolNftId);
@@ -241,7 +241,7 @@ contract PoolService is
             InstanceStore instanceStore,
             NftId instanceNftId,
             NftId poolNftId,
-        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
+        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId, getRelease());
 
         // call bundle service for bookkeeping and additional checks
         Amount unstakedAmount = _bundleService.unstake(instanceStore, bundleNftId, amount);

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";
 
@@ -18,13 +18,13 @@ contract PoolServiceManager is ProxyManager {
     {
         PoolService poolSrv = new PoolService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             address(poolSrv), 
             data,
             salt);
 
-        _poolService = PoolService(address(versionable));
+        _poolService = PoolService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/ApplicationService.sol

@@ -38,7 +38,7 @@ contract ApplicationService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,
@@ -108,12 +108,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, "");
     }
 
 

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";
 
@@ -18,13 +18,13 @@ contract ApplicationServiceManager is ProxyManager {
     {
         ApplicationService svc = new ApplicationService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _applicationService = ApplicationService(address(versionable));
+        _applicationService = ApplicationService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/BasicProductAuthorization.sol

@@ -2,15 +2,16 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IComponent} 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 {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
@@ -19,7 +20,7 @@ contract BasicProductAuthorization
           Authorization(
                componentName, 
                PRODUCT(), 
-               3,
+               GIF_INITIAL_RELEASE(),
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -57,7 +58,7 @@ contract BasicProductAuthorization
           functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
           _authorize(functions, BasicProduct.setFees.selector, "setFees");
           _authorize(functions, IProductComponent.registerComponent.selector, "registerComponent");
-          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
      }
 }
 

package/contracts/product/ClaimService.sol

@@ -39,7 +39,7 @@ contract ClaimService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,

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";
 
@@ -18,13 +18,13 @@ contract ClaimServiceManager is ProxyManager {
     {
         ClaimService svc = new ClaimService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _claimService = ClaimService(address(versionable));
+        _claimService = ClaimService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/PolicyService.sol

@@ -45,7 +45,7 @@ contract PolicyService is
     )
         internal
         virtual override
-        initializer
+        onlyInitializing()
     {
         (
             address authority,

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";
 
@@ -18,13 +18,13 @@ contract PolicyServiceManager is ProxyManager {
     {
         PolicyService svc = new PolicyService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _policyService = PolicyService(address(versionable));
+        _policyService = PolicyService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/PricingService.sol

@@ -36,7 +36,7 @@ contract PricingService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,

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";
 
@@ -18,13 +18,13 @@ contract PricingServiceManager is ProxyManager {
     {
         PricingService pricingSrv = new PricingService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             address(pricingSrv), 
             data,
             salt);
 
-        _pricingService = PricingService(address(versionable));
+        _pricingService = PricingService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/RiskService.sol

@@ -26,8 +26,8 @@ contract RiskService is
         bytes memory data
     )
         internal
-        initializer
         virtual override
+        onlyInitializing()
     {
         (
             address authority,

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";
 
@@ -18,13 +18,13 @@ contract RiskServiceManager is ProxyManager {
     {
         RiskService svc = new RiskService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             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);
 }