refactor(contracts): improve task to deploy

semaphore-protocol · Jan 23, 2024 · d593f48 · d593f48
1 parent 7a1ba9e
commit d593f48
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 36 deletions.
diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
@@ -10,7 +10,7 @@ import { NetworksUserConfig } from "hardhat/types"
 import { resolve } from "path"
 import "solidity-coverage"
 import "./tasks/accounts"
-import "./tasks/deploy-semaphore"
+import "./tasks/deploy"
 
 dotenvConfig({ path: resolve(__dirname, "../../.env") })
 

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -4,8 +4,7 @@
     "scripts": {
         "start": "hardhat node",
         "compile": "hardhat compile",
-        "deploy:semaphore": "hardhat deploy:semaphore",
-        "verify:contracts": "hardhat run scripts/verify-contracts.ts",
+        "deploy": "hardhat deploy",
         "test": "hardhat test",
         "test:report-gas": "REPORT_GAS=true hardhat test",
         "test:coverage": "hardhat coverage",

diff --git a/packages/contracts/tasks/deploy-semaphore.ts → packages/contracts/tasks/deploy.ts b/packages/contracts/tasks/deploy-semaphore.ts → packages/contracts/tasks/deploy.ts
@@ -1,7 +1,8 @@
 import { writeFileSync } from "fs"
 import { task, types } from "hardhat/config"
+import { deployContract } from "./utils"
 
-task("deploy:semaphore", "Deploy a Semaphore contract")
+task("deploy", "Deploy a Semaphore contract")
     .addOptionalParam<boolean>("verifier", "Verifier contract address", undefined, types.string)
     .addOptionalParam<boolean>("poseidon", "Poseidon library address", undefined, types.string)
     .addOptionalParam<boolean>("logs", "Print the logs", true, types.boolean)
@@ -13,15 +14,7 @@ task("deploy:semaphore", "Deploy a Semaphore contract")
             if (!verifierAddress) {
                 const VerifierFactory = await ethers.getContractFactory(`SemaphoreVerifier`)
 
-                let verifier
-
-                if (hardhatArguments.network !== undefined && hardhatArguments.network !== "hardhat") {
-                    verifier = await defender.deployContract(VerifierFactory, { salt: process.env.CREATE2_SALT })
-
-                    await verifier.waitForDeployment()
-                } else {
-                    verifier = await VerifierFactory.deploy()
-                }
+                const verifier = await deployContract(defender, VerifierFactory, hardhatArguments.network)
 
                 verifierAddress = await verifier.getAddress()
 
@@ -33,15 +26,7 @@ task("deploy:semaphore", "Deploy a Semaphore contract")
             if (!poseidonAddress) {
                 const PoseidonT3Factory = await ethers.getContractFactory("PoseidonT3")
 
-                let poseidonT3
-
-                if (hardhatArguments.network !== undefined && hardhatArguments.network !== "hardhat") {
-                    poseidonT3 = await defender.deployContract(PoseidonT3Factory, { salt: process.env.CREATE2_SALT })
-
-                    await poseidonT3.waitForDeployment()
-                } else {
-                    poseidonT3 = await PoseidonT3Factory.deploy()
-                }
+                const poseidonT3 = await deployContract(defender, PoseidonT3Factory, hardhatArguments.network)
 
                 poseidonAddress = await poseidonT3.getAddress()
 
@@ -56,19 +41,9 @@ task("deploy:semaphore", "Deploy a Semaphore contract")
                 }
             })
 
-            let semaphore
-
-            if (hardhatArguments.network !== undefined && hardhatArguments.network !== "hardhat") {
-                semaphore = await defender.deployContract(SemaphoreFactory, [verifierAddress], {
-                    salt: process.env.CREATE2_SALT,
-                    unsafeAllow: ["external-library-linking", "constructor"],
-                    unsafeAllowDeployContract: true
-                })
-
-                await semaphore.waitForDeployment()
-            } else {
-                semaphore = await SemaphoreFactory.deploy(verifierAddress)
-            }
+            const semaphore = await deployContract(defender, SemaphoreFactory, hardhatArguments.network, [
+                verifierAddress
+            ])
 
             const semaphoreAddress = await semaphore.getAddress()
 

diff --git a/packages/contracts/tasks/utils.ts b/packages/contracts/tasks/utils.ts
@@ -0,0 +1,21 @@
+import { DefenderHardhatUpgrades } from "@openzeppelin/hardhat-upgrades"
+import { ContractFactory } from "ethers"
+
+export async function deployContract(
+    defender: DefenderHardhatUpgrades,
+    contractFactory: ContractFactory,
+    network?: string,
+    args: any[] = []
+) {
+    let contract
+
+    if (network !== undefined && network !== "hardhat" && network !== "localhost") {
+        contract = await defender.deployContract(contractFactory, args, { salt: process.env.CREATE2_SALT })
+
+        await contract.waitForDeployment()
+    } else {
+        contract = await contractFactory.deploy(...args)
+    }
+
+    return contract
+}
diff --git a/packages/contracts/test/Semaphore.ts b/packages/contracts/test/Semaphore.ts
@@ -19,7 +19,7 @@ describe("Semaphore", () => {
     const members = Array.from({ length: 3 }, (_, i) => new Identity(i)).map(({ commitment }) => commitment)
 
     before(async () => {
-        const { semaphore } = await run("deploy:semaphore", {
+        const { semaphore } = await run("deploy", {
             logs: false
         })