@reality.eth/contracts 3.0.48 → 4.0.0-rc.1

package/development/contracts/IRealityETHCore_ERC20.sol

@@ -2,59 +2,13 @@
 
 pragma solidity 0.8.20;
 
-import {IBalanceHolder_ERC20} from "./IBalanceHolder_ERC20.sol";
-import {IERC20} from "./IERC20.sol";
 import {IRealityETHErrors_ERC20} from "./IRealityETHErrors_ERC20.sol";
+import {IERC20} from "./IERC20.sol";
 
 /* solhint-disable func-name-mixedcase */
 
 // solhint-disable-next-line contract-name-camelcase
-interface IRealityETHCore_ERC20 is IBalanceHolder_ERC20, IRealityETHErrors_ERC20 {
-    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);
-
-    struct Question {
-        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;
-    }
-
-    // Only used when claiming more bonds than fits into a transaction
-    // Stored in a mapping indexed by question_id.
-    struct Claim {
-        address payee;
-        uint256 last_bond;
-        uint256 queued_funds; // Only used on v3 or lower (related to commit-reveal)
-    }
-
+interface IRealityETHCore_ERC20 is IRealityETHErrors_ERC20 {
     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(
@@ -67,83 +21,8 @@ interface IRealityETHCore_ERC20 is IBalanceHolder_ERC20, IRealityETHErrors_ERC20
         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(IERC20 _token) external;
-    function submitAnswerByArbitrator(bytes32 question_id, bytes32 answer, address answerer) 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 arbitrator_question_fees(address) external view returns (uint256);
-    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);
+    function token() external view returns (IERC20);
 }

package/development/contracts/IRealityETHCore_Native.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+/* solhint-disable func-name-mixedcase */
+interface IRealityETHCore_Native {
+    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 fundAnswerBounty(bytes32 question_id) external payable;
+    function submitAnswer(bytes32 question_id, bytes32 answer, uint256 max_previous) external payable;
+    function submitAnswerFor(bytes32 question_id, bytes32 answer, uint256 max_previous, address answerer) external payable;
+}

package/development/contracts/IRealityETHCreateTemplateAndAskQuestion.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+// This function was removed from reality.eth in version 4.
+interface IRealityETHCreateTemplateAndAskQuestion {
+    function createTemplateAndAskQuestion(string calldata content, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external payable returns (bytes32);
+}

package/development/contracts/IRealityETHHistoryVerification.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+// These functions were removed added to reality.eth in version 4.
+interface IRealityETHHistoryVerification {
+    function isHistoryOfUnfinalizedQuestionValid(bytes32 question_id, bytes32[] memory history_hashes, address[] memory addrs, uint256[] memory bonds, bytes32[] memory answers) external view returns (bool);
+}

package/development/contracts/IRealityETHReopenable.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+// These functions were removed from IRealityETH in version 4.
+interface IRealityETHReopenable {
+    event LogReopenQuestion(bytes32 indexed question_id, bytes32 indexed reopened_question_id);
+    function isSettledTooSoon(bytes32 question_id) external view returns (bool);
+    function resultForOnceSettled(bytes32 question_id) external view returns (bytes32);
+    function reopened_questions(bytes32) external view returns (bytes32);
+    function reopener_questions(bytes32) external view returns (bool);
+    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);
+}

package/development/contracts/IRealityETHReopenable_ERC20.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+// These functions were removed from IRealityETH in version 4.
+interface IRealityETHReopenable_ERC20 {
+    event LogReopenQuestion(bytes32 indexed question_id, bytes32 indexed reopened_question_id);
+    function isSettledTooSoon(bytes32 question_id) external view returns (bool);
+    function resultForOnceSettled(bytes32 question_id) external view returns (bytes32);
+    function reopened_questions(bytes32) external view returns (bytes32);
+    function reopener_questions(bytes32) external view returns (bool);
+    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);
+}

package/development/contracts/IRealityETH_ERC20.sol

@@ -2,9 +2,13 @@
 
 pragma solidity 0.8.20;
 
+// Features removed in v4
+import {IERC20} from "./IERC20.sol";
+import {IRealityETHCore_Common} from "./IRealityETHCore_Common.sol";
 import {IRealityETHCore_ERC20} from "./IRealityETHCore_ERC20.sol";
 import {IRealityETHCommitReveal_ERC20} from "./IRealityETHCommitReveal_ERC20.sol";
+import {IRealityETHCreateTemplateAndAskQuestion} from "./IRealityETHCreateTemplateAndAskQuestion.sol";
 
 /* solhint-disable func-name-mixedcase */
 
-interface IRealityETH_ERC20 is IRealityETHCore_ERC20, IRealityETHCommitReveal_ERC20 {}
+interface IRealityETH_ERC20 is IRealityETHCore_Common, IRealityETHCore_ERC20, IRealityETHCommitReveal_ERC20, IRealityETHCreateTemplateAndAskQuestion {}