@etherisc/gif-next 3.0.0-c0923b6f-772-12c20a7-167 → 3.0.0-c46a89a-335

package/contracts/registry/ReleaseRegistry.sol

@@ -5,10 +5,9 @@ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
 import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
-import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IRelease} from "./IRelease.sol";
-import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
 
@@ -16,7 +15,7 @@ import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId} from "../type/NftId.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 {Registry, GIF_INITIAL_RELEASE} from "./Registry.sol";
 import {ReleaseAdmin} from "./ReleaseAdmin.sol";
 import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -34,18 +33,13 @@ import {VersionPart, VersionPartLib} from "../type/Version.sol";
 contract ReleaseRegistry is 
     AccessManaged,
     ReleaseLifecycle, 
-    IRegistryLinked
+    RegistryLinked
 {
-    uint256 public constant INITIAL_GIF_VERSION = 3;// first active release version  
-
     event LogReleaseCreation(IAccessAdmin admin, VersionPart release, bytes32 salt); 
     event LogReleaseActivation(VersionPart release);
     event LogReleaseDisabled(VersionPart release);
     event LogReleaseEnabled(VersionPart release);
 
-    // constructor
-    error ErrorReleaseRegistryNotRegistry(Registry registry);
-
     // _verifyServiceAuthorization
     error ErrorReleaseRegistryNotServiceAuth(address notAuth);
     error ErrorReleaseRegistryServiceAuthVersionMismatch(IServiceAuthorization auth, VersionPart expected, VersionPart actual);
@@ -59,20 +53,19 @@ contract ReleaseRegistry is
 
     // _verifyService
     error ErrorReleaseRegistryNotService(address notService);
-    error ErrorReleaseRegistryServiceAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
-    error ErrorReleaseRegistryServiceVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
+    error ErrorReleaseRegistryServiceAuthorityMismatch(IService service, address expectedAuthority, address actualAuthority);
     error ErrorReleaseRegistryServiceDomainMismatch(IService service, ObjectType expectedDomain, ObjectType actualDomain);
 
-    // _verifyServiceInfo
+    // _getAndVerifyServiceInfo
     error ErrorReleaseRegistryServiceInfoAddressInvalid(IService service, address expected);
     error ErrorReleaseRegistryServiceInfoInterceptorInvalid(IService service, bool isInterceptor);
     error ErrorReleaseRegistryServiceInfoTypeInvalid(IService service, ObjectType expected, ObjectType found);
+    error ErrorReleaseRegistryServiceInfoReleaseMismatch(IService service, VersionPart expected, VersionPart actual);
     error ErrorReleaseRegistryServiceInfoOwnerInvalid(IService service, address expected, address found);
     error ErrorReleaseRegistryServiceSelfRegistration(IService service);
     error ErrorReleaseRegistryServiceOwnerRegistered(IService service, address owner);
 
     RegistryAdmin public immutable _registryAdmin;
-    Registry public immutable _registry;
 
     mapping(VersionPart release => IRelease.ReleaseInfo info) internal _releaseInfo;
     VersionPart [] internal _release; // array of all created releases    
@@ -86,21 +79,18 @@ contract ReleaseRegistry is
     uint256 internal _servicesToRegister = 0;
 
     // TODO move master relase admin outside constructor (same construction as for registry admin)
-    constructor(Registry registry)
+    constructor()
         AccessManaged(msg.sender)
     {
-        if (!ContractLib.isRegistry(address(registry))) {
-            revert ErrorReleaseRegistryNotRegistry(registry);
-        }
+        IRegistry registry = _getRegistry();
 
         setAuthority(registry.getAuthority());
 
-        _registry = registry;
-        _registryAdmin = RegistryAdmin(_registry.getRegistryAdminAddress());
+        _registryAdmin = RegistryAdmin(registry.getRegistryAdminAddress());
         _masterReleaseAdmin = new ReleaseAdmin(
             _cloneNewAccessManager());
 
-        _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
+        _next = VersionPartLib.toVersionPart(GIF_INITIAL_RELEASE().toInt() - 1);
     }
 
     /// @dev Initiates the creation of a new GIF release by the GIF admin.
@@ -118,7 +108,7 @@ contract ReleaseRegistry is
         }
 
         release = VersionPartLib.toVersionPart(release.toInt() + 1);
