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

package/governance/ExecutorsRegistry.sol

@@ -41,6 +41,7 @@ contract ExecutorsRegistry is IExecutorsRegistry, ERC165, UUPSUpgradeable, AValu
         bool isApproved;
         bool isActive;
         bool isStandby;
+        string externalLink;
     }
 
     struct WithdrawalAnnouncement {
@@ -320,6 +321,19 @@ contract ExecutorsRegistry is IExecutorsRegistry, ERC165, UUPSUpgradeable, AValu
         emit RewardsClaimed(msg.sender, rewards_);
     }
 
+    /**
+     * @notice Set an external link for the executor (e.g., profile or info page)
+     * @param externalLink_ The external link string
+     */
+    function setExternalLink(string calldata externalLink_) external {
+        ExecutorsRegistryStorage storage $ = _getExecutorsRegistryStorage();
+        ExecutorInfo storage executorInfo = $.executors[msg.sender];
+
+        if (executorInfo.stake == 0) revert ExecutorHasNoStake(msg.sender);
+
+        executorInfo.externalLink = externalLink_;
+    }
+
     /**
      * @notice Synchronize local maxActiveExecutors parameter with the one in the registry
      */
@@ -362,6 +376,15 @@ contract ExecutorsRegistry is IExecutorsRegistry, ERC165, UUPSUpgradeable, AValu
         return _getExecutorsRegistryStorage().executors[executor_];
     }
 
