Skip to content
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.

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

disputable: Add submitter fees to Agreement challenges #604

Merged
merged 4 commits into from
Jul 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions contracts/apps/disputable/IAgreement.sol
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,18 @@ contract IAgreement is IArbitrable, IACLOracle {
uint64 endDate,
bytes context,
uint256 settlementOffer,
uint256 arbitratorFeeAmount,
ERC20 arbitratorFeeToken,
ChallengeState state,
bool submitterFinishedEvidence,
bool challengerFinishedEvidence,
uint256 disputeId,
uint256 ruling
);

function getChallengeArbitratorFees(uint256 _challengeId) external view
returns (
uint256 challengerArbitratorFeesAmount,
ERC20 challengerArbitratorFeesToken,
uint256 submitterArbitratorFeesAmount,
ERC20 submitterArbitratorFeesToken
);
}
19 changes: 14 additions & 5 deletions contracts/test/mocks/apps/disputable/AgreementMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ contract AgreementMock is IAgreement {
uint64,
bytes,
uint256,
uint256,
ERC20,
ChallengeState,
bool,
bool,
Expand All @@ -113,15 +111,26 @@ contract AgreementMock is IAgreement {
// do nothing
}

function submitEvidence(uint256 _disputeId, bytes _evidence, bool _finished) external {
function getChallengeArbitratorFees(uint256) external view
returns (
uint256,
ERC20,
uint256,
ERC20
)
{
// do nothing
}

function submitEvidence(uint256, bytes, bool) external {
// do nothing
}

function rule(uint256 _disputeId, uint256 _ruling) external {
function rule(uint256, uint256) external {
// do nothing
}

function supportsInterface(bytes4 _interfaceId) public pure returns (bool) {
function supportsInterface(bytes4) public pure returns (bool) {
// do nothing
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aragon/os",
"version": "5.0.0-beta.5",
"version": "5.0.0-beta.6",
bingen marked this conversation as resolved.
Show resolved Hide resolved
"author": "Aragon Association <[email protected]>",
"license": "(GPL-3.0-or-later OR MIT)",
"repository": "https://github.com/aragon/aragonOS",
Expand Down