@web3dotorg/evm-slc-core-contracts 0.3.15 → 0.3.17

package/core/QCoreTreasurty.sol

@@ -0,0 +1,192 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
+import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+
+import {AMultiOwnable} from "@solarity/solidity-lib/access/AMultiOwnable.sol";
+
+import {IGovernance} from "../interfaces/IGovernance.sol";
+
+/**
+ * @title QCoreTreasury
+ * @notice Minimal multi-owner upgradeable treasury for managing native currency, ERC20, and ERC721 assets.
+ * @dev Owners can pull/send assets and execute arbitrary operations (call/delegatecall). Delegatecall is powerful
+ *      and should be used with extreme care as it executes in this contract's context.
+ */
+contract QCoreTreasury is ERC165, UUPSUpgradeable, AMultiOwnable {
+    using SafeERC20 for IERC20;
+
+    address private constant ETHEREUM_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+
+    event NFTSent(address indexed token, address indexed to, uint256 tokenId);
+    event TokensSent(address indexed token, address indexed to, uint256 amount);
+    event NFTDeposited(address indexed token, address indexed from, uint256 tokenId);
+    event TokensDeposited(address indexed token, address indexed from, uint256 amount);
+    event ArbitraryExecute(
+        IGovernance.OperationType operation,
+        address to,
+        bytes data,
+        uint256 value
+    );
+
+    error FailedToExecuteArbitraryCall(
+        IGovernance.OperationType operation,
+        address to,
+        bytes data,
+        uint256 value
+    );
+
+    /**
+     * @notice Disables initializers on implementation.
+     */
+    constructor() {
+        _disableInitializers();
+    }
+
+    /**
+     * @notice Receive native currency and emit a deposit event.
+     */
+    receive() external payable {
+        depositNative();
+    }
+
+    /**
+     * @notice Initialize the contract with initial owners.
+     * @param initialOwners_ Array of initial owner addresses.
+     */
+    function __QCoreTreasury_init(address[] calldata initialOwners_) external initializer {
+        __AMultiOwnable_init(initialOwners_);
+    }
+
+    /**
+     * @notice Deposit native currency to the treasury.
+     */
+    function depositNative() public payable virtual {
+        emit TokensDeposited(ETHEREUM_ADDRESS, msg.sender, msg.value);
+    }
+
+    /**
+     * @notice Deposit ERC20 tokens to the treasury.
+     * @param tokenAddress_ ERC20 token address.
+     * @param amount_ Token amount to deposit.
+     */
+    function depositERC20(address tokenAddress_, uint256 amount_) public virtual {
+        IERC20(tokenAddress_).safeTransferFrom(msg.sender, address(this), amount_);
+
+        emit TokensDeposited(tokenAddress_, msg.sender, amount_);
+    }
+
+    /**
+     * @notice Deposit ERC721 token to the treasury.
+     * @param tokenAddress_ ERC721 token address.
+     * @param tokenId_ Token ID to deposit.
+     * @dev Uses transferFrom on purpose to accept tokens without ERC721Receiver.
+     */
+    function depositNFT(address tokenAddress_, uint256 tokenId_) public {
+        IERC721(tokenAddress_).transferFrom(msg.sender, address(this), tokenId_);
+
+        emit NFTDeposited(tokenAddress_, msg.sender, tokenId_);
+    }
+
+    /**
+     * @notice Send native currency from the treasury.
+     * @param to_ Recipient address.
+     * @param amount_ Amount in wei.
+     */
+    function sendNative(address to_, uint256 amount_) public onlyOwner {
+        Address.sendValue(payable(to_), amount_);
+
+        emit TokensSent(ETHEREUM_ADDRESS, to_, amount_);
+    }
+
+    /**
+     * @notice Send ERC20 tokens from the treasury.
+     * @param tokenAddress_ ERC20 token address.
+     * @param to_ Recipient address.
+     * @param amount_ Token amount to send.
+     */
+    function sendERC20(address tokenAddress_, address to_, uint256 amount_) public onlyOwner {
+        IERC20(tokenAddress_).safeTransfer(to_, amount_);
+
+        emit TokensSent(tokenAddress_, to_, amount_);
+    }
+
+    /**
+     * @notice Send ERC721 token from the treasury.
+     * @param tokenAddress_ ERC721 token address.
+     * @param to_ Recipient address.
+     * @param tokenId_ Token ID to send.
+     * @dev Uses safeTransferFrom to prevent sending NFTs to non-receivers.
+     */
+    function sendNFT(address tokenAddress_, address to_, uint256 tokenId_) public onlyOwner {
+        IERC721(tokenAddress_).safeTransferFrom(address(this), to_, tokenId_);
+
+        emit NFTSent(tokenAddress_, to_, tokenId_);
+    }
+
+    /* solhint-disable-next-line gas-calldata-parameters */
+    /**
+     * @notice Execute arbitrary operation (call or delegatecall).
+     * @param operation_ Operation type.
+     * @param to_ Target address.
+     * @param data_ Calldata to execute.
+     * @param value_ ETH value to send with call (ignored for delegatecall).
+     * @return success True if the low-level operation succeeded.
+     */
+    function arbitraryExecute(
+        IGovernance.OperationType operation_,
+        address to_,
+        bytes memory data_,
+        uint256 value_
+    ) external virtual onlyOwner returns (bool success) {
+        if (data_.length == 0 && value_ == 0) return true;
+
+        if (operation_ == IGovernance.OperationType.DelegateCall) {
+            /* solhint-disable-next-line no-inline-assembly */
+            assembly ("memory-safe") {
+                success := delegatecall(gas(), to_, add(data_, 0x20), mload(data_), 0, 0)
+            }
+        } else {
+            /* solhint-disable-next-line no-inline-assembly */
+            assembly ("memory-safe") {
+                success := call(gas(), to_, value_, add(data_, 0x20), mload(data_), 0, 0)
+            }
+        }
+
+        require(success, FailedToExecuteArbitraryCall(operation_, to_, data_, value_));
+
+        emit ArbitraryExecute(operation_, to_, data_, value_);
+    }
+
+    /**
+     * @notice Get native currency balance held by the treasury.
+     */
+    function getNativeBalance() public view returns (uint256) {
+        return address(this).balance;
+    }
+
+    /**
+     * @notice Get ERC20 token balance held by the treasury.
+     * @param tokenAddress_ ERC20 token address.
+     */
+    function getERC20Balance(address tokenAddress_) public view returns (uint256) {
+        return IERC20(tokenAddress_).balanceOf(address(this));
+    }
+
+    /**
+     * @notice Get ERC721 token balance (number of tokens) held by the treasury.
+     * @param tokenAddress_ ERC721 token address.
+     */
+    function getNFTBalance(address tokenAddress_) public view returns (uint256) {
+        return IERC721(tokenAddress_).balanceOf(address(this));
+    }
+
+    // solhint-disable-next-line no-empty-blocks
+    function _authorizeUpgrade(address newImplementation_) internal override onlyOwner {}
+}

