Skip to content

No evidence submission by the contract #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

No evidence submission by the contract #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions contracts/src/CurateV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ contract CurateV2 is IArbitrableV2 {
struct ArbitrationParams {
IArbitratorV2 arbitrator; // The arbitrator trusted to solve disputes for this request.
bytes arbitratorExtraData; // The extra data for the trusted arbitrator of this request.
EvidenceModule evidenceModule; // The evidence module for the arbitrator.
}

struct TemplateRegistryParams {
Expand Down Expand Up @@ -132,7 +131,14 @@ contract CurateV2 is IArbitrableV2 {
/// @dev Emitted when someone submits a request.
/// @param _itemID The ID of the affected item.
/// @param _requestID Unique dispute identifier within this contract.
event RequestSubmitted(bytes32 indexed _itemID, uint256 _requestID);
/// @param _evidence Stringified evidence object, example: '{"name" : "Justification", "description" : "Description", "fileURI" : "/ipfs/QmWQV5ZFFhEJiW8Lm7ay2zLxC2XS4wx1b2W7FfdrLMyQQc"}'.
event RequestSubmitted(bytes32 indexed _itemID, uint256 _requestID, string _evidence);

/// @dev Emitted when someone challenges a request.
/// @param _itemID The ID of the affected item.
/// @param _requestID Unique dispute identifier within this contract.
/// @param _evidence Stringified evidence object, example: '{"name" : "Justification", "description" : "Description", "fileURI" : "/ipfs/QmWQV5ZFFhEJiW8Lm7ay2zLxC2XS4wx1b2W7FfdrLMyQQc"}'.
event RequestChallenged(bytes32 indexed _itemID, uint256 _requestID, string _evidence);

/// @dev Emitted when the address of the connected Curate contract is set. The Curate is an instance of the Curate contract where each item is the address of a Curate contract related to this one.
/// @param _connectedList The address of the connected Curate.
Expand Down Expand Up @@ -200,11 +206,7 @@ contract CurateV2 is IArbitrableV2 {
);

arbitrationParamsChanges.push(
ArbitrationParams({
arbitrator: _arbitrator,
arbitratorExtraData: _arbitratorExtraData,
evidenceModule: _evidenceModule
})
ArbitrationParams({arbitrator: _arbitrator, arbitratorExtraData: _arbitratorExtraData})
);

if (_connectedList != address(0)) {
Expand Down Expand Up @@ -313,11 +315,7 @@ contract CurateV2 is IArbitrableV2 {
EvidenceModule _evidenceModule
) external onlyGovernor {
arbitrationParamsChanges.push(
ArbitrationParams({
arbitrator: _arbitrator,
arbitratorExtraData: _arbitratorExtraData,
evidenceModule: _evidenceModule
})
ArbitrationParams({arbitrator: _arbitrator, arbitratorExtraData: _arbitratorExtraData})
);
}

Expand Down Expand Up @@ -383,7 +381,7 @@ contract CurateV2 is IArbitrableV2 {
request.arbitrationParamsIndex = uint24(arbitrationParamsIndex);
request.requester = payable(msg.sender);

emit RequestSubmitted(itemID, getRequestID(itemID, item.requestCount - 1));
emit RequestSubmitted(itemID, getRequestID(itemID, item.requestCount - 1), "");

if (msg.value > totalCost) {
payable(msg.sender).send(msg.value - totalCost);
Expand Down Expand Up @@ -416,12 +414,7 @@ contract CurateV2 is IArbitrableV2 {
request.requestType = RequestType.Clearing;

uint256 requestID = getRequestID(_itemID, item.requestCount - 1);
emit RequestSubmitted(_itemID, requestID);

// Emit evidence if it was provided.
if (bytes(_evidence).length > 0) {
arbitrationParams.evidenceModule.submitEvidence(requestID, _evidence); // TODO: add a msg.sender parameter to submitEvidence.
}
emit RequestSubmitted(_itemID, requestID, _evidence);

if (msg.value > totalCost) {
payable(msg.sender).send(msg.value - totalCost);
Expand Down Expand Up @@ -472,16 +465,13 @@ contract CurateV2 is IArbitrableV2 {
arbitratorDisputeIDToItemID[address(arbitrator)][disputeData.disputeID] = _itemID;

uint256 requestID = getRequestID(_itemID, lastRequestIndex);
emit RequestChallenged(_itemID, requestID, _evidence);

uint256 templateId = request.requestType == RequestType.Registration
? templateIdRegistration
: templateIdRemoval;
emit DisputeRequest(arbitrator, disputeData.disputeID, requestID, templateId, "");

// Emit evidence if it was provided.
if (bytes(_evidence).length > 0) {
arbitrationParams.evidenceModule.submitEvidence(requestID, _evidence); // TODO: add a msg.sender parameter to submitEvidence.
}

if (msg.value > totalCost) {
payable(msg.sender).send(msg.value - totalCost);
}
Expand Down