feat: disputeResolver as upgradable

Author: Anmol-Dhiman

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

@@ -108,7 +108,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     log: true,
   });
 
-  const resolver = await deploy("DisputeResolverNeo", {
+  const resolver = await deployUpgradable(deployments, "DisputeResolverNeo", {
     from: deployer,
     contract: "DisputeResolver",
     args: [core.address, disputeTemplateRegistry.address],

contracts/package.json

@@ -28,6 +28,7 @@
     "start-testnet-fork": "HARDHAT_FORK=arbitrumSepolia hardhat node --tags Arbitration,HomeArbitrable",
     "deploy": "hardhat deploy",
     "deploy-local": "hardhat deploy --tags Arbitration,HomeArbitrable --network localhost",
+    "deploy-neo-local": "hardhat deploy --tags ArbitrationNeo --network localhost",
     "deploy-devnet-fork": "HARDHAT_FORK=arbitrumSepoliaDevnet yarn deploy --network localhost --tags Arbitration,HomeArbitrable",
     "deploy-testnet-fork": "HARDHAT_FORK=arbitrumSepolia yarn deploy --network localhost --tags Arbitration,HomeArbitrable",
     "simulate": "hardhat simulate:all",

contracts/test/arbitration/staking-neo.ts

@@ -27,7 +27,7 @@ Otherwise it should behave like a Neo arbitrator.
 
 // TODO: assert on sortition.totalStaked in happy case
 
-describe("Staking", async () => {
+describe("Staking Neo", async () => {
   const ETH = (amount: number) => ethers.utils.parseUnits(amount.toString());
   const PNK = ETH;
 

contracts/test/arbitration/staking.ts

@@ -24,6 +24,7 @@ describe("Staking", async () => {
 
   const deploy = async () => {
     ({ deployer } = await getNamedAccounts());
+    await ethers.provider.send("hardhat_reset", []);
     await deployments.fixture(["Arbitration"], {
       fallbackToGlobal: true,
       keepExistingDeployments: false,

contracts/test/integration/index.ts

@@ -43,6 +43,7 @@ describe("Integration tests", async () => {
 
   beforeEach("Setup", async () => {
     ({ deployer } = await getNamedAccounts());
+    await ethers.provider.send("hardhat_reset", []);
     await deployments.fixture(["Arbitration", "VeaMock"], {
       fallbackToGlobal: true,
       keepExistingDeployments: false,