feat: additional validations

solidity/contracts/Oracle.sol

@@ -104,6 +104,11 @@ contract Oracle is IOracle {
       revert Oracle_InvalidResponseBody();
     }
 
+    // Can't propose the same response twice
+    if (createdAt[_responseId] != 0) {
+      revert Oracle_InvalidResponseBody();
+    }
+
     if (finalizedAt[_response.requestId] != 0) {
       revert Oracle_AlreadyFinalized(_response.requestId);
     }
@@ -124,6 +129,10 @@ contract Oracle is IOracle {
   ) external returns (bytes32 _disputeId) {
     _disputeId = _validateDispute(_request, _response, _dispute);
 
+    if (_dispute.disputer != msg.sender) {
+      revert Oracle_InvalidDisputeBody();
+    }
+
     if (createdAt[_dispute.requestId] == 0) {
       revert Oracle_InvalidDisputeBody();
     }

solidity/test/integration/Finalization.t.sol

@@ -9,7 +9,6 @@ contract Integration_Finalization is IntegrationBase {
 
   function setUp() public override {
     super.setUp();
-    _expectedDeadline = block.timestamp + BLOCK_TIME * 600;
     vm.etch(_callbackTarget, hex'069420');
   }
 

solidity/test/integration/IntegrationBase.sol

@@ -85,6 +85,8 @@ contract IntegrationBase is TestConstants, Helpers {
 
     vm.stopPrank();
 
+    _expectedDeadline = block.timestamp + BLOCK_TIME * 600;
+
     // Configure the mock request
     mockRequest.requestModuleData = abi.encode(
       IMockRequestModule.RequestParameters({

solidity/test/integration/ResponseDispute.t.sol

@@ -7,11 +7,6 @@ contract Integration_ResponseDispute is IntegrationBase {
   bytes internal _responseData;
   bytes32 internal _requestId;
   bytes32 internal _responseId;
-  bytes internal _requestModuleData;
-  bytes internal _responseModuleData;
-  bytes internal _disputeModuleData;
-  bytes internal _resolutionModuleData;
-  bytes internal _finalityModuleData;
 
   function setUp() public override {
     super.setUp();
@@ -43,7 +38,10 @@ contract Integration_ResponseDispute is IntegrationBase {
     vm.prank(disputer);
     oracle.disputeResponse(mockRequest, mockResponse, mockDispute);
 
-    vm.prank(disputer);
+    address _anotherDisputer = makeAddr('anotherDisputer');
+    mockDispute.disputer = _anotherDisputer;
+
+    vm.prank(_anotherDisputer);
     vm.expectRevert(abi.encodeWithSelector(IOracle.Oracle_ResponseAlreadyDisputed.selector, _responseId));
     oracle.disputeResponse(mockRequest, mockResponse, mockDispute);
   }

solidity/test/integration/ResponseProposal.t.sol

@@ -9,52 +9,7 @@ contract Integration_ResponseProposal is IntegrationBase {
   function setUp() public override {
     super.setUp();
 
-    _expectedDeadline = block.timestamp + BLOCK_TIME * 600;
-
-    mockRequest.requestModuleData = abi.encode(
-      IMockRequestModule.RequestParameters({
-        url: _expectedUrl,
-        body: _expectedBody,
-        accountingExtension: _accountingExtension,
-        paymentToken: usdc,
-        paymentAmount: _expectedReward
-      })
-    );
-
-    mockRequest.responseModuleData = abi.encode(
-      IMockResponseModule.RequestParameters({
-        accountingExtension: _accountingExtension,
-        bondToken: usdc,
-        bondAmount: _expectedBondAmount,
-        deadline: _expectedDeadline,
-        disputeWindow: _baseDisputeWindow
-      })
-    );
-
-    mockRequest.disputeModuleData = abi.encode(
-      IMockDisputeModule.RequestParameters({
-        accountingExtension: _accountingExtension,
-        bondToken: usdc,
-        bondAmount: _expectedBondAmount
-      })
-    );
-
-    mockRequest.resolutionModuleData = abi.encode();
-
-    mockRequest.finalityModuleData = abi.encode(
-      IMockFinalityModule.RequestParameters({target: address(_mockCallback), data: abi.encode(_expectedCallbackValue)})
-    );
-
-    mockRequest.requestModule = address(_requestModule);
-    mockRequest.responseModule = address(_responseModule);
-    mockRequest.disputeModule = address(_disputeModule);
-    mockRequest.resolutionModule = address(_resolutionModule);
-    mockRequest.finalityModule = address(_finalityModule);
-
     mockRequest.nonce = uint96(oracle.totalRequestCount());
-    mockRequest.requester = requester;
-
-    mockResponse.requestId = _getId(mockRequest);
 
     vm.prank(requester);
     _requestId = oracle.createRequest(mockRequest, _ipfsHash);
@@ -82,6 +37,7 @@ contract Integration_ResponseProposal is IntegrationBase {
     vm.warp(_timestamp);
     oracle.finalize(mockRequest, mockResponse);
 
+    mockResponse.response = abi.encode(_timestamp);
     vm.expectRevert(abi.encodeWithSelector(IOracle.Oracle_AlreadyFinalized.selector, _requestId));
     vm.prank(proposer);
     oracle.proposeResponse(mockRequest, mockResponse);

solidity/test/unit/Oracle.t.sol

@@ -422,6 +422,22 @@ contract Oracle_Unit_ProposeResponse is BaseTest {
     oracle.proposeResponse(mockRequest, mockResponse);
   }
 
+  /**
+   * @notice Revert if the response has been already proposed
+   */
+  function test_proposeResponse_revertsIfDuplicateResponse() public {
+    // Test: propose a response
+    vm.prank(proposer);
+    oracle.proposeResponse(mockRequest, mockResponse);
+
+    // Check: revert?
+    vm.expectRevert(IOracle.Oracle_InvalidResponseBody.selector);
+
+    // Test: try to propose the same response again
+    vm.prank(proposer);
+    oracle.proposeResponse(mockRequest, mockResponse);
+  }
+
   /**
    * @notice Proposing a response to a finalized request should fail
    */
@@ -440,8 +456,8 @@ contract Oracle_Unit_ProposeResponse is BaseTest {
 }
 
 contract Oracle_Unit_DisputeResponse is BaseTest {
-  bytes32 _responseId;
-  bytes32 _disputeId;
+  bytes32 internal _responseId;
+  bytes32 internal _disputeId;
 
   function setUp() public override {
     super.setUp();
@@ -496,6 +512,20 @@ contract Oracle_Unit_DisputeResponse is BaseTest {
     oracle.disputeResponse(mockRequest, mockResponse, mockDispute);
   }
 
+  /**
+   * @notice Reverts if the caller and the disputer are not the same
+   */
+  function test_disputeResponse_revertIfWrongDisputer(address _caller) public {
+    vm.assume(_caller != disputer);
+
+    // Check: revert?
+    vm.expectRevert(IOracle.Oracle_InvalidDisputeBody.selector);
+
+    // Test: try to dispute the response again
+    vm.prank(_caller);
+    oracle.disputeResponse(mockRequest, mockResponse, mockDispute);
+  }
+
   /**
    * @notice Reverts if the request has already been disputed
    */