-        _release.push(release);
+        _release.push(release); // TODO push only activated releases, _next keeps total release count
 
         _next = release;
         _releaseInfo[release].version = release;
@@ -184,24 +174,21 @@ contract ReleaseRegistry is
         address releaseAuthority = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin).authority();
         IServiceAuthorization releaseAuthz = _releaseInfo[releaseVersion].auth;
         ObjectType expectedDomain = releaseAuthz.getServiceDomain(_registeredServices);
+        address expectedOwner = msg.sender;
 
         // service can work with release registry and release version
         (
             IRegistry.ObjectInfo memory info,
-            ObjectType serviceDomain,
-            VersionPart serviceVersion
-            //,string memory serviceName
+            bytes memory data,
+            ObjectType serviceDomain
         ) = _verifyService(
             service, 
+            expectedOwner,
             releaseAuthority, 
             releaseVersion, 
             expectedDomain
         );
 
-        //_releaseInfo[releaseVersion].addresses.push(address(service)); // TODO get this info from auth contract?
-        //_releaseInfo[releaseVersion].domains.push(serviceDomain);
-        //_releaseInfo[releaseVersion].names.push(serviceName); // TODO if needed read in _verifyService()
-
         _registeredServices++; // TODO use releaseInfo.someArray.length instead of _registeredServices
 
         // release fully deployed
@@ -222,7 +209,7 @@ contract ReleaseRegistry is
         releaseAdmin.setReleaseLocked(true); 
 
         // register service with registry
-        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
+        nftId = _getRegistry().registerService(info, expectedOwner, serviceDomain, data);
         service.linkToRegisteredNftId();
     }
 
@@ -245,25 +232,27 @@ contract ReleaseRegistry is
         // grant special roles for registry/staking/pool services
         // this will enable access to core contracts functions
 
+        IRegistry registry = _getRegistry();
+
         // registry service MUST be registered for each release
-        address service = _registry.getServiceAddress(REGISTRY(), release);
+        address service = registry.getServiceAddress(REGISTRY(), release);
         if(service == address(0)) {
             revert ErrorReleaseRegistryRegistryServiceMissing(release);
         }
 
         _registryAdmin.grantServiceRoleForAllVersions(IService(service), REGISTRY());
 
-        service = _registry.getServiceAddress(STAKING(), release);
+        service = registry.getServiceAddress(STAKING(), release);
         if(service != address(0)) {
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), STAKING());
         }
 
-        service = _registry.getServiceAddress(COMPONENT(), release);
+        service = registry.getServiceAddress(COMPONENT(), release);
         if(service != address(0)) {
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), COMPONENT());
         }
 
-        service = _registry.getServiceAddress(POOL(), release);
+        service = registry.getServiceAddress(POOL(), release);
         if(service != address(0)) {
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), POOL());
         }
@@ -356,12 +345,6 @@ contract ReleaseRegistry is
         return address(_registryAdmin);
     }
 
-    //--- IRegistryLinked ------------------------------------------------------//
-
-    function getRegistry() external view returns (IRegistry) {
-        return _registry;
-    }
-
     //--- private functions ----------------------------------------------------//
 
     function _setReleaseLocked(VersionPart release, bool locked)
@@ -389,12 +372,11 @@ contract ReleaseRegistry is
 
         clonedAdmin.initialize(
             address(_cloneNewAccessManager()),
-            releaseAdminName);
+            releaseAdminName,
+            release);
 
         clonedAdmin.completeSetup(
-            address(_registry), 
             address(serviceAuthorization),
-            release,
             address(this)); // release registry (this contract)
 
         // lock release (remains locked until activation)
