Second attempt at fix for issue

JoinColony · Nov 30, 2022 · ae55253 · ae55253
1 parent 0dedc59
commit ae55253
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 39 deletions.
diff --git a/contracts/reputationMiningCycle/IReputationMiningCycle.sol b/contracts/reputationMiningCycle/IReputationMiningCycle.sol
@@ -271,12 +271,5 @@ interface IReputationMiningCycle is ReputationMiningCycleDataTypes {
   /// enum in ReputationMiningCycleDataTypes
   /// @param _since The timestamp the last response for the submission in the dispute in question was made at.
   /// @return possible bool Whether the user can respond at the current time.
-  /// @dev Deprecated
   function getResponsePossible(DisputeStages _stage, uint256 _since) external view returns (bool possible);
-
-  /// @notice Returns whether the caller is able to currently respond to a dispute stage.
-  /// @param _since The timestamp the last response for the submission in the dispute in question was made at.
-  /// @return possible bool Whether the user can respond at the current time.
-  function getResponsePossible(uint256 _since) external view returns (bool possible);
-
 }
diff --git a/contracts/reputationMiningCycle/ReputationMiningCycle.sol b/contracts/reputationMiningCycle/ReputationMiningCycle.sol
@@ -216,7 +216,7 @@ contract ReputationMiningCycle is ReputationMiningCycleCommon {
     require(submissionWindowClosed(), "colony-reputation-mining-submission-window-still-open");
 
     require(
-      responsePossible(disputeRounds[_roundNumber][0].lastResponseTimestamp),
+      responsePossible(DisputeStages.ConfirmNewHash, disputeRounds[_roundNumber][0].lastResponseTimestamp),
       "colony-reputation-mining-user-ineligible-to-respond"
     );
 
@@ -256,7 +256,7 @@ contract ReputationMiningCycle is ReputationMiningCycleCommon {
 
       // Is the person making this call eligible to?
       require(
-        responsePossible(disputeRounds[_round][opponentIdx].lastResponseTimestamp),
+        responsePossible(DisputeStages.InvalidateHash, disputeRounds[_round][opponentIdx].lastResponseTimestamp),
         "colony-reputation-mining-user-ineligible-to-respond"
       );
 
@@ -292,7 +292,7 @@ contract ReputationMiningCycle is ReputationMiningCycleCommon {
 
       // The submission can be invalidated - now check the person invalidating is allowed to
       require(
-        responsePossible(add(disputeRounds[_round][_idx].lastResponseTimestamp, CHALLENGE_RESPONSE_WINDOW_DURATION)),
+        responsePossible(DisputeStages.InvalidateHash, add(disputeRounds[_round][_idx].lastResponseTimestamp, CHALLENGE_RESPONSE_WINDOW_DURATION)),
         "colony-reputation-mining-user-ineligible-to-respond"
       );
 
@@ -350,7 +350,7 @@ contract ReputationMiningCycle is ReputationMiningCycleCommon {
     require(submissionWindowClosed(), "colony-reputation-mining-cycle-submissions-not-closed");
     require(_index < disputeRounds[_round].length, "colony-reputation-mining-index-beyond-round-length");
     require(
-      responsePossible(disputeRounds[_round][_index].lastResponseTimestamp),
+      responsePossible(DisputeStages.ConfirmNewHash, disputeRounds[_round][_index].lastResponseTimestamp),
       "colony-reputation-mining-user-ineligible-to-respond"
     );
 
@@ -500,11 +500,7 @@ contract ReputationMiningCycle is ReputationMiningCycleCommon {
   }
 
   function getResponsePossible(DisputeStages _stage, uint256 _since) external view returns (bool) {
-    return responsePossible(_since);
-  }
-
-  function getResponsePossible(uint256 _since) external view returns (bool) {
-    return responsePossible(_since);
+    return responsePossible(_stage, _since);
   }
 
   /////////////////////////

diff --git a/contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol b/contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol
@@ -37,7 +37,7 @@ contract ReputationMiningCycleBinarySearch is ReputationMiningCycleCommon {
     require(_idx < disputeRounds[_round].length, "colony-reputation-mining-index-beyond-round-length");
     require(disputeRounds[_round][_idx].lowerBound != disputeRounds[_round][_idx].upperBound, "colony-reputation-mining-challenge-not-active");
     require(
-      responsePossible(disputeRounds[_round][_idx].lastResponseTimestamp),
+      responsePossible(DisputeStages.BinarySearchResponse, disputeRounds[_round][_idx].lastResponseTimestamp),
       "colony-reputation-mining-user-ineligible-to-respond"
     );
 
@@ -87,7 +87,7 @@ contract ReputationMiningCycleBinarySearch is ReputationMiningCycleCommon {
       "colony-reputation-binary-search-result-already-confirmed"
     );
     require(
-      responsePossible(disputeRounds[_round][_idx].lastResponseTimestamp),
+      responsePossible(DisputeStages.BinarySearchConfirm, disputeRounds[_round][_idx].lastResponseTimestamp),
       "colony-reputation-mining-user-ineligible-to-respond"
     );
 

diff --git a/contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol b/contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol
@@ -146,7 +146,7 @@ contract ReputationMiningCycleCommon is ReputationMiningCycleStorage, PatriciaTr
   uint256 constant CHALLENGE_RESPONSE_WINDOW_DURATION = 60 * 20;
   uint256 constant Y = UINT256_MAX / (CHALLENGE_RESPONSE_WINDOW_DURATION - ALL_ENTRIES_ALLOWED_END_OF_WINDOW);
 
-  function responsePossible(uint256 _responseWindowOpened) internal view returns (bool) {
+  function responsePossible(DisputeStages _stage, uint256 _responseWindowOpened) internal view returns (bool) {
     if (_responseWindowOpened > block.timestamp) {
       // I don't think this is currently possible, but belt and braces!
       return false;
@@ -162,7 +162,7 @@ contract ReputationMiningCycleCommon is ReputationMiningCycleStorage, PatriciaTr
         return false;
       }
       uint256 target = windowOpenFor * Y;
-      if (uint256(keccak256(abi.encodePacked(minerAddress, _responseWindowOpened))) > target) {
+      if (uint256(keccak256(abi.encodePacked(minerAddress, address(this), _stage))) > target) {
         return false;
       }
     }

diff --git a/contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol b/contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol
@@ -112,7 +112,7 @@ contract ReputationMiningCycleRespond is ReputationMiningCycleCommon {
     challengeOpen(_u[U_ROUND], _u[U_IDX])
   {
     require(
-      responsePossible(disputeRounds[_u[U_ROUND]][_u[U_IDX]].lastResponseTimestamp),
+      responsePossible(DisputeStages.RespondToChallenge, disputeRounds[_u[U_ROUND]][_u[U_IDX]].lastResponseTimestamp),
       "colony-reputation-mining-user-ineligible-to-respond"
     );
 

diff --git a/docs/interfaces/ireputationminingcycle.md b/docs/interfaces/ireputationminingcycle.md
@@ -277,7 +277,6 @@ Get the length of the ReputationUpdateLog stored on this instance of the Reputat
 
 Returns whether the caller is able to currently respond to a dispute stage.
 
-*Note: Deprecated*
 
 **Parameters**
 
@@ -292,23 +291,6 @@ Returns whether the caller is able to currently respond to a dispute stage.
 |---|---|---|
 |possible|bool|bool Whether the user can respond at the current time.
 
-### ▸ `getResponsePossible(uint256 _since):bool possible`
-
-Returns whether the caller is able to currently respond to a dispute stage.
-
-
-**Parameters**
-
-|Name|Type|Description|
-|---|---|---|
-|_since|uint256|The timestamp the last response for the submission in the dispute in question was made at.
-
-**Return Parameters**
-
-|Name|Type|Description|
-|---|---|---|
-|possible|bool|bool Whether the user can respond at the current time.
-
 ### ▸ `getSubmissionUser(bytes32 _hash, uint256 _nLeaves, bytes32 _jrh, uint256 _index):address user`
 
 Get the address that made a particular submission.