chore: removed traces of Neo in many scripts and filenames

Author: jaybuidl

contracts/config/courts.v2.mainnet-neo.json renamed to contracts/config/courts.v2.mainnet.json

@@ -6,7 +6,7 @@ import { changeCurrencyRate } from "./utils/klerosCoreHelper";
 import { HomeChains, isSkipped, isDevnet, PNK, ETH } from "./utils";
 import { getContractOrDeploy, getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
 import { deployERC20AndFaucet, deployERC721 } from "./utils/deployTokens";
-import { ChainlinkRNG, DisputeKitClassic, KlerosCore, RNGWithFallback } from "../typechain-types";
+import { DisputeKitClassic, KlerosCore, RNGWithFallback } from "../typechain-types";
 
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;

contracts/config/policies.v2.mainnet-neo.json renamed to contracts/config/policies.v2.mainnet.json

@@ -6,7 +6,7 @@ import { changeCurrencyRate } from "./utils/klerosCoreHelper";
 import { HomeChains, isSkipped, isDevnet, PNK, ETH, Courts } from "./utils";
 import { getContractOrDeploy, getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
 import { deployERC20AndFaucet } from "./utils/deployTokens";
-import { ChainlinkRNG, DisputeKitClassic, KlerosCore, RNGWithFallback } from "../typechain-types";
+import { DisputeKitClassic, KlerosCore, RNGWithFallback } from "../typechain-types";
 
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;

contracts/deploy/00-home-chain-arbitration-mainnet.ts

@@ -1,8 +1,8 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { HomeChains, isMainnet, isSkipped } from "./utils";
+import { HomeChains, isSkipped } from "./utils";
 import { ethers } from "hardhat";
-import { ChainlinkRNG, SortitionModule, SortitionModuleNeo } from "../typechain-types";
+import { ChainlinkRNG, SortitionModule } from "../typechain-types";
 
 const task: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { getNamedAccounts, getChainId } = hre;
@@ -13,15 +13,7 @@ const task: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   console.log("deploying to %s with deployer %s", HomeChains[chainId], deployer);
 
   const chainlinkRng = await ethers.getContract<ChainlinkRNG>("ChainlinkRNG");
-
-  let sortitionModule: SortitionModule | SortitionModuleNeo;
-  if (isMainnet(hre.network)) {
-    console.log("Using SortitionModuleNeo");
-    sortitionModule = await ethers.getContract<SortitionModuleNeo>("SortitionModuleNeo");
-  } else {
-    console.log("Using SortitionModule");
-    sortitionModule = await ethers.getContract<SortitionModule>("SortitionModule");
-  }
+  const sortitionModule = await ethers.getContract<SortitionModule>("SortitionModule");
 
   console.log(`chainlinkRng.changeConsumer(${sortitionModule.target})`);
   await chainlinkRng.changeConsumer(sortitionModule.target);

contracts/deploy/00-home-chain-arbitration.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 { getContractNames, getContractNamesFromNetwork } from "../scripts/utils/contracts";
+import { getContractNamesFromNetwork } from "../scripts/utils/contracts";
 
 const { bold } = print.colors;
 
@@ -36,21 +36,7 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     try {
       print.highlight(`🔍 Validating upgrade of ${bold(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)}`);
@@ -65,25 +51,12 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       }
       print.info(`Upgrading ${contractName}...`);
 
-      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
-          });
-      }
+      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) {

contracts/deploy/change-sortition-module-rng.ts

@@ -1,8 +1,8 @@
-import { KlerosCore, KlerosCoreNeo, KlerosCoreRuler, KlerosCoreUniversity } from "../../typechain-types";
+import { KlerosCore, KlerosCoreRuler, KlerosCoreUniversity } from "../../typechain-types";
 import { BigNumberish, toBigInt } from "ethers";
 
 export const changeCurrencyRate = async (
-  core: KlerosCore | KlerosCoreNeo | KlerosCoreRuler | KlerosCoreUniversity,
+  core: KlerosCore | KlerosCoreRuler | KlerosCoreUniversity,
   erc20: string,
   accepted: boolean,
   rateInEth: BigNumberish,

contracts/deploy/upgrade-all.ts

@@ -91,11 +91,11 @@
     "docbuild": "scripts/docPreprocess.sh && forge doc --build --out dist && scripts/docPostprocess.sh",
     "populate:courts:devnet": "hardhat populate:courts --from v2_devnet  --network arbitrumSepoliaDevnet",
     "populate:courts:testnet": "hardhat populate:courts --from v2_testnet  --network arbitrumSepolia",
-    "populate:courts:mainnetNeo": "hardhat populate:courts --core-type neo --from v2_mainnet_neo  --network arbitrum",
-    "populate:policiesUris": "scripts/setPoliciesURIs.sh config/policies.v2.{devnet,testnet,mainnet-neo}.json",
+    "populate:courts:mainnet": "hardhat populate:courts --from v2_mainnet  --network arbitrum",
+    "populate:policiesUris": "scripts/setPoliciesURIs.sh config/policies.v2.{devnet,testnet,mainnet}.json",
     "populate:policies:devnet": "hardhat populate:policy-registry --from v2_devnet --network arbitrumSepoliaDevnet",
     "populate:policies:testnet": "hardhat populate:policy-registry --from v2_testnet --network arbitrumSepolia",
-    "populate:policies:mainnetNeo": "hardhat populate:policy-registry --from v2_mainnet_neo --network arbitrum",
+    "populate:policies:mainnet": "hardhat populate:policy-registry --from v2_mainnet --network arbitrum",
     "release:patch": "scripts/publish.sh patch",
     "release:minor": "scripts/publish.sh minor",
     "release:major": "scripts/publish.sh major",

contracts/deploy/utils/klerosCoreHelper.ts

@@ -28,12 +28,12 @@ function generate() { #deploymentDir #explorerUrl
     done
 }
 
-echo "### V2 Neo (prelaunch)"
+echo "### V2 Mainnet"
 echo "#### Arbitrum One"
 echo
 generate "$SCRIPT_DIR/../deployments/arbitrum" "https://arbiscan.io/address/" | grep -v 'DAI\|WETH\|PNKFaucet'
 echo
-echo "### Official Testnet"
+echo "### V2 Testnet"
 echo "#### Arbitrum Sepolia"
 echo
 generate "$SCRIPT_DIR/../deployments/arbitrumSepolia" "https://sepolia.arbiscan.io/address/"
@@ -47,7 +47,7 @@ echo
 generate "$SCRIPT_DIR/../deployments/chiado" "https://gnosis-chiado.blockscout.com/address/"
 echo
 
-echo "### Devnet"
+echo "### V2 Devnet (unstable)"
 echo "#### Arbitrum Sepolia"
 echo
 generate "$SCRIPT_DIR/../deployments/arbitrumSepoliaDevnet" "https://sepolia.arbiscan.io/address/"

contracts/package.json

@@ -4,7 +4,7 @@ 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/KlerosCoreNeo.sol:KlerosCoreNeo`);
-    console.log(buildInfo.output.contracts["src/arbitration/KlerosCoreNeo.sol"]["KlerosCoreNeo"].storageLayout);
+    const buildInfo = await hre.artifacts.getBuildInfo(`src/arbitration/KlerosCore.sol:KlerosCore`);
+    console.log(buildInfo.output.contracts["src/arbitration/KlerosCore.sol"]["KlerosCore"].storageLayout);
   }
 );