npm - @etherisc/gif-next - Versions diffs - 0.0.2-dd8c542-531 → 0.0.2-ddc9ec2-570 - Mend

@etherisc/gif-next 0.0.2-dd8c542-531 → 0.0.2-ddc9ec2-570

Files changed (703) hide show

package/contracts/registry/RegistryServiceReleaseManager.sol DELETED Viewed

@@ -1,366 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
-import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
-import {NftId} from "../types/NftId.sol";
-import {RoleId} from "../types/RoleId.sol";
-import {ObjectType, zeroObjectType, SERVICE} from "../types/ObjectType.sol";
-import {VersionPart, VersionPartLib} from "../types/Version.sol";
-import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
-import {IService} from "../shared/IService.sol";
-import {ProxyManager} from "../shared/ProxyManager.sol";
-import {IRegistry} from "./IRegistry.sol";
-import {Registry} from "./Registry.sol";
-import {IRegistryService} from "./IRegistryService.sol";
-import {RegistryService} from "./RegistryService.sol";
-import {RegistryServiceManager} from "./RegistryServiceManager.sol";
-import {RegistryServiceAccessManager} from "./RegistryServiceAccessManager.sol";
-contract RegistryServiceReleaseManager is AccessManaged
-{
-    event LogReleaseCreation(VersionPart version, IService registryService);
-    event LogServiceRegistration(VersionPart majorVersion, ObjectType serviceDomain);
-    event LogReleaseActivation(VersionPart version);
-    // registerService
-    error ServiceNotInRelease(IService service, ObjectType serviceDomain);
-    error ServiceAlreadyRegistered(address service);
-    // activateNextRelease
-    //error ReleaseNotCreated();
-    //error ReleaseRegistrationNotFinished();
-    // _getAndVerifyContractInfo
-    error UnexpectedRegisterableType(ObjectType expected, ObjectType found);
-    error NotRegisterableOwner(address expectedOwner);
-    error SelfRegistration();
-    error RegisterableOwnerIsRegistered();
-    // _verifyServiceInfo
-    error UnexpectedServiceVersion(VersionPart expected, VersionPart found);
-    error UnexpectedServiceDomain(ObjectType expected, ObjectType found);
-    // _verifyAndStoreConfig
-    error ConfigMissing();
-    error ConfigServiceTypeInvalid();
-    error ConfigSelectorMissing();
-    error ConfigSelectorZero();
-    error ConfigSelectorAlreadyExists(VersionPart serviceVersion, ObjectType serviceDomain);
-    struct ReleaseInfo {
-        ObjectType[] types; // service types in release
-    }
-    // unique role for some service function
-    struct ConfigInfo {
-        bytes4[] selector; // selector used by service
-        RoleId roleId; // roleId granted to service
-    }
-    RegistryServiceAccessManager private immutable _accessManager;
-    IRegistry private immutable _registry;
-    VersionPart _latest;// latest active version
-    VersionPart immutable _initial;// first active version
-    mapping(VersionPart version => ReleaseInfo info) _release;
-    mapping(VersionPart version => mapping(ObjectType serviceDomain => ConfigInfo)) _config;
-    mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) _service;
-    uint _awaitingRegistration; // "services left to register" counter
-    mapping(address => bool) _isActiveRegistryService;
-    constructor(
-        RegistryServiceAccessManager accessManager,
-        VersionPart initialVersion)
-        AccessManaged(accessManager.authority())
-    {
-        _accessManager = accessManager;
-        _initial = initialVersion;
-        _registry = new Registry(address(this), initialVersion);
-    }
-    // TODO deploy proxy and initialize with given implementation instead of using given proxy?
-    function createNextRelease(IService registryService)
-        external
-        restricted // GIF_ADMIN_ROLE
-        returns(NftId nftId)
-    {
-        // check interface
-        // check authority
-        (
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
-        ) = _getAndVerifyContractInfo(registryService, SERVICE(), msg.sender);
-        VersionPart nextVersion = getNextVersion();
-        _verifyServiceInfo(info, nextVersion, SERVICE());
-        _verifyAndStoreConfig(data);
-        //setTargetClosed(newRegistryService, true);
-        _registerService(address(registryService), nextVersion, SERVICE());
-        nftId = _registry.registerService(info);
-        // external call
-        registryService.linkToRegisteredNftId();
-        emit LogReleaseCreation(nextVersion, registryService);
-    }
-    function registerService(IService service)
-        external
-        restricted // GIF_MANAGER_ROLE
-        returns(NftId nftId)
-    {
-        // check interface
-        // check authority
-        (
-            IRegistry.ObjectInfo memory info,
-            //bytes memory data
-        ) = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
-        VersionPart nextVersion = getNextVersion();
-        ObjectType serviceDomain = _verifyServiceInfo(info, nextVersion, zeroObjectType());
-        bytes4[] memory selector = _config[nextVersion][serviceDomain].selector;
-        // service type is in release
-        if(selector.length == 0) {
-            revert ServiceNotInRelease(service, serviceDomain);
-        }
-        // setup and grant unique role
-        address registryService = _registry.getServiceAddress(SERVICE(), nextVersion);
-        RoleId roleId = _accessManager.setAndGrantUniqueRole(
-            address(service),
-            registryService,
-            selector);
-        _config[nextVersion][serviceDomain].roleId = roleId;
-        _awaitingRegistration--;
-        // activate release
-        if(_awaitingRegistration == 0) {
-            _latest = nextVersion;
-            _isActiveRegistryService[registryService] = true;
-            emit LogReleaseActivation(nextVersion);
-        }
-        _registerService(address(service), nextVersion, serviceDomain);
-        nftId = _registry.registerService(info);
-        // external call
-        service.linkToRegisteredNftId();
-    }
-    /*function activateNextRelease()
-        external
-        restricted // GIF_ADMIN_ROLE
-    {
-        VersionPart nextVersion = getNextVersion();
-        address service = _service[nextVersion][SERVICE()];
-        // release was created
-        if(service == address(0)) {
-            revert ReleaseNotCreated();
-        }
-        // release fully deployed
-        if(_awaitingRegistration > 0) {
-            revert ReleaseRegistrationNotFinished();
-        }
-        //setTargetClosed(newRegistryService, false);
-        _latest = nextVersion;
-        _isActiveRegistryService[service] = true;
-        LogReleaseActivation(nextVersion);
-    }*/
-    //--- view functions ----------------------------------------------------//
-    function isActiveRegistryService(address service) external view returns(bool)
-    {
-        return _isActiveRegistryService[service];
-    }
-    function getRegistry() external view returns(address)
-    {
-        return (address(_registry));
-    }
-    function getService(VersionPart serviceVersion, ObjectType serviceDomain) external view returns(address)
-    {
-        return _service[serviceVersion][serviceDomain];
-    }
-    function getReleaseInfo(VersionPart releaseVersion) external view returns(ReleaseInfo memory)
-    {
-        return _release[releaseVersion];
-    }
-    function getNextVersion() public view returns(VersionPart)
-    {
-        uint256 latest = _latest.toInt();
-        return latest == 0 ?
-            _initial : // no active releases yet
-            VersionPartLib.toVersionPart(latest + 1);
-    }
-    function getLatestVersion() external view returns(VersionPart) {
-        return _latest;
-    }
-    function getInitialVersion() external view returns(VersionPart) {
-        return _initial;
-    }
-    //--- private functions ----------------------------------------------------//
-    function _registerService(address service, VersionPart version, ObjectType serviceDomain)
-        internal
-    {
-        if(_service[version][serviceDomain] > address(0)) {
-            revert ServiceAlreadyRegistered(service);
-        }
-        _service[version][serviceDomain] = service;
-        emit LogServiceRegistration(version, serviceDomain);
-    }
-    function _getAndVerifyContractInfo(
-        IService service,
-        ObjectType expectedType,
-        address expectedOwner // assume alway valid, can not be 0
-    )
-        internal
-        view
-        returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
-        )
-    {
-        (info, data) = service.getInitialInfo();
-        info.objectAddress = address(service);
-        info.isInterceptor = false; // service is never interceptor, at least now
-        if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
-            revert UnexpectedRegisterableType(expectedType, info.objectType);
-        }
-        address owner = info.initialOwner;
-        if(owner != expectedOwner) { // registerable owner protection
-            revert NotRegisterableOwner(expectedOwner);
-        }
-        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(
-        IRegistry.ObjectInfo memory info,
-        VersionPart expectedVersion,
-        ObjectType expectedType
-    )
-        internal
-        view
-        returns(ObjectType)
-    {
-        (
-            ObjectType serviceDomain,
-            VersionPart serviceVersion
-        ) = abi.decode(info.data, (ObjectType, VersionPart));
-        if(serviceVersion != expectedVersion) {
-            revert UnexpectedServiceVersion(expectedVersion, serviceVersion);
-        }
-        if(expectedType != zeroObjectType()) {
-            if(serviceDomain != expectedType) {
-                revert UnexpectedServiceDomain(expectedType, serviceDomain);
-            }
-        }
-        return serviceDomain;
-    }
-    function _verifyAndStoreConfig(bytes memory configBytes)
-        internal
-    {
-        VersionPart nextVersion = getNextVersion();
-        IRegistryService.FunctionConfig[] memory config = abi.decode(configBytes, (IRegistryService.FunctionConfig[]));
-        if(config.length == 0) {
-            revert ConfigMissing();
-        }
-        // always in release
-        _release[nextVersion].types.push(SERVICE());
-        for(uint idx = 0; idx < config.length; idx++)
-        {
-            ObjectType serviceDomain = config[idx].serviceDomain;
-            bytes4[] memory selector = config[idx].selector;
-            // not "registry service" type
-            if(serviceDomain == SERVICE()) { revert ConfigServiceTypeInvalid(); }
-            // at least one selector exists
-            if(selector.length == 0) { revert ConfigSelectorMissing(); }
-            // no zero selectors
-            for(uint jdx = 0; jdx < selector.length; jdx++) {
-                if(selector[jdx] == 0) { revert ConfigSelectorZero(); }
-            }
-            // no overwrite
-            if(_config[nextVersion][serviceDomain].selector.length > 0) {
-                revert ConfigSelectorAlreadyExists(nextVersion, serviceDomain);
-            }
-            _config[nextVersion][serviceDomain].selector = selector;
-            _release[nextVersion].types.push(serviceDomain);
-        }
-        _awaitingRegistration = config.length;
-    }
-}

