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

package/contracts/authorization/AccessAdmin.sol

@@ -14,13 +14,14 @@ import {AccessAdminLib} from "./AccessAdminLib.sol";
 import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
 import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
+import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {Selector, SelectorSetLib} from "../type/Selector.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
-import {VersionPart} from "../type/Version.sol";
+import {VersionPartLib, VersionPart} from "../type/Version.sol";
 
 
 /**
@@ -30,6 +31,7 @@ import {VersionPart} from "../type/Version.sol";
  */ 
 contract AccessAdmin is
     AccessManagedUpgradeable,
+    RegistryLinked,
     IAccessAdmin
 {
     using EnumerableSet for EnumerableSet.AddressSet;
@@ -91,12 +93,16 @@ contract AccessAdmin is
     /// Internally initializes access manager with this admin and creates basic role setup.
     function initialize(
         address authority,
-        string memory adminName 
+        string memory adminName,
+        VersionPart release 
     )
         public
-        initializer()
     {
-        __AccessAdmin_init(authority, adminName);
+        if(_getInitializedVersion() != 0) {
+            revert InvalidInitialization();
+        }
+
+        __AccessAdmin_init(authority, adminName, release);
     }
 
 
@@ -106,14 +112,16 @@ contract AccessAdmin is
     /// - this function as well as any completeSetup functions MUST be called in the same tx.
     function __AccessAdmin_init(
         address authority, 
-        string memory adminName 
+        string memory adminName,
+        VersionPart release
     )
         internal
-        onlyInitializing()
+        reinitializer(release.toInt())
     {
         AccessAdminLib.checkInitParameters(authority, adminName);
+
         _authority = AccessManagerCloneable(authority);
-        _authority.initialize(address(this));
+        _authority.initialize(address(this), release);
 
         // delayed additional check for authority after its initialization
         if (!ContractLib.isAuthority(authority)) {
@@ -121,7 +129,7 @@ contract AccessAdmin is
         }
 
         // effects
-        // set and initialize this access manager contract as
+        // set and initialize this contract as
         // the admin (ADMIN_ROLE) of the provided authority
         __AccessManaged_init(authority);
 
@@ -129,7 +137,7 @@ contract AccessAdmin is
         _adminName = adminName;
 
         // set initial linked NFT ID to zero
-        _linkedNftId = NftIdLib.zero();
+        //_linkedNftId = NftIdLib.zero();
 
         // setup admin role
         _createRoleUnchecked(
@@ -149,12 +157,7 @@ contract AccessAdmin is
     //--- view functions for access admin ---------------------------------------//
 
     function getRelease() public view virtual returns (VersionPart release) {
-        return _authority.getRelease();
-    }
-
-
-    function getRegistry() public view returns (IRegistry registry) {
-        return _authority.getRegistry();
+        return VersionPartLib.toVersionPart(uint8(_getInitializedVersion()));
     }
 
 

package/contracts/authorization/AccessManagerCloneable.sol

@@ -4,9 +4,9 @@ pragma solidity ^0.8.20;
 import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
 import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
 
+import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {InitializableERC165} from "../shared/InitializableERC165.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
-import {VersionPart} from "../type/Version.sol";
+import {VersionPartLib, VersionPart} from "../type/Version.sol";
 
 
 /// @dev An AccessManager based on OpenZeppelin that is cloneable and has a central lock property.
@@ -14,8 +14,7 @@ import {VersionPart} from "../type/Version.sol";
 /// Cloned by upon release preparation and instance cloning.
 contract AccessManagerCloneable is
     AccessManagerUpgradeable,
-    InitializableERC165,
-    RegistryLinked
+    InitializableERC165
 {
     error ErrorAccessManagerCallerNotAdmin(address caller);
     error ErrorAccessManagerRegistryAlreadySet(address registry);
@@ -24,7 +23,6 @@ contract AccessManagerCloneable is
     error ErrorAccessManagerTargetAdminLocked(address target);
     error ErrorAccessManagerCallerAdminLocked(address caller);
 
-    VersionPart private _release;
     bool private _isLocked;
 
 
@@ -36,34 +34,36 @@ contract AccessManagerCloneable is
         _;
     }
 
-
-    function initialize(address admin)
+    function initialize(address adminAddress, VersionPart release)
         public
-        initializer()
+
     {
-        __ERC165_init();
-        __AccessManager_init(admin);
+        if(_getInitializedVersion() != 0) {
+            revert InvalidInitialization();
+        }
 
-        _registerInterface(type(IAccessManager).interfaceId);
+        AccessManagerCloneable_init(adminAddress, release);
     }
 
-
-    /// @dev Completes the setup of the access manager.
-    /// Links the access manager to the registry and sets the release version.
-    function completeSetup(
-        address registry, 
+    function AccessManagerCloneable_init(
+        address admin,
         VersionPart release
     )
-        external
-        onlyAdminRole
-        reinitializer(uint64(release.toInt()))
+        internal
+        reinitializer(release.toInt())
     {
-        _checkAndSetRegistry(registry);
-        _checkAndSetRelease(release);
+        if (!release.isValidRelease()) {
+            revert ErrorAccessManagerInvalidRelease(release);
+        }
+
+        __ERC165_init();
+        __AccessManager_init(admin);
+
+        _registerInterface(type(IAccessManager).interfaceId);
     }
 
     /// @dev Returns true if the caller is authorized to call the target with the given selector and the manager lock is not set to locked.
-    /// Feturn values as in OpenZeppelin AccessManager.
+    /// Return values as in OpenZeppelin AccessManager.
     /// For a locked manager the function reverts with ErrorAccessManagerTargetAdminLocked.
     function canCall(
         address caller,
@@ -101,10 +101,10 @@ contract AccessManagerCloneable is
     /// For the registry admin release 3 is returned.
     /// For the release admin and the instance admin the actual release version is returned.
     function getRelease() external view returns (VersionPart release) {
-        return _release;
+        return VersionPartLib.toVersionPart(
+            uint8(_getInitializedVersion()));
     }
 
-
     /// @dev Returns true iff all contracts of this access manager are locked.
     function isLocked()
         public
@@ -113,28 +113,4 @@ contract AccessManagerCloneable is
     {
         return _isLocked;
     }
-
-
-    function _checkAndSetRelease(VersionPart release)
-        internal
-    {
-        if (!release.isValidRelease()) {
-            revert ErrorAccessManagerInvalidRelease(release);
-        }
-
-        _release = release;
-    }
-
-
-    function _checkAndSetRegistry(address registry)
-        internal
-    {
-        // checks
-        if(address(getRegistry()) != address(0)) {
-            revert ErrorAccessManagerRegistryAlreadySet(address(getRegistry()) );
-        }
-
-        // effects
-        __RegistryLinked_init(registry);
-    }
 }

package/contracts/authorization/Authorization.sol

@@ -9,7 +9,7 @@ import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib} from "../type/RoleId.sol";
 import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
 import {Str, StrLib} from "../type/String.sol";
-
+import {VersionPart} from "../type/Version.sol";
 
 contract Authorization is
     ServiceAuthorization,
@@ -30,7 +30,7 @@ contract Authorization is
     constructor(
         string memory mainTargetName, 
         ObjectType domain,
-        uint8 release,
+        VersionPart release,
         string memory commitHash,
         IAccess.TargetType targetType,
         bool includeTokenHandler

package/contracts/authorization/IAccessAdmin.sol

@@ -6,7 +6,6 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
 import {IAccess} from "./IAccess.sol";
 import {IAuthorization} from "./IAuthorization.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
-import {IRelease} from "../registry/IRelease.sol";
 
 import {Blocknumber} from "../type/Blocknumber.sol";
 import {NftId} from "../type/NftId.sol";
@@ -19,8 +18,7 @@ import {VersionPart} from "../type/Version.sol";
 interface IAccessAdmin is 
     IAccessManaged,
     IAccess,
-    IRegistryLinked,
-    IRelease
+    IRegistryLinked
 {
 
     // roles, targets and functions
@@ -139,4 +137,5 @@ interface IAccessAdmin is
 
     function authorizedFunctions(address target) external view returns (uint256 numberOfFunctions);
     function getAuthorizedFunction(address target, uint256 idx) external view returns (FunctionInfo memory func, RoleId roleId);
+        function getRelease() external view returns (VersionPart);
 }

package/contracts/authorization/IServiceAuthorization.sol

@@ -16,7 +16,7 @@ interface IServiceAuthorization is
 
      error ErrorAuthorizationMainTargetNameEmpty();
      error ErrorAuthorizationTargetDomainZero();
-     error ErrorAuthorizationReleaseInvalid(uint8 release);
+     error ErrorAuthorizationReleaseInvalid(VersionPart release);
      error ErrorAuthorizationCommitHashInvalid(string commitHash);
 
      /// @dev Returns the main domain of the authorization.

package/contracts/authorization/ServiceAuthorization.sol

@@ -30,7 +30,7 @@ contract ServiceAuthorization is
      string public constant ROLE_NAME_SUFFIX = "_Role";
 
      ObjectType public immutable DOMAIN;
-     uint256 internal immutable _release;
+     VersionPart internal immutable _release;
      string internal _commitHash;
 
      string internal _mainTargetName;
@@ -55,7 +55,7 @@ contract ServiceAuthorization is
      constructor(
           string memory mainTargetName, 
           ObjectType domain,
-          uint8 release,
+          VersionPart release,
           string memory commitHash
      )
      {
@@ -68,7 +68,7 @@ contract ServiceAuthorization is
                revert ErrorAuthorizationTargetDomainZero();
           }
 
-          if (release < VersionPartLib.releaseMin().toInt() || release >= VersionPartLib.releaseMax().toInt()) {
+          if (!VersionPartLib.isValidRelease(release)) {
                revert ErrorAuthorizationReleaseInvalid(release);
           }
 
@@ -103,7 +103,7 @@ contract ServiceAuthorization is
 
      /// @inheritdoc IServiceAuthorization
      function getRelease() public view returns(VersionPart release) {
-          return VersionPartLib.toVersionPart(_release);
+          return _release;
      }
 
      /// @inheritdoc IServiceAuthorization

package/contracts/distribution/BasicDistributionAuthorization.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 {Authorization} from "../authorization/Authorization.sol";
 import {BasicDistribution} from "./BasicDistribution.sol"; 
 import {Distribution} from "./Distribution.sol";
 import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
 import {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 BasicDistributionAuthorization
      is Authorization
@@ -20,7 +21,7 @@ contract BasicDistributionAuthorization
           Authorization(
                distributionName, 
                DISTRIBUTION(), 
-               3,
+               GIF_INITIAL_RELEASE(),
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -60,7 +61,7 @@ contract BasicDistributionAuthorization
           _authorize(functions, BasicDistribution.changeDistributorType.selector, "changeDistributorType");
           _authorize(functions, BasicDistribution.createReferral.selector, "createReferral");
           
-          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
           _authorize(functions, Distribution.withdrawCommission.selector, "withdrawCommission");
      }
 }

package/contracts/distribution/DistributionService.sol

@@ -44,7 +44,7 @@ contract DistributionService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,
@@ -134,11 +134,12 @@ contract DistributionService is
                 NftIdLib.zero(), 
                 distributionNftId,
                 DISTRIBUTOR(),
+                getRelease(),
                 true, // intercepting property for bundles is defined on pool
-                address(0),
-                distributor,
-                ""
-            ));
+                address(0)),
+            distributor,
+            ""
+        );
 
         IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo({
             distributorType: distributorType,
@@ -197,9 +198,11 @@ contract DistributionService is
             revert ErrorDistributionServiceExpirationInvalid(expiryAt);
         }
 
-        NftId distributorDistributionNftId = getRegistry().getParentNftId(distributorNftId);
-        if (distributorDistributionNftId != distributionNftId) {
-            revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
+        {
+            NftId distributorDistributionNftId = getRegistry().getParentNftId(distributorNftId);
+            if (distributorDistributionNftId != distributionNftId) {
+                revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
+            }
         }
 
         {

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

package/contracts/instance/Instance.sol

@@ -26,8 +26,6 @@ contract Instance is
     IInstance,
     Registerable
 {
-    bool private _initialized;
-
     IComponentService internal _componentService;
     IInstanceService internal _instanceService;
 
@@ -60,7 +58,6 @@ contract Instance is
     function initialize(
         InstanceContracts memory instanceContracts,
         IRegistry registry, 
-        VersionPart release,
         address initialOwner,
         bool tokenRegistryDisabled // only disable for testing
     ) 
@@ -100,12 +97,12 @@ contract Instance is
         _componentService = IComponentService(
             getRegistry().getServiceAddress(
                 COMPONENT(), 
-                release));
+                getRelease()));
 
         _instanceService = IInstanceService(
             getRegistry().getServiceAddress(
                 INSTANCE(), 
-                release));
+                getRelease()));
 
         _tokenRegistryDisabled = tokenRegistryDisabled;
 

package/contracts/instance/InstanceAdmin.sol

@@ -11,8 +11,9 @@ import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {ObjectType, INSTANCE} from "../type/ObjectType.sol";
 import {RoleId, ADMIN_ROLE} from "../type/RoleId.sol";
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {Str} from "../type/String.sol";
-import {VersionPart} from "../type/Version.sol";
+import {VersionPartLib, VersionPart} from "../type/Version.sol";
 import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 
 
@@ -26,13 +27,12 @@ contract InstanceAdmin is
     error ErrorInstanceAdminNotComponentOrCustomTarget(address target);
 
     IInstance internal _instance;
-    IRegistry internal _registry;
 
     uint64 internal _customRoleIdNext;
 
 
     modifier onlyInstanceService() {
-        if (msg.sender != _registry.getServiceAddress(INSTANCE(), getRelease())) {
+        if (msg.sender != getRegistry().getServiceAddress(INSTANCE(), getRelease())) {
             revert ErrorInstanceAdminNotInstanceService(msg.sender);
         }
         _;
@@ -43,7 +43,8 @@ contract InstanceAdmin is
     constructor(address accessManager) {
         initialize(
             accessManager,
-            "MasterInstanceAdmin");
+            "MasterInstanceAdmin",
+            GIF_INITIAL_RELEASE());
     }
 
 
@@ -53,30 +54,24 @@ contract InstanceAdmin is
     function completeSetup(
         address registry,
         address authorization,
-        VersionPart release,
         address instance
     )
         external
-        reinitializer(uint64(release.toInt()))
     {
         // checks
         AccessAdminLib.checkIsRegistered(registry, instance, INSTANCE());
 
         // effects
-        AccessManagerCloneable(
-            authority()).completeSetup(
-                registry, 
-                release); 
-
         AccessAdminLib.checkAuthorization(
             address(_authorization), 
             authorization, 
             INSTANCE(), // expectedDomain
-            release, // expectedRelease
+            getRelease(), // expectedRelease
             false, // expectServiceAuthorization
             true); // checkAlreadyInitialized
 
-        _registry = IRegistry(registry);
+        __RegistryLinked_init(registry);
+
         _instance = IInstance(instance);
         _authorization = IAuthorization(authorization);
         _customRoleIdNext = 0;
@@ -105,7 +100,7 @@ contract InstanceAdmin is
         for(uint256 i = 0; i < serviceDomains.length; i++) {
             ObjectType serviceDomain = serviceDomains[i];
             RoleId serviceRoleId = authorization.getServiceRole(serviceDomain);
-            address service = _registry.getServiceAddress(serviceDomain, getRelease());
+            address service = getRegistry().getServiceAddress(serviceDomain, getRelease());
 
             _grantRoleToAccount(
                 serviceRoleId,

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -13,7 +13,9 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 import {ProductStore} from "../instance/ProductStore.sol";
 import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {RiskSet} from "../instance/RiskSet.sol"; 
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
+import {RiskSet} from "../instance/RiskSet.sol";
+import {VersionPartLib} from "../type/Version.sol";
 
 
 contract InstanceAuthorizationV3
@@ -27,7 +29,7 @@ contract InstanceAuthorizationV3
           Authorization(
                INSTANCE_TARGET_NAME, 
                INSTANCE(), 
-               3, 
+               GIF_INITIAL_RELEASE(), 
                COMMIT_HASH,
                TargetType.Instance, 
                false)

package/contracts/instance/InstanceService.sol

@@ -206,7 +206,6 @@ contract InstanceService is
         instanceAdmin.completeSetup(
             address(getRegistry()),
             address(instanceAuthorization),
-            getRelease(),
             address(instance));
 
         // hard checks for newly cloned instance
@@ -349,6 +348,7 @@ contract InstanceService is
             if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
             if(productStoreAddress == address(0)) { revert ErrorInstanceServiceProductStoreZero(); } // TODO: rename exception
             
+            // TODO check instance cluster release
             if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
             if(bundleSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
             if(riskSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRiskSetAuthorityMismatch(); }
@@ -419,7 +419,8 @@ contract InstanceService is
 
         clonedAdmin.initialize(
             address(clonedAccessManager),
-            "InstanceAdmin");
+            "InstanceAdmin",
+            getRelease());
     }
 
 
@@ -446,7 +447,6 @@ contract InstanceService is
                 instanceReader: InstanceReader(Clones.clone(address(_masterInstanceReader)))
             }),
             getRegistry(),
-            getRelease(),
             instanceOwner,
             allowAnyToken);
 
@@ -461,7 +461,7 @@ contract InstanceService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,

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

package/contracts/oracle/BasicOracleAuthorization.sol

@@ -8,6 +8,8 @@ import {IAccess} from "../authorization/IAccess.sol";
 import {IOracle} from "./IOracle.sol"; 
 import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
 import {RoleId} from "../type/RoleId.sol";
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
+import {VersionPartLib} from "../type/Version.sol";
 
 
 contract BasicOracleAuthorization
@@ -21,7 +23,7 @@ contract BasicOracleAuthorization
           Authorization(
                componentName, 
                ORACLE(), 
-               3, 
+               GIF_INITIAL_RELEASE(),
                commitHash, 
                TargetType.Component, 
                false)

package/contracts/oracle/Oracle.sol

@@ -5,10 +5,11 @@ import {Amount} from "../type/Amount.sol";
 import {COMPONENT, PRODUCT, ORACLE} from "../type/ObjectType.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IComponent} from "../shared/IComponent.sol";
 import {IOracleComponent} from "./IOracleComponent.sol";
 import {IOracleService} from "./IOracleService.sol";
 import {NftId} from "../type/NftId.sol";
+import {Component} from "../shared/Component.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -66,7 +67,7 @@ abstract contract Oracle is
     function withdrawFees(Amount amount)
         external
         virtual
-        override(IInstanceLinkedComponent, InstanceLinkedComponent)
+        override(IComponent, Component)
         onlyOwner()
         restricted()
         returns (Amount)

package/contracts/oracle/OracleService.sol

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