@etherisc/gif-next 0.0.2-b9e43cf-870 → 0.0.2-bb1081a-994

package/contracts/registry/ReleaseManager.sol

@@ -21,7 +21,7 @@ contract ReleaseManager is AccessManaged
 {
     using ObjectTypeLib for ObjectType;
 
-    event LogReleaseCreation(VersionPart version, IService registryService); 
+    event LogReleaseCreation(VersionPart version); 
     event LogReleaseActivation(VersionPart version);
 
     // createNextRelease
@@ -32,8 +32,8 @@ contract ReleaseManager is AccessManaged
     error NotService();
 
     // activateNextRelease
-    //error ReleaseNotCreated();
-    //error ReleaseRegistrationNotFinished();
+    error ReleaseNotCreated();
+    error ReleaseRegistrationNotFinished();
 
     // _getAndVerifyContractInfo
     error UnexpectedRegisterableType(ObjectType expected, ObjectType found);
@@ -55,8 +55,9 @@ contract ReleaseManager is AccessManaged
     RegistryAccessManager private immutable _accessManager;
     IRegistry private immutable _registry;
 
+    VersionPart immutable _initial;// first active version    
     VersionPart _latest;// latest active version
-    VersionPart immutable _initial;// first active version
+    VersionPart _next;// version to create and activate 
 
     mapping(VersionPart version => IRegistry.ReleaseInfo info) _release;
 
@@ -66,6 +67,8 @@ contract ReleaseManager is AccessManaged
 
     mapping(address registryService => bool isActive) _active;
 
+    mapping(VersionPart version => bool isValid) _valid; // TODO refactor to use _active only
+
     constructor(
         RegistryAccessManager accessManager, 
         VersionPart initialVersion)
@@ -76,20 +79,63 @@ contract ReleaseManager is AccessManaged
         _accessManager = accessManager;
 
         _initial = initialVersion;
+        _next = initialVersion;
 
         _registry = new Registry();
     }
 
+    /// @dev skips previous release if was not activated
+    function createNextRelease()
+        external
+        restricted // GIF_ADMIN_ROLE
+    {
+        // allow to register new registry service for next version
+        VersionPartLib.toVersionPart(_next.toInt() + 1);
+        // disallow registration of regular services for next version while registry service is not registered 
+        _awaitingRegistration = 0;
+
+        emit LogReleaseCreation(_next); 
+    }
+
+    function activateNextRelease() 
+        external 
+        restricted // GIF_ADMIN_ROLE
+    {
+        VersionPart version = _next;
+        address service = _registry.getServiceAddress(REGISTRY(), version);
+
+        // release was created
+        if(service == address(0)) {
+            revert ReleaseNotCreated();
+        }
+
+        // release fully deployed
+        if(_awaitingRegistration > 0) {
+            revert ReleaseRegistrationNotFinished();
+        }
+
+        //setTargetClosed(service, false);
+
+        _latest = version;
+
+        _active[service] = true;
+        _valid[version] = true;
+
+        emit LogReleaseActivation(version);
+    }
+
     // TODO deploy proxy and initialize with given implementation instead of using given proxy?
     // IMPORTANT: MUST never be possible to create with access/release manager, token registry
-    function createNextRelease(IRegistryService service)
+    // callable once per release after release creation, can not register regular services while registry service is not registered
+    function registerRegistryService(IRegistryService service)
         external
-        restricted // GIF_ADMIN_ROLE
+        restricted // GIF_MANAGER_ROLE
         returns(NftId nftId)
     {
         if(!service.supportsInterface(type(IRegistryService).interfaceId)) {
             revert NotRegistryService();
         }
+
         // TODO unreliable! MUST guarantee the same authority -> how?
         address serviceAuthority = service.authority();
         if(serviceAuthority != authority()) {
@@ -98,16 +144,14 @@ contract ReleaseManager is AccessManaged
                 serviceAuthority); 
         }
 
-        (
-            IRegistry.ObjectInfo memory info, 
-            bytes memory data
-        ) = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
+        IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
 
-        VersionPart version = getNextVersion();
+        VersionPart version = _next;
         ObjectType domain = REGISTRY();
         _verifyServiceInfo(info, version, domain);
 
-        _createRelease(data);
+        // data: config bytes
+        _createRelease(service.getFunctionConfigs());
 
         //setTargetClosed(service, true);
         
@@ -115,8 +159,6 @@ contract ReleaseManager is AccessManaged
 
         // external call
         service.linkToRegisteredNftId();
-
-        emit LogReleaseCreation(version, service); 
     }
 
     // TODO adding service to release -> synchronized with proxy upgrades or simple addServiceToRelease(service, version, selector)?
@@ -130,67 +172,30 @@ contract ReleaseManager is AccessManaged
             revert NotService();
         }
 
