fix(realitio): use arbitrable and arbitrator chain ids in priority, w…

…hen missing use chainID
kleros · Oct 15, 2021 · d43eded · d43eded
1 parent 8a9c088
commit d43eded
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/src/containers/realitio.js b/src/containers/realitio.js
@@ -15,19 +15,28 @@ class RealitioDisplayInterface extends Component {
     const message = JSON.parse(decodeURIComponent(window.location.search.substring(1)));
     console.debug(message);
 
-    const { arbitrableContractAddress, arbitratorContractAddress, disputeID, chainID, arbitratorJsonRpcUrl, arbitrableJsonRpcUrl, jsonRpcUrl } = message;
+    const {
+      arbitrableContractAddress,
+      arbitratorContractAddress,
+      disputeID,
+      arbitratorChainID,
+      arbitrableChainID,
+      chainID,
+      arbitratorJsonRpcUrl,
+      arbitrableJsonRpcUrl,
+      jsonRpcUrl,
+    } = message;
 
-    const web3 = new Web3(
-      (arbitratorJsonRpcUrl && decodeURIComponent(arbitratorJsonRpcUrl)) ||
-        (arbitrableJsonRpcUrl && decodeURIComponent(arbitrableJsonRpcUrl)) ||
-        (jsonRpcUrl && decodeURIComponent(jsonRpcUrl))
-    );
+    const rpcURL = arbitrableJsonRpcUrl || arbitratorJsonRpcUrl || jsonRpcUrl;
+    const cid = arbitrableChainID || arbitratorChainID || chainID;
 
-    if (!arbitrableContractAddress || !disputeID || !arbitratorContractAddress || (!arbitrableJsonRpcUrl && !arbitrableJsonRpcUrl && !jsonRpcUrl)) {
+    if (!rpcURL || !disputeID || !arbitratorContractAddress || !cid) {
       console.error("Evidence display is missing critical information.");
       return;
     }
 
+    const web3 = new Web3(rpcURL && decodeURIComponent(rpcURL));
+
     const realitioProxyContractInstance = new web3.eth.Contract(RealitioProxyContract.abi, arbitrableContractAddress);
 
     const realitioContractAddress = await realitioProxyContractInstance.methods.realitio().call();
@@ -64,7 +73,7 @@ class RealitioDisplayInterface extends Component {
 
     this.setState({
       questionID,
-      chainID,
+      chainID: cid,
       realitioContractAddress,
       rawQuestion: questionEventLog[0].returnValues.question,
       rawTemplate: templateEventLog[0].returnValues.question_text,