@etherisc/gif-next 0.0.2-ffa91a6-022 → 3.0.0-04e2e0d-531

package/contracts/registry/ReleaseRegistry.sol

@@ -14,7 +14,7 @@ import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol"
 
 import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
+import {ObjectType, ObjectTypeLib, COMPONENT, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 import {Registry} from "./Registry.sol";
 import {ReleaseAdmin} from "./ReleaseAdmin.sol";
@@ -150,7 +150,7 @@ contract ReleaseRegistry is
         uint256 serviceDomainsCount = _verifyServiceAuthorization(serviceAuthorization, releaseVersion, salt);
 
         // create and initialize release admin
-        releaseAdmin = _cloneNewReleaseAdmin(releaseVersion);
+        releaseAdmin = _cloneNewReleaseAdmin(serviceAuthorization, releaseVersion);
         releaseSalt = salt;
 
         // ensures unique salt
@@ -182,8 +182,8 @@ contract ReleaseRegistry is
         checkTransition(_releaseInfo[releaseVersion].state, RELEASE(), DEPLOYING(), DEPLOYED());
 
         address releaseAuthority = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin).authority();
-        IServiceAuthorization releaseAuth = _releaseInfo[releaseVersion].auth;
-        ObjectType expectedDomain = releaseAuth.getServiceDomain(_registeredServices);
+        IServiceAuthorization releaseAuthz = _releaseInfo[releaseVersion].auth;
+        ObjectType expectedDomain = releaseAuthz.getServiceDomain(_registeredServices);
 
         // service can work with release registry and release version
         (
@@ -216,7 +216,6 @@ contract ReleaseRegistry is
         ReleaseAdmin releaseAdmin = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin);
         releaseAdmin.setReleaseLocked(false);
         releaseAdmin.authorizeService(
-            releaseAuth, 
             service,
             serviceDomain,
             releaseVersion);
@@ -240,7 +239,7 @@ contract ReleaseRegistry is
 
         _latest = release;
         _releaseInfo[release].state = ACTIVE();
-        _releaseInfo[release].activatedAt = TimestampLib.blockTimestamp();
+        _releaseInfo[release].activatedAt = TimestampLib.current();
         _releaseInfo[release].disabledAt = TimestampLib.max();
 
         // grant special roles for registry/staking/pool services
@@ -259,6 +258,11 @@ contract ReleaseRegistry is
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), STAKING());
         }
 
+        service = _registry.getServiceAddress(COMPONENT(), release);
+        if(service != address(0)) {
+            _registryAdmin.grantServiceRoleForAllVersions(IService(service), COMPONENT());
+        }
+
         service = _registry.getServiceAddress(POOL(), release);
         if(service != address(0)) {
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), POOL());
@@ -284,7 +288,7 @@ contract ReleaseRegistry is
         } else {
             checkTransition(state, RELEASE(), ACTIVE(), PAUSED());
             _releaseInfo[release].state = PAUSED();
-            _releaseInfo[release].disabledAt = TimestampLib.blockTimestamp();
+            _releaseInfo[release].disabledAt = TimestampLib.current();
             emit LogReleaseDisabled(release);
         }
 
@@ -367,7 +371,10 @@ contract ReleaseRegistry is
             _releaseInfo[release].releaseAdmin).setReleaseLocked(locked);
     }
 