package/governance/ExecutorsRegistry.sol

@@ -286,6 +286,7 @@ contract ExecutorsRegistry is IExecutorsRegistry, ERC165, UUPSUpgradeable, AValu
         executorInfo.stake -= amount_;
 
         _manipulateExecutorState(executor_);
+        _tryActivateFromStandby();
 
         $.stakeToken.safeTransfer(slashingRecipient_, amount_);
 
@@ -484,6 +485,7 @@ contract ExecutorsRegistry is IExecutorsRegistry, ERC165, UUPSUpgradeable, AValu
 
         if (!executorInfo.isApproved) return;
         if (executorInfo.stake < _getMinimumStake()) return;
+        if (executorInfo.isActive) return;
 
         if ($.activeExecutors.length() < $.maxActiveExecutors) {
             _activateExecutor(executor_);
@@ -702,7 +704,7 @@ contract ExecutorsRegistry is IExecutorsRegistry, ERC165, UUPSUpgradeable, AValu
         }
 
         _addToStandby(executor_);
-        _tryActivateFromStandby();
+        _tryActivateExecutor(executor_);
 
         _updateExecutorShares(executor_);
     }

package/governance/Governance.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 /* solhint-disable-next-line no-unused-import */
 import {IERC6372} from "@openzeppelin/contracts/interfaces/IERC6372.sol";
@@ -17,13 +16,11 @@ import {Paginator} from "@solarity/solidity-lib/libs/arrays/Paginator.sol";
 
 import {Errors} from "../libs/Errors.sol";
 import {IWrappedToken} from "../interfaces/IWrappedToken.sol";
-import {ISLCCore} from "../interfaces/ISLCCore.sol";
 import {IGovernance} from "../interfaces/IGovernance.sol";
 import {IQParameters} from "../interfaces/IQParameters.sol";
 import {INeutralsRegistry} from "../interfaces/INeutralsRegistry.sol";
 import {IExecutorsRegistry} from "../interfaces/IExecutorsRegistry.sol";
 import {GovernanceUtils} from "../libs/GovernanceUtils.sol";
-import {DAOSLC_PARAM_NAME, TREASURY_ADDRESS_PARAM_NAME} from "../utils/Globals.sol";
 
 import * as Globals from "../utils/Globals.sol";
 
@@ -67,6 +64,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         string additionalLink;
         EnumerableSet.AddressSet selectedNeutrals;
         bytes data;
+        uint256 createdAt;
         VotingPhase votingPhase;
         bytes32 leadingOperationHash;
         // Proposals
@@ -82,6 +80,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         string additionalLink;
         address[] selectedNeutrals;
         bytes data;
+        uint256 createdAt;
         VotingPhase votingPhase;
         bytes32 leadingOperationHash;
         // Proposals
@@ -192,6 +191,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         requestState.neutralsNumber = neutralsNumber_;
         requestState.additionalLink = additionalLink_;
         requestState.data = data_;
+        requestState.createdAt = block.timestamp;
         for (uint256 i = 0; i < selectedNeutrals_.length; ++i) {
             requestState.selectedNeutrals.add(selectedNeutrals_[i]);
         }
@@ -335,6 +335,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
                 additionalLink: requestState.additionalLink,
                 selectedNeutrals: requestState.selectedNeutrals.values(),
                 data: requestState.data,
+                createdAt: requestState.createdAt,
                 votingPhase: requestState.votingPhase,
                 leadingOperationHash: requestState.leadingOperationHash,
                 requestNonce: requestState.proposalNonce,

package/libs/GovernanceUtils.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.28;
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
-import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";
 
 import {ISLCCore} from "../interfaces/ISLCCore.sol";
 import {Governance} from "../governance/Governance.sol";

package/mocks/MockERC721.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+
+contract MockERC721 is ERC721 {
+    constructor() ERC721("Mock NFT", "MNFT") {}
+
+    function mint(address to_, uint256 tokenId_) external {
+        _mint(to_, tokenId_);
+    }
+}

package/mocks/Noop.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+contract Noop {
+    function doNothing() external {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3dotorg/evm-slc-core-contracts",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "author": "<TBD>",
   "repository": {
     "type": "git",