-        (
-            IRegistry.ObjectInfo memory info, 
-            //bytes memory data
-        ) = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
-
+        IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
         VersionPart version = getNextVersion();
         ObjectType domain = _release[version].domains[_awaitingRegistration];// reversed registration order of services specified in RegistryService config
         _verifyServiceInfo(info, version, domain);
 
         // setup and grant unique role if service does registrations
-        address registryService = _registry.getServiceAddress(REGISTRY(), version);
         bytes4[] memory selector = new bytes4[](1);
         selector[0] = _selector[version][domain];
+        address registryService = _registry.getServiceAddress(REGISTRY(), version);
         if(selector[0] != 0) {
             _accessManager.setAndGrantUniqueRole(
                 address(service), 
                 registryService, 
                 selector);
         }
-
+        
         _awaitingRegistration--;
 
-        // activate release
-        if(_awaitingRegistration == 0) {
-            _latest = version;
-            _active[registryService] = true;  
-
-            emit LogReleaseActivation(version);
-        }
-
         nftId = _registry.registerService(info, version, domain);
 
         // external call
         service.linkToRegisteredNftId(); 
     }
 
-    /*function activateNextRelease() 
-        external 
-        restricted // GIF_ADMIN_ROLE
-    {
-        VersionPart version = getNextVersion();
-        address service = _registry.getServiceAddress(REGISTRY(), version);
-
-        // release was created
-        if(service == address(0)) {
-            revert ReleaseNotCreated();
-        }
-
-        // release fully deployed
-        if(_awaitingRegistration > 0) {
-            revert ReleaseRegistrationNotFinished();
-        }
-
-        //setTargetClosed(service, false);
-
-        _latest = version;
-        _active[service] = true;
-
-        LogReleaseActivation(version);
-    }*/
-
     //--- view functions ----------------------------------------------------//
 
     function isActiveRegistryService(address service) external view returns(bool)
@@ -198,6 +203,11 @@ contract ReleaseManager is AccessManaged
         return _active[service];
     }
 
