Merge branch 'dev' of github.com:defi-wonderland/prophet-core into fe…

…at/pure-to-view
defi-wonderland · Jul 22, 2024 · c98e0a8 · c98e0a8
2 parents c1dd58a + 8b25c6d
commit c98e0a8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/solidity/contracts/Oracle.sol b/solidity/contracts/Oracle.sol
@@ -130,11 +130,11 @@ contract Oracle is IOracle {
   ) external returns (bytes32 _disputeId) {
     _disputeId = _validateDispute(_request, _response, _dispute);
 
-    if (_dispute.disputer != msg.sender) {
+    if (_dispute.proposer != _response.proposer) {
       revert Oracle_InvalidDisputeBody();
     }
 
-    if (createdAt[_dispute.requestId] == 0) {
+    if (_dispute.disputer != msg.sender || createdAt[_dispute.requestId] == 0) {
       revert Oracle_InvalidDisputeBody();
     }
 

diff --git a/solidity/interfaces/IModule.sol b/solidity/interfaces/IModule.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {IOracle} from '../interfaces/IOracle.sol';
+import {IOracle} from './IOracle.sol';
 
 /**
  * @title Module

diff --git a/solidity/test/unit/Oracle.t.sol b/solidity/test/unit/Oracle.t.sol
@@ -536,6 +536,23 @@ contract Oracle_Unit_DisputeResponse is BaseTest {
     }
   }
 
+  /**
+   * @notice Reverts if the dispute proposer and response proposer are not same
+   */
+  function test_disputeResponse_revertIfProposerIsNotValid(address _otherProposer) public {
+    vm.assume(_otherProposer != proposer);
+    oracle.mock_setCreatedAt(_getId(mockRequest), 0);
+
+    // Check: revert?
+    vm.expectRevert(IOracle.Oracle_InvalidDisputeBody.selector);
+
+    mockDispute.proposer = _otherProposer;
+
+    // Test: try to dispute the response
+    vm.prank(disputer);
+    oracle.disputeResponse(mockRequest, mockResponse, mockDispute);
+  }
+
   /**
    * @notice Reverts if the request doesn't exist
    */