Merge branch 'fix(contracts)/remove-court-subcourt-naming-inconsistencies' of github.com:kleros/kleros-v2 into fix(contracts)/remove-court-subcourt-naming-inconsistencies

Author: alcercu

contracts/deploy/01-foreign-gateway.ts

@@ -10,7 +10,7 @@ enum ForeignChains {
 
 const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId, config } = hre;
-  const { deploy } = deployments;
+  const { deploy, execute } = deployments;
   const { hexZeroPad, hexlify } = ethers.utils;
 
   // fallback to hardhat node signers on local network
@@ -38,17 +38,19 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
   const foreignGateway = await deploy("ForeignGatewayOnEthereum", {
     from: deployer,
     contract: "ForeignGateway",
-    args: [
-      deployer,
-      veaReceiver.address,
-      [ethers.BigNumber.from(10).pow(17)],
-      homeGatewayAddress,
-      homeChainIdAsBytes32,
-    ],
+    args: [deployer, veaReceiver.address, homeGatewayAddress, homeChainIdAsBytes32],
     gasLimit: 4000000,
     log: true,
   });
 
+  await execute(
+    "ForeignGatewayOnEthereum",
+    { from: deployer, log: true },
+    "changeSubcourtJurorFee",
+    0,
+    ethers.BigNumber.from(10).pow(17)
+  );
+
   const metaEvidenceUri = `https://raw.githubusercontent.com/kleros/kleros-v2/master/contracts/deployments/${hre.network.name}/MetaEvidence_ArbitrableExample.json`;
 
   await deploy("ArbitrableExample", {

contracts/deploy/03-vea-mock.ts

@@ -9,7 +9,7 @@ const HARDHAT_NETWORK = 31337;
 
 const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
+  const { deploy, execute } = deployments;
   const { hexZeroPad, hexlify } = ethers.utils;
 
   // fallback to hardhat node signers on local network
@@ -31,7 +31,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const foreignGateway = await deploy("ForeignGatewayOnEthereum", {
     from: deployer,
     contract: "ForeignGateway",
-    args: [deployer, vea.address, [ethers.BigNumber.from(10).pow(17)], homeGatewayAddress, homeChainIdAsBytes32],
+    args: [deployer, vea.address, homeGatewayAddress, homeChainIdAsBytes32],
     gasLimit: 4000000,
     log: true,
   }); // nonce+0
@@ -44,6 +44,14 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     log: true,
   }); // nonce+1
 
+  await execute(
+    "ForeignGatewayOnEthereum",
+    { from: deployer, log: true },
+    "changeSubcourtJurorFee",
+    0,
+    ethers.BigNumber.from(10).pow(17)
+  );
+
   const metaEvidenceUri = `https://raw.githubusercontent.com/kleros/kleros-v2/master/contracts/deployments/goerli/MetaEvidence_ArbitrableExample.json`;
 
   await deploy("ArbitrableExample", {

contracts/src/gateway/ForeignGateway.sol

@@ -43,6 +43,8 @@ contract ForeignGateway is IForeignGateway {
         address arbitrable
     );
 
+    event ArbitrationCostModified(uint96 indexed _courtID, uint256 _feeForJuror);
+
     // ************************************* //
     // *             Storage               * //
     // ************************************* //
@@ -51,7 +53,7 @@ contract ForeignGateway is IForeignGateway {
     uint256 public immutable override senderChainID;
     address public immutable override senderGateway;
     uint256 internal localDisputeID = 1; // The disputeID must start from 1 as the KlerosV1 proxy governor depends on this implementation. We now also depend on localDisputeID not ever being zero.
-    uint256[] internal feeForJuror; // feeForJuror[courtID]
+    mapping(uint96 => uint256) public feeForJuror; // feeForJuror[courtID], it mirrors the value on KlerosCore.
     address public governor;
     IFastBridgeReceiver public fastBridgeReceiver;
     IFastBridgeReceiver public depreciatedFastbridge;
@@ -79,13 +81,11 @@ contract ForeignGateway is IForeignGateway {
     constructor(
         address _governor,
         IFastBridgeReceiver _fastBridgeReceiver,
-        uint256[] memory _feeForJuror,
         address _senderGateway,
         uint256 _senderChainID
     ) {
         governor = _governor;
         fastBridgeReceiver = _fastBridgeReceiver;
-        feeForJuror = _feeForJuror;
         senderGateway = _senderGateway;
         senderChainID = _senderChainID;
     }
@@ -111,16 +111,9 @@ contract ForeignGateway is IForeignGateway {
      * @param _courtID The ID of the court.
      * @param _feeForJuror The new value for the `feeForJuror` property value.
      */
-    function changeCourtJurorFee(uint96 _courtID, uint256 _feeForJuror) external onlyByGovernor {
+    function changeSubcourtJurorFee(uint96 _courtID, uint256 _feeForJuror) external onlyByGovernor {
         feeForJuror[_courtID] = _feeForJuror;
-    }
-
-    /**
-     * @dev Creates the `feeForJuror` property value for a new court.
-     * @param _feeForJuror The new value for the `feeForJuror` property value.
-     */
-    function createCourtJurorFee(uint256 _feeForJuror) external onlyByGovernor {
-        feeForJuror.push(_feeForJuror);
+        emit ArbitrationCostModified(_courtID, _feeForJuror);
     }
 
     // ************************************* //
@@ -163,8 +156,7 @@ contract ForeignGateway is IForeignGateway {
     }
 
     function arbitrationCost(bytes calldata _extraData) public view override returns (uint256 cost) {
-        (uint96 courtID, uint256 minJurors) = extraDataToCourtIDMinJurors(_extraData);
-
+        (uint96 courtID, uint256 minJurors) = extraDataToSubcourtIDMinJurors(_extraData);
         cost = feeForJuror[courtID] * minJurors;
     }
 
@@ -212,7 +204,7 @@ contract ForeignGateway is IForeignGateway {
     // *       Internal       * //
     // ************************ //
 
-    function extraDataToCourtIDMinJurors(
+    function extraDataToSubcourtIDMinJurors(
         bytes memory _extraData
     ) internal view returns (uint96 courtID, uint256 minJurors) {
         // Note that here we ignore DisputeKitID
@@ -222,7 +214,7 @@ contract ForeignGateway is IForeignGateway {
                 courtID := mload(add(_extraData, 0x20))
                 minJurors := mload(add(_extraData, 0x40))
             }
-            if (courtID >= feeForJuror.length) courtID = 0;
+            if (feeForJuror[courtID] == 0) courtID = 0;
             if (minJurors == 0) minJurors = MIN_JURORS;
         } else {
             courtID = 0;