fix: manual fixes after rebase

jaybuidl · jaybuidl · commit 7a08a3724783 · 2023-06-23T01:55:10.000+01:00
diff --git a/contracts/src/arbitration/CentralizedArbitrator.sol b/contracts/src/arbitration/CentralizedArbitrator.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.18;
 
-import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
+import {IArbitrableV2, IArbitratorV2, IERC20} from "./interfaces/IArbitratorV2.sol";
 
 /// @title Centralized Arbitrator
 /// @dev This is a centralized arbitrator deciding alone on the result of disputes. It illustrates how IArbitratorV2 interface can be implemented.
@@ -322,12 +322,12 @@ contract CentralizedArbitrator is IArbitratorV2 {
     // *           Public Views            * //
     // ************************************* //
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function arbitrationCost(bytes calldata /*_extraData*/) public view override returns (uint256 fee) {
         return arbitrationFee;
     }
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function arbitrationCost(
         bytes calldata /*_extraData*/,
         IERC20 /*_feeToken*/
diff --git a/contracts/src/arbitration/IArbitrator.sol b/contracts/src/arbitration/IArbitrator.sol
diff --git a/contracts/src/arbitration/arbitrables/ArbitrableExample.sol b/contracts/src/arbitration/arbitrables/ArbitrableExample.sol
@@ -3,19 +3,29 @@
 pragma solidity 0.8.18;
 
 import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitrableV2.sol";
+import "../../libraries/SafeERC20.sol";
 
 /// @title ArbitrableExample
 /// An example of an arbitrable contract which connects to the arbitator that implements the updated interface.
-contract ArbitrableExample is IArbitrable, IMetaEvidence {
+contract ArbitrableExample is IArbitrableV2 {
+    using SafeERC20 for IERC20;
+
+    // ************************************* //
+    // *         Enums / Structs           * //
+    // ************************************* //
+
     struct DisputeStruct {
         bool isRuled; // Whether the dispute has been ruled or not.
         uint256 ruling; // Ruling given by the arbitrator.
         uint256 numberOfRulingOptions; // The number of choices the arbitrator can give.
     }
 
+    event Action(string indexed _action);
+
     address public immutable governor;
-    IArbitrator public arbitrator; // Arbitrator is set in constructor and never changed.
-    ERC20 public immutable weth; // The WETH token.
+    IArbitratorV2 public arbitrator; // Arbitrator is set in constructor.
+    uint256 public disputeTemplates; // The number of dispute templates created.
+    IERC20 public immutable weth; // The WETH token.
     mapping(uint256 => uint256) public externalIDtoLocalID; // Maps external (arbitrator side) dispute IDs to local dispute IDs.
     DisputeStruct[] public disputes; // Stores the disputes' info. disputes[disputeID].
 
@@ -25,9 +35,9 @@ contract ArbitrableExample is IArbitrable, IMetaEvidence {
 
     /// @dev Constructor
     /// @param _arbitrator The arbitrator to rule on created disputes.
-    /// @param _metaEvidenceID Unique identifier of meta-evidence.
-    /// @param _metaEvidence The URI of the meta evidence object for evidence submissions requests.
-    constructor(IArbitrator _arbitrator, uint256 _metaEvidenceID, string memory _metaEvidence, ERC20 _weth) {
+    /// @param _templateData The dispute template data.
+    /// @param _weth The WETH token.
+    constructor(IArbitratorV2 _arbitrator, string memory _templateData, IERC20 _weth) {
         governor = msg.sender;
         arbitrator = _arbitrator;
         weth = _weth;
@@ -38,12 +48,12 @@ contract ArbitrableExample is IArbitrable, IMetaEvidence {
     // *             Governance            * //
     // ************************************* //
 
-    function changeMetaEvidence(uint256 _metaEvidenceID, string memory _metaEvidence) external {
+    function changeDisputeTemplate(string memory _templateData) external {
         require(msg.sender == governor, "Not authorized: governor only.");
-        emit MetaEvidence(_metaEvidenceID, _metaEvidence);
+        emit DisputeTemplate(disputeTemplates++, "", _templateData);
     }
 
-    function changeArbitrator(IArbitrator _arbitrator) external {
+    function changeArbitrator(IArbitratorV2 _arbitrator) external {
         require(msg.sender == governor, "Not authorized: governor only.");
         arbitrator = _arbitrator;
     }
@@ -70,7 +80,6 @@ contract ArbitrableExample is IArbitrable, IMetaEvidence {
         disputes.push(DisputeStruct({isRuled: false, ruling: 0, numberOfRulingOptions: numberOfRulingOptions}));
 
         disputeID = arbitrator.createDispute{value: msg.value}(numberOfRulingOptions, _arbitratorExtraData);
-
         externalIDtoLocalID[disputeID] = localDisputeID;
 
         uint256 externalDisputeID = uint256(keccak256(abi.encodePacked(_action)));
@@ -121,14 +130,4 @@ contract ArbitrableExample is IArbitrable, IMetaEvidence {
 
         emit Ruling(IArbitratorV2(msg.sender), _externalDisputeID, dispute.ruling);
     }
-
-    function changeMetaEvidence(uint256 _metaEvidenceID, string memory _metaEvidence) external {
-        require(msg.sender == governor, "Not authorized: governor only.");
-        emit MetaEvidence(_metaEvidenceID, _metaEvidence);
-    }
-
-    function changeArbitrator(IArbitrator _arbitrator) external {
-        require(msg.sender == governor, "Not authorized: governor only.");
-        arbitrator = _arbitrator;
-    }
 }
diff --git a/contracts/src/arbitration/interfaces/IArbitratorV2.sol b/contracts/src/arbitration/interfaces/IArbitratorV2.sol
@@ -3,7 +3,7 @@
 pragma solidity 0.8.18;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "./IArbitrable.sol";
+import "./IArbitrableV2.sol";
 
 /// @title Arbitrator
 /// Arbitrator interface that implements the new arbitration standard.
@@ -22,18 +22,14 @@ interface IArbitratorV2 {
     /// @param _arbitrable The arbitrable receiving the ruling.
     /// @param _disputeID The identifier of the dispute in the Arbitrator contract.
     /// @param _ruling The ruling which was given.
-    event Ruling(IArbitrable indexed _arbitrable, uint256 indexed _disputeID, uint256 _ruling);
+    event Ruling(IArbitrableV2 indexed _arbitrable, uint256 indexed _disputeID, uint256 _ruling);
 
     /// @dev To be emitted when an ERC20 token is added or removed as a method to pay fees.
     /// @param _token The ERC20 token.
     /// @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.
diff --git a/contracts/src/gateway/ForeignGateway.sol b/contracts/src/gateway/ForeignGateway.sol
@@ -167,7 +167,7 @@ contract ForeignGateway is IForeignGateway {
         cost = feeForJuror[courtID] * minJurors;
     }
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function arbitrationCost(
         bytes calldata /*_extraData*/,
         IERC20 /*_feeToken*/
diff --git a/contracts/src/gateway/HomeGateway.sol b/contracts/src/gateway/HomeGateway.sol
@@ -105,43 +105,10 @@ contract HomeGateway is IHomeGateway {
     // ************************************* //
 
     /// @inheritdoc IHomeGateway
-    function relayCreateDispute(
-        uint256 _foreignChainID,
-        bytes32 _foreignBlockHash,
-        uint256 _foreignDisputeID,
-        uint256 _choices,
-        bytes calldata _extraData,
-        address _arbitrable
-    ) external payable override {
+    function relayCreateDispute(RelayCreateDisputeParams memory _params) external payable override {
         require(feeToken == NATIVE_CURRENCY, "Fees paid in ERC20 only");
-        require(_foreignChainID == foreignChainID, "Foreign chain ID not supported");
-
-        bytes32 disputeHash = keccak256(
-            abi.encodePacked(
-                _foreignChainID,
-                _foreignBlockHash,
-                "createDispute",
-                _foreignDisputeID,
-                _choices,
-                _extraData,
-                _arbitrable
-            )
-        );
-        RelayedData storage relayedData = disputeHashtoRelayedData[disputeHash];
-        require(relayedData.relayer == address(0), "Dispute already relayed");
-
-        uint256 disputeID = arbitrator.createDispute{value: msg.value}(_choices, _extraData);
-        disputeIDtoHash[disputeID] = disputeHash;
-        disputeHashtoID[disputeHash] = disputeID;
-        relayedData.relayer = msg.sender;
-
-        emit Dispute(arbitrator, disputeID, 0, 0);
-    }
-
+        require(_params.foreignChainID == foreignChainID, "Foreign chain ID not supported");
 
-    /// @dev Provide the same parameters as on the foreignChain while creating a dispute. Providing incorrect parameters will create a different hash than on the foreignChain and will not affect the actual dispute/arbitrable's ruling.
-    /// @param _params The parameters of the dispute, see `RelayCreateDisputeParams`.
-    function relayCreateDispute(RelayCreateDisputeParams memory _params) external payable override {
         bytes32 disputeHash = keccak256(
             abi.encodePacked(
                 "createDispute",
@@ -153,14 +120,9 @@ contract HomeGateway is IHomeGateway {
                 _params.extraData
             )
         );
-        require(_params.foreignChainID == foreignChainID, "Foreign chain ID not supported");
-
         RelayedData storage relayedData = disputeHashtoRelayedData[disputeHash];
         require(relayedData.relayer == address(0), "Dispute already relayed");
 
-        relayedData.arbitrationCost = arbitrator.arbitrationCost(_params.extraData);
-        require(msg.value >= relayedData.arbitrationCost, "Not enough arbitration cost paid");
-
         uint256 disputeID = arbitrator.createDispute{value: msg.value}(_params.choices, _params.extraData);
         disputeIDtoHash[disputeID] = disputeHash;
         disputeHashtoID[disputeHash] = disputeID;
@@ -180,27 +142,19 @@ contract HomeGateway is IHomeGateway {
     }
 
     /// @inheritdoc IHomeGateway
-    function relayCreateDispute(
-        uint256 _foreignChainID,
-        bytes32 _foreignBlockHash,
-        uint256 _foreignDisputeID,
-        uint256 _choices,
-        bytes calldata _extraData,
-        address _arbitrable,
-        uint256 _feeAmount
-    ) external {
+    function relayCreateDispute(RelayCreateDisputeParams memory _params, uint256 _feeAmount) external {
         require(feeToken != NATIVE_CURRENCY, "Fees paid in native currency only");
-        require(_foreignChainID == foreignChainID, "Foreign chain ID not supported");
+        require(_params.foreignChainID == foreignChainID, "Foreign chain ID not supported");
 
         bytes32 disputeHash = keccak256(
             abi.encodePacked(
-                _foreignChainID,
-                _foreignBlockHash,
                 "createDispute",
-                _foreignDisputeID,
-                _choices,
-                _extraData,
-                _arbitrable
+                _params.foreignBlockHash,
+                _params.foreignChainID,
+                _params.foreignArbitrable,
+                _params.foreignDisputeID,
+                _params.choices,
+                _params.extraData
             )
         );
         RelayedData storage relayedData = disputeHashtoRelayedData[disputeHash];
@@ -209,12 +163,22 @@ contract HomeGateway is IHomeGateway {
         require(feeToken.safeTransferFrom(msg.sender, address(this), _feeAmount), "Transfer failed");
         require(feeToken.increaseAllowance(address(arbitrator), _feeAmount), "Allowance increase failed");
 
-        uint256 disputeID = arbitrator.createDispute(_choices, _extraData, feeToken, _feeAmount);
+        uint256 disputeID = arbitrator.createDispute(_params.choices, _params.extraData, feeToken, _feeAmount);
         disputeIDtoHash[disputeID] = disputeHash;
         disputeHashtoID[disputeHash] = disputeID;
         relayedData.relayer = msg.sender;
 
-        emit Dispute(arbitrator, disputeID, 0, 0);
+        emit DisputeRequest(arbitrator, disputeID, _params.externalDisputeID, _params.templateId, _params.templateUri);
+
+        emit CrossChainDisputeIncoming(
+            arbitrator,
+            _params.foreignChainID,
+            _params.foreignArbitrable,
+            _params.foreignDisputeID,
+            _params.externalDisputeID,
+            _params.templateId,
+            _params.templateUri
+        );
     }
 
     /// @inheritdoc IArbitrableV2
diff --git a/contracts/src/gateway/interfaces/IHomeGateway.sol b/contracts/src/gateway/interfaces/IHomeGateway.sol
@@ -31,24 +31,6 @@ interface IHomeGateway is IArbitrableV2, ISenderGateway {
         string _templateUri
     );
 
-    /// @dev Relays a dispute creation from the ForeignGateway to the home arbitrator using the same parameters as the ones on the foreign chain.
-    ///      Providing incorrect parameters will create a different hash than on the foreignChain and will not affect the actual dispute/arbitrable's ruling.
-    ///      This function accepts the fees payment in the native currency of the home chain, typically ETH.
-    /// @param _foreignChainID foreignChainId
-    /// @param _foreignBlockHash foreignBlockHash
-    /// @param _foreignDisputeID foreignDisputeID
-    /// @param _choices number of ruling choices
-    /// @param _extraData extraData
-    /// @param _arbitrable arbitrable
-    function relayCreateDispute(
-        uint256 _foreignChainID,
-        bytes32 _foreignBlockHash,
-        uint256 _foreignDisputeID,
-        uint256 _choices,
-        bytes calldata _extraData,
-        address _arbitrable
-    ) external payable;
-
     // Workaround stack too deep for relayCreateDispute()
     struct RelayCreateDisputeParams {
         bytes32 foreignBlockHash;
@@ -68,6 +50,12 @@ interface IHomeGateway is IArbitrableV2, ISenderGateway {
     /// @param _params The parameters of the dispute, see `RelayCreateDisputeParams`.
     function relayCreateDispute(RelayCreateDisputeParams memory _params) external payable;
 
+    /// @dev Relays a dispute creation from the ForeignGateway to the home arbitrator using the same parameters as the ones on the foreign chain.
+    ///      Providing incorrect parameters will create a different hash than on the foreignChain and will not affect the actual dispute/arbitrable's ruling.
+    ///      This function accepts the fees payment in the ERC20 `acceptedFeeToken()`.
+    /// @param _params The parameters of the dispute, see `RelayCreateDisputeParams`.
+    function relayCreateDispute(RelayCreateDisputeParams memory _params, uint256 _feeAmount) external;
+
     /// @dev Looks up the local home disputeID for a disputeHash
     /// @param _disputeHash dispute hash
     /// @return disputeID dispute identifier on the home chain
diff --git a/contracts/src/kleros-v1/kleros-liquid-xdai/xKlerosLiquidV2.sol b/contracts/src/kleros-v1/kleros-liquid-xdai/xKlerosLiquidV2.sol
@@ -615,12 +615,12 @@ contract xKlerosLiquidV2 is Initializable, ITokenController, IArbitratorV2 {
     // *           Public Views            * //
     // ************************************* //
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function arbitrationCost(bytes memory _extraData) public view override returns (uint256 cost) {
         cost = foreignGateway.arbitrationCost(_extraData);
     }
 
-    /// @inheritdoc IArbitrator
+    /// @inheritdoc IArbitratorV2
     function arbitrationCost(
         bytes calldata /*_extraData*/,
         IERC20 /*_feeToken*/
diff --git a/contracts/test/arbitration/draw.ts b/contracts/test/arbitration/draw.ts
diff --git a/contracts/test/integration/index.ts b/contracts/test/integration/index.ts

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ contract ForeignGateway is IForeignGateway {`
`167`	`167`	`cost = feeForJuror[courtID] * minJurors;`
`168`	`168`	`}`
`169`	`169`
`170`		`- /// @inheritdoc IArbitrator`
	`170`	`+ /// @inheritdoc IArbitratorV2`
`171`	`171`	`function arbitrationCost(`
`172`	`172`	`bytes calldata /_extraData/,`
`173`	`173`	`IERC20 /_feeToken/`