Merge branch 'dev'

Author: jaybuidl

contracts/hardhat.config.ts

@@ -18,6 +18,7 @@ require("./scripts/populateCourts");
 require("./scripts/changeGovernor");
 require("./scripts/getDisputeTemplate");
 require("./scripts/compareStorageLayout");
+require("./scripts/storage-layout");
 
 dotenv.config();
 

contracts/scripts/changeGovernor.ts

@@ -41,6 +41,8 @@ task("change-governor", "Changes the governor for all the contracts")
       chainlinkRng,
       randomizerRng,
       snapshotProxy,
+      sortition,
+      evidence,
     } = await getContracts(hre, coreType);
 
     const updateGovernor = async (contractName: string, contractInstance: any) => {
@@ -60,16 +62,14 @@ task("change-governor", "Changes the governor for all the contracts")
       }
     };
 
-    // TODO: upgrade and add changeGovernor!
-    // await updateGovernor("SortitionModule", sortition)
-    // await updateGovernor("EvidenceModule", evidence)
-
     await updateGovernor("KlerosCore", core);
     await updateGovernor("DisputeKitClassic", disputeKitClassic);
     await updateGovernor("DisputeResolver", disputeResolver);
     await updateGovernor("DisputeTemplateRegistry", disputeTemplateRegistry);
     await updateGovernor("PolicyRegistry", policyRegistry);
     await updateGovernor("KlerosCoreSnapshotProxy", snapshotProxy);
+    await updateGovernor("SortitionModule", sortition);
+    await updateGovernor("EvidenceModule", evidence);
     if (chainlinkRng) await updateGovernor("ChainlinkRNG", chainlinkRng);
     if (randomizerRng) await updateGovernor("RandomizerRNG", randomizerRng);
 

contracts/scripts/storage-layout.ts

@@ -0,0 +1,15 @@
+import { task } from "hardhat/config";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+
+task("storage-layout", "Prints the storage layout of a contract").setAction(
+  async ({}, hre: HardhatRuntimeEnvironment) => {
+    await hre.run("compile");
+    const buildInfo = await hre.artifacts.getBuildInfo(
+      `src/arbitration/dispute-kits/DisputeKitClassic.sol:DisputeKitClassic`
+    );
+    console.log(
+      buildInfo.output.contracts["src/arbitration/dispute-kits/DisputeKitClassic.sol"]["DisputeKitClassic"]
+        .storageLayout
+    );
+  }
+);

web/src/pages/Resolver/Landing/index.tsx

@@ -86,7 +86,10 @@ const Landing: React.FC = () => {
     if (isUndefined(populatedDispute) || isUndefined(roundData) || isInvalidDispute) return;
 
     const answers = populatedDispute.answers.reduce<Answer[]>((acc, val) => {
-      acc.push({ ...val, id: parseInt(val.id, 16).toString() });
+      const id = parseInt(val.id, 16);
+      // don't duplicate RFA option
+      if (id === 0) return acc;
+      acc.push({ ...val, id: id.toString() });
       return acc;
     }, []);