chore: clean up

Author: jaybuidl

contracts/deploy/00-home-chain-arbitration-v2-neo.ts

@@ -5,7 +5,7 @@ import { deployUpgradable } from "./utils/deployUpgradable";
 import { HomeChains, isSkipped, isDevnet, PNK, ETH } from "./utils";
 import { getContractOrDeploy, getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
 import { deployERC20AndFaucet, deployERC721 } from "./utils/deployTokens";
-import { ChainlinkRNG, DisputeKitClassic, KlerosCoreXNeo, StakeControllerNeo, VaultNeo } from "../typechain-types";
+import { ChainlinkRNG, DisputeKitClassic, KlerosCoreNeo, StakeControllerNeo, VaultNeo } from "../typechain-types";
 
 const deployArbitrationV2Neo: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;
@@ -53,7 +53,7 @@ const deployArbitrationV2Neo: DeployFunction = async (hre: HardhatRuntimeEnviron
   console.log(`core.changeArbitrableWhitelist(${resolver.address}, true)`);
   await core.changeArbitrableWhitelist(resolver.address, true);
 
-  await deploy("KlerosCoreXNeoSnapshotProxy", {
+  await deploy("KlerosCoreNeoSnapshotProxy", {
     from: deployer,
     contract: "KlerosCoreSnapshotProxy",
     args: [deployer, core.target],
@@ -65,7 +65,7 @@ const deployArbitrationV2Neo: DeployFunction = async (hre: HardhatRuntimeEnviron
   console.log(`🎫 stPNKNeo: ${stPNK.address}`);
   console.log(`🎯 SortitionSumTreeNeo: ${sortitionModuleV2Neo.address}`);
   console.log(`🎮 StakeControllerNeo: ${stakeControllerNeo.target}`);
-  console.log(`⚖️ KlerosCoreXNeo: ${klerosCoreV2Neo.target}`);
+  console.log(`⚖️ KlerosCoreNeo: ${klerosCoreV2Neo.target}`);
   console.log(`🎨 JurorNFT: ${nft.target}`);
   console.log(`🔐 DisputeResolver: ${resolver.address}`);
 };

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

@@ -5,7 +5,7 @@ import { deployUpgradable } from "./utils/deployUpgradable";
 import { HomeChains, isSkipped, isDevnet, PNK, ETH } from "./utils";
 import { getContractOrDeploy, getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
 import { deployERC20AndFaucet } from "./utils/deployTokens";
-import { ChainlinkRNG, DisputeKitClassic, KlerosCoreX, StakeController, Vault } from "../typechain-types";
+import { ChainlinkRNG, DisputeKitClassic, KlerosCore, StakeController, Vault } from "../typechain-types";
 import { changeCurrencyRate } from "./utils/klerosCoreHelper";
 
 const deployArbitrationV2: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
@@ -34,7 +34,7 @@ const deployArbitrationV2: DeployFunction = async (hre: HardhatRuntimeEnvironmen
     contract: "DisputeKitClassic",
     args: [
       deployer,
-      ZeroAddress, // Placeholder for KlerosCoreX address, configured later
+      ZeroAddress, // Placeholder for KlerosCore address, configured later
     ],
     log: true,
   });
@@ -49,7 +49,7 @@ const deployArbitrationV2: DeployFunction = async (hre: HardhatRuntimeEnvironmen
   console.log("calculated future StakeController address for nonce %d: %s", nonce + 5, stakeControllerAddress);
 
   const klerosCoreAddress = getContractAddress(deployer, nonce + 7); // deployed on the 8th tx (nonce+7): Vault Impl tx, Vault Proxy tx, SortitionModule Impl tx, SortitionModule Proxy tx, StakeController Impl tx, StakeController Proxy tx, KlerosCore Impl tx, KlerosCore Proxy tx
-  console.log("calculated future KlerosCoreX address for nonce %d: %s", nonce + 7, klerosCoreAddress);
+  console.log("calculated future KlerosCore address for nonce %d: %s", nonce + 7, klerosCoreAddress);
 
   const vault = await deployUpgradable(deployments, "Vault", {
     from: deployer,
@@ -89,8 +89,8 @@ const deployArbitrationV2: DeployFunction = async (hre: HardhatRuntimeEnvironmen
   const feeForJuror = ETH(0.1);
   const jurorsForCourtJump = 256;
 
-  // Deploy KlerosCoreX (only if not already deployed)
-  const klerosCoreV2 = await deployUpgradable(deployments, "KlerosCoreX", {
+  // Deploy KlerosCore (only if not already deployed)
+  const klerosCoreV2 = await deployUpgradable(deployments, "KlerosCore", {
     from: deployer,
     args: [
       deployer,
@@ -126,7 +126,7 @@ const deployArbitrationV2: DeployFunction = async (hre: HardhatRuntimeEnvironmen
     await rng.changeSortitionModule(stakeController.address);
   }
 
-  const core = (await hre.ethers.getContract("KlerosCoreX")) as KlerosCoreX;
+  const core = (await hre.ethers.getContract("KlerosCore")) as KlerosCore;
   try {
     await changeCurrencyRate(core, await pnk.getAddress(), true, 12225583, 12);
     await changeCurrencyRate(core, await dai.getAddress(), true, 60327783, 11);
@@ -135,7 +135,7 @@ const deployArbitrationV2: DeployFunction = async (hre: HardhatRuntimeEnvironmen
     console.error("failed to change currency rates:", e);
   }
 
-  await deploy("KlerosCoreXSnapshotProxy", {
+  await deploy("KlerosCoreSnapshotProxy", {
     from: deployer,
     contract: "KlerosCoreSnapshotProxy",
     args: [deployer, core.target],
@@ -146,7 +146,7 @@ const deployArbitrationV2: DeployFunction = async (hre: HardhatRuntimeEnvironmen
   console.log(`📦 Vault: ${vault.address}`);
   console.log(`🎯 SortitionSumTree: ${sortitionModuleV2.address}`);
   console.log(`🎮 StakeController: ${stakeController.address}`);
-  console.log(`⚖️ KlerosCoreX: ${klerosCoreV2.address}`);
+  console.log(`⚖️ KlerosCore: ${klerosCoreV2.address}`);
 };
 
 deployArbitrationV2.tags = ["ArbitrationV2"];

contracts/deploy/utils/klerosCoreHelper.ts

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

contracts/src/arbitration/KlerosCoreX.sol contracts/src/arbitration/KlerosCore.solcontracts/src/arbitration/KlerosCoreX.sol renamed to contracts/src/arbitration/KlerosCore.sol

@@ -2,11 +2,11 @@
 
 pragma solidity 0.8.24;
 
-import "./KlerosCoreXBase.sol";
+import "./KlerosCoreBase.sol";
 
-/// @title KlerosCoreX
+/// @title KlerosCore
 /// @notice KlerosCore implementation with new StakeController architecture for testing environments
-contract KlerosCoreX is KlerosCoreXBase {
+contract KlerosCore is KlerosCoreBase {
     /// @notice Version of the implementation contract
     string public constant override version = "0.0.1";
 
@@ -42,7 +42,7 @@ contract KlerosCoreX is KlerosCoreXBase {
         IStakeController _stakeController,
         IVault _vault
     ) external initializer {
-        __KlerosCoreXBase_initialize(
+        __KlerosCoreBase_initialize(
             _governor,
             _guardian,
             _jurorProsecutionModule,