@@ -439,62 +421,65 @@ contract ReleaseRegistry is
 
     // TODO get service names 
     function _verifyService(
-        IService service, 
+        IService service,
+        address expectedOwner,
         address expectedAuthority, 
-        VersionPart expectedVersion,
+        VersionPart expectedRelease,
         ObjectType expectedDomain
     )
         internal
         view
         returns(
-            IRegistry.ObjectInfo memory serviceInfo,
-            ObjectType serviceDomain, 
-            VersionPart serviceVersion
+            IRegistry.ObjectInfo memory info,
+            bytes memory data,
+            ObjectType domain
         )
     {
         if(!service.supportsInterface(type(IService).interfaceId)) {
             revert ErrorReleaseRegistryNotService(address(service));
         }
 
-        address owner = msg.sender;
-        address serviceAuthority = service.authority();
-        serviceVersion = service.getVersion().toMajorPart();
-        serviceDomain = service.getDomain();// checked in registry
-        serviceInfo = service.getInitialInfo();
+        address authority = service.authority();
+        domain = service.getDomain();// checked in registry
 
-        _verifyServiceInfo(service, serviceInfo, owner);
+        (info,, data) = _getAndVerifyServiceInfo(
+            service,
+            expectedOwner,
+            expectedRelease);
 
-        if(serviceAuthority != expectedAuthority) {
+        if(authority != expectedAuthority) {
             revert ErrorReleaseRegistryServiceAuthorityMismatch(
                 service,
-                serviceAuthority,
-                expectedAuthority);
+                expectedAuthority,
+                authority);
         }
 
-        if(serviceVersion != expectedVersion) {
-            revert ErrorReleaseRegistryServiceVersionMismatch(
-                service,
-                serviceVersion,
-                expectedVersion);            
-        }
-
-        if(serviceDomain != expectedDomain) {
+        if(domain != expectedDomain) {
             revert ErrorReleaseRegistryServiceDomainMismatch(
                 service,
                 expectedDomain,
-                serviceDomain);
+                domain);
         }
     }
 
 
