fix: proposeResponse call and ResponseDisputed event

defi-wonderland · Nov 10, 2023 · 8c86c7b · 8c86c7b
1 parent 2b1511b
commit 8c86c7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/solidity/contracts/modules/dispute/CircuitResolverModule.sol b/solidity/contracts/modules/dispute/CircuitResolverModule.sol
@@ -50,7 +50,7 @@ contract CircuitResolverModule is Module, ICircuitResolverModule {
 
       emit DisputeStatusChanged({_disputeId: _disputeId, _dispute: _dispute, _status: IOracle.DisputeStatus.Won});
 
-      ORACLE.proposeResponse(_dispute.disputer, _request, _newResponse);
+      ORACLE.proposeResponse(_request, _newResponse);
       ORACLE.finalize(_request, _newResponse);
     } else {
       emit DisputeStatusChanged({_disputeId: _disputeId, _dispute: _dispute, _status: IOracle.DisputeStatus.Lost});
@@ -79,6 +79,7 @@ contract CircuitResolverModule is Module, ICircuitResolverModule {
 
     // TODO: call ORACLE.updateDisputeStatus
     emit ResponseDisputed({
+      _requestId: _response.requestId,
       _responseId: _dispute.responseId,
       _disputeId: _getId(_dispute),
       _dispute: _dispute,

diff --git a/solidity/test/unit/modules/dispute/CircuitResolverModule.t.sol b/solidity/test/unit/modules/dispute/CircuitResolverModule.t.sol
@@ -41,7 +41,11 @@ contract BaseTest is Test, Helpers {
   // Events
   event DisputeStatusChanged(bytes32 _disputeId, IOracle.Dispute _dispute, IOracle.DisputeStatus _status);
   event ResponseDisputed(
-    bytes32 indexed _responseId, bytes32 indexed _disputeId, IOracle.Dispute _dispute, uint256 _blockNumber
+    bytes32 indexed _requestId,
+    bytes32 indexed _responseId,
+    bytes32 indexed _disputeId,
+    IOracle.Dispute _dispute,
+    uint256 _blockNumber
   );
 
   /**
@@ -162,6 +166,7 @@ contract CircuitResolverModule_Unit_DisputeResponse is BaseTest {
     // Check: is the event emitted?
     vm.expectEmit(true, true, true, true, address(circuitResolverModule));
     emit ResponseDisputed({
+      _requestId: mockResponse.requestId,
       _responseId: mockDispute.responseId,
       _disputeId: _getId(mockDispute),
       _dispute: mockDispute,