@reality.eth/contracts 3.0.46 → 3.0.47

package/development/contracts/IERC20.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity 0.8.10;
-
+pragma solidity 0.8.20;
 
 /**
  * @title ERC20 interface
@@ -20,11 +19,11 @@ interface IERC20 {
 
     function transferFrom(address from, address to, uint256 value) external returns (bool);
 
-    function decimals() external returns (uint8); 
+    function decimals() external returns (uint8);
 
-    function name() external returns (string memory); 
+    function name() external returns (string memory);
 
-    function symbol() external returns (string memory); 
+    function symbol() external returns (string memory);
 
     event Transfer(address indexed from, address indexed to, uint256 value);
 

package/development/contracts/IOwned.sol

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

package/development/contracts/IRealityETH.sol

@@ -1,63 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity 0.8.10;
+pragma solidity 0.8.20;
 
-import './IBalanceHolder.sol';
+import {IRealityETHCore} from "./IRealityETHCore.sol";
+import {IRealityETHCommitReveal} from "./IRealityETHCommitReveal.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);
+/* solhint-disable func-name-mixedcase */
 
-     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);
-}
+interface IRealityETH is IRealityETHCore, IRealityETHCommitReveal {}

package/development/contracts/IRealityETHCommitReveal.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+// These functions were removed from IRealityETH in version 4.
+interface IRealityETHCommitReveal {
+    // Stored in a mapping indexed by commitment_id, a hash of commitment hash, question, bond.
+    struct Commitment {
+        uint32 reveal_ts;
+        bool is_revealed;
+        bytes32 revealed_answer;
+    }
+    event LogAnswerReveal(bytes32 indexed question_id, address indexed user, bytes32 indexed answer_hash, bytes32 answer, uint256 nonce, uint256 bond);
+    function commitments(bytes32) external view returns (uint32 reveal_ts, bool is_revealed, bytes32 revealed_answer);
+    function submitAnswerCommitment(bytes32 question_id, bytes32 answer_hash, uint256 max_previous, address _answerer) external payable;
+    function submitAnswerReveal(bytes32 question_id, bytes32 answer, uint256 nonce, uint256 bond) external;
+}

package/development/contracts/IRealityETHCommitReveal_ERC20.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+interface IRealityETHCommitReveal_ERC20 {
+    // Stored in a mapping indexed by commitment_id, a hash of commitment hash, question, bond.
+    struct Commitment {
+        uint32 reveal_ts;
+        bool is_revealed;
+        bytes32 revealed_answer;
+    }
+    event LogAnswerReveal(bytes32 indexed question_id, address indexed user, bytes32 indexed answer_hash, bytes32 answer, uint256 nonce, uint256 bond);
+    function commitments(bytes32) external view returns (uint32 reveal_ts, bool is_revealed, bytes32 revealed_answer);
+    function submitAnswerCommitmentERC20(bytes32 question_id, bytes32 answer_hash, uint256 max_previous, address _answerer, uint256 tokens) external;
+    function submitAnswerReveal(bytes32 question_id, bytes32 answer, uint256 nonce, uint256 bond) external;
+}

package/development/contracts/IRealityETHCore.sol

@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+import {IBalanceHolder} from "./IBalanceHolder.sol";
+import {IRealityETHErrors} from "./IRealityETHErrors.sol";
+
+/* solhint-disable func-name-mixedcase */
+
+interface IRealityETHCore is IBalanceHolder, IRealityETHErrors {
+    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)
+    }
+
+    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 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 submitAnswerFor(bytes32 question_id, bytes32 answer, uint256 max_previous, address answerer) external payable;
+    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);
+}

package/development/contracts/IRealityETHCore_ERC20.sol

@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+import {IBalanceHolder_ERC20} from "./IBalanceHolder_ERC20.sol";
+import {IERC20} from "./IERC20.sol";
+import {IRealityETHErrors_ERC20} from "./IRealityETHErrors_ERC20.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)
+    }
+
+    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(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);
+}

package/development/contracts/IRealityETHErrors.sol

