package.json

@@ -23,15 +23,18 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-waffle": "^2.0.6",
     "chai": "^4.3.7",
     "ethereum-waffle": "^4.0.10",
     "ethers": "^6.5.1",
+=======
     "@nomicfoundation/hardhat-foundry": "^1.0.1",
     "@nomicfoundation/hardhat-verify": "^1.0.1",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "ethers": "^5",
+>>>>>>> 80078475d5d09a2b730f8334120a524d069ec5b1
     "hardhat": "^2.15.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.3"

scripts/deployProposal.js

@@ -1,48 +1,28 @@
-const hre = require("hardhat");
-const config = require("../config");
-const { ethers } = hre;
-
-const sleep = (s) => new Promise((r) => setTimeout(r, s * 1000));
+const hre = require('hardhat')
+const config = require("../config")
+const { ethers } = hre
 
 async function main() {
-  const factory_staking = await ethers.getContractFactory(
-    "TornadoStakingRewards"
-  );
-  const factory_proposal = await ethers.getContractFactory(
-    "RestoreRewardsProposal"
-  );
+    const factory_staking = await ethers.getContractFactory("TornadoStakingRewards")
+    const factory_proposal = await ethers.getContractFactory("Proposal")
 
-  const staking = await factory_staking.deploy(
-    config.governanceProxy,
-    config.torn,
-    config.registryProxy
-  );
-  await sleep(20);
+    const staking = await factory_staking.deploy(config.governanceProxy, config.torn, config.registryProxy)
 
-  console.log(
-    "\nStaking contract impl successfully deployed @ " + staking.target + "\n"
-  );
+    console.log("\nStaking contract impl successfully deployed @ " + staking.address + '\n')
 
-  await hre.run("verify:verify", {
-    address: staking.target,
-    constructorArguments: [
-      config.governanceProxy,
-      config.torn,
-      config.registryProxy,
-    ],
-  });
+    await hre.run('verify:verify', {
+        address: staking.address,
+        constructorArguments: [config.governanceProxy, config.torn, config.registryProxy],
+    })
 
-  const proposal = await factory_proposal.deploy(staking.target);
-  await sleep(20);
+    const proposal = await factory_proposal.deploy(staking.address)
 
-  console.log(
-    "\nProposal 25 successfully deployed @ " + proposal.target + "\n"
-  );
+    console.log("\nProposal 25 successfully deployed @ " + proposal.address + '\n')
 
-  await hre.run("verify:verify", {
-    address: proposal.target,
-    constructorArguments: [staking.target],
-  });
+    await hre.run('verify:verify', {
+        address: proposal.address,
+        constructorArguments: [staking.address],
+    })
 }
 
-main().then((res) => console.log(res ?? "\nScript finished.\n"));
+main().then((res) => console.log(res ?? "\nScript finished.\n"))