S3s4 contract and tests with deployment

deploy/002_xHOPR-token.ts

@@ -13,4 +13,7 @@ const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     log: true,
   });
 };
+main.tags = ['xHOPR'];
+main.skip = async (env: HardhatRuntimeEnvironment) => !!env.network.tags.production || !!env.network.tags.staging
+
 export default main;

deploy/003_wxHOPR-token.ts

@@ -13,4 +13,7 @@ const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     log: true,
   });
 };
+main.tags = ['wxHOPR'];
+main.skip = async (env: HardhatRuntimeEnvironment) => !!env.network.tags.production || !!env.network.tags.staging
+
 export default main;

deploy/004_HOPRBoost-contract.ts

@@ -7,10 +7,14 @@ const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deploy } = deployments;
   const { deployer, admin } = await getNamedAccounts();
 
+  console.log(`hoprbost ${admin}`)
   await deploy("HoprBoost", {
     from: deployer,
     args: [admin, ""],
     log: true,
   });
 };
+main.tags = ['HoprBoost'];
+main.skip = async (env: HardhatRuntimeEnvironment) => !!env.network.tags.production || !!env.network.tags.staging
+
 export default main;

deploy/005_HOPRStake-contract.ts

@@ -6,28 +6,21 @@ const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts } = hre;
 
   const { deploy } = deployments;
-  const { deployer, admin, alice } = await getNamedAccounts();
+  const { deployer, admin } = await getNamedAccounts();
 
   const HoprBoost = await deployments.get("HoprBoost");
   const xHOPR = await deployments.get("xHOPR");
   const wxHOPR = await deployments.get("wxHOPR");
 
-  // We verify the address we will be passing to our contract
-  console.table([
-    ['From Deployments', 'Addresses'], 
-    ['wxHOPR', wxHOPR.address],
-    ['xHOPR', xHOPR.address],
-    ['HoprBoost', HoprBoost.address],
-    ['Deployer', deployer],
-    ['Admin', admin],
-    ['Alice', alice]
-  ])
-
   await deploy("HoprStake", {
     from: deployer,
     args: [HoprBoost.address, admin, xHOPR.address, wxHOPR.address],
     log: true,
   });
 };
 
+main.tags = ['HoprStake'];
+main.dependencies = ['xHOPR', 'wxHOPR', 'HoprBoost'];
+main.skip = async (env: HardhatRuntimeEnvironment) => !!env.network.tags.production || !!env.network.tags.staging
+
 export default main;

deploy/006_HOPRStake2-contract.ts

@@ -6,28 +6,20 @@ const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts } = hre;
 
   const { deploy } = deployments;
-  const { deployer, admin, alice } = await getNamedAccounts();
+  const { deployer, admin } = await getNamedAccounts();
 
   const HoprBoost = await deployments.get("HoprBoost");
   const xHOPR = await deployments.get("xHOPR");
   const wxHOPR = await deployments.get("wxHOPR");
 
-  // We verify the address we will be passing to our contract
-  console.table([
-    ['From Deployments', 'Addresses'], 
-    ['wxHOPR', wxHOPR.address],
-    ['xHOPR', xHOPR.address],
-    ['HoprBoost', HoprBoost.address],
-    ['Deployer', deployer],
-    ['Admin', admin],
-    ['Alice', alice]
-  ])
-
   await deploy("HoprStake2", {
     from: deployer,
     args: [HoprBoost.address, admin, xHOPR.address, wxHOPR.address],
     log: true,
   });
 };
+main.tags = ['HoprStake2'];
+main.dependencies = ['xHOPR', 'wxHOPR', 'HoprBoost'];
+main.skip = async (env: HardhatRuntimeEnvironment) => !!env.network.tags.production || !!env.network.tags.staging
 
 export default main;

deploy/007_HOPRStakeS3-contract.ts

@@ -0,0 +1,26 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+
+
+const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments, getNamedAccounts } = hre;
+
+  const { deploy } = deployments;
+  const { deployer, admin } = await getNamedAccounts();
+
+  const HoprBoost = await deployments.get("HoprBoost");
+  const xHOPR = await deployments.get("xHOPR");
+  const wxHOPR = await deployments.get("wxHOPR");
+
+  await deploy("HoprStakeSeason3", {
+    from: deployer,
+    args: [HoprBoost.address, admin, xHOPR.address, wxHOPR.address],
+    log: true,
+  });
+};
+
+main.tags = ['HoprStakeSeason3'];
+main.dependencies = ['xHOPR', 'wxHOPR', 'HoprBoost'];
+// main.skip = async (env: HardhatRuntimeEnvironment) => !!env.network.tags.production || !!env.network.tags.staging
+
+export default main;

deploy/008_HOPRStakeS4-contract.ts

@@ -0,0 +1,25 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+
+
+const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments, getNamedAccounts } = hre;
+
+  const { deploy } = deployments;
+  const { deployer, admin } = await getNamedAccounts();
+
+  const HoprBoost = await deployments.get("HoprBoost");
+  const xHOPR = await deployments.get("xHOPR");
+  const wxHOPR = await deployments.get("wxHOPR");
+
+  await deploy("HoprStakeSeason4", {
+    from: deployer,
+    args: [HoprBoost.address, admin, xHOPR.address, wxHOPR.address],
+    log: true,
+  });
+};
+
+main.tags = ['HoprStakeSeason4'];
+main.dependencies = ['xHOPR', 'wxHOPR', 'HoprBoost'];
+// main.skip = async (env: HardhatRuntimeEnvironment) => !!env.network.tags.production
+export default main;

deploy/007_Contracts-logging.ts → deploy/200_Contracts-logging.ts

@@ -9,13 +9,18 @@ const main: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const HoprBoost = await deployments.get("HoprBoost");
   const HoprStake = await deployments.get("HoprStake");
   const HoprStake2 = await deployments.get("HoprStake2");
+  const HoprStakeSeason3 = await deployments.get("HoprStakeSeason3");
+  const HoprStakeSeason4 = await deployments.get("HoprStakeSeason4");
 
   console.table([
     ["xHOPR", xHOPR.address],
     ["wxHOPR", wxHOPR.address],
     ["HoprBoost", HoprBoost.address],
     ["HoprStake", HoprStake.address],
     ["HoprStake2", HoprStake2.address],
+    ["HoprStakeSeason3", HoprStakeSeason3.address],
+    ["HoprStakeSeason4", HoprStakeSeason4.address],
   ]);
 };
+main.runAtTheEnd = true;
 export default main;