@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+interface IRealityETHErrors {
+    /// @notice msg.sender must be arbitrator
+    error MsgSenderMustBeArbitrator();
+    /// @notice question must not exist
+    error QuestionMustNotExist();
+    /// @notice question must exist
+    error QuestionMustExist();
+    /// @notice question must not be pending arbitration
+    error QuestionMustNotBePendingArbitration();
+    /// @notice finalization deadline must not have passed
+    error FinalizationDeadlineMustNotHavePassed();
+    /// @notice opening date must have passed
+    error OpeningDateMustHavePassed();
+    /// @notice question must be pending arbitration
+    error QuestionMustBePendingArbitration();
+    /// @notice finalization dealine must not have passed
+    error FinalizationDealineMustNotHavePassed();
+    /// @notice question must be finalized
+    error QuestionMustBeFinalized();
+    /// @notice bond must be positive
+    error BondMustBePositive();
+    /// @notice bond must exceed the minimum
+    error BondMustExceedTheMinimum();
+    /// @notice bond must be double at least previous bond
+    error BondMustBeDoubleAtLeastPreviousBond();
+    /// @notice bond must exceed max_previous
+    error BondMustExceedMax_Previous();
+    /// @notice template must exist
+    error TemplateMustExist();
+    /// @notice timeout must be positive
+    error TimeoutMustBePositive();
+    /// @notice timeout must be less than 365 days
+    error TimeoutMustBeLessThan365Days();
+    /// @notice Tokens provided must cover question fee
+    error TokensProvidedMustCoverQuestionFee();
+    /// @notice answerer must be non-zero
+    error AnswererMustBeNonZero();
+    /// @notice commitment must not already exist
+    error CommitmentMustNotAlreadyExist();
+    /// @notice commitment must not have been revealed yet
+    error CommitmentMustNotHaveBeenRevealedYet();
+    /// @notice reveal deadline must not have passed
+    error RevealDeadlineMustNotHavePassed();
+    /// @notice Question must already have an answer when arbitration is requested
+    error QuestionMustAlreadyHaveAnAnswerWhenArbitrationIsRequested();
+    /// @notice answerer must be provided
+    error AnswererMustBeProvided();
+    /// @notice You must wait for the reveal deadline before finalizing
+    error YouMustWaitForTheRevealDeadlineBeforeFinalizing();
+    /// @notice Question was settled too soon and has not been reopened
+    error QuestionWasSettledTooSoonAndHasNotBeenReopened();
+    /// @notice Question replacement was settled too soon and has not been reopened
+    error QuestionReplacementWasSettledTooSoonAndHasNotBeenReopened();
+    /// @notice You can only reopen questions that resolved as settled too soon
+    error YouCanOnlyReopenQuestionsThatResolvedAsSettledTooSoon();
+    /// @notice content hash mismatch
+    error ContentHashMismatch();
+    /// @notice arbitrator mismatch
+    error ArbitratorMismatch();
+    /// @notice timeout mismatch
+    error TimeoutMismatch();
+    /// @notice opening_ts mismatch
+    error Opening_TsMismatch();
+    /// @notice min_bond mismatch
+    error Min_BondMismatch();
+    /// @notice Question is already reopening a previous question
+    error QuestionIsAlreadyReopeningAPreviousQuestion();
+    /// @notice Question has already been reopened
+    error QuestionHasAlreadyBeenReopened();
+    /// @notice content hash must match
+    error ContentHashMustMatch();
+    /// @notice arbitrator must match
+    error ArbitratorMustMatch();
+    /// @notice timeout must be long enough
+    error TimeoutMustBeLongEnough();
+    /// @notice bond must be high enough
+    error BondMustBeHighEnough();
+    /// @notice at least one history hash entry must be provided
+    error AtLeastOneHistoryHashEntryMustBeProvided();
+    /// @notice History input provided did not match the expected hash
+    error HistoryInputProvidedDidNotMatchTheExpectedHash();
+}

package/development/contracts/IRealityETHErrors_ERC20.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+import {IRealityETHErrors} from "./IRealityETHErrors.sol";
+
+// solhint-disable-next-line contract-name-camelcase
+interface IRealityETHErrors_ERC20 is IRealityETHErrors {
+    /// @notice Token can only be initialized once
+    error TokenCanOnlyBeInitializedOnce();
+    /// @notice Transfer of tokens failed, insufficient approved balance?
+    error TransferOfTokensFailedInsufficientApprovedBalance();
+}

package/development/contracts/IRealityETH_ERC20.sol

@@ -1,67 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity 0.8.10;
+pragma solidity 0.8.20;
 
-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);
-}
+import {IRealityETHCore_ERC20} from "./IRealityETHCore_ERC20.sol";
+import {IRealityETHCommitReveal_ERC20} from "./IRealityETHCommitReveal_ERC20.sol";
 
+/* solhint-disable func-name-mixedcase */
 
+interface IRealityETH_ERC20 is IRealityETHCore_ERC20, IRealityETHCommitReveal_ERC20 {}

package/development/contracts/Owned.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.20;
 
-import './IOwned.sol';
+import "./IOwned.sol";
 
 contract Owned is IOwned {
     address public owner;
@@ -11,14 +11,12 @@ contract Owned is IOwned {
         owner = msg.sender;
     }
 
-    modifier onlyOwner {
+    modifier onlyOwner() {
         require(msg.sender == owner);
         _;
     }
 
-    function transferOwnership(address newOwner) 
-        onlyOwner 
-    external {
+    function transferOwnership(address newOwner) external onlyOwner {
         owner = newOwner;
     }
 }