@web3dotorg/evm-slc-core-contracts 0.3.5 → 0.3.8

package/governance/Governance.sol

@@ -86,6 +86,21 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         uint256 serviceFee;
         uint256 neutralsNumber;
         string additionalLink;
+        EnumerableSet.AddressSet selectedNeutrals;
+        bytes data;
+        VotingPhase votingPhase;
+        bytes32 leadingOperationHash;
+        // Proposals
+        uint256 requestNonce;
+        uint256[] proposalIds;
+    }
+
+    struct ServiceRequestStateView {
+        address requester;
+        uint256 serviceFee;
+        uint256 neutralsNumber;
+        string additionalLink;
+        address[] selectedNeutrals;
         bytes data;
         VotingPhase votingPhase;
         bytes32 leadingOperationHash;
@@ -101,8 +116,6 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         // Voting parameters
         uint256 neutralsThreshold;
         uint256 executorsThreshold;
-        // Service request data
-        EnumerableSet.AddressSet selectedNeutrals;
         // Voting data
         OperationBundle[] operationBundles;
         mapping(bytes32 operationHash => uint256 position) operationBundlePosition;
@@ -118,7 +131,6 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         uint256 neutralsThreshold;
         uint256 executorsThreshold;
         // Service request data
-        address[] selectedNeutrals;
         bytes32[] neutralToOperationHashes;
         // Voting data
         OperationBundle[] operationBundles;
@@ -129,16 +141,16 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     event RejectedByExecutors(uint256 proposalId, uint256 newProposalId);
 
     error Unreachable();
-    error AccountAlreadyVoted(address account);
-    error NeutralsThresholdTooHigh(uint256 threshold);
-    error ExecutorsThresholdTooHigh(uint256 threshold);
     error InvalidTimepoint(uint256 timepoint);
     error AccountNotSelected(address account);
     error AccountNotExecutor(address account);
+    error AccountAlreadyVoted(address account);
+    error InvalidSharesTotal(uint256 totalShares);
+    error NeutralsThresholdTooHigh(uint256 threshold);
+    error ExecutorsThresholdTooHigh(uint256 threshold);
     error InvalidServiceFee(uint256 serviceFee, uint256 msgValue);
     error InvalidVotingPhaseForExecutorVote(VotingPhase votingPhase);
     error InvalidVotingPhaseForProposeOperations(VotingPhase votingPhase);
-    error InvalidSharesTotal(uint256 totalShares);
     error ServiceFeeTooLow(uint256 serviceFee, uint256 minServiceFee);
     error MinServiceFeeNotSet(address parametersRegistry);
 
@@ -184,6 +196,8 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
             requester_
         );
 
+        address[] memory selectedNeutrals_ = $.neutralsRegistry.getNeutralsSlice(neutralsNumber_);
+
         ServiceRequestState storage requestState = $.slcGovernanceState[slcCore_].requestState[
             requestCounter_
         ];
@@ -192,9 +206,11 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         requestState.neutralsNumber = neutralsNumber_;
         requestState.additionalLink = additionalLink_;
         requestState.data = data_;
+        for (uint256 i = 0; i < selectedNeutrals_.length; ++i) {
+            requestState.selectedNeutrals.add(selectedNeutrals_[i]);
+        }
 
-        address[] memory selectedNeutrals_ = $.neutralsRegistry.getNeutralsSlice(neutralsNumber_);
-        _fillProposalState(selectedNeutrals_, proposalId_);
+        _fillProposalState(proposalId_);
 
         _distributeServiceFeeRewards(proposalId_, selectedNeutrals_);
 
@@ -217,7 +233,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         );
 
         require(
-            $.proposalState[proposalId_].selectedNeutrals.contains(msg.sender),
+            requestState.selectedNeutrals.contains(msg.sender),
             AccountNotSelected(msg.sender)
         );
 
@@ -270,7 +286,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         address slcCore_,
         uint256 offset_,
         uint256 limit_
