Merge branch 'master' into scripts-modernization

Author: jaybuidl

contracts/hardhat.config.js

@@ -10,15 +10,6 @@ require("./tasks/update-deployments");
 module.exports = {
   solidity: {
     compilers: [
-      {
-        version: "0.7.6",
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
       {
         version: "0.8.25",
         settings: {
@@ -31,7 +22,7 @@ module.exports = {
     ],
   },
   paths: {
-    sources: "./src",
+    sources: "./src/0.8",
   },
   networks: {
     // ----------------------------------------------------------------------------------------

contracts/hardhat.config.zksync.js

@@ -22,11 +22,13 @@ module.exports = {
     ],
   },
   zksolc: {
-    version: "1.3.16", // Latest versions aren't supported for verification yet.
-    settings: {},
+    version: "1.5.11",
+    settings: {
+      suppressedErrors: ["sendtransfer"]
+    },
   },
   paths: {
-    sources: "./src",
+    sources: "./src/0.8",
   },
   networks: {
     hardhat: {

contracts/src/0.8/RealitioHomeProxyOptimism.sol

@@ -52,7 +52,7 @@ contract RealitioHomeProxyOptimism is IHomeArbitrationProxy {
     /// @dev Associates a question ID with the requester who succeeded in requesting arbitration. questionIDToRequester[questionID]
     mapping(bytes32 => address) public questionIDToRequester;
 
-    modifier onlyForeignProxy() {
+    modifier onlyForeignProxy() virtual {
         require(msg.sender == address(messenger), "NOT_MESSENGER");
         require(messenger.xDomainMessageSender() == foreignProxy, "Can only be called by Foreign Proxy");
         _;
@@ -123,7 +123,7 @@ contract RealitioHomeProxyOptimism is IHomeArbitrationProxy {
 
         bytes4 selector = IForeignArbitrationProxy.receiveArbitrationAcknowledgement.selector;
         bytes memory data = abi.encodeWithSelector(selector, _questionID, _requester);
-        messenger.sendMessage(foreignProxy, data, MIN_GAS_LIMIT);
+        sendToL1(data);
         emit RequestAcknowledged(_questionID, _requester);
     }
 
@@ -146,7 +146,7 @@ contract RealitioHomeProxyOptimism is IHomeArbitrationProxy {
 
         bytes4 selector = IForeignArbitrationProxy.receiveArbitrationCancelation.selector;
         bytes memory data = abi.encodeWithSelector(selector, _questionID, _requester);
-        messenger.sendMessage(foreignProxy, data, MIN_GAS_LIMIT);
+        sendToL1(data);
         emit RequestCanceled(_questionID, _requester);
     }
 
@@ -217,4 +217,12 @@ contract RealitioHomeProxyOptimism is IHomeArbitrationProxy {
 
         emit ArbitrationFinished(_questionID);
     }
+
+    /**
+     * @notice Sends a message to L1.
+     * @param _data The data sent.
+     */
+    function sendToL1(bytes memory _data) internal virtual {
+        messenger.sendMessage(foreignProxy, _data, MIN_GAS_LIMIT);
+    }
 }

contracts/src/0.8/test/arbitrum/MockHomeProxy.sol renamed to contracts/src/0.8/test/arbitrum/MockRealitioHomeProxyArbitrum.sol

@@ -6,7 +6,7 @@ import "../../RealitioHomeProxyArbitrum.sol";
 import "./MockBridge.sol";
 
 /// @dev MockHomeProxy to bypass the modifier and usage of precompile.
-contract MockRealitioHomeProxy is RealitioHomeProxyArbitrum {
+contract MockRealitioHomeProxyArbitrum is RealitioHomeProxyArbitrum {
     address public mockInbox;
     MockBridge public mockBridge;
 

contracts/src/0.8/test/optimism/MockRealitioHomeProxyOptimism.sol

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.25;
+
+import "../../RealitioHomeProxyOptimism.sol";
+import "./MockCrossDomainMessenger.sol";
+
+/// @dev MockHomeProxy to bypass the modifier and usage of precompile.
+contract MockRealitioHomeProxyOptimism is RealitioHomeProxyOptimism {
+    MockCrossDomainMessenger public mockMessenger;
+
+    modifier onlyForeignProxy() override {
+        require(msg.sender == address(mockMessenger), "NOT_MESSENGER");
+        require(mockMessenger.xDomainMessageSender() == foreignProxy, "Can only be called by Foreign Proxy");
+        _;
+    }
+
+    constructor(
+        IRealitio _realitio,
+        string memory _metadata,
+        address _foreignProxy,
+        uint256 _foreignChainId,
+        MockCrossDomainMessenger _messenger
+    ) RealitioHomeProxyOptimism(_realitio, _metadata, _foreignProxy, _foreignChainId) {
+        mockMessenger = _messenger;
+    }
+
+    function sendToL1(bytes memory _data) internal override {
+        mockMessenger.sendMessage(foreignProxy, _data, MIN_GAS_LIMIT);
+    }
+}

contracts/src/0.8/test/polygon/MockForeignArbitratorProxyWithAppeals.sol renamed to contracts/src/0.8/test/polygon/MockRealitioForeignProxyPolygon.sol

@@ -7,7 +7,7 @@ import {RealitioForeignProxyPolygon} from "../../RealitioForeignProxyPolygon.sol
  * @title Arbitration proxy for Realitio on Ethereum side (A.K.A. the Foreign Chain).
  * @dev This contract is meant to be deployed to the Ethereum chains where Kleros is deployed.
  */
-contract MockForeignArbitrationProxyWithAppeals is RealitioForeignProxyPolygon {
+contract MockRealitioForeignProxyPolygon is RealitioForeignProxyPolygon {
     constructor(
         IArbitrator _arbitrator,
         bytes memory _arbitratorExtraData,

contracts/src/0.8/test/polygon/MockHomeArbitratorProxy.sol renamed to contracts/src/0.8/test/polygon/MockRealitioHomeProxyPolygon.sol

@@ -3,13 +3,13 @@ pragma solidity 0.8.25;
 import {IRealitio} from "../../interfaces/IRealitio.sol";
 import {RealitioHomeProxyPolygon} from "../../RealitioHomeProxyPolygon.sol";
 
-import {MockForeignArbitrationProxyWithAppeals} from "./MockForeignArbitratorProxyWithAppeals.sol";
+import {MockRealitioForeignProxyPolygon} from "./MockRealitioForeignProxyPolygon.sol";
 
 /**
  * @title Arbitration proxy for Realitio on Polygon side (A.K.A. the Home Chain).
  * @dev This contract is meant to be deployed on the side of Realitio.
  */
-contract MockHomeArbitrationProxy is RealitioHomeProxyPolygon {
+contract MockRealitioHomeProxyPolygon is RealitioHomeProxyPolygon {
     constructor(
         IRealitio _realitio,
         string memory _metadata,
@@ -20,6 +20,6 @@ contract MockHomeArbitrationProxy is RealitioHomeProxyPolygon {
     // Overridden to directly call the foreignProxy under test
     // instead of emitting an event
     function _sendMessageToRoot(bytes memory message) internal override {
-        MockForeignArbitrationProxyWithAppeals(fxRootTunnel).processMessageFromChild(message);
+        MockRealitioForeignProxyPolygon(fxRootTunnel).processMessageFromChild(message);
     }
 }

contracts/src/0.8/test/zksync/MockZkHomeProxy.sol renamed to contracts/src/0.8/test/zksync/MockRealitioHomeProxyZkSync.sol

@@ -7,7 +7,7 @@ import "../../RealitioHomeProxyZkSync.sol";
 /**
  * @dev The purpose of this contract is to override the precompiled L1Messenger.
  */
-contract MockZkHomeProxy is RealitioHomeProxyZkSync {
+contract MockRealitioHomeProxyZkSync is RealitioHomeProxyZkSync {
     event L1MessageSent(bytes _data);
 
     constructor(