package/contracts/shared/ContractDeployerLib.sol DELETED Viewed

@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-library ContractDeployerLib {
-    event LogContractDeployed(address contractAddress);
-    error ErrorCreationCodeHashMismatch(bytes32 expectedHash, bytes32 actualHash);
-    /// @dev deploys a new contract using the provided creation code
-    function deploy(
-        bytes memory creationCode,
-        bytes32 expectedCreationCodeHash
-    )
-        public
-        returns (address contractAdress)
-    {
-        // check against expected hash, if provided
-        if (expectedCreationCodeHash != bytes32(0)) {
-            bytes32 creationCodeHash = getHash(creationCode);
-            if (creationCodeHash != expectedCreationCodeHash) {
-                revert ErrorCreationCodeHashMismatch(expectedCreationCodeHash, creationCodeHash);
-            }
-        }
-        // solhint-disable no-inline-assembly
-        assembly {
-            contractAdress := create(0, add(creationCode, 0x20), mload(creationCode))
-            if iszero(extcodesize(contractAdress)) {
-                revert(0, 0)
-            }
-        }
-        // solhint enable
-        emit LogContractDeployed(contractAdress);
-    }
-    /// @dev gets the creation code for the new contract
-    // for terminology see eg https://www.rareskills.io/post/ethereum-contract-creation-code
-    function getCreationCode(
-        bytes memory byteCodeWithInitCode, // what you get with type(<Contract>).creationCode
-        bytes memory encodedConstructorArguments // what you get with
-    )
-        public
-        pure
-        returns (bytes memory creationCode)
-    {
-        return abi.encodePacked(byteCodeWithInitCode, encodedConstructorArguments);
-    }
-    function matchesWithHash(
-        bytes memory creationCode,
-        bytes32 expectedHash
-    )
-        public
-        pure
-        returns (bool isMatching)
-    {
-        return getHash(creationCode) == expectedHash;
-    }
-    function getHash(bytes memory creationCode)
-        public
-        pure
-        returns (bytes32 hash)
-    {
-        return keccak256(creationCode);
-    }
-}

