@etherisc/gif-next 0.0.2-de0a1d3-009 → 0.0.2-e1e92ab-754

package/contracts/shared/Proxy.sol

@@ -1,94 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Ownable} from "@openzeppelin5/contracts/access/Ownable.sol";
-import {ProxyAdmin} from "@openzeppelin5/contracts/proxy/transparent/ProxyAdmin.sol";
-import {TransparentUpgradeableProxy, ITransparentUpgradeableProxy} from "@openzeppelin5/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-
-import {IVersionable} from "./IVersionable.sol";
-
-contract ProxyWithProxyAdminGetter is TransparentUpgradeableProxy {
-
-    constructor(address implementation, address initialProxyAdminOwner, bytes memory data)
-        TransparentUpgradeableProxy(implementation, initialProxyAdminOwner, data)
-    {}
-
-    function getProxyAdmin() external returns (ProxyAdmin) { return ProxyAdmin(_proxyAdmin()); }
-}
-
-// renamed because of name collision with OZ Proxy -> local proxy type was missing in typechain-types
-contract ProxyDeployer is Ownable {
-
-    event ProxyDeployed(address indexed proxy);
-
-    // TODO use contract functions selectors ???
-    string public constant INITIALIZE_SIGNATURE = "initialize(address,address,bytes)";
-    string public constant UPGRADE_SIGNATURE = "upgrade(address,address,bytes)";
-
-    ProxyWithProxyAdminGetter private _proxy;
-    bool private _isDeployed;
-
-    /// @dev only used to capture proxy owner
-    constructor()
-        Ownable(msg.sender)
-    {
-    }
-
-    function getDeployData(address implementation, address proxyOwner, bytes memory deployData) public pure returns (bytes memory data) {
-        return abi.encodeWithSignature(INITIALIZE_SIGNATURE, implementation, proxyOwner, deployData);
-    }
-
-    function getUpgradeData(address implementation, address proxyOwner, bytes memory upgradeData) public pure returns (bytes memory data) {
-        return abi.encodeWithSignature(UPGRADE_SIGNATURE, implementation, proxyOwner, upgradeData);
-    }
-
-    /// @dev deploy initial contract
-    function deploy(address initialImplementation, bytes memory deployData)
-        external
-        onlyOwner()
-        returns (IVersionable versionable)
-    {
-        require(!_isDeployed, "ERROR:PRX-010:ALREADY_DEPLOYED");
-
-        address currentProxyOwner = owner();
-        address initialProxyAdminOwner = address(this);
-        bytes memory data = getDeployData(initialImplementation, currentProxyOwner, deployData);
-        
-        _proxy = new ProxyWithProxyAdminGetter(
-            initialImplementation,
-            initialProxyAdminOwner,
-            data
-        );
-
-        _isDeployed = true;
-        versionable = IVersionable(address(_proxy));
-
-        emit ProxyDeployed(address(_proxy));
-    }
-
-    /// @dev upgrade existing contract
-    function upgrade(address newImplementation, bytes memory upgradeData)
-        external
-        onlyOwner
-        returns (IVersionable versionable)
-    {
-        require(_isDeployed, "ERROR:PRX-020:NOT_YET_DEPLOYED");
-
-        address currentProxyOwner = owner();
-        // ProxyAdmin proxyAdmin = _proxy.getProxyAdmin();
-        ProxyAdmin proxyAdmin = getProxyAdmin();
-        ITransparentUpgradeableProxy proxy = ITransparentUpgradeableProxy(address(_proxy));
-        bytes memory data = getUpgradeData(newImplementation, currentProxyOwner, upgradeData);
-
-        proxyAdmin.upgradeAndCall(
-            proxy,
-            newImplementation, 
-            data);
-
-        versionable = IVersionable(address(_proxy));
-    }
-
-    function getProxyAdmin() public returns (ProxyAdmin) {
-        return _proxy.getProxyAdmin();
-    }
-}