-    ) external view returns (ServiceRequestState[] memory) {
+    ) external view returns (ServiceRequestStateView[] memory) {
         GovernanceStorage storage $ = _getGovernanceStorage();
 
         uint256 to_ = Paginator.getTo(
@@ -279,10 +295,24 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
             limit_
         );
 
-        ServiceRequestState[] memory requests_ = new ServiceRequestState[](to_ - offset_);
+        ServiceRequestStateView[] memory requests_ = new ServiceRequestStateView[](to_ - offset_);
 
         for (uint256 i = offset_; i < to_; ++i) {
-            requests_[i - offset_] = $.slcGovernanceState[slcCore_].requestState[i];
+            ServiceRequestState storage requestState_ = $
+                .slcGovernanceState[slcCore_]
+                .requestState[i];
+            requests_[i - offset_] = ServiceRequestStateView({
+                requester: requestState_.requester,
+                serviceFee: requestState_.serviceFee,
+                neutralsNumber: requestState_.neutralsNumber,
+                additionalLink: requestState_.additionalLink,
+                selectedNeutrals: requestState_.selectedNeutrals.values(),
+                data: requestState_.data,
+                votingPhase: requestState_.votingPhase,
+                leadingOperationHash: requestState_.leadingOperationHash,
+                requestNonce: requestState_.requestNonce,
+                proposalIds: requestState_.proposalIds
+            });
         }
 
         return requests_;
@@ -323,21 +353,21 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         SLCProposalState storage proposalState = $.proposalState[proposalId];
 
-        bytes32[] memory neutralToOperationHashes_ = new bytes32[](
-            proposalState.selectedNeutrals.length()
-        );
+        ServiceRequestState storage requestState = $
+            .slcGovernanceState[proposalState.slcCore]
+            .requestState[proposalState.requestNumber];
+
+        uint256 selectedNeutralsLength_ = requestState.selectedNeutrals.length();
+        bytes32[] memory neutralToOperationHashes_ = new bytes32[](selectedNeutralsLength_);
 
-        uint256 selectedNeutralsLength_ = proposalState.selectedNeutrals.length();
         for (uint256 i = 0; i < selectedNeutralsLength_; ++i) {
-            neutralToOperationHashes_[i] = proposalState.neutralToOperation[
-                proposalState.selectedNeutrals.at(i)
-            ];
+            address neutral_ = requestState.selectedNeutrals.at(i);
+            neutralToOperationHashes_[i] = proposalState.neutralToOperation[neutral_];
         }
 
         SLCProposalStateView memory proposalData = SLCProposalStateView({
             neutralsThreshold: proposalState.neutralsThreshold,
             executorsThreshold: proposalState.executorsThreshold,
-            selectedNeutrals: proposalState.selectedNeutrals.values(),
             neutralToOperationHashes: neutralToOperationHashes_,
             operationBundles: proposalState.operationBundles,
             positiveExecutorVotes: proposalState.positiveExecutorVotes.values(),
@@ -379,13 +409,11 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     }
 
     function getSystemToken() external view returns (address) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-        return address($.token);
+        return address(_getGovernanceStorage().token);
     }
 
     function getParametersRegistry() external view returns (address) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-        return address($.parametersRegistry);
+        return address(_getGovernanceStorage().parametersRegistry);
     }
 
     /**
@@ -424,77 +452,43 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     }
 
     function getNeutralsVotingPeriod() public view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(NEUTRALS_VOTING_PERIOD_PARAM_NAME) returns (
-            uint256 neutralsVotingPeriod_
-        ) {
-            return neutralsVotingPeriod_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                NEUTRALS_VOTING_PERIOD_PARAM_NAME
-            );
-        }
+        return
+            _getGovernanceStorage().parametersRegistry.getUint(NEUTRALS_VOTING_PERIOD_PARAM_NAME);
     }
 
     function getExecutorsVotingPeriod() public view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(EXECUTORS_VOTING_PERIOD_PARAM_NAME) returns (
-            uint256 executorsVotingPeriod_
-        ) {
-            return executorsVotingPeriod_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                EXECUTORS_VOTING_PERIOD_PARAM_NAME
-            );
-        }
+        return
+            _getGovernanceStorage().parametersRegistry.getUint(EXECUTORS_VOTING_PERIOD_PARAM_NAME);
     }
 
     /**
      * @notice Returns the threshold for the neutrals voting phase. Expected value is in range [0, 100].
      */
     function getNeutralsThreshold() public view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(NEUTRALS_THRESHOLD_PARAM_NAME) returns (
-            uint256 neutralsThreshold_
-        ) {
-            if (neutralsThreshold_ > 100) {
-                revert NeutralsThresholdTooHigh(neutralsThreshold_);
-            }
+        uint256 neutralsThreshold_ = _getGovernanceStorage().parametersRegistry.getUint(
+            NEUTRALS_THRESHOLD_PARAM_NAME
+        );
 
-            return neutralsThreshold_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                NEUTRALS_THRESHOLD_PARAM_NAME
-            );
+        if (neutralsThreshold_ > 100) {
+            revert NeutralsThresholdTooHigh(neutralsThreshold_);
         }