-    function _verifyServiceInfo(
+    function _getAndVerifyServiceInfo(
         IService service,
-        IRegistry.ObjectInfo memory info,
-        address expectedOwner // assume always valid, can not be 0
+        address expectedOwner, // assume always valid, can not be 0
+        VersionPart expectedRelease
     )
         internal
         view
+        returns (
+            IRegistry.ObjectInfo memory info,
+            address initialOwner,
+            bytes memory data
+        )
     {
+        info = service.getInitialInfo();
+        initialOwner = service.getOwner();
+        data = service.getInitialData();
+
         if(info.objectAddress != address(service)) {
             revert ErrorReleaseRegistryServiceInfoAddressInvalid(service, info.objectAddress);
         }
@@ -507,18 +492,23 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryServiceInfoTypeInvalid(service, SERVICE(), info.objectType);
         }
 
-        address owner = info.initialOwner;
+        if(info.release != expectedRelease) {
+            revert ErrorReleaseRegistryServiceInfoReleaseMismatch(
+                service,
+                expectedRelease,
+                info.release);            
+        }
 
-        if(owner != expectedOwner) { // registerable owner protection
-            revert ErrorReleaseRegistryServiceInfoOwnerInvalid(service, expectedOwner, owner); 
+        if(initialOwner != expectedOwner) { // registerable owner protection
+            revert ErrorReleaseRegistryServiceInfoOwnerInvalid(service, expectedOwner, initialOwner); 
         }
 
-        if(owner == address(service)) {
+        if(initialOwner == address(service)) {
             revert ErrorReleaseRegistryServiceSelfRegistration(service);
         }
         
-        if(_registry.isRegistered(owner)) { 
-            revert ErrorReleaseRegistryServiceOwnerRegistered(service, owner);
+        if(_getRegistry().isRegistered(initialOwner)) { 
+            revert ErrorReleaseRegistryServiceOwnerRegistered(service, initialOwner);
         }
     }
 }

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -21,6 +21,8 @@ import {IRegistryService} from "./IRegistryService.sol";
 import {IRiskService} from "../product/IRiskService.sol";
 
 import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
+import {VersionPartLib} from "../../contracts/type/Version.sol";
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 
 
 contract ServiceAuthorizationV3
@@ -31,7 +33,7 @@ contract ServiceAuthorizationV3
           ServiceAuthorization(
                "ReleaseAdmin",
                RELEASE(),
-               3,
+               GIF_INITIAL_RELEASE(),
                commitHash)
      {}
 
@@ -90,8 +92,7 @@ contract ServiceAuthorizationV3
           _authorize(functions, IRegistryService.registerBundle.selector, "registerBundle");
 
           functions = _authorizeForService(REGISTRY(), COMPONENT());
-          _authorize(functions, IRegistryService.registerProduct.selector, "registerProduct");
-          _authorize(functions, IRegistryService.registerProductLinkedComponent.selector, "registerProductLinkedComponent");
+          _authorize(functions, IRegistryService.registerComponent.selector, "registerComponent");
 
           functions = _authorizeForService(REGISTRY(), DISTRIBUTION());
           _authorize(functions, IRegistryService.registerDistributor.selector, "registerDistributor");

package/contracts/registry/TokenRegistry.sol

@@ -5,7 +5,7 @@ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManage
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "./IRegistry.sol";
-import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {IStaking} from "../staking/IStaking.sol";
 
 import {ChainId, ChainIdLib} from "../type/ChainId.sol";
@@ -16,7 +16,7 @@ import {VersionPart} from "../type/Version.sol";
 /// Only whitelisted tokens can be used as default tokens for products, distribution and pools components.
 contract TokenRegistry is
     AccessManaged,
-    IRegistryLinked
+    RegistryLinked
 {
     event LogTokenRegistryTokenRegistered(ChainId chainId, address token, uint256 decimals, string symbol);
     event LogTokenRegistryTokenGlobalStateSet(ChainId chainId, address token, bool active);
@@ -47,7 +47,6 @@ contract TokenRegistry is
     mapping(ChainId chainId => mapping(address token => mapping(VersionPart release => bool isActive))) internal _active;
     TokenInfo [] internal _token;
 
-    IRegistry internal _registry;
     ChainId internal _chainId = ChainIdLib.current();
     IERC20Metadata internal _dipToken;
 
@@ -59,14 +58,13 @@ contract TokenRegistry is
         _;
     }
 
-    constructor(IRegistry registry, IERC20Metadata dipToken)
+    constructor(IERC20Metadata dipToken)
         AccessManaged(msg.sender)
     {
         // set authority
-        address authority = RegistryAdmin(registry.getRegistryAdminAddress()).authority();
+        address authority = RegistryAdmin(
+            _getRegistry().getRegistryAdminAddress()).authority();
         setAuthority(authority);
-        
-        _registry = registry;
 
         // TODO deal with chains without a dip token
         _dipToken = _verifyOnchainToken(address(dipToken));
@@ -180,7 +178,7 @@ contract TokenRegistry is
         // verify valid major version
         if(enforceVersionCheck) {
             uint256 version = release.toInt();
-            if (!getRegistry().isActiveRelease(release)) {
+            if (!_getRegistry().isActiveRelease(release)) {
                 revert ErrorTokenRegistryMajorVersionInvalid(release);
             }
         }
@@ -228,13 +226,6 @@ contract TokenRegistry is
         return address(_dipToken);
     }
 
-    //--- IRegistryLinked --------------------------------------------------//
-
-    /// @dev returns the dip token for this chain
-    function getRegistry() public view returns (IRegistry) {
-        return _registry;
-    }
-
     //--- internal functions ------------------------------------------------//
 
 

package/contracts/shared/Component.sol

@@ -12,7 +12,7 @@ import {NftId} from "../type/NftId.sol";
 import {ObjectType, COMPONENT} from "../type/ObjectType.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {Version, VersionLib} from "../type/Version.sol";
+import {Version, VersionPart, VersionLib} from "../type/Version.sol";
 
 
 abstract contract Component is
@@ -23,14 +23,17 @@ abstract contract Component is
     bytes32 public constant COMPONENT_LOCATION_V1 = 0xffe8d4462baed26a47154f4b8f6db497d2f772496965791d25bd456e342b7f00;
 
     struct ComponentStorage {
-        string _name; // unique (per instance) component name
-        bool _isInterceptor;
+        // slot 0
         IComponentService _componentService;
+        // slot 1
+        string _name; // unique (per instance) component name -> make pure to save gas?
+        // slot 2
+        bytes _data;
     }
 
 
     modifier onlyChainNft() {
-        if(msg.sender != getRegistry().getChainNftAddress()) {
+        if(msg.sender != _getRegistry().getChainNftAddress()) {
             revert ErrorComponentNotChainNft(msg.sender);
         }
         _;
@@ -44,10 +47,9 @@ abstract contract Component is
         }
     }
 
-
+    /// @dev requires component parent to be registered 
     function __Component_init(
         address authority,
-        address registry,
         NftId parentNftId,
         string memory name,
         ObjectType componentType,
@@ -65,7 +67,6 @@ abstract contract Component is
 
         __Registerable_init(
             authority,
-            registry, 
             parentNftId, 
             componentType, 
             isInterceptor, 
@@ -75,7 +76,6 @@ abstract contract Component is
         // set component state
         ComponentStorage storage $ = _getComponentStorage();
         $._name = name;
-        $._isInterceptor = isInterceptor;
         $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
 
         _registerInterface(type(IAccessManaged).interfaceId);
@@ -93,6 +93,17 @@ abstract contract Component is
         _nftTransferFrom(from, to, tokenId, operator);
     }
 
+    /// @inheritdoc IComponent
+    function withdrawFees(Amount amount)
+        external
+        virtual
+        restricted()
+        onlyOwner()
+        returns (Amount withdrawnAmount)
+    {
+        return _withdrawFees(amount);
+    }
+
 
     function getWallet() public view virtual returns (address walletAddress) {
         return getTokenHandler().getWallet();
@@ -110,10 +121,6 @@ abstract contract Component is
         return getComponentInfo().name;
     }
 
-    function getVersion() public view virtual returns (Version version) {
-        return VersionLib.toVersion(1, 0, 0);
-    }
-
     function getComponentInfo() public virtual view returns (IComponents.ComponentInfo memory info) {
         if (isRegistered()) {
             return _getComponentInfo();
@@ -129,17 +136,9 @@ abstract contract Component is
     }
 
 
-    function isNftInterceptor() public virtual view returns(bool isInterceptor) {
-        if (isRegistered()) {
-            return getRegistry().getObjectInfo(address(this)).isInterceptor;
-        } else {
-            return _getComponentStorage()._isInterceptor;
-        }
-    }
-
 
     function isRegistered() public virtual view returns (bool) {
-        return getRegistry().getNftIdForAddress(address(this)).gtz();
+        return _getRegistry().getNftIdForAddress(address(this)).gtz();
     }
 
 
@@ -170,6 +169,12 @@ abstract contract Component is
         // empty default implementation
     }
 
+    function _withdrawFees(Amount amount)
+        internal
+        returns (Amount withdrawnAmount)
+    {
+        return _getComponentStorage()._componentService.withdrawFees(amount);
+    }
 
     /// @dev Sets the components wallet to the specified address.
     /// Depending on the source of the component information this function needs to be overwritten. 
@@ -205,6 +210,6 @@ abstract contract Component is
     /// @dev returns the service address for the specified domain
     /// gets address via lookup from registry using the major version form the linked instance
     function _getServiceAddress(ObjectType domain) internal view returns (address) {
-        return getRegistry().getServiceAddress(domain, getRelease());
+        return _getRegistry().getServiceAddress(domain, getRelease());
     }
 }