-    function _cloneNewReleaseAdmin(VersionPart release)
+    function _cloneNewReleaseAdmin(
+        IServiceAuthorization serviceAuthorization,
+        VersionPart release
+    )
         private
         returns (ReleaseAdmin clonedAdmin)
     {
@@ -377,7 +384,7 @@ contract ReleaseRegistry is
 
         string memory releaseAdminName = string(
             abi.encodePacked(
-                "ReleaseAdmin_v", 
+                "ReleaseAdminV", 
                 release.toString()));
 
         clonedAdmin.initialize(
@@ -386,8 +393,9 @@ contract ReleaseRegistry is
 
         clonedAdmin.completeSetup(
             address(_registry), 
-            address(this), // release registry (this contract)
-            release);
+            address(serviceAuthorization),
+            release,
+            address(this)); // release registry (this contract)
 
         // lock release (remains locked until activation)
         clonedAdmin.setReleaseLocked(true);
@@ -412,7 +420,7 @@ contract ReleaseRegistry is
         returns (uint256 serviceDomainsCount)
     {
         // authorization contract supports IServiceAuthorization interface
-        if(!serviceAuthorization.supportsInterface(type(IServiceAuthorization).interfaceId)) {
+        if(!ContractLib.supportsInterface(address(serviceAuthorization), type(IServiceAuthorization).interfaceId)) {
             revert ErrorReleaseRegistryNotServiceAuth(address(serviceAuthorization));
         }
 

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {
-     ALL, ACCOUNTING, REGISTRY, RISK, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, STAKING, PRICE
+     ALL, RELEASE, ACCOUNTING, REGISTRY, RISK, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, STAKING, PRICE
 } from "../../contracts/type/ObjectType.sol";
 
 import {IAccess} from "../authorization/IAccess.sol";
@@ -19,6 +19,7 @@ import {IPoolService} from "../pool/IPoolService.sol";
 import {IStakingService} from "../staking/IStakingService.sol";
 import {IRegistryService} from "./IRegistryService.sol";
 import {IRiskService} from "../product/IRiskService.sol";
+
 import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
 
 
@@ -27,27 +28,31 @@ contract ServiceAuthorizationV3
 {
 
      constructor(string memory commitHash)
-          ServiceAuthorization(commitHash, 3)
+          ServiceAuthorization(
+               "ReleaseAdmin",
+               RELEASE(),
+               3,
+               commitHash)
      {}
 
      function _setupDomains()
           internal
           override
      {
-          _authorizeDomain(REGISTRY(), address(1));
-          _authorizeDomain(STAKING(), address(2));
-          _authorizeDomain(INSTANCE(), address(3));
-          _authorizeDomain(ACCOUNTING(), address(4));
-          _authorizeDomain(COMPONENT(), address(5));
-          _authorizeDomain(DISTRIBUTION(), address(6));
-          _authorizeDomain(PRICE(), address(7));
-          _authorizeDomain(BUNDLE(), address(8));
-          _authorizeDomain(POOL(), address(9));
-          _authorizeDomain(ORACLE(), address(10));
-          _authorizeDomain(RISK(), address(11));
-          _authorizeDomain(POLICY(), address(12));
-          _authorizeDomain(CLAIM(), address(13));
-          _authorizeDomain(APPLICATION(), address(14));
+          _authorizeServiceDomain(REGISTRY(), address(1));
+          _authorizeServiceDomain(STAKING(), address(2));
+          _authorizeServiceDomain(INSTANCE(), address(3));
+          _authorizeServiceDomain(ACCOUNTING(), address(4));
+          _authorizeServiceDomain(COMPONENT(), address(5));
+          _authorizeServiceDomain(DISTRIBUTION(), address(6));
+          _authorizeServiceDomain(PRICE(), address(7));
+          _authorizeServiceDomain(BUNDLE(), address(8));
+          _authorizeServiceDomain(POOL(), address(9));
+          _authorizeServiceDomain(ORACLE(), address(10));
+          _authorizeServiceDomain(RISK(), address(11));
+          _authorizeServiceDomain(POLICY(), address(12));
+          _authorizeServiceDomain(CLAIM(), address(13));
+          _authorizeServiceDomain(APPLICATION(), address(14));
      }
 
 
@@ -55,10 +60,9 @@ contract ServiceAuthorizationV3
           internal
           override
      {
-          _setupIRegistryServiceAuthorization();
+          _setupRegistryServiceAuthorization();
           _setupStakingServiceAuthorization();
           _setupInstanceServiceAuthorization();
-          _setupInstanceServiceAuthorization();
           _setupAccountingServiceAuthorization();
           _setupComponentServiceAuthorization();
           _setupClaimServiceAuthorization();
@@ -74,7 +78,7 @@ contract ServiceAuthorizationV3
 
      /// @dev registry service authorization.
      /// authorized functions MUST be implemented with a restricted modifier
-     function _setupIRegistryServiceAuthorization()
+     function _setupRegistryServiceAuthorization()
           internal
      {
           IAccess.FunctionInfo[] storage functions;
@@ -116,12 +120,9 @@ contract ServiceAuthorizationV3
           _authorize(functions, IStakingService.withdrawInstanceRewardReserves.selector, "withdrawInstanceRewardReserves");
 
           functions = _authorizeForService(STAKING(), ALL());
-          _authorize(functions, IStakingService.create.selector, "create");
-          _authorize(functions, IStakingService.stake.selector, "stake");
-          _authorize(functions, IStakingService.restakeToNewTarget.selector, "restakeToNewTarget");
-          _authorize(functions, IStakingService.updateRewards.selector, "updateRewards");
-          _authorize(functions, IStakingService.claimRewards.selector, "claimRewards");
-          _authorize(functions, IStakingService.unstake.selector, "unstake");
+          _authorize(functions, IStakingService.createStakeObject.selector, "createStakeObject");
+          _authorize(functions, IStakingService.pullDipToken.selector, "pullDipToken");
+          _authorize(functions, IStakingService.pushDipToken.selector, "pushDipToken");
      }
 
 
@@ -131,8 +132,16 @@ contract ServiceAuthorizationV3
      {
           IAccess.FunctionInfo[] storage functions;
           functions = _authorizeForService(INSTANCE(), ALL());
-          _authorize(functions, IInstanceService.setInstanceLocked.selector, "setInstanceLocked");
+          _authorize(functions, IInstanceService.createRole.selector, "createRole");
+          _authorize(functions, IInstanceService.setRoleActive.selector, "setRoleActive");
+          _authorize(functions, IInstanceService.grantRole.selector, "grantRole");
+          _authorize(functions, IInstanceService.revokeRole.selector, "revokeRole");
+
+          _authorize(functions, IInstanceService.createTarget.selector, "createTarget");
+          _authorize(functions, IInstanceService.authorizeFunctions.selector, "authorizeFunctions");
+          _authorize(functions, IInstanceService.unauthorizeFunctions.selector, "unauthorizeFunctions");
           _authorize(functions, IInstanceService.setTargetLocked.selector, "setTargetLocked");
+          _authorize(functions, IInstanceService.setInstanceLocked.selector, "setInstanceLocked");
 
           _authorize(functions, IInstanceService.createInstance.selector, "createInstance");
           _authorize(functions, IInstanceService.upgradeInstanceReader.selector, "upgradeInstanceReader");
@@ -141,8 +150,8 @@ contract ServiceAuthorizationV3
           _authorize(functions, IInstanceService.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
           _authorize(functions, IInstanceService.setStakingRewardRate.selector, "setStakingRewardRate");
           _authorize(functions, IInstanceService.setStakingMaxAmount.selector, "setStakingMaxAmount");
-          _authorize(functions, IInstanceService.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
-          _authorize(functions, IInstanceService.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
+          _authorize(functions, IInstanceService.refillInstanceRewardReserves.selector, "refillInstanceRewardReserves");
+          _authorize(functions, IInstanceService.withdrawInstanceRewardReserves.selector, "withdrawInstanceRewardReserves");
      }
 
      /// @dev Accounting service function authorization.
@@ -172,6 +181,7 @@ contract ServiceAuthorizationV3
           _authorize(functions, IAccountingService.decreasePoolBalance.selector, "decreasePoolBalance");
           _authorize(functions, IAccountingService.increaseBundleBalanceForPool.selector, "increaseBundleBalanceForPool");
           _authorize(functions, IAccountingService.decreaseBundleBalanceForPool.selector, "decreaseBundleBalanceForPool");
+          _authorize(functions, IAccountingService.increaseProductFeesForPool.selector, "increaseProductFeesForPool");
 
      }
 
@@ -203,7 +213,8 @@ contract ServiceAuthorizationV3
           functions = _authorizeForService(RISK(), ALL());
           _authorize(functions, IRiskService.createRisk.selector, "createRisk");
           _authorize(functions, IRiskService.updateRisk.selector, "updateRisk");
-          _authorize(functions, IRiskService.updateRiskState.selector, "updateRiskState");
+          _authorize(functions, IRiskService.setRiskLocked.selector, "setRiskLocked");
+          _authorize(functions, IRiskService.closeRisk.selector, "closeRisk");
      }
 
      /// @dev Distribution service function authorization.
@@ -216,7 +227,7 @@ contract ServiceAuthorizationV3
           _authorize(functions, IClaimService.confirm.selector, "confirm");
           _authorize(functions, IClaimService.decline.selector, "decline");
           _authorize(functions, IClaimService.revoke.selector, "revoke");
-          _authorize(functions, IClaimService.close.selector, "close");
+          _authorize(functions, IClaimService.cancelConfirmedClaim.selector, "cancelConfirmedClaim");
           _authorize(functions, IClaimService.createPayoutForBeneficiary.selector, "createPayoutForBeneficiary");
           _authorize(functions, IClaimService.createPayout.selector, "createPayout");
           _authorize(functions, IClaimService.processPayout.selector, "processPayout");
@@ -283,8 +294,7 @@ contract ServiceAuthorizationV3
           functions = _authorizeForService(BUNDLE(), ALL());
           _authorize(functions, IBundleService.create.selector, "create");
           _authorize(functions, IBundleService.extend.selector, "extend");
-          _authorize(functions, IBundleService.lock.selector, "lock");
-          _authorize(functions, IBundleService.unlock.selector, "unlock");
+          _authorize(functions, IBundleService.setLocked.selector, "setLocked");
           _authorize(functions, IBundleService.setFee.selector, "setFee");
      }
 
@@ -322,6 +332,7 @@ contract ServiceAuthorizationV3
           _authorize(functions, IPolicyService.createPolicy.selector, "createPolicy");
           _authorize(functions, IPolicyService.collectPremium.selector, "collectPremium");
           _authorize(functions, IPolicyService.activate.selector, "activate");
+          _authorize(functions, IPolicyService.adjustActivation.selector, "adjustActivation");
           _authorize(functions, IPolicyService.expire.selector, "expire");
           _authorize(functions, IPolicyService.expirePolicy.selector, "expirePolicy");
           _authorize(functions, IPolicyService.close.selector, "close");

package/contracts/registry/TokenRegistry.sol

@@ -3,15 +3,14 @@ pragma solidity ^0.8.20;
 
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-
-import {REGISTRY} from "../type/ObjectType.sol";
-import {VersionPart} from "../type/Version.sol";
 
 import {IRegistry} from "./IRegistry.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
-import {ReleaseRegistry} from "./ReleaseRegistry.sol";
+import {IStaking} from "../staking/IStaking.sol";
+
+import {ChainId, ChainIdLib} from "../type/ChainId.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
+import {VersionPart} from "../type/Version.sol";
 
 /// @dev The TokenRegistry contract is used to whitelist/manage ERC-20 of tokens per major release.
 /// Only whitelisted tokens can be used as default tokens for products, distribution and pools components.
@@ -19,39 +18,41 @@ contract TokenRegistry is
     AccessManaged,
     IRegistryLinked
 {
-    event LogTokenRegistryTokenRegistered(uint256 chainId, address token, uint256 decimals, string symbol);
-    event LogTokenRegistryTokenGlobalStateSet(uint256 chainId, address token, bool active);
-    event LogTokenRegistryTokenStateSet(uint256 chainId, address token, VersionPart majorVersion, bool active);
+    event LogTokenRegistryTokenRegistered(ChainId chainId, address token, uint256 decimals, string symbol);
+    event LogTokenRegistryTokenGlobalStateSet(ChainId chainId, address token, bool active);
+    event LogTokenRegistryTokenStateSet(ChainId chainId, address token, VersionPart release, bool active);
 
     error ErrorTokenRegistryChainIdZero();
     error ErrorTokenRegistryTokenAddressZero();
 
-    error ErrorTokenRegistryNotRemoteToken(uint256 chainId, address token);
-    error ErrorTokenRegistryTokenAlreadyRegistered(uint256 chainId, address token);
-    error ErrorTokenRegistryTokenNotContract(uint256 chainId, address token);
-    error ErrorTokenRegistryTokenNotErc20(uint256 chainId, address token);
+    error ErrorTokenRegistryNotRemoteToken(ChainId chainId, address token);
+    error ErrorTokenRegistryTokenAlreadyRegistered(ChainId chainId, address token);
+    error ErrorTokenRegistryTokenNotContract(ChainId chainId, address token);
+    error ErrorTokenRegistryTokenNotErc20(ChainId chainId, address token);
 
-    error ErrorTokenRegistryTokenNotRegistered(uint256 chainId, address token);
-    error ErrorTokenRegistryMajorVersionInvalid(VersionPart majorVersion);
+    error ErrorTokenRegistryTokenNotRegistered(ChainId chainId, address token);
+    error ErrorTokenRegistryMajorVersionInvalid(VersionPart release);
 
     struct TokenInfo {
-        uint256 chainId;
-        address token;
-        uint8 decimals;
-        string symbol;
+        // slot 0
+        ChainId chainId; // 96
+        address token; // 20
+        uint8 decimals; // 8
         bool active;
+        // slot 1
+        string symbol;
     }
 
-    mapping(uint256 chainId => mapping(address token => TokenInfo info)) internal _tokenInfo;
-    mapping(uint256 chainId => mapping(address token => mapping(VersionPart majorVersion => bool isActive))) internal _active;
+    mapping(ChainId chainId => mapping(address token => TokenInfo info)) internal _tokenInfo;
+    mapping(ChainId chainId => mapping(address token => mapping(VersionPart release => bool isActive))) internal _active;
     TokenInfo [] internal _token;
 
     IRegistry internal _registry;
-    ReleaseRegistry internal _releaseRegistry;
+    ChainId internal _chainId = ChainIdLib.current();
     IERC20Metadata internal _dipToken;
 
     /// @dev enforces msg.sender is owner of nft (or initial owner of nft ownable)
-    modifier onlyRegisteredToken(uint256 chainId, address token) {
+    modifier onlyRegisteredToken(ChainId chainId, address token) {
         if (!isRegistered(chainId, token)) {
             revert ErrorTokenRegistryTokenNotRegistered(chainId, token);
         }
@@ -66,12 +67,13 @@ contract TokenRegistry is
         setAuthority(authority);
         
         _registry = registry;
+
+        // TODO deal with chains without a dip token
         _dipToken = _verifyOnchainToken(address(dipToken));
 
         // register dip token
-        uint256 chainId = block.chainid;
         _registerToken(
-            chainId, 
+            _chainId, 
             address(_dipToken), 
             _dipToken.decimals(), 
             _dipToken.symbol());
@@ -85,15 +87,18 @@ contract TokenRegistry is
         external
         restricted()
     {
+        // checks
         IERC20Metadata token = _verifyOnchainToken(tokenAddress);
-        _registerToken(block.chainid, tokenAddress, token.decimals(), token.symbol());
+
+        // effects
+        _registerToken(_chainId, tokenAddress, token.decimals(), token.symbol());
     }
 
 
     /// @dev register the remote token with the provided attributes.
     /// this function may not be used for tokens when chainId == block.chainid.
     function registerRemoteToken(
-        uint256 chainId,
+        ChainId chainId,
         address token,
         uint8 decimals,
         string memory symbol
@@ -101,7 +106,7 @@ contract TokenRegistry is
         external
         restricted()
     {
-        if (chainId == block.chainid) {
+        if (chainId == _chainId) {
             revert ErrorTokenRegistryNotRemoteToken(chainId, token);
         }
 
@@ -113,7 +118,7 @@ contract TokenRegistry is
     /// when setting a token to active=false isActive will return false
     /// regardless of release specific active value.
     function setActive(
-        uint256 chainId, 
+        ChainId chainId, 
         address token, 
         bool active
     )
@@ -126,32 +131,32 @@ contract TokenRegistry is
     }
 
 
-    /// @dev sets active state for specified token and major version.
+    /// @dev sets active state for specified token and release (major version).
     /// internally calls setActiveWithVersionCheck() with enforcing version check.
     /// token state is informative, registry have no clue about used tokens
     /// component owner is responsible for token selection and operations
     /// service MUST deny registration of component with inactive token.
     function setActiveForVersion(
-        uint256 chainId, 
+        ChainId chainId, 
         address token, 
-        VersionPart majorVersion, 
+        VersionPart release, 
         bool active
     )
         external
         restricted()
         onlyRegisteredToken(chainId, token)
     {
-        _setActiveWithVersionCheck(chainId, token, majorVersion, active, true);
+        _setActiveWithVersionCheck(chainId, token, release, active, true);
     }
 
 
     /// @dev as setActiveForVersion() with the option to skip the version check.
     /// enforcing the version check checks if the provided major version with the release manager. 
-    /// the function reverts if the provided majorVersion is unknown to the release manager.
+    /// the function reverts if the provided release is unknown to the release manager.
     function setActiveWithVersionCheck(
-        uint256 chainId, 
+        ChainId chainId, 
         address token, 
-        VersionPart majorVersion, 
+        VersionPart release, 
         bool active,
         bool enforceVersionCheck
     )
@@ -159,14 +164,14 @@ contract TokenRegistry is
         restricted()
         onlyRegisteredToken(chainId, token)
     {
-        _setActiveWithVersionCheck(chainId, token, majorVersion, active, enforceVersionCheck);
+        _setActiveWithVersionCheck(chainId, token, release, active, enforceVersionCheck);
     }
 
 
     function _setActiveWithVersionCheck(
-        uint256 chainId, 
+        ChainId chainId, 
         address token, 
-        VersionPart majorVersion, 
+        VersionPart release, 
         bool active,
         bool enforceVersionCheck
     )
@@ -174,15 +179,15 @@ contract TokenRegistry is
     {
         // verify valid major version
         if(enforceVersionCheck) {
-            uint256 version = majorVersion.toInt();
-            if (!getRegistry().isActiveRelease(majorVersion)) {
-                revert ErrorTokenRegistryMajorVersionInvalid(majorVersion);
+            uint256 version = release.toInt();
+            if (!getRegistry().isActiveRelease(release)) {
+                revert ErrorTokenRegistryMajorVersionInvalid(release);
             }
         }
 
-        _active[chainId][token][majorVersion] = active;
+        _active[chainId][token][release] = active;
 
-        emit LogTokenRegistryTokenStateSet(chainId, token, majorVersion, active);
+        emit LogTokenRegistryTokenStateSet(chainId, token, release, active);
     }
 
     /// @dev returns the dip token for this chain
@@ -201,17 +206,17 @@ contract TokenRegistry is
     }
 
     /// @dev returns the token info for the specified token coordinates.
-    function getTokenInfo(uint256 chainId, address token) external view returns (TokenInfo memory tokenInfo) {
+    function getTokenInfo(ChainId chainId, address token) external view returns (TokenInfo memory tokenInfo) {
         return _tokenInfo[chainId][token];
     }
 
     /// @dev returns true iff the specified token has been registered for this TokenRegistry contract.
-    function isRegistered(uint256 chainId, address token) public view returns (bool) {
-        return _tokenInfo[chainId][token].chainId > 0;
+    function isRegistered(ChainId chainId, address token) public view returns (bool) {
+        return _tokenInfo[chainId][token].chainId.gtz();
     }
 
     /// @dev returns true iff both the token is active for the specfied release and the global token state is active
-    function isActive(uint256 chainId, address token, VersionPart release) external view returns (bool) {
+    function isActive(ChainId chainId, address token, VersionPart release) external view returns (bool) {
         if(!_tokenInfo[chainId][token].active) {
             return false;
         }
@@ -242,16 +247,15 @@ contract TokenRegistry is
         returns (IERC20Metadata token)
     {
         token = IERC20Metadata(tokenAddress);
-        uint256 chainId = block.chainid;
 
         // MUST be contract
         if(tokenAddress.code.length == 0) {
-            revert ErrorTokenRegistryTokenNotContract(chainId, tokenAddress);
+            revert ErrorTokenRegistryTokenNotContract(ChainIdLib.current(), tokenAddress);
         }
 
         // MUST implement required erc20 view functions
         if(!_implementsErc20Functions(token)) {
-            revert ErrorTokenRegistryTokenNotErc20(chainId, tokenAddress);
+            revert ErrorTokenRegistryTokenNotErc20(ChainIdLib.current(), tokenAddress);
         }
     }
 
@@ -284,13 +288,13 @@ contract TokenRegistry is
     /// - token not yet registered
     /// - chainId not zero
     /// - token address not zero
-    function _registerToken(uint256 chainId, address token, uint8 decimals, string memory symbol) internal {
+    function _registerToken(ChainId chainId, address token, uint8 decimals, string memory symbol) internal {
 
         if (isRegistered(chainId, token)) {
             revert ErrorTokenRegistryTokenAlreadyRegistered(chainId, token);
         }
 
-        if(chainId == 0) {
+        if(chainId.eqz()) {
             revert ErrorTokenRegistryChainIdZero();
         }
 

package/contracts/shared/Component.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {Amount} from "../type/Amount.sol";
+import {Amount, AmountLib} from "../type/Amount.sol";
 import {IComponent} from "./IComponent.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IComponentService} from "./IComponentService.sol";
@@ -25,7 +25,6 @@ abstract contract Component is
     struct ComponentStorage {
         string _name; // unique (per instance) component name
         bool _isInterceptor;
-        bytes _data;
         IComponentService _componentService;
     }
 
@@ -46,7 +45,7 @@ abstract contract Component is
     }
 
 
-    function _initializeComponent(
+    function __Component_init(
         address authority,
         address registry,
         NftId parentNftId,
@@ -54,8 +53,7 @@ abstract contract Component is
         ObjectType componentType,
         bool isInterceptor,
         address initialOwner,
-        bytes memory registryData, // writeonly data that will saved in the object info record of the registry
-        bytes memory componentData // other component specific data
+        bytes memory registryData // writeonly data that will saved in the object info record of the registry
     )
         internal
         virtual
@@ -78,7 +76,6 @@ abstract contract Component is
         ComponentStorage storage $ = _getComponentStorage();
         $._name = name;
         $._isInterceptor = isInterceptor;
-        $._data = componentData;
         $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
 
         _registerInterface(type(IAccessManaged).interfaceId);
@@ -152,7 +149,11 @@ abstract contract Component is
     function _approveTokenHandler(IERC20Metadata token, Amount amount)
         internal
         virtual
+        returns (Amount oldAllowanceAmount)
     {
+        oldAllowanceAmount = AmountLib.toAmount(
+            token.allowance(address(getTokenHandler()), address(this)));
+
         _getComponentStorage()._componentService.approveTokenHandler(
             token, 
             amount);
@@ -197,8 +198,7 @@ abstract contract Component is
         
         return IComponents.ComponentInfo({
             name: $._name,
-            tokenHandler: TokenHandler(address(0)),
-            data: $._data // user specific component data
+            tokenHandler: TokenHandler(address(0))
         });
     }