@reality.eth/contracts 3.0.1 → 3.0.4

package/chains/deployments/1/ETH/RealityETH-3.0.json

@@ -2,5 +2,8 @@
     "address": "0x5b7dD1E86623548AF054A4985F7fc8Ccbb554E2c",
     "block": 13194676,
     "notes": null,
-    "arbitrators": {}
+    "arbitrators": {
+        "0x728cba71a3723caab33ea416cb46e2cc9215a596": "Kleros (General Court)",
+        "0xf72cfd1b34a91a64f9a98537fe63fbab7530adca": "Kleros DAO Governance (Technical Court)"
+    }
 }

package/chains/deployments/1/SWISE/RealityETH_ERC20-3.0.json

@@ -0,0 +1,7 @@
+{
+    "address": "0x867092A32bC16816F12Fb326EfF7A2865E1ec138",
+    "block": 14485577,
+    "token_address": "0x48C3399719B582dD63eB5AADf12A40B4C3f52FA2",
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/deployments/10/OETH/RealityETH-3.0.json

@@ -0,0 +1,6 @@
+{
+    "address": "0x0eF940F7f053a2eF5D6578841072488aF0c7d89A",
+    "block": 2462149,
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/deployments/100/GNO/RealityETH_ERC20-3.0.json

@@ -0,0 +1,7 @@
+{
+    "address": "0x95b2b2b4b66A5a47Df79bF07BEBe72E9870fceb2",
+    "block": 20882108,
+    "token_address": "0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb",
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/deployments/100/SWISE/RealityETH_ERC20-3.0.json

@@ -0,0 +1,7 @@
+{
+    "address": "0xC9FbdF0df8dE06Ad8d2193F7FA28bdA78c13a102",
+    "block": 21371853,
+    "token_address": "0xfdA94F056346d2320d4B5E468D6Ad099b2277746",
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/deployments/100/XDAI/RealityETH-3.0.json

@@ -2,5 +2,7 @@
     "address": "0xE78996A233895bE74a66F451f1019cA9734205cc",
     "block": 17997262,
     "notes": null,
-    "arbitrators": {}
+    "arbitrators": {
+        "0x29f39de98d750eb77b5fafb31b2837f079fce222": "Kleros"
+    }
 }

package/chains/deployments/1337702/ETH/RealityETH-3.0.json

@@ -0,0 +1,6 @@
+{
+    "address": "0x45fF90518c92C0AcF5C58784435852B5F0CBD4Be",
+    "block": 47012,
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/deployments/4/ETH/RealityETH-3.0.json

@@ -2,5 +2,7 @@
     "address": "0xDf33060F476F8cff7511F806C72719394da1Ad64",
     "block": 9106451,
     "notes": null,
-    "arbitrators": {}
+    "arbitrators": {
+        "0xe27768bdb76a9b742b7ddcfe1539fadaf3b89bc7": "Kleros (General Court)"
+    }
 }

package/chains/deployments/42/ETH/RealityETH-3.0.json

@@ -3,6 +3,7 @@
     "block": 27103177,
     "notes": null,
     "arbitrators": {
-        "0xb9fdd2904cbcc5543F02DB948B2CE59Ef10A950E": "Kleros"
+        "0x99489d7bb33539f3d1a401741e56e8f02b9ae0cf": "Kleros (General Court)",
+        "0xb9fdd2904cbcc5543F02DB948B2CE59Ef10A950E": "Kleros DAO Governance (Technical Court)"
     }
 }

package/chains/deployments/56/DEXE/RealityETH_ERC20-3.0.json

@@ -0,0 +1,7 @@
+{
+    "address": "0x95f8fc16C7Bd5a5b24CaE629471c6cCC3916826A",
+    "block": 13749748,
+    "token_address": "0x039cb485212f996a9dbb85a9a75d898f94d38da6",
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/deployments/69/OETH/RealityETH-3.0.json

@@ -0,0 +1,6 @@
+{
+    "address": "0x327543eaf65FE0D68333d4D092282cDBA0Bc37a6",
+    "block": 28282,
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/deployments/77/XDAI/RealityETH-2.1-rc1.json

@@ -3,7 +3,5 @@
     "block": 17307142,
     "token_address": null,
     "notes": "Same as 2.1 except missing an empty address check",
-    "arbitrators": {
-        "0x37Fcdb26F12f3FC76F2424EC6B94D434a959A0f7": "Kleros (testing)"
-    }
+    "arbitrators": {}
 }

package/chains/deployments/777/CTH/RealityETH-3.0.json

@@ -0,0 +1,6 @@
+{
+    "address": "0xF935d11116fA0103Bd340B663879d325673106f0",
+    "block": 13539397,
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/supported.json

@@ -2,22 +2,30 @@
     "1": {
         "hostedRPC": "https://eth-mainnet.alchemyapi.io/v2/c9uS--nIxEOjVjh0AJlNttMaqUXQy8gR",
         "explorerURL": "https://etherscan.io",
-        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth"
+        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth",
+        "network_name": "mainnet"
     },
     "3": {
         "hostedRPC": "https://ropsten.infura.io/tSrhlXUe1sNEO5ZWhpUK",
         "explorerURL": "https://ropsten.etherscan.io",
-        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-ropsten"
+        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-ropsten",
+        "network_name": "ropsten"
     },
     "4": {
         "hostedRPC": "https://eth-rinkeby.alchemyapi.io/v2/m2Op-gK2G1RiwtWHr6QB_JH9-ry0A6do",
         "explorerURL": "https://rinkeby.etherscan.io",
-        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-rinkeby"
+        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-rinkeby",
+        "network_name": "rinkeby"
     },
     "8": {
         "hostedRPC": "https://rpc.octano.dev",
         "explorerURL": "https://ubqblockexplorer.com/"
     },
+    "10": {
+        "hostedRPC": "https://mainnet.optimism.io",
+        "explorerURL": "https://optimistic.etherscan.io",
+        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-optimism"
+    },
     "42": {
         "explorerURL": "https://kovan.etherscan.io",
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-kovan"
@@ -27,6 +35,11 @@
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-bsc",
         "network_name": "bsc"
     },
+    "69": {
+        "hostedRPC": "https://kovan.optimism.io",
+        "explorerURL": "https://kovan-optimistic.etherscan.io",
+        "network_name": "kovan"
+    },
     "77": {
         "explorerURL": "https://blockscout.com/poa/sokol",
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-sokol",
@@ -43,6 +56,10 @@
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-polygon",
         "network_name": "matic"
     },
+    "777": {
+        "explorerURL": "https://explore.cheapswap.io/",
+        "network_name": "cheapeth"
+    },
     "43114": {
         "explorerURL": "https://cchain.explorer.avax.network/",
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-ava",
@@ -53,5 +70,8 @@
     },
     "421611": {
         "network_name": "arbitrum-rinkeby"
+    },
+    "1337702": {
+        "network_name": "kintsugi"
     }
 }

package/development/contracts/Arbitrator.sol

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+pragma solidity ^0.8.10;
 
-import './IRealitio.sol';
+import './IArbitrator.sol';
+import './IRealityETH.sol';
 import './IERC20.sol';
 import './Owned.sol';
 
-contract Arbitrator is Owned {
+contract Arbitrator is Owned, IArbitrator {
 
-    IRealitio public realitio;
+    IRealityETH public realitio;
 
     mapping(bytes32 => uint256) public arbitration_bounties;
 
@@ -49,7 +50,7 @@ contract Arbitrator is Owned {
 
     /// @notice Returns the Realitio contract address - deprecated in favour of realitio()
     function realitycheck() 
-    external view returns(IRealitio) {
+    external view returns(IRealityETH) {
         return realitio;
     }
 
@@ -58,7 +59,7 @@ contract Arbitrator is Owned {
     function setRealitio(address addr) 
         onlyOwner 
     public {
-        realitio = IRealitio(addr);
+        realitio = IRealityETH(addr);
         emit LogSetRealitio(addr);
     }
 

package/development/contracts/BalanceHolder.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+pragma solidity ^0.8.10;
 
-contract BalanceHolder {
+import './IBalanceHolder.sol';
+
+contract BalanceHolder is IBalanceHolder {
 
     mapping(address => uint256) public balanceOf;
 

package/development/contracts/{BalanceHolderERC20.sol → BalanceHolder_ERC20.sol}

@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+pragma solidity ^0.8.10;
 
 import './IERC20.sol';
+import './IBalanceHolder_ERC20.sol';
 
-contract BalanceHolder {
+contract BalanceHolder_ERC20 is IBalanceHolder_ERC20 {
 
     IERC20 public token;
 

package/development/contracts/IArbitrator.sol

@@ -1,17 +1,16 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+pragma solidity ^0.8.10;
 
-import './IRealitio.sol';
+import './IRealityETH.sol';
 import './IERC20.sol';
 import './IOwned.sol';
 
 interface IArbitrator {
   function metadata (  ) external view returns ( string memory );
-  function owner (  ) external view returns ( address );
   function arbitration_bounties ( bytes32 ) external view returns ( uint256 );
-  function realitio (  ) external view returns ( IRealitio );
-  function realitycheck (  ) external view returns ( IRealitio );
+  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;
@@ -23,6 +22,4 @@ interface IArbitrator {
   function withdrawERC20 ( IERC20 _token, address addr ) external;
   function callWithdraw (  ) external;
   function setMetaData ( string memory _metadata ) external;
-  function foreignProxy() external returns (address);
-  function foreignChainId() external returns (uint256);
 }

package/development/contracts/IArbitratorForeignProxy.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity ^0.8.10;
+
+import './IArbitrator.sol';
+import './IERC20.sol';
+import './IOwned.sol';
+
+interface IArbitrator {
+  function foreignProxy() external returns (address);
+  function foreignChainId() external returns (uint256);
+}

package/development/contracts/IBalanceHolder.sol

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

package/development/contracts/IBalanceHolder_ERC20.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity ^0.8.10;
+
+import './IERC20.sol';
+
+interface IBalanceHolder_ERC20 {
+  function withdraw (  ) external;
+  function balanceOf ( address ) external view returns ( uint256 );
+  function token ( ) external view returns ( IERC20 );
+}

package/development/contracts/IERC20.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+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.6;
+pragma solidity ^0.8.10;
 
 interface IOwned {
   function owner (  ) external view returns ( address );

package/development/contracts/IRealityETH.sol

@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity ^0.8.10;
+
+import './IBalanceHolder.sol';
+
+interface IRealityETH is IBalanceHolder {
+     event LogAnswerReveal (bytes32 indexed question_id, address indexed user, bytes32 indexed answer_hash, bytes32 answer, uint256 nonce, uint256 bond);
+     event LogCancelArbitration (bytes32 indexed question_id);
+     event LogClaim (bytes32 indexed question_id, address indexed user, uint256 amount);
+     event LogFinalize (bytes32 indexed question_id, bytes32 indexed answer);
+     event LogFundAnswerBounty (bytes32 indexed question_id, uint256 bounty_added, uint256 bounty, address indexed user);
+     event LogMinimumBond (bytes32 indexed question_id, uint256 min_bond);
+     event LogNewAnswer (bytes32 answer, bytes32 indexed question_id, bytes32 history_hash, address indexed user, uint256 bond, uint256 ts, bool is_commitment);
+     event LogNewQuestion (bytes32 indexed question_id, address indexed user, uint256 template_id, string question, bytes32 indexed content_hash, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 created);
+     event LogNewTemplate (uint256 indexed template_id, address indexed user, string question_text);
+     event LogNotifyOfArbitrationRequest (bytes32 indexed question_id, address indexed user);
+     event LogReopenQuestion (bytes32 indexed question_id, bytes32 indexed reopened_question_id);
+     event LogSetQuestionFee (address arbitrator, uint256 amount);
+
+     function assignWinnerAndSubmitAnswerByArbitrator (bytes32 question_id, bytes32 answer, address payee_if_wrong, bytes32 last_history_hash, bytes32 last_answer_or_commitment_id, address last_answerer) external;
+     function cancelArbitration (bytes32 question_id) external;
+     function claimMultipleAndWithdrawBalance (bytes32[] calldata question_ids, uint256[] calldata lengths, bytes32[] calldata hist_hashes, address[] calldata addrs, uint256[] calldata bonds, bytes32[] calldata answers) external;
+     function claimWinnings (bytes32 question_id, bytes32[] calldata history_hashes, address[] calldata addrs, uint256[] calldata bonds, bytes32[] calldata answers) external;
+     function createTemplate (string calldata content) external returns (uint256);
+     function notifyOfArbitrationRequest (bytes32 question_id, address requester, uint256 max_previous) external;
+     function setQuestionFee (uint256 fee) external;
+     function submitAnswerByArbitrator (bytes32 question_id, bytes32 answer, address answerer) external;
+     function submitAnswerReveal (bytes32 question_id, bytes32 answer, uint256 nonce, uint256 bond) external;
+     function askQuestion (uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external payable returns (bytes32);
+     function askQuestionWithMinBond (uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 min_bond) external payable returns (bytes32);
+     function createTemplateAndAskQuestion (string calldata content, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external payable returns (bytes32);
+     function fundAnswerBounty (bytes32 question_id) external payable;
+     function reopenQuestion (uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 min_bond, bytes32 reopens_question_id) external payable returns (bytes32);
+     function submitAnswer (bytes32 question_id, bytes32 answer, uint256 max_previous) external payable;
+     function submitAnswerCommitment (bytes32 question_id, bytes32 answer_hash, uint256 max_previous, address _answerer) external payable;
+     function submitAnswerFor (bytes32 question_id, bytes32 answer, uint256 max_previous, address answerer) external payable;
+     function arbitrator_question_fees (address) external view returns (uint256);
+     function commitments (bytes32) external view returns (uint32 reveal_ts, bool is_revealed, bytes32 revealed_answer);
+     function getArbitrator (bytes32 question_id) external view returns (address);
+     function getBestAnswer (bytes32 question_id) external view returns (bytes32);
+     function getBond (bytes32 question_id) external view returns (uint256);
+     function getBounty (bytes32 question_id) external view returns (uint256);
+     function getContentHash (bytes32 question_id) external view returns (bytes32);
+     function getFinalAnswer (bytes32 question_id) external view returns (bytes32);
+     function getFinalAnswerIfMatches (bytes32 question_id, bytes32 content_hash, address arbitrator, uint32 min_timeout, uint256 min_bond) external view returns (bytes32);
+     function getFinalizeTS (bytes32 question_id) external view returns (uint32);
+     function getHistoryHash (bytes32 question_id) external view returns (bytes32);
+     function getMinBond (bytes32 question_id) external view returns (uint256);
+     function getOpeningTS (bytes32 question_id) external view returns (uint32);
+     function getTimeout (bytes32 question_id) external view returns (uint32);
+     function isFinalized (bytes32 question_id) external view returns (bool);
+     function isPendingArbitration (bytes32 question_id) external view returns (bool);
+     function isSettledTooSoon (bytes32 question_id) external view returns (bool);
+     function question_claims (bytes32) external view returns (address payee, uint256 last_bond, uint256 queued_funds);
+     function questions (bytes32) external view returns (bytes32 content_hash, address arbitrator, uint32 opening_ts, uint32 timeout, uint32 finalize_ts, bool is_pending_arbitration, uint256 bounty, bytes32 best_answer, bytes32 history_hash, uint256 bond, uint256 min_bond);
+     function reopened_questions (bytes32) external view returns (bytes32);
+     function reopener_questions (bytes32) external view returns (bool);
+     function resultFor (bytes32 question_id) external view returns (bytes32);
+     function resultForOnceSettled (bytes32 question_id) external view returns (bytes32);
+     function template_hashes (uint256) external view returns (bytes32);
+     function templates (uint256) external view returns (uint256);
+}

package/development/contracts/IRealityETH_ERC20.sol

@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity ^0.8.10;
+
+import './IBalanceHolder_ERC20.sol';
+
+interface IRealityETH_ERC20 is IBalanceHolder_ERC20 {
+     event LogAnswerReveal (bytes32 indexed question_id, address indexed user, bytes32 indexed answer_hash, bytes32 answer, uint256 nonce, uint256 bond);
+     event LogCancelArbitration (bytes32 indexed question_id);
+     event LogClaim (bytes32 indexed question_id, address indexed user, uint256 amount);
+     event LogFinalize (bytes32 indexed question_id, bytes32 indexed answer);
+     event LogFundAnswerBounty (bytes32 indexed question_id, uint256 bounty_added, uint256 bounty, address indexed user);
+     event LogMinimumBond (bytes32 indexed question_id, uint256 min_bond);
+     event LogNewAnswer (bytes32 answer, bytes32 indexed question_id, bytes32 history_hash, address indexed user, uint256 bond, uint256 ts, bool is_commitment);
+     event LogNewQuestion (bytes32 indexed question_id, address indexed user, uint256 template_id, string question, bytes32 indexed content_hash, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 created);
+     event LogNewTemplate (uint256 indexed template_id, address indexed user, string question_text);
+     event LogNotifyOfArbitrationRequest (bytes32 indexed question_id, address indexed user);
+     event LogReopenQuestion (bytes32 indexed question_id, bytes32 indexed reopened_question_id);
+     event LogSetQuestionFee (address arbitrator, uint256 amount);
+
+     function askQuestion (uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external returns (bytes32);
+     function askQuestionERC20 (uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 tokens) external returns (bytes32);
+     function askQuestionWithMinBondERC20 (uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 min_bond, uint256 tokens) external returns (bytes32);
+     function assignWinnerAndSubmitAnswerByArbitrator (bytes32 question_id, bytes32 answer, address payee_if_wrong, bytes32 last_history_hash, bytes32 last_answer_or_commitment_id, address last_answerer) external;
+     function cancelArbitration (bytes32 question_id) external;
+     function claimMultipleAndWithdrawBalance (bytes32[] calldata question_ids, uint256[] calldata lengths, bytes32[] calldata hist_hashes, address[] calldata addrs, uint256[] calldata bonds, bytes32[] calldata answers) external;
+     function claimWinnings (bytes32 question_id, bytes32[] calldata history_hashes, address[] calldata addrs, uint256[] calldata bonds, bytes32[] calldata answers) external;
+     function createTemplate (string calldata content) external returns (uint256);
+     function createTemplateAndAskQuestion (string calldata content, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external returns (bytes32);
+     function fundAnswerBountyERC20 (bytes32 question_id, uint256 tokens) external;
+     function notifyOfArbitrationRequest (bytes32 question_id, address requester, uint256 max_previous) external;
+     function reopenQuestionERC20 (uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 min_bond, bytes32 reopens_question_id, uint256 tokens) external returns (bytes32);
+     function setQuestionFee (uint256 fee) external;
+     function setToken (address _token) external;
+     function submitAnswerByArbitrator (bytes32 question_id, bytes32 answer, address answerer) external;
+     function submitAnswerCommitmentERC20 (bytes32 question_id, bytes32 answer_hash, uint256 max_previous, address _answerer, uint256 tokens) external;
+     function submitAnswerERC20 (bytes32 question_id, bytes32 answer, uint256 max_previous, uint256 tokens) external;
+     function submitAnswerForERC20 (bytes32 question_id, bytes32 answer, uint256 max_previous, address answerer, uint256 tokens) external;
+     function submitAnswerReveal (bytes32 question_id, bytes32 answer, uint256 nonce, uint256 bond) external;
+     function arbitrator_question_fees (address) external view returns (uint256);
+     function commitments (bytes32) external view returns (uint32 reveal_ts, bool is_revealed, bytes32 revealed_answer);
+     function getArbitrator (bytes32 question_id) external view returns (address);
+     function getBestAnswer (bytes32 question_id) external view returns (bytes32);
+     function getBond (bytes32 question_id) external view returns (uint256);
+     function getBounty (bytes32 question_id) external view returns (uint256);
+     function getContentHash (bytes32 question_id) external view returns (bytes32);
+     function getFinalAnswer (bytes32 question_id) external view returns (bytes32);
+     function getFinalAnswerIfMatches (bytes32 question_id, bytes32 content_hash, address arbitrator, uint32 min_timeout, uint256 min_bond) external view returns (bytes32);
+     function getFinalizeTS (bytes32 question_id) external view returns (uint32);
+     function getHistoryHash (bytes32 question_id) external view returns (bytes32);
+     function getMinBond (bytes32 question_id) external view returns (uint256);
+     function getOpeningTS (bytes32 question_id) external view returns (uint32);
+     function getTimeout (bytes32 question_id) external view returns (uint32);
+     function isFinalized (bytes32 question_id) external view returns (bool);
+     function isPendingArbitration (bytes32 question_id) external view returns (bool);
+     function isSettledTooSoon (bytes32 question_id) external view returns (bool);
+     function question_claims (bytes32) external view returns (address payee, uint256 last_bond, uint256 queued_funds);
+     function questions (bytes32) external view returns (bytes32 content_hash, address arbitrator, uint32 opening_ts, uint32 timeout, uint32 finalize_ts, bool is_pending_arbitration, uint256 bounty, bytes32 best_answer, bytes32 history_hash, uint256 bond, uint256 min_bond);
+     function reopened_questions (bytes32) external view returns (bytes32);
+     function reopener_questions (bytes32) external view returns (bool);
+     function resultFor (bytes32 question_id) external view returns (bytes32);
+     function resultForOnceSettled (bytes32 question_id) external view returns (bytes32);
+     function template_hashes (uint256) external view returns (bytes32);
+     function templates (uint256) external view returns (uint256);
+}
+
+

package/development/contracts/Owned.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+pragma solidity ^0.8.10;
 
-contract Owned {
+import './IOwned.sol';
+
+contract Owned is IOwned {
     address public owner;
 
     constructor() {

package/development/contracts/RealityETH-3.0.sol

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+pragma solidity ^0.8.10;
+
+import './IRealityETH.sol';
 
 import './BalanceHolder.sol';
 
-contract RealityETH_v3_0 is BalanceHolder {
+contract RealityETH_v3_0 is BalanceHolder, IRealityETH {
 
     address constant NULL_ADDRESS = address(0);
 
@@ -27,86 +29,6 @@ contract RealityETH_v3_0 is BalanceHolder {
     // bytes32(-2). By convention we use bytes32(-1) for "invalid", although the contract does not handle this.
     bytes32 constant UNRESOLVED_ANSWER = 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe;
 
-    event LogSetQuestionFee(
-        address arbitrator,
-        uint256 amount
-    );
-
-    event LogNewTemplate(
-        uint256 indexed template_id,
-        address indexed user, 
-        string question_text
-    );
-
-    event LogNewQuestion(
-        bytes32 indexed question_id,
-        address indexed user, 
-        uint256 template_id,
-        string question,
-        bytes32 indexed content_hash,
-        address arbitrator, 
-        uint32 timeout,
-        uint32 opening_ts,
-        uint256 nonce,
-        uint256 created
-    );
-
-    event LogMinimumBond(
-        bytes32 indexed question_id,
-        uint256 min_bond
-    );
-
-    event LogFundAnswerBounty(
-        bytes32 indexed question_id,
-        uint256 bounty_added,
-        uint256 bounty,
-        address indexed user 
-    );
-
-    event LogNewAnswer(
-        bytes32 answer,
-        bytes32 indexed question_id,
-        bytes32 history_hash,
-        address indexed user,
-        uint256 bond,
-        uint256 ts,
-        bool is_commitment
-    );
-
-    event LogAnswerReveal(
-        bytes32 indexed question_id, 
-        address indexed user, 
-        bytes32 indexed answer_hash, 
-        bytes32 answer, 
-        uint256 nonce, 
-        uint256 bond
-    );
-
-    event LogNotifyOfArbitrationRequest(
-        bytes32 indexed question_id,
-        address indexed user 
-    );
-
-    event LogCancelArbitration(
-        bytes32 indexed question_id
-    );
-
-    event LogFinalize(
-        bytes32 indexed question_id,
-        bytes32 indexed answer
-    );
-
-    event LogClaim(
-        bytes32 indexed question_id,
-        address indexed user,
-        uint256 amount
-    );
-
-    event LogReopenQuestion(
-        bytes32 indexed question_id,
-        bytes32 indexed reopened_question_id
-    );
-
     struct Question {
         bytes32 content_hash;
         address arbitrator;

package/development/contracts/RealityETH_ERC20-3.0.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.6;
+pragma solidity ^0.8.10;
 
-import './BalanceHolderERC20.sol';
+import './BalanceHolder_ERC20.sol';
 
-contract RealityETH_ERC20_v3_0 is BalanceHolder {
+contract RealityETH_ERC20_v3_0 is BalanceHolder_ERC20 {
 
     address constant NULL_ADDRESS = address(0);