+    function isValidRelease(VersionPart version) external view returns(bool)
+    {
+        return _valid[version];
+    }
+
     function getRegistry() external view returns(address)
     {
         return (address(_registry));
@@ -210,11 +220,7 @@ contract ReleaseManager is AccessManaged
 
     function getNextVersion() public view returns(VersionPart) 
     {
-        uint256 latest = _latest.toInt();
-
-        return latest == 0 ?
-            _initial : // no active releases yet
-            VersionPartLib.toVersionPart(latest + 1);
+        return _next;
     }
 
     function getLatestVersion() external view returns(VersionPart) {
@@ -233,13 +239,12 @@ contract ReleaseManager is AccessManaged
         address expectedOwner // assume always valid, can not be 0
     )
         internal
-        view
+        // view
         returns(
-            IRegistry.ObjectInfo memory info, 
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         )
     {
-        (info, data) = service.getInitialInfo();
+        info = service.getInitialInfo();
         info.objectAddress = address(service);
         info.isInterceptor = false; // service is never interceptor, at least now
 
@@ -256,23 +261,10 @@ contract ReleaseManager is AccessManaged
         if(owner == address(service)) {
             revert SelfRegistration();
         }
-
-        /*if(owner == address(0)) { // never 0
-            revert();// RegisterableOwnerIsZero();
-        }*/
         
         if(_registry.isRegistered(owner)) { 
             revert RegisterableOwnerIsRegistered(); 
         }
-
-        /*NftId parentNftId = info.parentNftId;
-        IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
-
-        if(parentInfo.objectType != parentType) { // parent registration + type
-            revert InvalidParent(parentNftId);
-        }*/
-
-        return(info, data);
     }
 
     function _verifyServiceInfo(
@@ -293,21 +285,18 @@ contract ReleaseManager is AccessManaged
             revert UnexpectedServiceVersion(expectedVersion, version);
         }
 
-        if(expectedDomain.gtz()) { 
-            if(domain != expectedDomain) {
-                revert UnexpectedServiceDomain(expectedDomain, domain);
-            }
+        if(domain != expectedDomain) {
+            revert UnexpectedServiceDomain(expectedDomain, domain);
         }
 
         return domain;
     }
 
     // TODO check if registry supports types specified in the config array
-    function _createRelease(bytes memory configBytes)
+    function _createRelease(IRegistryService.FunctionConfig[] memory config)
         internal
     {
         VersionPart version = getNextVersion();
-        IRegistryService.FunctionConfig[] memory config = abi.decode(configBytes, (IRegistryService.FunctionConfig[]));
 
         if(config.length == 0) {
             revert ConfigMissing();
@@ -325,6 +314,7 @@ contract ReleaseManager is AccessManaged
                 domain.eqz()
             ) { revert ConfigServiceDomainInvalid(idx, domain); } 
 
+            // TODO can be zero -> e.g. duplicate domain, first with zero selector, second with non zero selector -> need to check _release[version].domains.contains(domain) instead
             // no overwrite
             if(_selector[version][domain] > 0) {
                 revert SelectorAlreadyExists(version, domain); 

package/contracts/registry/TokenRegistry.sol

@@ -32,13 +32,15 @@ contract TokenRegistry is
 
 
     /// @dev link ownership of token registry to nft owner of registry service
+    // TODO latter registry service will get new release, new address, new nft, TokenRegistry will not catch that -> use AccessManaged only for services
     function linkToNftOwnable(address registryAddress) 
         external
         onlyOwner
     {
         IRegistry registry = IRegistry(registryAddress);
-        // TODO use _latest instead of `next version` -> but _latest is 0 before first release activation
-        address registryServiceAddress = registry.getServiceAddress(REGISTRY(), registry.getMajorVersionMax());
+        // TODO use _latest instead of _initial -> but _latest is 0 before first release activation
+        address registryServiceAddress = registry.getServiceAddress(REGISTRY(), registry.getNextVersion());
+        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), registry.getInitialVersion());
 
         _linkToNftOwnable(registryAddress, registryServiceAddress);
     }
@@ -58,7 +60,7 @@ contract TokenRegistry is
         // verify valid major version
         // ensure major version increments is one
         uint256 version = majorVersion.toInt();
-        if (version < _registry.getMajorVersionMin().toInt() || version > _registry.getMajorVersionMax().toInt()) {
+        if (!_registry.isValidRelease(majorVersion)) {
             revert TokenMajorVersionInvalid(majorVersion);
         }
 

package/contracts/shared/IRegisterable.sol

@@ -5,13 +5,11 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 import {INftOwnable} from "./INftOwnable.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {NftId} from "../types/NftId.sol";
-import {ObjectType} from "../types/ObjectType.sol";
 
 interface IRegisterable is IERC165, INftOwnable {
 
     function getInitialInfo() 
         external 
         view
-        returns (IRegistry.ObjectInfo memory, bytes memory data);
+        returns (IRegistry.ObjectInfo memory);
 }

package/contracts/shared/NftOwnable.sol

@@ -5,8 +5,10 @@ import {INftOwnable} from "./INftOwnable.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId, zeroNftId} from "../types/NftId.sol";
 
+// TODO make contract upgradeable
 contract NftOwnable is INftOwnable {
 
+    // TODO move vars to struct and add _getNftOwnableStorage
     IRegistry internal _registry;
     NftId private _nftId;
     address private _initialOwner; 
@@ -55,6 +57,9 @@ contract NftOwnable is INftOwnable {
         return _nftId;
     }
 
+    function getInitialOwner() public view returns (address) {
+        return _initialOwner;
+    }
 
     function getOwner() public view virtual override returns (address) {
         if (_nftId.gtz()) {

package/contracts/shared/Registerable.sol

@@ -71,20 +71,16 @@ contract Registerable is
         public 
         view 
         virtual 
-        returns (IRegistry.ObjectInfo memory, bytes memory data) 
+        returns (IRegistry.ObjectInfo memory info) 
     {
-        RegisterableStorage storage $ = _getRegisterableStorage();
-        return (
-            IRegistry.ObjectInfo(
-                getNftId(),
-                $._parentNftId,
-                $._objectType,
-                $._isInterceptor,
-                address(this), 
-                getOwner(),
-                $._data
-            ),
-            bytes("")
-        );
+        RegisterableStorage memory $ = _getRegisterableStorage();
+        info = IRegistry.ObjectInfo(
+            zeroNftId(),
+            $._parentNftId,
+            $._objectType,
+            $._isInterceptor,
+            address(this), 
+            getInitialOwner(),
+            $._data);
     }
 }

package/contracts/shared/Service.sol

@@ -8,14 +8,16 @@ import {Version, VersionPart, VersionLib} from "../types/Version.sol";
 import {Versionable} from "./Versionable.sol";
 import {IService} from "./IService.sol";
 import {IVersionable} from "./IVersionable.sol";
-import {RegisterableUpgradable} from "./RegisterableUpgradable.sol";
+import {Versionable} from "./Versionable.sol";
+import {Registerable} from "./Registerable.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 
 
 /// @dev service base contract
 abstract contract Service is 
-    RegisterableUpgradable,
+    Registerable,
+    Versionable,
     IService
 {
     function getDomain() public pure virtual override returns(ObjectType);

package/contracts/types/RoleId.sol

@@ -38,8 +38,8 @@ function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId
 function BUNDLE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2500); }
 
 
-function REGISTRY_SERVICE_ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1500); } 
-function REGISTRY_SERVICE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1600); } 
+function GIF_ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1500); } 
+function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1600); } 
 function RELEASE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1700); } 
 
 // @dev Returns true iff role ids a and b are identical

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-b9e43cf-870",
+  "version": "0.0.2-bb1081a-994",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {

package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e5530b5c57be84d76caaa584abf46dd1.json"
-}

package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e5530b5c57be84d76caaa584abf46dd1.json"
-}

package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e5530b5c57be84d76caaa584abf46dd1.json"
-}