Merge branch 'dev' into ci/export-lib

defi-wonderland · Aug 8, 2024 · 8b4142a · 8b4142a
2 parents 5e1cf55 + b705027
commit 8b4142a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/solidity/contracts/Oracle.sol b/solidity/contracts/Oracle.sol
@@ -229,7 +229,7 @@ contract Oracle is IOracle {
 
     IResolutionModule(_request.resolutionModule).resolveDispute(_disputeId, _request, _response, _dispute);
 
-    emit DisputeResolved(msg.sender, _disputeId, block.number);
+    emit DisputeResolved(_disputeId, _dispute, msg.sender, block.number);
   }
 
   /// @inheritdoc IOracle
@@ -255,7 +255,7 @@ contract Oracle is IOracle {
     disputeStatus[_disputeId] = _status;
     IDisputeModule(_request.disputeModule).onDisputeStatusChange(_disputeId, _request, _response, _dispute);
 
-    emit DisputeStatusUpdated(_disputeId, _status, block.number);
+    emit DisputeStatusUpdated(_disputeId, _dispute, _status, block.number);
   }
 
   /**

diff --git a/solidity/interfaces/IOracle.sol b/solidity/interfaces/IOracle.sol
@@ -63,18 +63,20 @@ interface IOracle {
   /**
    * @notice Emitted when a dispute's status changes
    * @param _disputeId The id of the dispute
+   * @param _dispute The dispute that is being updated
    * @param _status The new dispute status
    * @param _blockNumber The block number of the status update
    */
-  event DisputeStatusUpdated(bytes32 indexed _disputeId, DisputeStatus _status, uint256 _blockNumber);
+  event DisputeStatusUpdated(bytes32 indexed _disputeId, Dispute _dispute, DisputeStatus _status, uint256 _blockNumber);
 
   /**
    * @notice Emitted when a dispute is resolved
-   * @param _caller The address of the user who resolved the dispute
    * @param _disputeId The id of the dispute being resolved
+   * @param _dispute The dispute that is being updated
+   * @param _caller The address of the user who resolved the dispute
    * @param _blockNumber The block number of the dispute resolution
    */
-  event DisputeResolved(address indexed _caller, bytes32 indexed _disputeId, uint256 _blockNumber);
+  event DisputeResolved(bytes32 indexed _disputeId, Dispute _dispute, address indexed _caller, uint256 _blockNumber);
 
   /*///////////////////////////////////////////////////////////////
                               ERRORS

diff --git a/solidity/test/unit/Oracle.t.sol b/solidity/test/unit/Oracle.t.sol
@@ -102,8 +102,12 @@ contract BaseTest is Test, Helpers {
     bytes32 indexed _requestId, bytes32 indexed _responseId, address indexed _caller, uint256 _blockNumber
   );
   event DisputeEscalated(address indexed _caller, bytes32 indexed _disputeId, uint256 _blockNumber);
-  event DisputeStatusUpdated(bytes32 indexed _disputeId, IOracle.DisputeStatus _status, uint256 _blockNumber);
-  event DisputeResolved(address indexed _caller, bytes32 indexed _disputeId, uint256 _blockNumber);
+  event DisputeStatusUpdated(
+    bytes32 indexed _disputeId, IOracle.Dispute _dispute, IOracle.DisputeStatus _status, uint256 _blockNumber
+  );
+  event DisputeResolved(
+    bytes32 indexed _disputeId, IOracle.Dispute _dispute, address indexed _caller, uint256 _blockNumber
+  );
 
   function setUp() public virtual {
     oracle = new MockOracle();
@@ -652,7 +656,7 @@ contract Oracle_Unit_UpdateDisputeStatus is BaseTest {
 
         // Check: emits DisputeStatusUpdated event?
         _expectEmit(address(oracle));
-        emit DisputeStatusUpdated(_disputeId, IOracle.DisputeStatus(_newStatus), block.number);
+        emit DisputeStatusUpdated(_disputeId, mockDispute, IOracle.DisputeStatus(_newStatus), block.number);
 
         // Test: change the status
         vm.prank(address(resolutionModule));
@@ -747,7 +751,7 @@ contract Oracle_Unit_ResolveDispute is BaseTest {
 
     // Check: emits DisputeResolved event?
     _expectEmit(address(oracle));
-    emit DisputeResolved(address(this), _disputeId, block.number);
+    emit DisputeResolved(_disputeId, mockDispute, address(this), block.number);
 
     // Test: resolve the dispute
     oracle.resolveDispute(mockRequest, mockResponse, mockDispute);