+    /**
+     * @notice Get the external link set by an executor
+     * @param executor_ Address of the executor
+     * @return The external link string
+     */
+    function getExternalLink(address executor_) external view returns (string memory) {
+        return _getExecutorsRegistryStorage().executors[executor_].externalLink;
+    }
+
     /**
      * @notice Get active executors list with pagination
      * @param offset_ Starting index

package/governance/Governance.sol

@@ -22,11 +22,13 @@ 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";
+
 contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     using EnumerableSet for EnumerableSet.AddressSet;
-
     using SafeERC20 for IWrappedToken;
 
     // keccak256(abi.encode(uint256(keccak256("evm-slc-core.storage.Governance")) - 1)) & ~bytes32(uint256(0xff))
@@ -36,30 +38,6 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     bytes32 private constant GOVERNOR_STORAGE_LOCATION =
         0x7c712897014dbe49c045ef1299aa2d5f9e67e48eea4403efa21f1e0f3ac0cb00;
 
-    string private constant VOTING_DELAY_PARAM_NAME = "slc.governance.votingDelay";
-
-    // solhint-disable-next-line gas-small-strings
-    string private constant NEUTRALS_VOTING_PERIOD_PARAM_NAME =
-        "slc.governance.neutralsVotingPeriod";
-
-    // solhint-disable-next-line gas-small-strings
-    string private constant EXECUTORS_VOTING_PERIOD_PARAM_NAME =
-        "slc.governance.executorsVotingPeriod";
-
-    // solhint-disable-next-line gas-small-strings
-    string private constant NEUTRALS_THRESHOLD_PARAM_NAME = "slc.governance.neutralsThreshold";
-
-    // solhint-disable-next-line gas-small-strings
-    string private constant EXECUTORS_THRESHOLD_PARAM_NAME = "slc.governance.executorsThreshold";
-
-    string private constant EXECUTORS_SHARE_PARAM_NAME = "slc.governance.executorsShare";
-
-    string private constant NEUTRALS_SHARE_PARAM_NAME = "slc.governance.neutralsShare";
-
-    string private constant TREASURY_SHARE_PARAM_NAME = "slc.governance.treasuryShare";
-
-    string private constant MIN_SERVICE_FEE_PARAM_NAME = "slc.governance.minServiceFee";
-
     enum VotingPhase {
         None,
         Neutrals,
@@ -92,7 +70,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         VotingPhase votingPhase;
         bytes32 leadingOperationHash;
         // Proposals
-        uint256 requestNonce;
+        uint256 proposalNonce;
         uint256[] proposalIds;
     }
 
@@ -114,7 +92,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     struct SLCProposalState {
         // Parent data
         address slcCore;
-        uint256 requestNumber;
+        uint256 requestId;
         // Voting parameters
         uint256 neutralsThreshold;
         uint256 executorsThreshold;
@@ -193,9 +171,14 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         uint256 minServiceFee_ = _getMinServiceFee();
         require(serviceFee_ >= minServiceFee_, ServiceFeeTooLow(serviceFee_, minServiceFee_));
 
-        (uint256 proposalId_, uint256 requestCounter_) = _makeProposal(
+        // solhint-disable-next-line gas-increment-by-one
+        uint256 requestCounter_ = $.slcGovernanceState[slcCore_].totalRequestsCount++;
+
+        uint256 proposalId_ = _makeProposal(
             additionalLink_,
-            requester_
+            requester_,
+            slcCore_,
+            requestCounter_
         );
 
         address[] memory selectedNeutrals_ = $.neutralsRegistry.getNeutralsSlice(neutralsNumber_);
@@ -224,41 +207,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         uint256 proposalId_,
         OperationBundle calldata operationBundle_
     ) external {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        ServiceRequestState storage requestState = $
-            .slcGovernanceState[$.proposalState[proposalId_].slcCore]
-            .requestState[$.proposalState[proposalId_].requestNumber];
-
-        require(
-            requestState.votingPhase == VotingPhase.Neutrals,
-            InvalidVotingPhaseForProposeOperations(requestState.votingPhase)
-        );
-
-        require(
-            requestState.selectedNeutrals.contains(msg.sender),
-            AccountNotSelected(msg.sender)
-        );
-
-        SLCProposalState storage proposalState = $.proposalState[proposalId_];
-
-        bytes32 operationHash_ = hashOperation(operationBundle_);
-
-        bytes32 previousOperationHash_ = proposalState.neutralToOperation[msg.sender];
-        if (previousOperationHash_ != bytes32(0)) {
-            proposalState.operationByNeutral[previousOperationHash_].remove(msg.sender);
-
-            if (proposalState.operationByNeutral[previousOperationHash_].length() == 0) {
-                _removeOperation(proposalState, previousOperationHash_);
-            }
-        }
-
-        proposalState.operationByNeutral[operationHash_].add(msg.sender);
-        proposalState.neutralToOperation[msg.sender] = operationHash_;
-
-        _addOperation(proposalState, operationBundle_, operationHash_);
-
-        proposalState.operationBundleByHash[operationHash_] = operationBundle_;
+        GovernanceUtils.handleProposeOperations(proposalId_, operationBundle_);
     }
 
     function implementation() external view returns (address) {
@@ -343,7 +292,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         ServiceRequestState storage requestState = $
             .slcGovernanceState[proposalState.slcCore]
-            .requestState[proposalState.requestNumber];
+            .requestState[proposalState.requestId];
 
         uint256 selectedNeutralsLength_ = requestState.selectedNeutrals.length();
         bytes32[] memory neutralToOperationHashes_ = new bytes32[](selectedNeutralsLength_);
@@ -388,7 +337,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
                 data: requestState.data,
                 votingPhase: requestState.votingPhase,
                 leadingOperationHash: requestState.leadingOperationHash,
-                requestNonce: requestState.requestNonce,
+                requestNonce: requestState.proposalNonce,
                 proposalIds: requestState.proposalIds
             });
     }
@@ -441,7 +390,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
      * @inheritdoc IGovernor
      */
     function votingDelay() public view override returns (uint256) {
-        return _getGovernanceStorage().parametersRegistry.getUint(VOTING_DELAY_PARAM_NAME);
+        return _getGovernanceStorage().parametersRegistry.getUint(Globals.VOTING_DELAY_PARAM_NAME);
     }
 
     /**
@@ -468,12 +417,16 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
     function getNeutralsVotingPeriod() public view returns (uint256) {
         return
-            _getGovernanceStorage().parametersRegistry.getUint(NEUTRALS_VOTING_PERIOD_PARAM_NAME);
+            _getGovernanceStorage().parametersRegistry.getUint(
+                Globals.NEUTRALS_VOTING_PERIOD_PARAM_NAME
+            );
     }
 
     function getExecutorsVotingPeriod() public view returns (uint256) {
         return
-            _getGovernanceStorage().parametersRegistry.getUint(EXECUTORS_VOTING_PERIOD_PARAM_NAME);
+            _getGovernanceStorage().parametersRegistry.getUint(
+                Globals.EXECUTORS_VOTING_PERIOD_PARAM_NAME
+            );
     }
 
     /**
@@ -481,7 +434,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
      */
     function getNeutralsThreshold() public view returns (uint256) {
         uint256 neutralsThreshold_ = _getGovernanceStorage().parametersRegistry.getUint(
-            NEUTRALS_THRESHOLD_PARAM_NAME
+            Globals.NEUTRALS_THRESHOLD_PARAM_NAME
         );
 
         if (neutralsThreshold_ > 100) {
@@ -496,7 +449,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
      */
     function getExecutorsThreshold() public view returns (uint256) {
         uint256 executorsThreshold_ = _getGovernanceStorage().parametersRegistry.getUint(
-            EXECUTORS_THRESHOLD_PARAM_NAME
+            Globals.EXECUTORS_THRESHOLD_PARAM_NAME
         );
 
         if (executorsThreshold_ > 100) {
@@ -520,50 +473,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         uint256 proposalId_,
         address[] memory selectedNeutrals_
     ) internal {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        ServiceRequestState storage requestState = $
-            .slcGovernanceState[$.proposalState[proposalId_].slcCore]
-            .requestState[$.proposalState[proposalId_].requestNumber];
-
-        uint256 serviceFee_ = requestState.serviceFee;
-        if (serviceFee_ == 0 && msg.value == 0) return;
-
-        if (msg.value > 0) {
-            require(serviceFee_ == msg.value, InvalidServiceFee(serviceFee_, msg.value));
-            $.token.deposit{value: msg.value}();
-        } else {
-            $.token.safeTransferFrom(requestState.requester, address(this), serviceFee_);
-        }
-
-        uint256 executorsShare_ = _getExecutorsShare();
-        uint256 neutralsShare_ = _getNeutralsShare();
-        uint256 treasuryShare_ = _getTreasuryShare();
-
-        // Validate shares total 100%
-        uint256 totalShares_ = executorsShare_ + neutralsShare_ + treasuryShare_;
-        require(totalShares_ == 100, InvalidSharesTotal(totalShares_));
-
-        // Calculate amounts
-        uint256 executorsAmount_ = (serviceFee_ * executorsShare_) / 100;
-        uint256 neutralsAmount_ = (serviceFee_ * neutralsShare_) / 100;
-        uint256 treasuryAmount_ = (serviceFee_ * treasuryShare_) / 100;
-
-        // Distribute to executors
-        if (executorsAmount_ > 0) {
-            $.executorsRegistry.distributeRewards(executorsAmount_);
-        }
-
-        // Distribute to neutrals
-        if (neutralsAmount_ > 0) {
-            $.neutralsRegistry.distributeRewards(selectedNeutrals_, neutralsAmount_);
-        }
-
-        // Send to treasury
-        if (treasuryAmount_ > 0) {
-            address treasury_ = _getTreasuryAddress();
-            $.token.safeTransfer(treasury_, treasuryAmount_);
-        }
+        GovernanceUtils.distributeServiceFeeRewards(proposalId_, selectedNeutrals_);
     }
 
     function _executeOperations(
@@ -573,34 +483,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         bytes[] memory /*calldatas*/,
         bytes32 /*descriptionHash*/
     ) internal override {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        ServiceRequestState storage requestState = $
-            .slcGovernanceState[$.proposalState[proposalId].slcCore]
-            .requestState[$.proposalState[proposalId].requestNumber];
-
-        bytes32 leadingOperationHash_ = requestState.leadingOperationHash;
-        if (leadingOperationHash_ == bytes32(0)) {
-            revert Unreachable();
-        }
-
-        OperationBundle storage leadingOperationBundle_ = $
-            .proposalState[proposalId]
-            .operationBundleByHash[leadingOperationHash_];
-
-        ISLCCore slcCore_ = ISLCCore(targets[0]);
-
-        uint256 operationsLength_ = leadingOperationBundle_.operations.length;
-        for (uint256 i = 0; i < operationsLength_; ++i) {
-            slcCore_.arbitraryExecute(
-                leadingOperationBundle_.operations[i].operation_,
-                leadingOperationBundle_.operations[i].to_,
-                leadingOperationBundle_.operations[i].data_,
-                leadingOperationBundle_.operations[i].value_
-            );
-        }
-
-        requestState.votingPhase = VotingPhase.Executed;
+        GovernanceUtils.executeOperations(proposalId, targets);
     }
 
     /**
@@ -620,7 +503,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         ServiceRequestState storage requestState = $
             .slcGovernanceState[$.proposalState[proposalId].slcCore]
-            .requestState[$.proposalState[proposalId].requestNumber];
+            .requestState[$.proposalState[proposalId].requestId];
 
         require($.executorsRegistry.isExecutor(account), AccountNotExecutor(account));
 
@@ -651,9 +534,11 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
             $.proposalState[proposalId].negativeExecutorVotes.length() >=
             $.proposalState[proposalId].executorsThreshold
         ) {
-            (uint256 newProposalId_, ) = _makeProposal(
+            uint256 newProposalId_ = _makeProposal(
                 requestState.additionalLink,
-                requestState.requester
+                requestState.requester,
+                $.proposalState[proposalId].slcCore,
+                requestState.requestId
             );
             _fillProposalState(newProposalId_);
 
@@ -703,44 +588,27 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     }
 
     function _getDAOSLC() internal view returns (address) {
-        return _getGovernanceStorage().parametersRegistry.getAddr(DAOSLC_PARAM_NAME);
-    }
-
-    function _getExecutorsShare() internal view returns (uint256) {
-        return _getGovernanceStorage().parametersRegistry.getUint(EXECUTORS_SHARE_PARAM_NAME);
-    }
-
-    function _getNeutralsShare() internal view returns (uint256) {
-        return _getGovernanceStorage().parametersRegistry.getUint(NEUTRALS_SHARE_PARAM_NAME);
-    }
-
-    function _getTreasuryShare() internal view returns (uint256) {
-        return _getGovernanceStorage().parametersRegistry.getUint(TREASURY_SHARE_PARAM_NAME);
-    }
-
-    function _getTreasuryAddress() internal view returns (address) {
-        return _getGovernanceStorage().parametersRegistry.getAddr(TREASURY_ADDRESS_PARAM_NAME);
+        return _getGovernanceStorage().parametersRegistry.getAddr(Globals.DAOSLC_PARAM_NAME);
     }
 
     function _getMinServiceFee() internal view returns (uint256) {
-        return _getGovernanceStorage().parametersRegistry.getUint(MIN_SERVICE_FEE_PARAM_NAME);
+        return
+            _getGovernanceStorage().parametersRegistry.getUint(Globals.MIN_SERVICE_FEE_PARAM_NAME);
     }
 
     function _makeProposal(
         string memory additionalLink_,
-        address requester_
-    ) private returns (uint256 proposalId_, uint256 requestCounter_) {
+        address requester_,
+        address slcCore_,
+        uint256 requestId_
+    ) private returns (uint256 proposalId_) {
         GovernanceStorage storage $ = _getGovernanceStorage();
 
-        address slcCore_ = msg.sender;
-
         // solhint-disable-next-line gas-increment-by-one
-        requestCounter_ = $.slcGovernanceState[slcCore_].totalRequestsCount++;
-        // solhint-disable-next-line gas-increment-by-one
-        uint256 requestNonce_ = $
+        uint256 proposalNonce_ = $
             .slcGovernanceState[slcCore_]
-            .requestState[requestCounter_]
-            .requestNonce++;
+            .requestState[requestId_]
+            .proposalNonce++;
 
         address[] memory targets = new address[](1);
         targets[0] = slcCore_;
@@ -749,18 +617,18 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         values[0] = 0;
 
         bytes[] memory calldatas = new bytes[](1);
-        calldatas[0] = abi.encodePacked(requestCounter_, requestNonce_);
+        calldatas[0] = abi.encodePacked(requestId_, proposalNonce_);
 
         proposalId_ = _propose(targets, values, calldatas, additionalLink_, requester_);
 
         $.proposalState[proposalId_].slcCore = slcCore_;
-        $.proposalState[proposalId_].requestNumber = requestCounter_;
+        $.proposalState[proposalId_].requestId = requestId_;
     }
 
     function _executeProposal(uint256 proposalId_) private {
         GovernanceStorage storage $ = _getGovernanceStorage();
 
-        uint256 requestCounter_ = $.proposalState[proposalId_].requestNumber;
+        uint256 requestCounter_ = $.proposalState[proposalId_].requestId;
         ServiceRequestState storage requestState = $
             .slcGovernanceState[$.proposalState[proposalId_].slcCore]
             .requestState[requestCounter_];
@@ -770,7 +638,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         // Here we need to execute the previous proposal related to this request
         bytes[] memory calldatas = new bytes[](1);
-        calldatas[0] = abi.encodePacked(requestCounter_, requestState.requestNonce - 1);
+        calldatas[0] = abi.encodePacked(requestCounter_, requestState.proposalNonce - 1);
 
         execute(
             targets,
@@ -781,93 +649,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     }
 
     function _fillProposalState(uint256 proposalId_) private {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        ServiceRequestState storage requestState = $
-            .slcGovernanceState[$.proposalState[proposalId_].slcCore]
-            .requestState[$.proposalState[proposalId_].requestNumber];
-
-        uint256 neutralsLength_ = requestState.selectedNeutrals.length();
-
-        $.proposalState[proposalId_].neutralsThreshold = Math.mulDiv(
-            neutralsLength_,
-            getNeutralsThreshold(),
-            100,
-            Math.Rounding.Ceil
-        );
-
-        uint256 executorsCount_ = $.executorsRegistry.getExecutorsCount();
-        $.proposalState[proposalId_].executorsThreshold = Math.mulDiv(
-            executorsCount_,
-            getExecutorsThreshold(),
-            100,
-            Math.Rounding.Ceil
-        );
-
-        requestState.proposalIds.push(proposalId_);
-
-        requestState.votingPhase = VotingPhase.Neutrals;
-    }
-
-    function _addOperation(
-        SLCProposalState storage proposalState,
-        OperationBundle memory operationBundle_,
-        bytes32 operationHash_
-    ) private returns (bool) {
-        if (!_containsOperation(proposalState, operationHash_)) {
-            proposalState.operationBundles.push(operationBundle_);
-            // The value is stored at length-1, but we add 1 to all indexes
-            // and use 0 as a sentinel value
-            proposalState.operationBundlePosition[operationHash_] = proposalState
-                .operationBundles
-                .length;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function _removeOperation(
-        SLCProposalState storage proposalState,
-        bytes32 operationHash_
-    ) private returns (bool) {
-        // We cache the value's position to prevent multiple reads from the same storage slot
-        uint256 position_ = proposalState.operationBundlePosition[operationHash_];
-
-        if (position_ != 0) {
-            // Equivalent to contains(set, value)
-            // To delete an element from the _values array in O(1), we swap the element to delete with the last one in
-            // the array, and then remove the last element (sometimes called as 'swap and pop').
-
-            uint256 valueIndex_ = position_ - 1;
-            uint256 lastIndex_ = proposalState.operationBundles.length - 1;
-
-            if (valueIndex_ != lastIndex_) {
-                OperationBundle storage lastValue = proposalState.operationBundles[lastIndex_];
-
-                // Move the lastValue to the index where the value to delete is
-                proposalState.operationBundles[valueIndex_] = lastValue;
-                // Update the tracked position of the lastValue (that was just moved)
-                proposalState.operationBundlePosition[hashOperation(lastValue)] = position_;
-            }
-
-            // Delete the slot where the moved value was stored
-            proposalState.operationBundles.pop();
-
-            // Delete the tracked position for the deleted slot
-            delete proposalState.operationBundlePosition[operationHash_];
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function _containsOperation(
-        SLCProposalState storage proposalState,
-        bytes32 operationHash_
-    ) private view returns (bool) {
-        return proposalState.operationBundlePosition[operationHash_] != 0;
+        GovernanceUtils.fillProposalState(proposalId_);
     }
 
     function _findLeadingOperation(uint256 proposalId_) private view returns (bytes32) {

package/governance/NeutralsRegistry.sol

@@ -287,7 +287,7 @@ contract NeutralsRegistry is INeutralsRegistry, ERC165, UUPSUpgradeable {
 
         uint256 amount_ = announcement.amount;
 
-        delete $.delegations[neutral_][msg.sender].withdrawal;
+        delete $.delegations[msg.sender][neutral_].withdrawal;
 
         if ($.delegations[msg.sender][neutral_].delegatedAmount == 0) {
             $.neutralsPerDelegator[msg.sender].remove(neutral_);

package/libs/GovernanceUtils.sol

@@ -0,0 +1,304 @@
+// 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";
+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";
+import {IGovernance} from "../interfaces/IGovernance.sol";
+import {IWrappedToken} from "../interfaces/IWrappedToken.sol";
+import * as Globals from "../utils/Globals.sol";
+
+library GovernanceUtils {
+    using EnumerableSet for EnumerableSet.AddressSet;
+    using SafeERC20 for IWrappedToken;
+
+    bytes32 private constant GOVERNANCE_STORAGE_LOCATION =
+        0xb93e2841340255f69de4f9300770e3cc1894dc081e8bf6d34a78e9ac897c7900;
+
+    bytes32 private constant GOVERNOR_STORAGE_LOCATION =
+        0x7c712897014dbe49c045ef1299aa2d5f9e67e48eea4403efa21f1e0f3ac0cb00;
+
+    function handleProposeOperations(
+        uint256 proposalId_,
+        IGovernance.OperationBundle calldata operationBundle_
+    ) external {
+        Governance.GovernanceStorage storage $ = _getGovernanceStorage();
+
+        Governance.ServiceRequestState storage requestState = $
+            .slcGovernanceState[$.proposalState[proposalId_].slcCore]
+            .requestState[$.proposalState[proposalId_].requestId];
+
+        require(
+            requestState.votingPhase == Governance.VotingPhase.Neutrals,
+            Governance.InvalidVotingPhaseForProposeOperations(requestState.votingPhase)
+        );
+
+        require(
+            requestState.selectedNeutrals.contains(msg.sender),
+            Governance.AccountNotSelected(msg.sender)
+        );
+
+        Governance.SLCProposalState storage proposalState = $.proposalState[proposalId_];
+
+        bytes32 operationHash_ = hashOperation(operationBundle_);
+
+        bytes32 previousOperationHash_ = proposalState.neutralToOperation[msg.sender];
+        if (previousOperationHash_ != bytes32(0)) {
+            proposalState.operationByNeutral[previousOperationHash_].remove(msg.sender);
+
+            if (proposalState.operationByNeutral[previousOperationHash_].length() == 0) {
+                _removeOperation(proposalState, previousOperationHash_);
+            }
+        }
+
+        proposalState.operationByNeutral[operationHash_].add(msg.sender);
+        proposalState.neutralToOperation[msg.sender] = operationHash_;
+
+        _addOperation(proposalState, operationBundle_, operationHash_);
+
+        proposalState.operationBundleByHash[operationHash_] = operationBundle_;
+    }
+
+    function fillProposalState(uint256 proposalId_) external {
+        Governance.GovernanceStorage storage $ = _getGovernanceStorage();
+
+        Governance.ServiceRequestState storage requestState = $
+            .slcGovernanceState[$.proposalState[proposalId_].slcCore]
+            .requestState[$.proposalState[proposalId_].requestId];
+
+        uint256 neutralsLength_ = requestState.selectedNeutrals.length();
+
+        $.proposalState[proposalId_].neutralsThreshold = Math.mulDiv(
+            neutralsLength_,
+            getNeutralsThreshold(),
+            100,
+            Math.Rounding.Ceil
+        );
+
+        uint256 executorsCount_ = $.executorsRegistry.getExecutorsCount();
+        $.proposalState[proposalId_].executorsThreshold = Math.mulDiv(
+            executorsCount_,
+            getExecutorsThreshold(),
+            100,
+            Math.Rounding.Ceil
+        );
+
+        requestState.proposalIds.push(proposalId_);
+
+        requestState.votingPhase = Governance.VotingPhase.Neutrals;
+    }
+
+    function distributeServiceFeeRewards(
+        uint256 proposalId_,
+        address[] memory selectedNeutrals_
+    ) external {
+        Governance.GovernanceStorage storage $ = _getGovernanceStorage();
+
+        Governance.ServiceRequestState storage requestState = $
+            .slcGovernanceState[$.proposalState[proposalId_].slcCore]
+            .requestState[$.proposalState[proposalId_].requestId];
+
+        uint256 serviceFee_ = requestState.serviceFee;
+        if (serviceFee_ == 0 && msg.value == 0) return;
+
+        if (msg.value > 0) {
+            require(
+                serviceFee_ == msg.value,
+                Governance.InvalidServiceFee(serviceFee_, msg.value)
+            );
+            $.token.deposit{value: msg.value}();
+        } else {
+            $.token.safeTransferFrom(requestState.requester, address(this), serviceFee_);
+        }
+
+        uint256 executorsShare_ = getExecutorsShare();
+        uint256 neutralsShare_ = getNeutralsShare();
+        uint256 treasuryShare_ = getTreasuryShare();
+
+        // Validate shares total 100%
+        uint256 totalShares_ = executorsShare_ + neutralsShare_ + treasuryShare_;
+        require(totalShares_ == 100, Governance.InvalidSharesTotal(totalShares_));
+
+        // Calculate amounts
+        uint256 executorsAmount_ = (serviceFee_ * executorsShare_) / 100;
+        uint256 neutralsAmount_ = (serviceFee_ * neutralsShare_) / 100;
+        uint256 treasuryAmount_ = (serviceFee_ * treasuryShare_) / 100;
+
+        // Distribute to executors
+        if (executorsAmount_ > 0) {
+            $.executorsRegistry.distributeRewards(executorsAmount_);
+        }
+
+        // Distribute to neutrals
+        if (neutralsAmount_ > 0) {
+            $.neutralsRegistry.distributeRewards(selectedNeutrals_, neutralsAmount_);
+        }
+
+        // Send to treasury
+        if (treasuryAmount_ > 0) {
+            address treasury_ = getTreasuryAddress();
+            $.token.safeTransfer(treasury_, treasuryAmount_);
+        }
+    }
+
+    function executeOperations(uint256 proposalId, address[] memory targets) external {
+        Governance.GovernanceStorage storage $ = _getGovernanceStorage();
+
+        Governance.ServiceRequestState storage requestState = $
+            .slcGovernanceState[$.proposalState[proposalId].slcCore]
+            .requestState[$.proposalState[proposalId].requestId];
+
+        bytes32 leadingOperationHash_ = requestState.leadingOperationHash;
+        if (leadingOperationHash_ == bytes32(0)) {
+            revert Governance.Unreachable();
+        }
+
+        IGovernance.OperationBundle storage leadingOperationBundle_ = $
+            .proposalState[proposalId]
+            .operationBundleByHash[leadingOperationHash_];
+
+        ISLCCore slcCore_ = ISLCCore(targets[0]);
+
+        uint256 operationsLength_ = leadingOperationBundle_.operations.length;
+        for (uint256 i = 0; i < operationsLength_; ++i) {
+            slcCore_.arbitraryExecute(
+                leadingOperationBundle_.operations[i].operation_,
+                leadingOperationBundle_.operations[i].to_,
+                leadingOperationBundle_.operations[i].data_,
+                leadingOperationBundle_.operations[i].value_
+            );
+        }
+
+        requestState.votingPhase = Governance.VotingPhase.Executed;
+    }
+
+    function hashOperation(
+        IGovernance.OperationBundle memory operation_
+    ) public pure returns (bytes32) {
+        return keccak256(abi.encode(operation_));
+    }
+
+    function getExecutorsShare() public view returns (uint256) {
+        return
+            _getGovernanceStorage().parametersRegistry.getUint(Globals.EXECUTORS_SHARE_PARAM_NAME);
+    }
+
+    function getNeutralsShare() public view returns (uint256) {
+        return
+            _getGovernanceStorage().parametersRegistry.getUint(Globals.NEUTRALS_SHARE_PARAM_NAME);
+    }
+
+    function getTreasuryShare() public view returns (uint256) {
+        return
+            _getGovernanceStorage().parametersRegistry.getUint(Globals.TREASURY_SHARE_PARAM_NAME);
+    }
+
+    function getTreasuryAddress() public view returns (address) {
+        return
+            _getGovernanceStorage().parametersRegistry.getAddr(
+                Globals.TREASURY_ADDRESS_PARAM_NAME
+            );
+    }
+
+    function getNeutralsThreshold() public view returns (uint256) {
+        uint256 neutralsThreshold_ = _getGovernanceStorage().parametersRegistry.getUint(
+            Globals.NEUTRALS_THRESHOLD_PARAM_NAME
+        );
+
+        if (neutralsThreshold_ > 100) {
+            revert Governance.NeutralsThresholdTooHigh(neutralsThreshold_);
+        }
+
+        return neutralsThreshold_;
+    }
+
+    function getExecutorsThreshold() public view returns (uint256) {
+        uint256 executorsThreshold_ = _getGovernanceStorage().parametersRegistry.getUint(
+            Globals.EXECUTORS_THRESHOLD_PARAM_NAME
+        );
+
+        if (executorsThreshold_ > 100) {
+            revert Governance.ExecutorsThresholdTooHigh(executorsThreshold_);
+        }
+
+        return executorsThreshold_;
+    }
+
+    function _addOperation(
+        Governance.SLCProposalState storage proposalState,
+        IGovernance.OperationBundle memory operationBundle_,
+        bytes32 operationHash_
+    ) private returns (bool) {
+        if (!_containsOperation(proposalState, operationHash_)) {
+            proposalState.operationBundles.push(operationBundle_);
+            // The value is stored at length-1, but we add 1 to all indexes
+            // and use 0 as a sentinel value
+            proposalState.operationBundlePosition[operationHash_] = proposalState
+                .operationBundles
+                .length;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function _containsOperation(
+        Governance.SLCProposalState storage proposalState,
+        bytes32 operationHash_
+    ) private view returns (bool) {
+        return proposalState.operationBundlePosition[operationHash_] != 0;
+    }
+
+    function _removeOperation(
+        Governance.SLCProposalState storage proposalState,
+        bytes32 operationHash_
+    ) private returns (bool) {
+        // We cache the value's position to prevent multiple reads from the same storage slot
+        uint256 position_ = proposalState.operationBundlePosition[operationHash_];
+
+        if (position_ != 0) {
+            // Equivalent to contains(set, value)
+            // To delete an element from the _values array in O(1), we swap the element to delete with the last one in
+            // the array, and then remove the last element (sometimes called as 'swap and pop').
+
+            uint256 valueIndex_ = position_ - 1;
+            uint256 lastIndex_ = proposalState.operationBundles.length - 1;
+
+            if (valueIndex_ != lastIndex_) {
+                IGovernance.OperationBundle storage lastValue = proposalState.operationBundles[
+                    lastIndex_
+                ];
+
+                // Move the lastValue to the index where the value to delete is
+                proposalState.operationBundles[valueIndex_] = lastValue;
+                // Update the tracked position of the lastValue (that was just moved)
+                proposalState.operationBundlePosition[hashOperation(lastValue)] = position_;
+            }
+
+            // Delete the slot where the moved value was stored
+            proposalState.operationBundles.pop();
+
+            // Delete the tracked position for the deleted slot
+            delete proposalState.operationBundlePosition[operationHash_];
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function _getGovernanceStorage()
+        private
+        pure
+        returns (Governance.GovernanceStorage storage $)
+    {
+        /* solhint-disable-next-line no-inline-assembly */
+        assembly ("memory-safe") {
+            $.slot := GOVERNANCE_STORAGE_LOCATION
+        }
+    }
+}

package/package.json

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

package/utils/Globals.sol

@@ -4,4 +4,28 @@ pragma solidity ^0.8.28;
 string constant TREASURY_ADDRESS_PARAM_NAME = "slc.general.treasuryAddress";
 string constant DAOSLC_PARAM_NAME = "slc.general.daoSLC";
 
+// Governance
+
+string constant VOTING_DELAY_PARAM_NAME = "slc.governance.votingDelay";
+
+// solhint-disable-next-line gas-small-strings
+string constant NEUTRALS_VOTING_PERIOD_PARAM_NAME = "slc.governance.neutralsVotingPeriod";
+
+// solhint-disable-next-line gas-small-strings
+string constant EXECUTORS_VOTING_PERIOD_PARAM_NAME = "slc.governance.executorsVotingPeriod";
+
+// solhint-disable-next-line gas-small-strings
+string constant NEUTRALS_THRESHOLD_PARAM_NAME = "slc.governance.neutralsThreshold";
+
+// solhint-disable-next-line gas-small-strings
+string constant EXECUTORS_THRESHOLD_PARAM_NAME = "slc.governance.executorsThreshold";
+
+string constant EXECUTORS_SHARE_PARAM_NAME = "slc.governance.executorsShare";
+
+string constant NEUTRALS_SHARE_PARAM_NAME = "slc.governance.neutralsShare";
+
+string constant TREASURY_SHARE_PARAM_NAME = "slc.governance.treasuryShare";
+
+string constant MIN_SERVICE_FEE_PARAM_NAME = "slc.governance.minServiceFee";
+
 uint256 constant MAX_BASIS_POINTS = 100_00;