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

package/governance/Governance.sol

@@ -92,7 +92,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         VotingPhase votingPhase;
         bytes32 leadingOperationHash;
         // Proposals
-        uint256 requestNonce;
+        uint256 proposalNonce;
         uint256[] proposalIds;
     }
 
@@ -114,7 +114,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 +193,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_);
@@ -228,7 +233,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         ServiceRequestState storage requestState = $
             .slcGovernanceState[$.proposalState[proposalId_].slcCore]
-            .requestState[$.proposalState[proposalId_].requestNumber];
+            .requestState[$.proposalState[proposalId_].requestId];
 
         require(
             requestState.votingPhase == VotingPhase.Neutrals,
@@ -343,7 +348,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 +393,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
             });
     }
@@ -524,7 +529,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         ServiceRequestState storage requestState = $
             .slcGovernanceState[$.proposalState[proposalId_].slcCore]
-            .requestState[$.proposalState[proposalId_].requestNumber];
+            .requestState[$.proposalState[proposalId_].requestId];
 
         uint256 serviceFee_ = requestState.serviceFee;
         if (serviceFee_ == 0 && msg.value == 0) return;
@@ -577,7 +582,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         ServiceRequestState storage requestState = $
             .slcGovernanceState[$.proposalState[proposalId].slcCore]
-            .requestState[$.proposalState[proposalId].requestNumber];
+            .requestState[$.proposalState[proposalId].requestId];
 
         bytes32 leadingOperationHash_ = requestState.leadingOperationHash;
         if (leadingOperationHash_ == bytes32(0)) {
@@ -620,7 +625,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 +656,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_);
 
@@ -728,19 +735,17 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
     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 +754,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 +775,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,
@@ -785,7 +790,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
 
         ServiceRequestState storage requestState = $
             .slcGovernanceState[$.proposalState[proposalId_].slcCore]
-            .requestState[$.proposalState[proposalId_].requestNumber];
+            .requestState[$.proposalState[proposalId_].requestId];
 
         uint256 neutralsLength_ = requestState.selectedNeutrals.length();
 

package/package.json

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