chore: beta contracts upgraded

Author: jaybuidl

contracts/README.md

@@ -12,19 +12,19 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 
 - [BlockHashRNG](https://arbiscan.io/address/0x39D123fc4cFD24EA5bB76195f9ecFE1f0DF35b0B)
 - [ChainlinkRNG](https://arbiscan.io/address/0x897d83a7d5F23555eFA15e1BE297d5503522cbA3)
-- [DisputeKitClassicNeo: proxy](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421), [implementation](https://arbiscan.io/address/0xAF0325dbBFa812a574743Bb5A085266D31e3e03a)
+- [DisputeKitClassicNeo: proxy](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421), [implementation](https://arbiscan.io/address/0x7F3C3C9f9c6238885d958afa1bCc92f1032ef81d)
 - [DisputeResolverNeo](https://arbiscan.io/address/0xb5526D022962A1fFf6eD32C93e8b714c901F4323)
 - [DisputeResolverRulerNeo](https://arbiscan.io/address/0xb3a5FdEAF461c42caCe148e978e6FBCa97bE6140)
 - [DisputeTemplateRegistry: proxy](https://arbiscan.io/address/0x0cFBaCA5C72e7Ca5fFABE768E135654fB3F2a5A2), [implementation](https://arbiscan.io/address/0x57EfD43DAfCeb6C58Df57932b2B299f46fef5c87)
-- [EvidenceModule: proxy](https://arbiscan.io/address/0x48e052B4A6dC4F30e90930F1CeaAFd83b3981EB3), [implementation](https://arbiscan.io/address/0xE22500Fa27f696d06702367246bd17Bd2C8a4c5d)
-- [KlerosCoreNeo: proxy](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea), [implementation](https://arbiscan.io/address/0x17c39AB53A7072b167A74a85D47b30385c98ae89)
+- [EvidenceModule: proxy](https://arbiscan.io/address/0x48e052B4A6dC4F30e90930F1CeaAFd83b3981EB3), [implementation](https://arbiscan.io/address/0xA502A3942abCF8e71FBD87ed442B39b798b192C8)
+- [KlerosCoreNeo: proxy](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea), [implementation](https://arbiscan.io/address/0xEb6D9E61921506f876dc662B2398E34C92330faB)
 - [KlerosCoreRulerNeo: proxy](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13), [implementation](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
 - [KlerosCoreSnapshotProxy](https://arbiscan.io/address/0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95)
 - [KlerosV2NeoEarlyUser](https://arbiscan.io/address/0xfE34a72c55e512601E7d491A9c5b36373cE34d63)
 - [Pinakion](https://arbiscan.io/address/0x330bD769382cFc6d50175903434CCC8D206DCAE5)
-- [PolicyRegistry: proxy](https://arbiscan.io/address/0x553dcbF6aB3aE06a1064b5200Df1B5A9fB403d3c), [implementation](https://arbiscan.io/address/0x15E5964C7751dF8563eA4bC000301582C79BC454)
+- [PolicyRegistry: proxy](https://arbiscan.io/address/0x553dcbF6aB3aE06a1064b5200Df1B5A9fB403d3c), [implementation](https://arbiscan.io/address/0xf7EE0Cd4E33C832DC05fB359896Add6E14E96C28)
 - [RandomizerRNG: proxy](https://arbiscan.io/address/0x044AfE0069C0fd641BC5f90d9A4218eF0b2Fa9d3), [implementation](https://arbiscan.io/address/0xF1a7Cd3115F5852966430f8E3877D2221F074A2e)
-- [SortitionModuleNeo: proxy](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D), [implementation](https://arbiscan.io/address/0x7E13f295536FD6c48Ba792CFdEF691d592Fa0851)
+- [SortitionModuleNeo: proxy](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D), [implementation](https://arbiscan.io/address/0x0cB3626Edf41F27a192102630D0502cCd93Cf043)
 - [TransactionBatcher](https://arbiscan.io/address/0xBC5ef8d9ad307154447AE148c088f083d2dEa4eF)
 
 ### Official Testnet

contracts/deploy/upgrade-all.ts

@@ -3,7 +3,7 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { prompt, print } from "gluegun";
 import { deployUpgradable } from "./utils/deployUpgradable";
 import { HomeChains, isSkipped } from "./utils";
-import { getContractNamesFromNetwork } from "../scripts/utils/contracts";
+import { getContractNames, getContractNamesFromNetwork } from "../scripts/utils/contracts";
 
 const { bold } = print.colors;
 
@@ -21,7 +21,23 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
  const upgrade = async (contractName: string, initializer: string, args: any[]) => {
  try {
  print.highlight(`🔍 Validating upgrade of ${bold(contractName)}`);
- await hre.run("compare-storage", { contract: contractName });
+
+ const contractNameWithoutNeo = contractName.replace(/Neo.*$/, "");
+ let compareStorageOptions = { contract: contractName } as any;
+ if (hre.network.name === "arbitrum") {
+ switch (contractName) {
+ case "KlerosCoreNeo":
+ case "SortitionModuleNeo":
+ compareStorageOptions = { deployedArtifact: `${contractName}_Implementation`, contract: contractName };
+ break;
+ default:
+ compareStorageOptions = {
+ deployedArtifact: `${contractName}_Implementation`,
+ contract: contractNameWithoutNeo,
+ };
+ }
+ }
+ await hre.run("compare-storage", compareStorageOptions);
  print.newline();
  print.highlight(`💣 Upgrading ${bold(contractName)}`);
  const { confirm } = await prompt.ask({
@@ -35,13 +51,25 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
  }
  print.info(`Upgrading ${contractName}...`);
 
- await deployUpgradable(deployments, contractName, {
- newImplementation: contractName,
- initializer,
- from: deployer,
- args, // Warning: do not reinitialize existing state variables, only the new ones
- });
-
+ switch (contractName) {
+ case "DisputeKitClassicNeo":
+ case "DisputeResolverNeo":
+ await deployUpgradable(deployments, contractName, {
+ contract: contractName,
+ newImplementation: contractNameWithoutNeo,
+ initializer,
+ from: deployer,
+ args, // Warning: do not reinitialize existing state variables, only the new ones
+ });
+ break;
+ default:
+ await deployUpgradable(deployments, contractName, {
+ newImplementation: contractName,
+ initializer,
+ from: deployer,
+ args, // Warning: do not reinitialize existing state variables, only the new ones
+ });
+ }
  print.info(`Verifying ${contractName} on Etherscan...`);
  await hre.run("etherscan-verify", { contractName: `${contractName}_Implementation` });
  } catch (err) {