From c178053ef53ced58ba5b3f816507c42244e5ee43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Fingen?= <bingen@aragon.one>
Date: Tue, 28 Jul 2020 13:11:47 +0200
Subject: [PATCH 1/4] disputable: Add submitter fees to Agreement challenges

---
 contracts/apps/disputable/IAgreement.sol | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/contracts/apps/disputable/IAgreement.sol b/contracts/apps/disputable/IAgreement.sol
index 105f35958..00cf5e04c 100644
--- a/contracts/apps/disputable/IAgreement.sol
+++ b/contracts/apps/disputable/IAgreement.sol
@@ -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 getChallengeFees(uint256 _challengeId) external view
+        returns (
+            uint256 challengerArbitratorFeeAmount,
+            ERC20 challengerArbitratorFeeToken,
+            uint256 submitterArbitratorFeeAmount,
+            ERC20 submitterArbitratorFeeToken
+        );
 }

From 3bf9232f866a89ce9f71a90b60941de90148628b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Fingen?= <bingen@aragon.one>
Date: Wed, 29 Jul 2020 12:07:29 +0200
Subject: [PATCH 2/4] fixup! disputable: Add submitter fees to Agreement
 challenges

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0f14f549f..e0500616a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aragon/os",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.6",
   "author": "Aragon Association <legal@aragon.org>",
   "license": "(GPL-3.0-or-later OR MIT)",
   "repository": "https://github.com/aragon/aragonOS",

From c2f7db88f1a6e92ae34b15084c67c5dc79483e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Fingen?= <bingen@aragon.one>
Date: Thu, 30 Jul 2020 10:51:39 +0200
Subject: [PATCH 3/4] fixup! fixup! disputable: Add submitter fees to Agreement
 challenges

---
 .../mocks/apps/disputable/AgreementMock.sol   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/contracts/test/mocks/apps/disputable/AgreementMock.sol b/contracts/test/mocks/apps/disputable/AgreementMock.sol
index 2796c84c4..8bccf2eaf 100644
--- a/contracts/test/mocks/apps/disputable/AgreementMock.sol
+++ b/contracts/test/mocks/apps/disputable/AgreementMock.sol
@@ -101,8 +101,6 @@ contract AgreementMock is IAgreement {
             uint64,
             bytes,
             uint256,
-            uint256,
-            ERC20,
             ChallengeState,
             bool,
             bool,
@@ -113,15 +111,26 @@ contract AgreementMock is IAgreement {
         // do nothing
     }
 
-    function submitEvidence(uint256 _disputeId, bytes _evidence, bool _finished) external {
+    function getChallengeFees(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
     }
 

From aa94db60ab92fbe0f6c804f325be2a66bc9d0b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Fingen?= <bingen@aragon.one>
Date: Thu, 30 Jul 2020 14:46:53 +0200
Subject: [PATCH 4/4] fixup! fixup! fixup! disputable: Add submitter fees to
 Agreement challenges

---
 contracts/apps/disputable/IAgreement.sol               | 10 +++++-----
 contracts/test/mocks/apps/disputable/AgreementMock.sol |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contracts/apps/disputable/IAgreement.sol b/contracts/apps/disputable/IAgreement.sol
index 00cf5e04c..40a5de41d 100644
--- a/contracts/apps/disputable/IAgreement.sol
+++ b/contracts/apps/disputable/IAgreement.sol
@@ -106,11 +106,11 @@ contract IAgreement is IArbitrable, IACLOracle {
             uint256 ruling
         );
 
-    function getChallengeFees(uint256 _challengeId) external view
+    function getChallengeArbitratorFees(uint256 _challengeId) external view
         returns (
-            uint256 challengerArbitratorFeeAmount,
-            ERC20 challengerArbitratorFeeToken,
-            uint256 submitterArbitratorFeeAmount,
-            ERC20 submitterArbitratorFeeToken
+            uint256 challengerArbitratorFeesAmount,
+            ERC20 challengerArbitratorFeesToken,
+            uint256 submitterArbitratorFeesAmount,
+            ERC20 submitterArbitratorFeesToken
         );
 }
diff --git a/contracts/test/mocks/apps/disputable/AgreementMock.sol b/contracts/test/mocks/apps/disputable/AgreementMock.sol
index 8bccf2eaf..7f89ff286 100644
--- a/contracts/test/mocks/apps/disputable/AgreementMock.sol
+++ b/contracts/test/mocks/apps/disputable/AgreementMock.sol
@@ -111,7 +111,7 @@ contract AgreementMock is IAgreement {
         // do nothing
     }
 
-    function getChallengeFees(uint256) external view
+    function getChallengeArbitratorFees(uint256) external view
         returns (
             uint256,
             ERC20,