Merge branch 'dev' into feat/add-stats-court-page

Author: kemuru

contracts/README.md

@@ -11,7 +11,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 #### Arbitrum One
 
 - [DisputeKitClassicNeo: proxy](https://arbiscan.io/address/0xb7c292cD9Fd3d20De84a71AE1caF054eEB6374A9), [implementation](https://arbiscan.io/address/0x86Ac67e5550F837a650B4B0Cd4778D4293a2bDe3)
-- [DisputeResolverNeo](https://arbiscan.io/address/0xE4066AE16685F66e30fb22e932B67E49220095c0)
+- [DisputeResolverNeo](https://arbiscan.io/address/0x3645F9e08D80E47c82aD9E33fCB4EA703822C831)
 - [DisputeTemplateRegistry: proxy](https://arbiscan.io/address/0x52c9f5634361eD3641016e5d9783310f9EFf9e25), [implementation](https://arbiscan.io/address/0x4Ce87329d40f15509D5F9bF4D9Ce1A081A80CeFb)
 - [EvidenceModule: proxy](https://arbiscan.io/address/0xe62B776498F48061ef9425fCEf30F3d1370DB005), [implementation](https://arbiscan.io/address/0x827411b3e98bAe8c441efBf26842A1670f8f378F)
 - [KlerosCoreNeo: proxy](https://arbiscan.io/address/0xCd415C03dfa85B02646C7e2977F22a480c4354F1), [implementation](https://arbiscan.io/address/0x4DD8B69958eF1D7d5dA9347E9d9F57ADFC3dc284)
@@ -73,10 +73,10 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 - [DisputeKitClassic: proxy](https://sepolia.arbiscan.io/address/0x9426F127116C3652A262AE1eA48391AC8F44D35b), [implementation](https://sepolia.arbiscan.io/address/0x692CC78F2570181FFB99297965FeAA8352ab12E8)
 - [DisputeKitClassicNeo: proxy](https://sepolia.arbiscan.io/address/0xd40aA608801a639E292e10C235B90488D04070b1), [implementation](https://sepolia.arbiscan.io/address/0xE636AB278fBfc8712E807c589A362dc2396d2d2F)
 - [DisputeKitClassicUniversity: proxy](https://sepolia.arbiscan.io/address/0xDaE66157D72Baa099cd63a833c353776206feea4), [implementation](https://sepolia.arbiscan.io/address/0xf36fa321Bb64b6E39f5DA3dbb053ccE63D077f8B)
-- [DisputeResolver](https://sepolia.arbiscan.io/address/0xAE92948F5534A6ABCC7ea16a5Cd1984cD305Aa6E)
-- [DisputeResolverNeo](https://sepolia.arbiscan.io/address/0x42776e45977C6C4e172e564102Ab01540555b368)
-- [DisputeResolverRuler](https://sepolia.arbiscan.io/address/0x2F34E49853EaDB3253C9453aBeE37d3fbA395F6B)
-- [DisputeResolverUniversity](https://sepolia.arbiscan.io/address/0x9e8F92708705D3571F29589E441bF52c9e5f8811)
+- [DisputeResolver](https://sepolia.arbiscan.io/address/0xCE3d5F83d9da70d60ab9cee8b644a18EF3671E61)
+- [DisputeResolverNeo](https://sepolia.arbiscan.io/address/0xB73B124f2939959676509c37Ab6a41C8Ab4aDA1C)
+- [DisputeResolverRuler](https://sepolia.arbiscan.io/address/0x199893232ECC74cC7898B24b5Ff58d613029f6B7)
+- [DisputeResolverUniversity](https://sepolia.arbiscan.io/address/0x88d793dA6e88Ebd58136A1e1483cc4cf0D915ca4)
 - [DisputeTemplateRegistry: proxy](https://sepolia.arbiscan.io/address/0x596D3B09E684D62217682216e9b7a0De75933391), [implementation](https://sepolia.arbiscan.io/address/0xE00A43d3c3321A0e210F2F8bE2F3F75eC8a4951E)
 - [EvidenceModule: proxy](https://sepolia.arbiscan.io/address/0x57fd453FB0d16f8ca174E7386102D7170E17Be09), [implementation](https://sepolia.arbiscan.io/address/0x05AD81f245209b7f91885fd96e57c9da90554824)
 - [KlerosCore: proxy](https://sepolia.arbiscan.io/address/0xA54e7A16d7460e38a8F324eF46782FB520d58CE8), [implementation](https://sepolia.arbiscan.io/address/0x91a373BBdE0532F86410682F362e2Cf685e95085)

contracts/deployments/arbitrum/DisputeResolverNeo.json

@@ -134,10 +134,10 @@ contract DisputeResolver is IArbitrableV2 {
         string memory _disputeTemplateDataMappings,
         string memory _disputeTemplateUri,
         uint256 _numberOfRulingOptions
-    ) internal virtual returns (uint256 disputeID) {
+    ) internal virtual returns (uint256 arbitratorDisputeID) {
         require(_numberOfRulingOptions > 1, "Should be at least 2 ruling options.");
 
-        disputeID = arbitrator.createDispute{value: msg.value}(_numberOfRulingOptions, _arbitratorExtraData);
+        arbitratorDisputeID = arbitrator.createDispute{value: msg.value}(_numberOfRulingOptions, _arbitratorExtraData);
         uint256 localDisputeID = disputes.length;
         disputes.push(
             DisputeStruct({
@@ -147,8 +147,8 @@ contract DisputeResolver is IArbitrableV2 {
                 numberOfRulingOptions: _numberOfRulingOptions
             })
         );
-        arbitratorDisputeIDToLocalID[disputeID] = localDisputeID;
+        arbitratorDisputeIDToLocalID[arbitratorDisputeID] = localDisputeID;
         uint256 templateId = templateRegistry.setDisputeTemplate("", _disputeTemplate, _disputeTemplateDataMappings);
-        emit DisputeRequest(arbitrator, localDisputeID, localDisputeID, templateId, _disputeTemplateUri);
+        emit DisputeRequest(arbitrator, arbitratorDisputeID, localDisputeID, templateId, _disputeTemplateUri);
     }
 }

contracts/deployments/arbitrumSepoliaDevnet/DisputeResolver.json

@@ -40,7 +40,7 @@ contract DisputeResolverRuler is DisputeResolver {
         string memory _disputeTemplateDataMappings,
         string memory _disputeTemplateUri,
         uint256 _numberOfRulingOptions
-    ) internal override returns (uint256 disputeID) {
+    ) internal override returns (uint256 arbitratorDisputeID) {
         require(_numberOfRulingOptions > 1, "Should be at least 2 ruling options.");
 
         uint256 localDisputeID = disputes.length;
@@ -49,10 +49,10 @@ contract DisputeResolverRuler is DisputeResolver {
         dispute.numberOfRulingOptions = _numberOfRulingOptions;
 
         // Keep track of the upcoming dispute ID before dispute creation, so rule() can be called immediately after.
-        disputeID = IKlerosCoreRulerFragment(address(arbitrator)).getNextDisputeID();
-        arbitratorDisputeIDToLocalID[disputeID] = localDisputeID;
+        arbitratorDisputeID = IKlerosCoreRulerFragment(address(arbitrator)).getNextDisputeID();
+        arbitratorDisputeIDToLocalID[arbitratorDisputeID] = localDisputeID;
         uint256 templateId = templateRegistry.setDisputeTemplate("", _disputeTemplate, _disputeTemplateDataMappings);
-        emit DisputeRequest(arbitrator, localDisputeID, localDisputeID, templateId, _disputeTemplateUri);
+        emit DisputeRequest(arbitrator, arbitratorDisputeID, localDisputeID, templateId, _disputeTemplateUri);
 
         arbitrator.createDispute{value: msg.value}(_numberOfRulingOptions, _arbitratorExtraData);
     }

contracts/deployments/arbitrumSepoliaDevnet/DisputeResolverNeo.json

@@ -17,14 +17,21 @@ describe("KlerosCoreRuler", async () => {
     automaticPreset, // The ruling is given automatically with a preset value.
   }
 
-  const extraData =
-    "0x" +
-    "0000000000000000000000000000000000000000000000000000000000000001" + // courtId 1
-    "0000000000000000000000000000000000000000000000000000000000000003"; // minJurors 3
+  const courtId = 1;
+  const minJurors = 3;
+  const disputeKitId = 1;
+  const extraData = ethers.utils.defaultAbiCoder.encode(
+    ["uint96", "uint96", "uint256"],
+    [courtId, minJurors, disputeKitId]
+  );
 
   before("Deploying", async () => {
     [deployer, dev, dev2] = await ethers.getSigners();
     [core, resolver] = await deployContracts(deployer);
+
+    // Create dummy disputes to distinguish between arbitrable-level and arbitrator-level disputeIDs
+    await core.changeRulingModeToManual(deployer.address);
+    await core["createDispute(uint256,bytes)"](2, extraData, { value: ethers.utils.parseEther("0.3") });
   });
 
   it("Should have initialized the Arbitrator", async () => {
@@ -75,7 +82,9 @@ describe("KlerosCoreRuler", async () => {
       .to.emit(core, "RulerSettingsChanged")
       .withArgs(resolver.address, [RulingMode.automaticRandom, 0, false, false]);
 
-    const disputeID = 0;
+    const disputeID = 1;
+    const localDisputeID = disputeID - 1;
+    const templateId = disputeID - 1;
 
     await expect(resolver.createDisputeForTemplate(extraData, "", "", 3, { value: ethers.utils.parseEther("0.3") }))
       .to.emit(core, "DisputeCreation")
@@ -87,7 +96,7 @@ describe("KlerosCoreRuler", async () => {
       .and.to.emit(core, "TokenAndETHShift")
       .withArgs(dev.address, disputeID, 0, 1, 0, anyValue, ethers.constants.AddressZero)
       .and.to.emit(resolver, "DisputeRequest")
-      .withArgs(core.address, disputeID, disputeID, disputeID, "")
+      .withArgs(core.address, disputeID, localDisputeID, templateId, "")
       .and.to.emit(resolver, "Ruling")
       .withArgs(core.address, disputeID, anyValue);
   });
@@ -97,7 +106,9 @@ describe("KlerosCoreRuler", async () => {
       .to.emit(core, "RulerSettingsChanged")
       .withArgs(resolver.address, [RulingMode.automaticPreset, 2, true, false]);
 
-    const disputeID = 1;
+    const disputeID = 2;
+    const localDisputeID = disputeID - 1;
+    const templateId = disputeID - 1;
 
     await expect(resolver.createDisputeForTemplate(extraData, "", "", 3, { value: ethers.utils.parseEther("0.3") }))
       .to.emit(core, "DisputeCreation")
@@ -109,7 +120,7 @@ describe("KlerosCoreRuler", async () => {
       .and.to.emit(core, "TokenAndETHShift")
       .withArgs(dev.address, disputeID, 0, 1, 0, anyValue, ethers.constants.AddressZero)
       .and.to.emit(resolver, "DisputeRequest")
-      .withArgs(core.address, disputeID, disputeID, disputeID, "")
+      .withArgs(core.address, disputeID, localDisputeID, templateId, "")
       .and.to.emit(resolver, "Ruling")
       .withArgs(core.address, disputeID, 2);
   });
@@ -119,13 +130,15 @@ describe("KlerosCoreRuler", async () => {
       .to.emit(core, "RulerSettingsChanged")
       .withArgs(resolver.address, [RulingMode.manual, 0, false, false]);
 
-    const disputeID = 2;
+    const disputeID = 3;
+    const localDisputeID = disputeID - 1;
+    const templateId = disputeID - 1;
 
     await expect(resolver.createDisputeForTemplate(extraData, "", "", 3, { value: ethers.utils.parseEther("0.3") }))
       .to.emit(core, "DisputeCreation")
       .withArgs(disputeID, resolver.address)
       .and.to.emit(resolver, "DisputeRequest")
-      .withArgs(core.address, disputeID, disputeID, disputeID, "");
+      .withArgs(core.address, disputeID, localDisputeID, templateId, "");
 
     await expect(core.connect(deployer).executeRuling(disputeID, 3, true, true)).revertedWithCustomError(
       core,

contracts/deployments/arbitrumSepoliaDevnet/DisputeResolverRuler.json

@@ -6,6 +6,7 @@ export REACT_APP_STATUS_URL=https://kleros-v2-devnet.betteruptime.com/badge
 export REACT_APP_GENESIS_BLOCK_ARBSEPOLIA=3084598
 export REACT_APP_DEVTOOLS_URL=https://dev--kleros-v2-neo-devtools.netlify.app
 export REACT_APP_ARBITRATOR_TYPE=neo
+export REACT_APP_ATLAS_URI=http://localhost:3000
 export WALLETCONNECT_PROJECT_ID=
 export ALCHEMY_API_KEY=
 export NODE_OPTIONS='--max-old-space-size=7680'