+
+        return neutralsThreshold_;
     }
 
     /**
      * @notice Returns the threshold for the executors voting phase. Expected value is in range [0, 100].
      */
     function getExecutorsThreshold() public view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(EXECUTORS_THRESHOLD_PARAM_NAME) returns (
-            uint256 executorsThreshold_
-        ) {
-            if (executorsThreshold_ > 100) {
-                revert ExecutorsThresholdTooHigh(executorsThreshold_);
-            }
+        uint256 executorsThreshold_ = _getGovernanceStorage().parametersRegistry.getUint(
+            EXECUTORS_THRESHOLD_PARAM_NAME
+        );
 
-            return executorsThreshold_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                EXECUTORS_THRESHOLD_PARAM_NAME
-            );
+        if (executorsThreshold_ > 100) {
+            revert ExecutorsThresholdTooHigh(executorsThreshold_);
         }
+
+        return executorsThreshold_;
     }
 
     /**
@@ -646,10 +640,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
                 requestState.additionalLink,
                 requestState.requester
             );
-            _fillProposalState(
-                $.proposalState[proposalId].selectedNeutrals.values(),
-                newProposalId_
-            );
+            _fillProposalState(newProposalId_);
 
             emit RejectedByExecutors(proposalId, newProposalId_);
         }
@@ -697,86 +688,27 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     }
 
     function _getDAOSLC() internal view returns (address) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getAddr(DAOSLC_PARAM_NAME) returns (address daoslc_) {
-            return daoslc_;
-        } catch {
-            revert Errors.ParameterIsNotSet(address($.parametersRegistry), DAOSLC_PARAM_NAME);
-        }
+        return _getGovernanceStorage().parametersRegistry.getAddr(DAOSLC_PARAM_NAME);
     }
 
     function _getExecutorsShare() internal view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(EXECUTORS_SHARE_PARAM_NAME) returns (
-            uint256 executorsShare_
-        ) {
-            return executorsShare_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                EXECUTORS_SHARE_PARAM_NAME
-            );
-        }
+        return _getGovernanceStorage().parametersRegistry.getUint(EXECUTORS_SHARE_PARAM_NAME);
     }
 
     function _getNeutralsShare() internal view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(NEUTRALS_SHARE_PARAM_NAME) returns (
-            uint256 neutralsShare_
-        ) {
-            return neutralsShare_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                NEUTRALS_SHARE_PARAM_NAME
-            );
-        }
+        return _getGovernanceStorage().parametersRegistry.getUint(NEUTRALS_SHARE_PARAM_NAME);
     }
 
     function _getTreasuryShare() internal view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(TREASURY_SHARE_PARAM_NAME) returns (
-            uint256 treasuryShare_
-        ) {
-            return treasuryShare_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                TREASURY_SHARE_PARAM_NAME
-            );
-        }
+        return _getGovernanceStorage().parametersRegistry.getUint(TREASURY_SHARE_PARAM_NAME);
     }
 
     function _getTreasuryAddress() internal view returns (address) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getAddr(TREASURY_ADDRESS_PARAM_NAME) returns (address treasury_) {
-            return treasury_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                TREASURY_ADDRESS_PARAM_NAME
-            );
-        }
+        return _getGovernanceStorage().parametersRegistry.getAddr(TREASURY_ADDRESS_PARAM_NAME);
     }
 
     function _getMinServiceFee() internal view returns (uint256) {
-        GovernanceStorage storage $ = _getGovernanceStorage();
-
-        try $.parametersRegistry.getUint(MIN_SERVICE_FEE_PARAM_NAME) returns (
-            uint256 minServiceFee_
-        ) {
-            return minServiceFee_;
-        } catch {
-            revert Errors.ParameterIsNotSet(
-                address($.parametersRegistry),
-                MIN_SERVICE_FEE_PARAM_NAME
-            );
-        }
+        return _getGovernanceStorage().parametersRegistry.getUint(MIN_SERVICE_FEE_PARAM_NAME);
     }
 
     function _makeProposal(
@@ -833,17 +765,14 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         );
     }
 
-    function _fillProposalState(address[] memory selectedNeutrals_, uint256 proposalId_) private {
+    function _fillProposalState(uint256 proposalId_) private {
         GovernanceStorage storage $ = _getGovernanceStorage();
 
         ServiceRequestState storage requestState = $
             .slcGovernanceState[$.proposalState[proposalId_].slcCore]
             .requestState[$.proposalState[proposalId_].requestNumber];
 
-        uint256 neutralsLength_ = selectedNeutrals_.length;
-        for (uint256 i = 0; i < neutralsLength_; ++i) {
-            $.proposalState[proposalId_].selectedNeutrals.add(selectedNeutrals_[i]);
-        }
+        uint256 neutralsLength_ = requestState.selectedNeutrals.length();
 
         $.proposalState[proposalId_].neutralsThreshold = Math.mulDiv(
             neutralsLength_,

package/package.json

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