diff --git a/solidity/contracts/modules/dispute/BondEscalationModule.sol b/solidity/contracts/modules/dispute/BondEscalationModule.sol index 74ffa53b..b213841d 100644 --- a/solidity/contracts/modules/dispute/BondEscalationModule.sol +++ b/solidity/contracts/modules/dispute/BondEscalationModule.sol @@ -51,8 +51,7 @@ contract BondEscalationModule is Module, IBondEscalationModule { _requestId: _dispute.requestId, _responseId: _dispute.responseId, _disputeId: _disputeId, - _dispute: _dispute, - _blockNumber: block.number + _dispute: _dispute }); // Only the first dispute of a request should go through the bond escalation diff --git a/solidity/contracts/modules/dispute/BondedDisputeModule.sol b/solidity/contracts/modules/dispute/BondedDisputeModule.sol index 527b3c07..42f8fd97 100644 --- a/solidity/contracts/modules/dispute/BondedDisputeModule.sol +++ b/solidity/contracts/modules/dispute/BondedDisputeModule.sol @@ -38,8 +38,7 @@ contract BondedDisputeModule is Module, IBondedDisputeModule { _requestId: _dispute.requestId, _responseId: _dispute.responseId, _disputeId: _getId(_dispute), - _dispute: _dispute, - _blockNumber: block.number + _dispute: _dispute }); } diff --git a/solidity/contracts/modules/dispute/CircuitResolverModule.sol b/solidity/contracts/modules/dispute/CircuitResolverModule.sol index bdd8e8f6..e4c955d9 100644 --- a/solidity/contracts/modules/dispute/CircuitResolverModule.sol +++ b/solidity/contracts/modules/dispute/CircuitResolverModule.sol @@ -85,8 +85,7 @@ contract CircuitResolverModule is Module, ICircuitResolverModule { _requestId: _response.requestId, _responseId: _dispute.responseId, _disputeId: _getId(_dispute), - _dispute: _dispute, - _blockNumber: block.number + _dispute: _dispute }); ORACLE.updateDisputeStatus(_request, _response, _dispute, _status); diff --git a/solidity/contracts/modules/dispute/RootVerificationModule.sol b/solidity/contracts/modules/dispute/RootVerificationModule.sol index dc05ae21..775d26b7 100644 --- a/solidity/contracts/modules/dispute/RootVerificationModule.sol +++ b/solidity/contracts/modules/dispute/RootVerificationModule.sol @@ -83,8 +83,7 @@ contract RootVerificationModule is Module, IRootVerificationModule { _requestId: _response.requestId, _responseId: _dispute.responseId, _disputeId: _getId(_dispute), - _dispute: _dispute, - _blockNumber: block.number + _dispute: _dispute }); ORACLE.updateDisputeStatus(_request, _response, _dispute, _status); diff --git a/solidity/contracts/modules/response/BondedResponseModule.sol b/solidity/contracts/modules/response/BondedResponseModule.sol index eb3d8197..79f3d565 100644 --- a/solidity/contracts/modules/response/BondedResponseModule.sol +++ b/solidity/contracts/modules/response/BondedResponseModule.sol @@ -62,7 +62,7 @@ contract BondedResponseModule is Module, IBondedResponseModule { }); } - emit ResponseProposed(_response.requestId, _response, block.number); + emit ResponseProposed(_response.requestId, _response); } /// @inheritdoc IBondedResponseModule diff --git a/solidity/interfaces/modules/response/IBondedResponseModule.sol b/solidity/interfaces/modules/response/IBondedResponseModule.sol index 4bae38f9..bacb55d0 100644 --- a/solidity/interfaces/modules/response/IBondedResponseModule.sol +++ b/solidity/interfaces/modules/response/IBondedResponseModule.sol @@ -20,9 +20,8 @@ interface IBondedResponseModule is IResponseModule { * * @param _requestId The ID of the request that the response was proposed * @param _response The proposed response - * @param _blockNumber The number of the block in which the response was proposed */ - event ResponseProposed(bytes32 indexed _requestId, IOracle.Response _response, uint256 indexed _blockNumber); + event ResponseProposed(bytes32 indexed _requestId, IOracle.Response _response); /** * @notice Emitted when an uncalled response is released