@reality.eth/contracts 3.0.44 → 3.0.46

package/chains/supported.json

@@ -87,7 +87,7 @@
         "network_name": "polygon-zkevm"
     },
     "17000": {
-        "hostedRPC": "https://rpc.holesky.ethpandaops.io",
+        "hostedRPC": "https://ethereum-holesky.publicnode.com",
         "explorerURL": "https://holesky.etherscan.io/",
         "network_name": "holesky"
     },

package/development/contracts/Arbitrator.sol

@@ -18,31 +18,6 @@ contract Arbitrator is Owned, IArbitrator {
 
     string public metadata;
 
-    event LogRequestArbitration(
-        bytes32 indexed question_id,
-        uint256 fee_paid,
-        address requester,
-        uint256 remaining
-    );
-
-    event LogSetRealitio(
-        address realitio
-    );
-
-    event LogSetQuestionFee(
-        uint256 fee
-    );
-
-
-    event LogSetDisputeFee(
-        uint256 fee
-    );
-
-    event LogSetCustomDisputeFee(
-        bytes32 indexed question_id,
-        uint256 fee
-    );
-
     /// @notice Constructor. Sets the deploying address as owner.
     constructor() {
         owner = msg.sender;

package/development/contracts/IArbitrator.sol

@@ -1,25 +1,22 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
-import './IRealityETH.sol';
-import './IERC20.sol';
-import './IOwned.sol';
+/*
+This interface describes the Arbitrator contract originally deployed and managed by the reality.eth team. See below for the various parts it comprises.
+For the minimal interface that will be able to interact with the reality.eth UI as an arbitrator, use IArbitratorCore.
+*/
 
-interface IArbitrator {
-  function metadata (  ) external view returns ( string memory );
-  function arbitration_bounties ( bytes32 ) external view returns ( uint256 );
-  function realitio (  ) external view returns ( IRealityETH );
-  function realitycheck (  ) external view returns ( IRealityETH );
-  function setRealitio ( address addr ) external;
-  function setDisputeFee ( uint256 fee ) external;
-  function setCustomDisputeFee ( bytes32 question_id, uint256 fee ) external;
-  function getDisputeFee ( bytes32 question_id ) external view returns ( uint256 );
-  function setQuestionFee ( uint256 fee ) external;
-  function submitAnswerByArbitrator ( bytes32 question_id, bytes32 answer, address answerer ) external;
-  function requestArbitration ( bytes32 question_id, uint256 max_previous ) external payable returns ( bool );
-  function withdraw ( address addr ) external;
-  function withdrawERC20 ( IERC20 _token, address addr ) external;
-  function callWithdraw (  ) external;
-  function setMetaData ( string memory _metadata ) external;
+import './IArbitratorCore.sol';
+
+// This provides management functionality to handle ownership, set fees etc.
+import './IArbitratorManagement.sol';
+
+// This provides the old function realitycheck(), replaced by realitio().
+import './IArbitratorLegacy.sol';
+
+// This provides a function for querying the status of crowd-funded arbitration.
+import './IArbitratorCrowdFundable.sol';
+
+interface IArbitrator is IArbitratorCore, IArbitratorLegacy, IArbitratorManagement, IArbitratorCrowdFundable {
 }

package/development/contracts/IArbitratorCore.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.10;
+
+import './IRealityETH.sol';
+
+interface IArbitratorCore {
+
+    event LogRequestArbitration(
+        bytes32 indexed question_id,
+        uint256 fee_paid,
+        address requester,
+        uint256 remaining
+    );
+
+    function getDisputeFee ( bytes32 question_id ) external view returns ( uint256 );
+    function metadata (  ) external view returns ( string memory );
+    function realitio (  ) external view returns ( IRealityETH );
+    function requestArbitration ( bytes32 question_id, uint256 max_previous ) external payable returns ( bool );
+
+}

package/development/contracts/IArbitratorCrowdFundable.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.10;
+
+interface IArbitratorCrowdFundable {
+    function arbitration_bounties ( bytes32 ) external view returns ( uint256 );
+}

package/development/contracts/IArbitratorForeignProxy.sol

@@ -1,12 +1,20 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
-import './IArbitrator.sol';
-import './IERC20.sol';
-import './IOwned.sol';
+/*
+This defines the features needed by a "foreign proxy" for a cross-chain arbitrator as created by Kleros, for example see
+https://github.com/kleros/cross-chain-realitio-proxy
 
-interface IArbitrator {
-  function foreignProxy() external returns (address);
-  function foreignChainId() external returns (uint256);
+In this arrangement, the "foreign" side is deployed on the chain where reality.eth is, and the "home" side is deployed on the chain where Kleros is.
+
+If you implement this you should also inherit and implement the functions in IArbitratorCore, with the exception of requestArbitration() which is done on the other chain.
+
+The metadata() string defined in IArbitratorCore should return some JSON to tell the UI that it is dealing with a foreign proxy, like:
+{ foreignProxy: true }
+*/
+
+interface IArbitratorForeignProxy {
+    function foreignProxy() external returns (address);
+    function foreignChainId() external returns (uint256);
 }

package/development/contracts/IArbitratorLegacy.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.10;
+
+import './IRealityETH.sol';
+
+interface IArbitratorLegacy {
+    function realitycheck (  ) external view returns ( IRealityETH );
+}

package/development/contracts/IArbitratorManagement.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.10;
+
+import './IERC20.sol';
+import './IOwned.sol';
+
+interface IArbitratorManagement {
+
+    event LogSetRealitio(
+        address realitio
+    );
+
+    event LogSetQuestionFee(
+        uint256 fee
+    );
+
+    event LogSetDisputeFee(
+        uint256 fee
+    );
+
+    event LogSetCustomDisputeFee(
+        bytes32 indexed question_id,
+        uint256 fee
+    );
+
+    function setRealitio ( address addr ) external;
+    function setDisputeFee ( uint256 fee ) external;
+    function setCustomDisputeFee ( bytes32 question_id, uint256 fee ) external;
+    function setQuestionFee ( uint256 fee ) external;
+    function submitAnswerByArbitrator ( bytes32 question_id, bytes32 answer, address answerer ) external;
+    function withdraw ( address addr ) external;
+    function withdrawERC20 ( IERC20 _token, address addr ) external;
+    function callWithdraw (  ) external;
+    function setMetaData ( string memory _metadata ) external;
+
+}

package/development/contracts/IBalanceHolder.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
 interface IBalanceHolder {
   function withdraw (  ) external;

package/development/contracts/IBalanceHolder_ERC20.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
 import './IERC20.sol';
 

package/development/contracts/IERC20.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
 
 /**

package/development/contracts/IOwned.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
 interface IOwned {
   function owner (  ) external view returns ( address );

package/development/contracts/IRealityETH.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
 import './IBalanceHolder.sol';
 

package/development/contracts/IRealityETH_ERC20.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity 0.8.10;
 
 import './IBalanceHolder_ERC20.sol';
 

package/generated/chains.json

@@ -376,7 +376,7 @@
             "https://ethereum-holesky.publicnode.com",
             "wss://ethereum-holesky.publicnode.com"
         ],
-        "hostedRPC": "https://rpc.holesky.ethpandaops.io",
+        "hostedRPC": "https://ethereum-holesky.publicnode.com",
         "blockExplorerUrls": [
             "https://holesky.beaconcha.in",
             "https://holesky.otterscan.io",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reality.eth/contracts",
-  "version": "3.0.44",
+  "version": "3.0.46",
   "description": "Collection of smart contracts for the Realitio fact verification platform",
   "scripts": {
     "generate-chains": "node scripts/generate_chains_json.js",
@@ -30,7 +30,7 @@
     "url": "https://github.com/RealityETH/monorepo/issues"
   },
   "homepage": "https://reality.eth.link",
-  "gitHead": "2d3f96cd8602d858584959689dbe486c3eb5e0b0",
+  "gitHead": "53818da8004aa8227d545643910a0ebc0bdcd8b5",
   "dependencies": {
     "ethers": "^5.6.8"
   }