@etherisc/gif-next 0.0.2-fe88ad7-208 → 0.0.2-ff8087d-237

package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json

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

package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json

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

package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json

@@ -1,442 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "RegisterableUpgradable",
-  "sourceName": "contracts/shared/RegisterableUpgradable.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registry",
-          "type": "address"
-        },
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "ErrorAlreadyLinked",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "contractAddress",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorContractNotRegistered",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorNotOwner",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorNotRegistry",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorRegisterableNotRegistry",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryAddressZero",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registry",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorRegistryAlreadyInitialized",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryNotInitialized",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "InvalidInitialization",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "NotInitializing",
-      "type": "error"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "uint64",
-          "name": "version",
-          "type": "uint64"
-        }
-      ],
-      "name": "Initialized",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        }
-      ],
-      "name": "LogVersionableInitialized",
-      "type": "event"
-    },
-    {
-      "inputs": [],
-      "name": "REGISTERABLE_LOCATION_V1",
-      "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitialInfo",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "NftId",
-              "name": "nftId",
-              "type": "uint96"
-            },
-            {
-              "internalType": "NftId",
-              "name": "parentNftId",
-              "type": "uint96"
-            },
-            {
-              "internalType": "ObjectType",
-              "name": "objectType",
-              "type": "uint8"
-            },
-            {
-              "internalType": "bool",
-              "name": "isInterceptor",
-              "type": "bool"
-            },
-            {
-              "internalType": "address",
-              "name": "objectAddress",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "initialOwner",
-              "type": "address"
-            },
-            {
-              "internalType": "bytes",
-              "name": "data",
-              "type": "bytes"
-            }
-          ],
-          "internalType": "struct IRegistry.ObjectInfo",
-          "name": "",
-          "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getOwner",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getRegistry",
-      "outputs": [
-        {
-          "internalType": "contract IRegistry",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getVersion",
-      "outputs": [
-        {
-          "internalType": "Version",
-          "name": "",
-          "type": "uint24"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "getVersion",
-      "outputs": [
-        {
-          "internalType": "Version",
-          "name": "",
-          "type": "uint24"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
-            },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            }
-          ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "isInitialized",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "linkToRegisteredNftId",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes4",
-          "name": "interfaceId",
-          "type": "bytes4"
-        }
-      ],
-      "name": "supportsInterface",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "name": "upgrade",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/contracts/components/BaseComponent.sol

@@ -1,159 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {IBaseComponent} from "./IBaseComponent.sol";
-import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
-import {IInstance} from "../instance/IInstance.sol";
-import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ObjectType, INSTANCE} from "../types/ObjectType.sol";
-import {VersionLib} from "../types/Version.sol";
-import {Registerable} from "../shared/Registerable.sol";
-import {RoleId, RoleIdLib} from "../types/RoleId.sol";
-import {IAccess} from "../instance/module/IAccess.sol";
-
-abstract contract BaseComponent is
-    Registerable,
-    IBaseComponent
-{
-    using NftIdLib for NftId;
-
-    IComponentOwnerService internal _componentOwnerService;
-    IInstanceService internal _instanceService;
-
-    address internal _deployer;
-    address internal _wallet;
-    IERC20Metadata internal _token;
-    IInstance internal _instance;
-    InstanceAccessManager internal _instanceAccessManager;
-    NftId internal _productNftId;
-
-    modifier onlyInstanceRole(uint64 roleIdNum) {
-        RoleId roleId = RoleIdLib.toRoleId(roleIdNum);
-        if( !_instanceAccessManager.hasRole(roleId, msg.sender)) {
-            revert ErrorBaseComponentUnauthorized(msg.sender, roleIdNum);
-        }
-        _;
-    }
-
-    modifier isNotLocked() {
-        if (_instanceAccessManager.isTargetLocked(address(this))) {
-            revert IAccess.ErrorIAccessTargetLocked(address(this));
-        }
-        _;
-    }
-
-    constructor(
-        address registry,
-        NftId instanceNftId,
-        address token,
-        ObjectType componentType,
-        bool isInterceptor,
-        address initialOwner
-    )
-    {
-        bytes memory data = "";
-        _initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
-
-        IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
-        _instance = IInstance(instanceInfo.objectAddress);
-        _instanceAccessManager = _instance.getInstanceAccessManager();
-        require(
-            _instance.supportsInterface(type(IInstance).interfaceId),
-            ""
-        );
-
-        _componentOwnerService = _instance.getComponentOwnerService();
-        _instanceService = IInstanceService(getRegistry().getServiceAddress(INSTANCE(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
-        _wallet = address(this);
-        _token = IERC20Metadata(token);
-
-        _registerInterface(type(IBaseComponent).interfaceId);
-    }
-
-    function getName() public pure virtual returns (string memory name);
-
-    // from component contract
-    // TODO only owner and instance owner 
-    function lock() external onlyOwner override {
-        _instanceService.setTargetLocked(getName(), true);
-    }
-    
-    // TODO only owner and instance owner 
-    function unlock() external onlyOwner override {
-        _instanceService.setTargetLocked(getName(), false);
-    }
-
-    function getWallet()
-        external
-        view
-        override
-        returns (address walletAddress)
-    {
-        return _wallet;
-    }
-
-    /// @dev Sets the wallet address for the component. 
-    /// if the current wallet has tokens, these will be transferred. 
-    /// if the new wallet address is externally owned, an approval from the 
-    /// owner of the external wallet for the component to move all tokens must exist. 
-    function setWallet(address newWallet) external override onlyOwner {
-        address currentWallet = _wallet;
-        uint256 currentBalance = _token.balanceOf(currentWallet);
-
-        // checks
-        if (newWallet == currentWallet) {
-            revert ErrorBaseComponentWalletAddressIsSameAsCurrent(newWallet);
-        }
-
-        if (currentBalance > 0) {
-            if (currentWallet == address(this)) {
-                // move tokens from component smart contract to external wallet
-            } else {
-                // move tokens from external wallet to component smart contract or another external wallet
-                uint256 allowance = _token.allowance(currentWallet, address(this));
-                if (allowance < currentBalance) {
-                    revert ErrorBaseComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
-                }
-            }
-        }
-
-        // effects
-        _wallet = newWallet;
-        emit LogBaseComponentWalletAddressChanged(newWallet);
-
-        // interactions
-        if (currentBalance > 0) {
-            // transfer tokens from current wallet to new wallet
-            if (currentWallet == address(this)) {
-                // transferFrom requires self allowance too
-                _token.approve(address(this), currentBalance);
-            }
-            
-            SafeERC20.safeTransferFrom(_token, currentWallet, newWallet, currentBalance);
-            emit LogBaseComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
-        }
-    }
-
-    function getToken() public view override returns (IERC20Metadata token) {
-        return _token;
-    }
-
-    function getInstance() public view override returns (IInstance instance) {
-        return _instance;
-    }
-
-    function setProductNftId(NftId productNftId) public override onlyOwner {
-        require(_productNftId.eq(zeroNftId()), "product nft id already set");
-        _productNftId = productNftId;
-    }
-
-    function getProductNftId() public view override returns (NftId productNftId) {
-        return _productNftId;
-    }
-}

package/contracts/components/IBaseComponent.sol

@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IInstance} from "../instance/IInstance.sol";
-import {NftId} from "../types/NftId.sol";
-
-interface IBaseComponent is IRegisterable {
-    error ErrorBaseComponentWalletAddressIsSameAsCurrent(address newWallet);
-    error ErrorBaseComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
-    error ErrorBaseComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
-
-    event LogBaseComponentWalletAddressChanged(address newWallet);
-    event LogBaseComponentWalletTokensTransferred(address from, address to, uint256 amount);
-
-    function getName() external pure virtual returns (string memory name);
-
-    function lock() external;
-
-    function unlock() external;
-
-    function getToken() external view returns (IERC20Metadata token);
-
-    function setWallet(address walletAddress) external;
-    function getWallet() external view returns (address walletAddress);
-
-    function getInstance() external view returns (IInstance instance);
-
-    function setProductNftId(NftId productNftId) external;
-    function getProductNftId() external view returns (NftId productNftId);
-
-}

package/contracts/experiment/cloning/Cloner.sol

@@ -1,47 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
-
-
-contract Cloner {
-
-    Mock1 public mock1;
-    Mock2 public mock2;
-
-    constructor() {
-        mock1 = new Mock1();
-        mock2 = new Mock2();
-    }
-
-    function createClone(address master)
-        external 
-        returns (address cloned)
-    {
-        cloned = Clones.clone(master);
-    }
-}
-
-
-contract Mock1 {
-    function getValue() external virtual view returns (uint256) {
-        return 42;
-    }
-}
-
-contract Mock2 is Mock1 {
-    uint256 internal _value;
-
-    constructor() {
-        _value = 42;
-    }
-
-    function setValue(uint256 value) external virtual {
-        _value = value;
-    }
-
-    function getValue() external virtual override view returns (uint256) {
-        return _value;
-    }
-}
-