@reality.eth/contracts 4.0.0-rc.2 → 4.0.0-rc.3

package/development/contracts/RealityETHFreezable_ERC20.sol

@@ -3,6 +3,7 @@
 pragma solidity ^0.8.20;
 
 import {RealityETH_ERC20_v4_0} from "./RealityETH_ERC20-4.0.sol";
+import {IRealityETHFreezable} from "./IRealityETHFreezable.sol";
 
 /*
  * This version of reality.eth provides the ability to freeze the entire contract.
@@ -12,14 +13,11 @@ import {RealityETH_ERC20_v4_0} from "./RealityETH_ERC20-4.0.sol";
 
 // solhint-disable-next-line contract-name-camelcase
 abstract contract RealityETHFreezable_ERC20 is RealityETH_ERC20_v4_0 {
-    /// @notice msg.sender must be arbitrator
-    error ContractIsFrozen();
-
     // The timestamp when the contract was frozen.
-    uint32 public freeze_ts;
+    uint32 public freezeTs;
 
     modifier notFrozen() override {
-        if (freeze_ts > 0) revert ContractIsFrozen();
+        if (freezeTs > 0) revert ContractIsFrozen();
         _;
     }
 
@@ -28,7 +26,7 @@ abstract contract RealityETHFreezable_ERC20 is RealityETH_ERC20_v4_0 {
     /// @return Return true if finalized
     function isFinalized(bytes32 question_id) public view override returns (bool) {
         // Nothing that finalizes after the freeze is finalized.
-        if (freeze_ts > 0 && questions[question_id].finalize_ts >= freeze_ts) {
+        if (freezeTs > 0 && questions[question_id].finalize_ts >= freezeTs) {
             return false;
         }
 

package/development/contracts/RealityETHReopenable-4.0.sol

@@ -6,12 +6,12 @@ import {IRealityETHReopenable} from "./IRealityETHReopenable.sol";
 import {RealityETH_v4_0} from "./RealityETH-4.0.sol";
 
 /*
- * This version of reality.eth provides the ability to answer a question as "answered too soon", allowing it to be reopened.
- * This is useful when you want to ask a question but you don't know when the answer will be available.
- * You can set the settlement time at the earliest date it may be available, then if someone answers it too soon, it can be answered at such then later reopened.
- * NB In v3 of reality.eth this feature was built in and there was no way to turn it off.
- * From v4, we ship two versions: RealityETH without it, and RealityETHReopenable with it.
- */
+* This version of reality.eth provides the ability to answer a question as "answered too soon", allowing it to be reopened.
+* This is useful when you want to ask a question but you don't know when the answer will be available.
+* You can set the settlement time at the earliest date it may be available, then if someone answers it too soon, it can be answered at such then later reopened.
+* NB In v3 of reality.eth this feature was built in and there was no way to turn it off. 
+* From v4, we ship two versions: RealityETH without it, and RealityETHReopenable with it.
+*/
 
 // solhint-disable-next-line contract-name-camelcase
 contract RealityETHReopenable_v4_0 is IRealityETHReopenable, RealityETH_v4_0 {

package/development/contracts/RealityETHReopenable_ERC20-4.0.sol

@@ -6,12 +6,12 @@ import {IRealityETHReopenable_ERC20} from "./IRealityETHReopenable_ERC20.sol";
 import {RealityETH_ERC20_v4_0} from "./RealityETH_ERC20-4.0.sol";
 
 /*
- * This version of reality.eth provides the ability to answer a question as "answered too soon", allowing it to be reopened.
- * This is useful when you want to ask a question but you don't know when the answer will be available.
- * You can set the settlement time at the earliest date it may be available, then if someone answers it too soon, it can be answered at such then later reopened.
- * NB In v3 of reality.eth this feature was built in and there was no way to turn it off.
- * From v4, we ship two versions: RealityETH_ERC20 without it, and RealityETHReopenable_ERC20 with it.
- */
+* This version of reality.eth provides the ability to answer a question as "answered too soon", allowing it to be reopened.
+* This is useful when you want to ask a question but you don't know when the answer will be available.
+* You can set the settlement time at the earliest date it may be available, then if someone answers it too soon, it can be answered at such then later reopened.
+* NB In v3 of reality.eth this feature was built in and there was no way to turn it off.
+* From v4, we ship two versions: RealityETH_ERC20 without it, and RealityETHReopenable_ERC20 with it.
+*/
 
 // solhint-disable-next-line contract-name-camelcase
 contract RealityETHReopenable_v4_0 is IRealityETHReopenable_ERC20, RealityETH_ERC20_v4_0 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reality.eth/contracts",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.3",
   "description": "Collection of smart contracts for the Realitio fact verification platform",
   "scripts": {
     "generate-chains": "node scripts/generate_chains_json.js",

package/tests/python/test.py

@@ -2770,11 +2770,11 @@ class TestRealitio(TestCase):
         st = self.submitAnswerReturnUpdatedState( st, question_id, 1001, 0, 200, k3)
         st = self.submitAnswerReturnUpdatedState( st, question_id, 1001, 200, 400, k3)
 
-        freeze_ts = self.rc0.functions.freeze_ts().call()
-        self.assertTrue(freeze_ts == 0, "Freeze timestamp should be zero before freeze")
+        freezeTs = self.rc0.functions.freezeTs().call()
+        self.assertTrue(freezeTs == 0, "Freeze timestamp should be zero before freeze")
         self.rc0.functions.setFreezeTimestamp(self._block_timestamp()).transact(self._txargs())
-        freeze_ts = self.rc0.functions.freeze_ts().call()
-        self.assertTrue(freeze_ts > 0, "Freeze timestamp should be not zero after freeze")
+        freezeTs = self.rc0.functions.freezeTs().call()
+        self.assertTrue(freezeTs > 0, "Freeze timestamp should be not zero after freeze")
 
         # You can no longer answer a question
         with self.assertRaises(TransactionFailed):

package/abi/solc-0.8.20/Arbitrator.abi.json

@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"TheArbitratorMustHaveSetANonZeroFeeForTheQuestion","type":"error"},{"inputs":[],"name":"TheQuestionMustNotHaveBeenFinalized","type":"error"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"question_id","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"fee_paid","type":"uint256"},{"indexed":false,"internalType":"address","name":"requester","type":"address"},{"indexed":false,"internalType":"uint256","name":"remaining","type":"uint256"}],"name":"LogRequestArbitration","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"question_id","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"fee","type":"uint256"}],"name":"LogSetCustomDisputeFee","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"fee","type":"uint256"}],"name":"LogSetDisputeFee","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"fee","type":"uint256"}],"name":"LogSetQuestionFee","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"realitio","type":"address"}],"name":"LogSetRealitio","type":"event"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"arbitration_bounties","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"question_id","type":"bytes32"},{"internalType":"bytes32","name":"answer","type":"bytes32"},{"internalType":"address","name":"payee_if_wrong","type":"address"},{"internalType":"bytes32","name":"last_history_hash","type":"bytes32"},{"internalType":"bytes32","name":"last_answer_or_commitment_id","type":"bytes32"},{"internalType":"address","name":"last_answerer","type":"address"}],"name":"assignWinnerAndSubmitAnswerByArbitrator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"callWithdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"question_id","type":"bytes32"}],"name":"cancelArbitration","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"question_id","type":"bytes32"}],"name":"getDisputeFee","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"metadata","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"realitio","outputs":[{"internalType":"contract IRealityETH","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"realitycheck","outputs":[{"internalType":"contract IRealityETH","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"question_id","type":"bytes32"},{"internalType":"uint256","name":"max_previous","type":"uint256"}],"name":"requestArbitration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"question_id","type":"bytes32"},{"internalType":"uint256","name":"fee","type":"uint256"}],"name":"setCustomDisputeFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"fee","type":"uint256"}],"name":"setDisputeFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"_metadata","type":"string"}],"name":"setMetaData","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"fee","type":"uint256"}],"name":"setQuestionFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"addr","type":"address"}],"name":"setRealitio","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"question_id","type":"bytes32"},{"internalType":"bytes32","name":"answer","type":"bytes32"},{"internalType":"address","name":"answerer","type":"address"}],"name":"submitAnswerByArbitrator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"addr","type":"address"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"contract IERC20","name":"_token","type":"address"},{"internalType":"address","name":"addr","type":"address"}],"name":"withdrawERC20","outputs":[],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}]