@web3dotorg/evm-slc-core-contracts 0.3.9 → 0.3.11

package/governance/Governance.sol

@@ -82,6 +82,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     }
 
     struct ServiceRequestState {
+        uint256 requestId;
         address requester;
         uint256 serviceFee;
         uint256 neutralsNumber;
@@ -96,6 +97,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
     }
 
     struct ServiceRequestStateView {
+        uint256 requestId;
         address requester;
         uint256 serviceFee;
         uint256 neutralsNumber;
@@ -201,6 +203,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         ServiceRequestState storage requestState = $.slcGovernanceState[slcCore_].requestState[
             requestCounter_
         ];
+        requestState.requestId = requestCounter_;
         requestState.requester = requester_;
         requestState.serviceFee = serviceFee_;
         requestState.neutralsNumber = neutralsNumber_;
@@ -277,9 +280,8 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         return "mode=timestamp";
     }
 
-    // TODO: fix
     function COUNTING_MODE() public pure virtual override returns (string memory) {
-        return "support=bravo,fractional&quorum=for,abstain&params=fractional";
+        return "support=for&quorum=for";
     }
 
     function getServiceRequestsBySLCCore(
@@ -298,21 +300,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         ServiceRequestStateView[] memory requests_ = new ServiceRequestStateView[](to_ - offset_);
 
         for (uint256 i = offset_; i < to_; ++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
-            });
+            requests_[i - offset_] = getServiceRequestById(slcCore_, i);
         }
 
         return requests_;
@@ -379,6 +367,32 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
         return (proposalData, proposalCore);
     }
 
+    function getServiceRequestById(
+        address slcCore_,
+        uint256 requestId
+    ) public view returns (ServiceRequestStateView memory) {
+        GovernanceStorage storage $ = _getGovernanceStorage();
+
+        ServiceRequestState storage requestState = $.slcGovernanceState[slcCore_].requestState[
+            requestId
+        ];
+
+        return
+            ServiceRequestStateView({
+                requestId: requestState.requestId,
+                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
+            });
+    }
+
     function hasVoted(uint256 proposalId, address account) external view returns (bool) {
         GovernanceStorage storage $ = _getGovernanceStorage();
 
@@ -420,13 +434,7 @@ contract Governance is IGovernance, GovernorUpgradeable, UUPSUpgradeable {
      * @inheritdoc IGovernor
      */
     function votingDelay() public view override returns (uint256) {
-        try _getGovernanceStorage().parametersRegistry.getUint(VOTING_DELAY_PARAM_NAME) returns (
-            uint256 votingDelay_
-        ) {
-            return votingDelay_;
-        } catch {
-            return 0;
-        }
+        return _getGovernanceStorage().parametersRegistry.getUint(VOTING_DELAY_PARAM_NAME);
     }
 
     /**

package/package.json

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