fix: manual fixes after rebasing onto feat/erc20-fees-on-arbitrator

Author: jaybuidl

contracts/src/arbitration/CentralizedArbitrator.sol

@@ -2,12 +2,12 @@
 
 pragma solidity 0.8.18;
 
-import "./IArbitrator.sol";
+import {IArbitrableV2, IArbitratorV2} from "./IArbitratorV2.sol";
 
 /// @title Centralized Arbitrator
-/// @dev This is a centralized arbitrator deciding alone on the result of disputes. It illustrates how IArbitrator interface can be implemented.
+/// @dev This is a centralized arbitrator deciding alone on the result of disputes. It illustrates how IArbitratorV2 interface can be implemented.
 /// Note that this contract supports appeals. The ruling given by the arbitrator can be appealed by crowdfunding a desired choice.
-contract CentralizedArbitrator is IArbitrator {
+contract CentralizedArbitrator is IArbitratorV2 {
     // ************************************* //
     // *         Enums / Structs           * //
     // ************************************* //
@@ -19,7 +19,7 @@ contract CentralizedArbitrator is IArbitrator {
     }
 
     struct DisputeStruct {
-        IArbitrable arbitrated; // The address of the arbitrable contract.
+        IArbitrableV2 arbitrated; // The address of the arbitrable contract.
         bytes arbitratorExtraData; // Extra data for the arbitrator.
         uint256 choices; // The number of choices the arbitrator can choose from.
         uint256 appealPeriodStart; // Time when the appeal funding becomes possible.
@@ -61,12 +61,12 @@ contract CentralizedArbitrator is IArbitrator {
     /// @dev To be emitted when a dispute can be appealed.
     /// @param _disputeID ID of the dispute.
     /// @param _arbitrable The contract which created the dispute.
-    event AppealPossible(uint256 indexed _disputeID, IArbitrable indexed _arbitrable);
+    event AppealPossible(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
 
     /// @dev To be emitted when the current ruling is appealed.
     /// @param _disputeID ID of the dispute.
     /// @param _arbitrable The contract which created the dispute.
-    event AppealDecision(uint256 indexed _disputeID, IArbitrable indexed _arbitrable);
+    event AppealDecision(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
 
     /// @dev Raised when a contribution is made, inside fundAppeal function.
     /// @param _disputeID ID of the dispute.
@@ -151,11 +151,7 @@ contract CentralizedArbitrator is IArbitrator {
     // *         State Modifiers           * //
     // ************************************* //
 
-    /// @dev Create a dispute. Must be called by the arbitrable contract.
-    /// Must be paid at least arbitrationCost().
-    /// @param _choices Amount of choices the arbitrator can make in this dispute.
-    /// @param _extraData Can be used to give additional info on the dispute to be created.
-    /// @return disputeID ID of the dispute created.
+    /// @inheritdoc IArbitratorV2
     function createDispute(
         uint256 _choices,
         bytes calldata _extraData
@@ -164,7 +160,7 @@ contract CentralizedArbitrator is IArbitrator {
         disputeID = disputes.length;
         disputes.push(
             DisputeStruct({
-                arbitrated: IArbitrable(msg.sender),
+                arbitrated: IArbitrableV2(msg.sender),
                 arbitratorExtraData: _extraData,
                 choices: _choices,
                 appealPeriodStart: 0,
@@ -175,10 +171,10 @@ contract CentralizedArbitrator is IArbitrator {
         );
 
         disputeIDtoRoundArray[disputeID].push();
-        emit DisputeCreation(disputeID, IArbitrable(msg.sender));
+        emit DisputeCreation(disputeID, IArbitrableV2(msg.sender));
     }
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function createDispute(
         uint256 /*_choices*/,
         bytes calldata /*_extraData*/,
@@ -373,4 +369,10 @@ contract CentralizedArbitrator is IArbitrator {
         }
         return (start, end);
     }
+
+    function currentRuling(
+        uint256 /*_disputeID*/
+    ) public pure returns (uint256 /*ruling*/, bool /*tied*/, bool /*overridden*/) {
+        revert("Not supported");
+    }
 }

contracts/src/arbitration/IArbitratorV2.sol

@@ -29,7 +29,11 @@ interface IArbitratorV2 {
     /// @param _accepted Whether the token is accepted or not.
     event AcceptedFeeToken(IERC20 indexed _token, bool indexed _accepted);
 
+<<<<<<< HEAD
     /// @dev Create a dispute and pay for the fees in the native currency, typically ETH.
+=======
+    /// @dev Create a dispute.
+>>>>>>> c716852 (fix: manual fixes after rebasing onto feat/erc20-fees-on-arbitrator)
     ///      Must be called by the arbitrable contract.
     ///      Must pay at least arbitrationCost(_extraData).
     /// @param _numberOfChoices The number of choices the arbitrator can choose from in this dispute.
@@ -68,9 +72,10 @@ interface IArbitratorV2 {
     /// @return cost The arbitration cost in `_feeToken`.
     function arbitrationCost(bytes calldata _extraData, IERC20 _feeToken) external view returns (uint256 cost);
 
-    /// @dev Return the current ruling of a dispute.
-    ///      This is useful for parties to know if they should appeal.
-    /// @param _disputeID The identifer of the dispute.
-    /// @return ruling The ruling which has been given or the one which will be given if there is no appeal.
-    function currentRuling(uint _disputeID) external view returns (uint ruling);
+    /// @dev Gets the current ruling of a specified dispute.
+    /// @param _disputeID The ID of the dispute.
+    /// @return ruling The current ruling.
+    /// @return tied Whether it's a tie or not.
+    /// @return overridden Whether the ruling was overridden by appeal funding or not.
+    function currentRuling(uint256 _disputeID) external view returns (uint256 ruling, bool tied, bool overridden);
 }

contracts/src/arbitration/IDisputeKit.sol

@@ -8,7 +8,7 @@
 
 pragma solidity 0.8.18;
 
-import "./IArbitrator.sol";
+import "./IArbitratorV2.sol";
 
 /// @title IDisputeKit
 /// An abstraction of the Dispute Kits intended for interfacing with KlerosCore.

contracts/src/arbitration/KlerosCore.sol

@@ -8,15 +8,15 @@
 
 pragma solidity 0.8.18;
 
-import "./IArbitrator.sol";
+import {IArbitrableV2, IArbitratorV2} from "./IArbitratorV2.sol";
 import "./IDisputeKit.sol";
 import "./ISortitionModule.sol";
 import "../libraries/SafeERC20.sol";
 
 /// @title KlerosCore
 /// Core arbitrator contract for Kleros v2.
 /// Note that this contract trusts the PNK token, the dispute kit and the sortition module contracts.
-contract KlerosCore is IArbitrator {
+contract KlerosCore is IArbitratorV2 {
     using SafeERC20 for IERC20;
 
     // ************************************* //
@@ -46,7 +46,7 @@ contract KlerosCore is IArbitrator {
 
     struct Dispute {
         uint96 courtID; // The ID of the court the dispute is in.
-        IArbitrable arbitrated; // The arbitrable contract.
+        IArbitrableV2 arbitrated; // The arbitrable contract.
         Period period; // The current period of the dispute.
         bool ruled; // True if the ruling has been executed, false otherwise.
         uint256 lastPeriodChange; // The last time the period was changed.
@@ -128,8 +128,8 @@ contract KlerosCore is IArbitrator {
     event StakeSet(address indexed _address, uint256 _courtID, uint256 _amount);
     event StakeDelayed(address indexed _address, uint256 _courtID, uint256 _amount, uint256 _penalty);
     event NewPeriod(uint256 indexed _disputeID, Period _period);
-    event AppealPossible(uint256 indexed _disputeID, IArbitrable indexed _arbitrable);
-    event AppealDecision(uint256 indexed _disputeID, IArbitrable indexed _arbitrable);
+    event AppealPossible(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
+    event AppealDecision(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
     event Draw(address indexed _address, uint256 indexed _disputeID, uint256 _roundID, uint256 _voteID);
     event CourtCreated(
         uint256 indexed _courtID,
@@ -490,7 +490,7 @@ contract KlerosCore is IArbitrator {
         _setStakeForAccount(_account, _courtID, _stake, _penalty);
     }
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function createDispute(
         uint256 _numberOfChoices,
         bytes memory _extraData
@@ -500,7 +500,7 @@ contract KlerosCore is IArbitrator {
         return _createDispute(_numberOfChoices, _extraData, NATIVE_CURRENCY, msg.value);
     }
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function createDispute(
         uint256 _numberOfChoices,
         bytes calldata _extraData,
@@ -526,7 +526,7 @@ contract KlerosCore is IArbitrator {
         disputeID = disputes.length;
         Dispute storage dispute = disputes.push();
         dispute.courtID = courtID;
-        dispute.arbitrated = IArbitrable(msg.sender);
+        dispute.arbitrated = IArbitrableV2(msg.sender);
         dispute.lastPeriodChange = block.timestamp;
 
         IDisputeKit disputeKit = disputeKitNodes[disputeKitID].disputeKit;
@@ -546,7 +546,7 @@ contract KlerosCore is IArbitrator {
         sortitionModule.createDisputeHook(disputeID, 0); // Default round ID.
 
         disputeKit.createDispute(disputeID, _numberOfChoices, _extraData, round.nbVotes);
-        emit DisputeCreation(disputeID, IArbitrable(msg.sender));
+        emit DisputeCreation(disputeID, IArbitrableV2(msg.sender));
     }
 
     /// @dev Passes the period of a specified dispute.

contracts/src/evidence/EvidenceModule.sol

@@ -10,20 +10,20 @@
 pragma solidity 0.8.18;
 
 // TODO: standard interfaces should be placed in a separated repo (?)
-import "../arbitration/IArbitrator.sol";
+import "../arbitration/IArbitratorV2.sol";
 
 /// @title Implementation of the Evidence Standard for cross-chain submissions
 contract EvidenceModule {
-    IArbitrator public arbitrator;
+    IArbitratorV2 public arbitrator;
 
     event Evidence(
-        IArbitrator indexed _arbitrator,
+        IArbitratorV2 indexed _arbitrator,
         uint256 indexed _evidenceGroupID,
         address indexed _party,
         string _evidence
     );
 
-    constructor(IArbitrator _arbitrator) {
+    constructor(IArbitratorV2 _arbitrator) {
         arbitrator = _arbitrator;
     }
 

contracts/src/evidence/IEvidence.sol

@@ -2,12 +2,10 @@
 
 pragma solidity 0.8.18;
 
-import "../arbitration/IArbitrator.sol";
-
 /// @title IEvidence
 interface IEvidence {
     /// @dev To be raised when evidence is submitted. Should point to the resource (evidences are not to be stored on chain due to gas considerations).
-    /// @param _externalDisputeID Unique identifier for this dispute outside Kleros. It's the submitter responsability to submit the right evidence group ID.
+    /// @param _externalDisputeID Unique identifier for this dispute outside Kleros. It's the submitter responsability to submit the right external dispute ID.
     /// @param _party The address of the party submiting the evidence. Note that 0x0 refers to evidence not submitted by any party.
     /// @param _evidence IPFS path to evidence, example: '/ipfs/Qmarwkf7C9RuzDEJNnarT3WZ7kem5bk8DZAzx78acJjMFH/evidence.json'
     event Evidence(uint256 indexed _externalDisputeID, address indexed _party, string _evidence);

contracts/src/gateway/ForeignGateway.sol

@@ -218,9 +218,11 @@ contract ForeignGateway is IForeignGateway {
     /// @inheritdoc IReceiverGateway
     function senderGateway() external view override returns (address) {
         return homeGateway;
-}
+    }
 
-    function currentRuling(uint _disputeID) external view returns (uint ruling) {
+    function currentRuling(
+        uint256 /*_disputeID*/
+    ) public pure returns (uint256 /*ruling*/, bool /*tied*/, bool /*overridden*/) {
         revert("Not supported");
     }
 

contracts/src/kleros-v1/kleros-liquid-xdai/xKlerosLiquidV2.sol

@@ -631,14 +631,15 @@ contract xKlerosLiquidV2 is Initializable, ITokenController, IArbitratorV2 {
     /// @dev Gets the current ruling of a specified dispute.
     /// @param _disputeID The ID of the dispute.
     /// @return ruling The current ruling.
-    function currentRuling(uint256 _disputeID) public view returns (uint256 ruling) {
+    /// @return tied Whether it's a tie or not.
+    /// @return overridden Whether the ruling was overridden by appeal funding or not.
+    function currentRuling(uint256 _disputeID) public view returns (uint256 ruling, bool tied, bool /*overridden*/) {
         Dispute storage dispute = disputes[_disputeID];
         if (dispute.voteCounters.length == 0) {
             ruling = disputesRuling[_disputeID];
         } else {
-            ruling = dispute.voteCounters[dispute.voteCounters.length - 1].tied
-                ? 0
-                : dispute.voteCounters[dispute.voteCounters.length - 1].winningChoice;
+            tied = dispute.voteCounters[dispute.voteCounters.length - 1].tied;
+            ruling = tied ? 0 : dispute.voteCounters[dispute.voteCounters.length - 1].winningChoice;
         }
     }
 

contracts/test/integration/index.ts

@@ -96,7 +96,7 @@ describe("Integration tests", async () => {
       expect(result.locked).to.equal(0);
       logJurorBalance(result);
     });
-    const tx = await arbitrable.functions["createDispute(uint256,bytes,uint256,uint256)"](2, "0x00", 0, 0, {
+    const tx = await arbitrable.functions["createDispute(uint256,string,bytes)"](0, "future of france", "0x00", {
       value: arbitrationCost,
     });
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);