package/contracts/shared/ERC165.sol DELETED Viewed

@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-contract ERC165 is IERC165 {
-    mapping(bytes4 => bool) private _isSupported;
-    constructor() {
-        _initializeERC165();
-    }
-    function supportsInterface(bytes4 interfaceId) external view override returns (bool) {
-        return _isSupported[interfaceId];
-    }
-    // @dev register support for ERC165 itself
-    function _initializeERC165() internal {
-        _isSupported[type(IERC165).interfaceId] = true;
-    }
-    function _registerInterface(bytes4 interfaceId) internal {
-        _isSupported[interfaceId] = true;
-    }
-}

package/contracts/shared/ProxyManager.sol DELETED Viewed

@@ -1,94 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
-import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {IVersionable} from "./IVersionable.sol";
-import {NftOwnable} from "./NftOwnable.sol";
-import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
-/// @dev manages proxy deployments for upgradable contracs of type IVersionable
-contract ProxyManager is
-    NftOwnable
-{
-    event LogProxyDeployed(address indexed proxy, address initialImplementation);
-    event LogProxyDeployedWithSalt(address indexed proxy, address initialImplementation);
-    event LogProxyUpgraded(address indexed proxy, address upgradedImplementation);
-    error ErrorAlreadyDeployed();
-    error ErrorAlreadyDeployedWithSalt();
-    error ErrorNotYetDeployed();
-    UpgradableProxyWithAdmin internal _proxy;
-    bool internal _isDeployed;
-    /// @dev only used to capture proxy owner
-    constructor()
-        NftOwnable()
-    { }
-    /// @dev deploy initial contract
-    function deploy(address initialImplementation, bytes memory initializationData)
-        public
-        virtual
-        onlyOwner()
-        returns (IVersionable versionable)
-    {
-        if (_isDeployed) { revert ErrorAlreadyDeployed(); }
-        _isDeployed = true;
-        address currentProxyOwner = getOwner(); // used by implementation
-        address initialProxyAdminOwner = address(this); // used by proxy
-        bytes memory data = getDeployData(initialImplementation, currentProxyOwner, initializationData);
-        _proxy = new UpgradableProxyWithAdmin(
-            initialImplementation,
-            initialProxyAdminOwner,
-            data
-        );
-        versionable = IVersionable(address(_proxy));
-        emit LogProxyDeployed(address(_proxy), initialImplementation);
-    }
-    /// @dev upgrade existing contract
-    function upgrade(address newImplementation, bytes memory upgradeData)
-        public
-        virtual
-        onlyOwner()
-        returns (IVersionable versionable)
-    {
-        if (!_isDeployed) { revert ErrorNotYetDeployed(); }
-        address currentProxyOwner = getOwner();
-        ProxyAdmin proxyAdmin = getProxy().getProxyAdmin();
-        ITransparentUpgradeableProxy proxy = ITransparentUpgradeableProxy(address(_proxy));
-        bytes memory data = getUpgradeData(newImplementation, currentProxyOwner, upgradeData);
-        proxyAdmin.upgradeAndCall(
-            proxy,
-            newImplementation,
-            data);
-        versionable = IVersionable(address(_proxy));
-        emit LogProxyUpgraded(address(_proxy), newImplementation);
-    }
-    function getDeployData(address implementation, address proxyOwner, bytes memory deployData) public pure returns (bytes memory data) {
-        return abi.encodeWithSelector(IVersionable.initialize.selector, implementation, proxyOwner, deployData);
-    }
-    function getUpgradeData(address implementation, address proxyOwner, bytes memory upgradeData) public pure returns (bytes memory data) {
-        return abi.encodeWithSelector(IVersionable.upgrade.selector, implementation, proxyOwner, upgradeData);
-    }
-    function getProxy() public returns (UpgradableProxyWithAdmin) {
-        return _proxy;
-    }
-}

package/contracts/shared/RegisterableUpgradable.sol DELETED Viewed

@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-import {Registerable} from "./Registerable.sol";
-import {Versionable} from "./Versionable.sol";
-/// @dev base contract for upgradable objects like services and upgradable components
-/// deriving contracs need to call _initializeRegisterable
-/// TODO internalizes versionable here, a non-registerable versionalbe might itself have some value but is outside the scope of the gif
-/// after this merge versionable will no longer exist on its own in gif
-/// only registerable and upgradable (which is a registerable too) will remain
-abstract contract RegisterableUpgradable is
-    Registerable,
-    Versionable
-{
-}