package/contracts/shared/VersionableUpgradeable.sol

@@ -1,133 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Initializable} from "@openzeppelin5/contracts/proxy/utils/Initializable.sol";
-
-import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
-import {Timestamp, blockTimestamp} from "../types/Timestamp.sol";
-import {Version, VersionPart, VersionLib} from "../types/Version.sol";
-
-import {IVersionable} from "./IVersionable.sol";
-
-abstract contract VersionableUpgradeable is 
-    Initializable,
-    IVersionable 
-{
-    /// @custom:storage-location erc7201:gif-next.contracts.shared.Versionable.sol
-    struct VersionableStorage {
-        mapping(Version version => VersionInfo info) _versionHistory;
-        Version [] _versions;
-        Version _v1;
-    }
-
-    // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Versionable.sol")) - 1)) & ~bytes32(uint256(0xff))
-    bytes32 private constant VersionableStorageLocation = 0x4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900;
-    
-    function _getVersionableStorage() private pure returns (VersionableStorage storage $) {
-        assembly {
-            $.slot := VersionableStorageLocation
-        }
-    }
-
-    constructor() {
-        _disableInitializers();
-    }
-
-    function initialize(
-        address implementation,
-        address activatedBy, // TODO can it be a msg.sender ? 
-        bytes memory data
-    )
-        public
-        virtual 
-        initializer
-    {
-        _activate(implementation, activatedBy);
-        _initialize(data);
-    }
-    function upgrade(
-        address implementation,
-        address activatedBy,
-        bytes memory data
-    )
-        external
-        virtual
-        reinitializer(VersionLib.toUint64(getVersion()))
-    {
-        _activate(implementation, activatedBy);
-        _upgrade(data);
-    }
-    // IMPORTANT each version must implement this function 
-    // each implementation MUST use onlyInitialising modifier
-    function _initialize(bytes memory data) virtual internal;
-
-    // IMPORTANT each version except version "1" must implement this function 
-    // each implementation MUST use onlyInitialising modifier
-    function _upgrade(bytes memory data) virtual internal {
-        revert();
-    }
-
-    // can only be called once per contract
-    // needs to be called inside the proxy upgrade tx
-    // TODO run reinitializer(version().toUint64()) modifier after "version()" is checked, 
-    function _activate(
-        address implementation,
-        address activatedBy
-    )
-        private
-        onlyInitializing
-    {
-        VersionableStorage storage $ = _getVersionableStorage();
-
-        uint64 version = _getInitializedVersion();
-
-        Version thisVersion = getVersion();
-
-        if(version == 1) {
-            // thisVersion is alias to version "1"
-            $._v1 = thisVersion;
-        }
-        else {
-            require(thisVersion > $._v1, "INVALID VERSION");
-        }
-
-        // update version history
-        $._versions.push(thisVersion);
-        $._versionHistory[thisVersion] = VersionInfo(
-            thisVersion,
-            implementation,
-            activatedBy,
-            blockTimestamp(),
-            blockNumber()
-        );
-
-        emit LogVersionableActivated(thisVersion, implementation, activatedBy);
-    }
-
-    // TODO previous version(s) can not be active -> check that _version is the current one
-    function isActivated(Version _version) public override view returns(bool) {
-        return _getVersionableStorage()._versionHistory[_version].activatedIn.toInt() > 0;
-    }
-
-
-    function getVersion() public pure virtual returns(Version);
-
-
-    function getVersionCount() external view override returns(uint256) {
-        return _getVersionableStorage()._versions.length;
-    }
-
-    function getVersion(uint256 idx) external view override returns(Version) {
-        return _getVersionableStorage()._versions[idx];
-    }
-
-
-    function getVersionInfo(Version _version) external override view returns(VersionInfo memory) {
-        return _getVersionableStorage()._versionHistory[_version];
-    }
-
-    function getInitializedVersion() external view returns(uint64)
-    {
-        return _getInitializedVersion();
-    }
-}