Merge branch 'dev' into feat(web)/dashboard-pixelart

Author: kemuru

contracts/README.md

@@ -66,19 +66,19 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 #### Arbitrum Goerli
 
 - [PNK](https://goerli.arbiscan.io/token/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
-- [ArbitrableExample](https://goerli.arbiscan.io/address/0x5d96ede4D4Dd4c245d6879A4D790fF0AB1F476cC)
+- [ArbitrableExample](https://goerli.arbiscan.io/address/0x437cbF6F0A62238b392715aC55bdC5abdA148eD8)
 - [BlockHashRNG](https://goerli.arbiscan.io/address/0xCea37c9A838831F6B4eE3BffbDC21b945113AD0C)
 - [DAI](https://goerli.arbiscan.io/address/0xB755843e26F2cD1c6A46659cEBb67CcFAE0f2EeE)
 - [DAIFaucet](https://goerli.arbiscan.io/address/0xCEBF1e0A5921767dd97b999ed14801A3770afAfd)
-- [DisputeKitClassic: proxy](https://goerli.arbiscan.io/address/0x6394A70cADD1376FdE5C38bA331761256DDd03E2), [implementation](https://goerli.arbiscan.io/address/0x9755b94c2c8AB04dDc7d102A6F8c974f538481fb)
-- [DisputeResolver](https://goerli.arbiscan.io/address/0xE4af4D800Ce12149199FA6f8870cD650cD8f3164)
-- [DisputeTemplateRegistry: proxy](https://goerli.arbiscan.io/address/0xBf5AF2c2938B3EE689d9A4f5324F144d9a617a2A), [implementation](https://goerli.arbiscan.io/address/0x93bf43132b6805E215d3c8305232ec3A174Ef146)
-- [KlerosCore: proxy](https://goerli.arbiscan.io/address/0x813DCc76dbA91DD9f6bDD038aea0877FC95656bE), [implementation](https://goerli.arbiscan.io/address/0xEE08d6427F4f23E602C4114B8F2B7f6d6D3F4206)
+- [DisputeKitClassic: proxy](https://goerli.arbiscan.io/address/0xc9aF9335327cAe0Cd45EC96ad9bDcD4304772729), [implementation](https://goerli.arbiscan.io/address/0x2757458b91faaB4240A6eAE72185C8185683a642)
+- [DisputeResolver](https://goerli.arbiscan.io/address/0x20433D10d3865e19af45956ed5bFe30c56536431)
+- [DisputeTemplateRegistry: proxy](https://goerli.arbiscan.io/address/0x8d17Ed667512412D9c194d178699f68159f250A2), [implementation](https://goerli.arbiscan.io/address/0x2F4c6c23C516A9247a413186cDcA693E1C078A1D)
+- [KlerosCore: proxy](https://goerli.arbiscan.io/address/0x544afd5A8AbC40ba5d38BbA8d47f30502896b050), [implementation](https://goerli.arbiscan.io/address/0x241C37152D43f60a0142bCbb2D765e908dd03D9D)
 - [PNKFaucet](https://goerli.arbiscan.io/address/0x05648Ee14941630a649082e0dA5cb80D29cC9002)
 - [PinakionV2](https://goerli.arbiscan.io/address/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
-- [PolicyRegistry: proxy](https://goerli.arbiscan.io/address/0x0d7EeA661C1f9cB1AD389c9Df90B3beDE86a1529), [implementation](https://goerli.arbiscan.io/address/0xF9128Ae440A9d4BABc6B66f9385C5Ba6ADf11D89)
-- [RandomizerRNG: proxy](https://goerli.arbiscan.io/address/0xF67D956988cb11449db7aeA80E6339b95b160593), [implementation](https://goerli.arbiscan.io/address/0xc1C85d303B4995Cb543C2b449C1b3dF490d49ebE)
-- [SortitionModule: proxy](https://goerli.arbiscan.io/address/0xA7e5D4C3E6C593cF6A367C3A415BB8E4A065E62E), [implementation](https://goerli.arbiscan.io/address/0xA472Dfb104696E5CE82E46148c33Cd5FeE2C3b7d)
+- [PolicyRegistry: proxy](https://goerli.arbiscan.io/address/0x37FFaF5506BB16327B4a32191Bb39d739fCE55a3), [implementation](https://goerli.arbiscan.io/address/0x3ab4C2906E3Cbc44C3e282affDb66272BCae6482)
+- [RandomizerRNG: proxy](https://goerli.arbiscan.io/address/0x105C019c2724F08BFA41Ff0D0bD77030E1DEA177), [implementation](https://goerli.arbiscan.io/address/0xc90d73C64997699d835a1122D47d4A231965740C)
+- [SortitionModule: proxy](https://goerli.arbiscan.io/address/0x5c9E4e7e85157DFD16D400dd358C541b65DaA83f), [implementation](https://goerli.arbiscan.io/address/0xec7C6C1b2FC93bBeF0fA4e301165144702c126F9)
 - [WETH](https://goerli.arbiscan.io/address/0xbB5839497dE7e6d4ddaFde093F69abA9be782E07)
 - [WETHFaucet](https://goerli.arbiscan.io/address/0xD2d862B060986b25996aaeDB54813002AB791013)
 

contracts/deployments/arbitrumGoerliDevnet/ArbitrableExample.json

@@ -222,7 +222,7 @@ contract KlerosCore is IArbitratorV2, UUPSProxiable, Initializable {
         uint256[4] memory _timesPerPeriod,
         bytes memory _sortitionExtraData,
         ISortitionModule _sortitionModuleAddress
-    ) external initializer {
+    ) external reinitializer(1) {
         governor = _governor;
         pinakion = _pinakion;
         jurorProsecutionModule = _jurorProsecutionModule;

contracts/deployments/arbitrumGoerliDevnet/DisputeKitClassic.json

@@ -307,8 +307,7 @@ contract DisputeKitClassic is IDisputeKit, IEvidence, Initializable, UUPSProxiab
         for (uint256 i = 0; i < _voteIDs.length; i++) {
             require(round.votes[_voteIDs[i]].account == msg.sender, "The caller has to own the vote.");
             require(
-                !hiddenVotes ||
-                    round.votes[_voteIDs[i]].commit == keccak256(abi.encodePacked(_choice, _justification, _salt)),
+                !hiddenVotes || round.votes[_voteIDs[i]].commit == keccak256(abi.encodePacked(_choice, _salt)),
                 "The commit must match the choice in courts with hidden votes."
             );
             require(!round.votes[_voteIDs[i]].voted, "Vote already cast.");

contracts/deployments/arbitrumGoerliDevnet/DisputeKitClassic_Implementation.json

@@ -325,8 +325,7 @@ contract DisputeKitSybilResistant is IDisputeKit, IEvidence, Initializable, UUPS
         for (uint256 i = 0; i < _voteIDs.length; i++) {
             require(round.votes[_voteIDs[i]].account == msg.sender, "The caller has to own the vote.");
             require(
-                !hiddenVotes ||
-                    round.votes[_voteIDs[i]].commit == keccak256(abi.encodePacked(_choice, _justification, _salt)),
+                !hiddenVotes || round.votes[_voteIDs[i]].commit == keccak256(abi.encodePacked(_choice, _salt)),
                 "The commit must match the choice in courts with hidden votes."
             );
             require(!round.votes[_voteIDs[i]].voted, "Vote already cast.");

contracts/deployments/arbitrumGoerliDevnet/DisputeKitClassic_Proxy.json

@@ -6,9 +6,9 @@ dataSources:
     name: DisputeTemplateRegistry
     network: arbitrum-goerli
     source:
-      address: "0x22A58a17F12A718d18C9B6Acca3E311Da1b00A04"
+      address: "0x8d17Ed667512412D9c194d178699f68159f250A2"
       abi: DisputeTemplateRegistry
-      startBlock: 33436741
+      startBlock: 48887136
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6

contracts/deployments/arbitrumGoerliDevnet/DisputeResolver.json

@@ -6,9 +6,9 @@ dataSources:
     name: KlerosCore
     network: arbitrum-goerli
     source:
-      address: "0x813DCc76dbA91DD9f6bDD038aea0877FC95656bE"
+      address: "0x544afd5A8AbC40ba5d38BbA8d47f30502896b050"
       abi: KlerosCore
-      startBlock: 43823780
+      startBlock: 48886815
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6
@@ -61,9 +61,9 @@ dataSources:
     name: PolicyRegistry
     network: arbitrum-goerli
     source:
-      address: "0x0d7EeA661C1f9cB1AD389c9Df90B3beDE86a1529"
+      address: "0x37FFaF5506BB16327B4a32191Bb39d739fCE55a3"
       abi: PolicyRegistry
-      startBlock: 43823685
+      startBlock: 48886711
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6
@@ -81,9 +81,9 @@ dataSources:
     name: DisputeKitClassic
     network: arbitrum-goerli
     source:
-      address: "0x6394A70cADD1376FdE5C38bA331761256DDd03E2"
+      address: "0xc9aF9335327cAe0Cd45EC96ad9bDcD4304772729"
       abi: DisputeKitClassic
-      startBlock: 43823737
+      startBlock: 48886762
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6