refactor(hardhat): update hardhat pkg tasks

semaphore-protocol · Jan 12, 2024 · b162ae6 · b162ae6
1 parent c8da0dc
commit b162ae6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 91 deletions.
diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json
@@ -40,7 +40,6 @@
     "dependencies": {
         "@nomiclabs/hardhat-ethers": "^2.1.1",
         "@semaphore-protocol/contracts": "3.15.2",
-        "circomlibjs": "^0.1.7",
         "ethers": "^5.7.1",
         "hardhat-dependency-compiler": "^1.1.3"
     }

diff --git a/packages/hardhat/src/index.ts b/packages/hardhat/src/index.ts
@@ -8,9 +8,9 @@ import "./tasks/deploy-semaphore-verifier"
 
 extendConfig((config: HardhatConfig, userConfig: Readonly<HardhatUserConfig>) => {
     config.dependencyCompiler.paths = [
-        "@semaphore-protocol/contracts/base/Pairing.sol",
         "@semaphore-protocol/contracts/base/SemaphoreVerifier.sol",
-        "@semaphore-protocol/contracts/Semaphore.sol"
+        "@semaphore-protocol/contracts/Semaphore.sol",
+        "poseidon-solidity/PoseidonT3.sol"
     ]
 
     if (userConfig.dependencyCompiler?.paths) {

diff --git a/packages/hardhat/src/tasks/deploy-semaphore-verifier.ts b/packages/hardhat/src/tasks/deploy-semaphore-verifier.ts
@@ -1,27 +1,9 @@
 import { task, types } from "hardhat/config"
 
 task("deploy:semaphore-verifier", "Deploy a SemaphoreVerifier contract")
-    .addOptionalParam<boolean>("pairing", "Pairing library address", undefined, types.string)
     .addOptionalParam<boolean>("logs", "Print the logs", true, types.boolean)
-    .setAction(async ({ logs, pairing: pairingAddress }, { ethers }): Promise<any> => {
-        if (!pairingAddress) {
-            const PairingFactory = await ethers.getContractFactory("Pairing")
-            const pairing = await PairingFactory.deploy()
-
-            await pairing.deployed()
-
-            if (logs) {
-                console.info(`Pairing library has been deployed to: ${pairing.address}`)
-            }
-
-            pairingAddress = pairing.address
-        }
-
-        const SemaphoreVerifierFactory = await ethers.getContractFactory("SemaphoreVerifier", {
-            libraries: {
-                Pairing: pairingAddress
-            }
-        })
+    .setAction(async ({ logs }, { ethers }): Promise<any> => {
+        const SemaphoreVerifierFactory = await ethers.getContractFactory("SemaphoreVerifier")
 
         const semaphoreVerifier = await SemaphoreVerifierFactory.deploy()
 
@@ -32,7 +14,6 @@ task("deploy:semaphore-verifier", "Deploy a SemaphoreVerifier contract")
         }
 
         return {
-            semaphoreVerifier,
-            pairingAddress
+            semaphoreVerifier
         }
     })
diff --git a/packages/hardhat/src/tasks/deploy-semaphore.ts b/packages/hardhat/src/tasks/deploy-semaphore.ts
@@ -1,47 +1,16 @@
-import { poseidonContract } from "circomlibjs"
 import { task, types } from "hardhat/config"
 
 task("deploy:semaphore", "Deploy a Semaphore contract")
-    .addOptionalParam<boolean>("pairing", "Pairing library address", undefined, types.string)
     .addOptionalParam<boolean>("semaphoreVerifier", "SemaphoreVerifier contract address", undefined, types.string)
     .addOptionalParam<boolean>("poseidon", "Poseidon library address", undefined, types.string)
-    .addOptionalParam<boolean>(
-        "incrementalBinaryTree",
-        "IncrementalBinaryTree library address",
-        undefined,
-        types.string
-    )
     .addOptionalParam<boolean>("logs", "Print the logs", true, types.boolean)
     .setAction(
         async (
-            {
-                logs,
-                pairing: pairingAddress,
-                semaphoreVerifier: semaphoreVerifierAddress,
-                poseidon: poseidonAddress,
-                incrementalBinaryTree: incrementalBinaryTreeAddress
-            },
+            { logs, semaphoreVerifier: semaphoreVerifierAddress, poseidon: poseidonAddress },
             { ethers }
         ): Promise<any> => {
             if (!semaphoreVerifierAddress) {
-                if (!pairingAddress) {
-                    const PairingFactory = await ethers.getContractFactory("Pairing")
-                    const pairing = await PairingFactory.deploy()
-
-                    await pairing.deployed()
-
-                    if (logs) {
-                        console.info(`Pairing library has been deployed to: ${pairing.address}`)
-                    }
-
-                    pairingAddress = pairing.address
-                }
-
-                const SemaphoreVerifierFactory = await ethers.getContractFactory("SemaphoreVerifier", {
-                    libraries: {
-                        Pairing: pairingAddress
-                    }
-                })
+                const SemaphoreVerifierFactory = await ethers.getContractFactory("SemaphoreVerifier")
 
                 const semaphoreVerifier = await SemaphoreVerifierFactory.deploy()
 
@@ -54,44 +23,22 @@ task("deploy:semaphore", "Deploy a Semaphore contract")
                 semaphoreVerifierAddress = semaphoreVerifier.address
             }
 
-            if (!incrementalBinaryTreeAddress) {
-                if (!poseidonAddress) {
-                    const poseidonABI = poseidonContract.generateABI(2)
-                    const poseidonBytecode = poseidonContract.createCode(2)
-
-                    const [signer] = await ethers.getSigners()
-
-                    const PoseidonFactory = new ethers.ContractFactory(poseidonABI, poseidonBytecode, signer)
-                    const poseidon = await PoseidonFactory.deploy()
-
-                    await poseidon.deployed()
-
-                    if (logs) {
-                        console.info(`Poseidon library has been deployed to: ${poseidon.address}`)
-                    }
-
-                    poseidonAddress = poseidon.address
-                }
-
-                const IncrementalBinaryTreeFactory = await ethers.getContractFactory("IncrementalBinaryTree", {
-                    libraries: {
-                        PoseidonT3: poseidonAddress
-                    }
-                })
-                const incrementalBinaryTree = await IncrementalBinaryTreeFactory.deploy()
+            if (!poseidonAddress) {
+                const PoseidonT3Factory = await ethers.getContractFactory("PoseidonT3")
+                const poseidonT3 = await PoseidonT3Factory.deploy()
 
-                await incrementalBinaryTree.deployed()
+                await poseidonT3.deployed()
 
                 if (logs) {
-                    console.info(`IncrementalBinaryTree library has been deployed to: ${incrementalBinaryTree.address}`)
+                    console.info(`Poseidon library has been deployed to: ${poseidonT3.address}`)
                 }
 
-                incrementalBinaryTreeAddress = incrementalBinaryTree.address
+                poseidonAddress = poseidonT3.address
             }
 
             const SemaphoreFactory = await ethers.getContractFactory("Semaphore", {
                 libraries: {
-                    IncrementalBinaryTree: incrementalBinaryTreeAddress
+                    PoseidonT3: poseidonAddress
                 }
             })
 
@@ -105,10 +52,8 @@ task("deploy:semaphore", "Deploy a Semaphore contract")
 
             return {
                 semaphore,
-                pairingAddress,
                 semaphoreVerifierAddress,
-                poseidonAddress,
-                incrementalBinaryTreeAddress
+                poseidonAddress
             }
         }
     )
diff --git a/yarn.lock b/yarn.lock
@@ -8451,7 +8451,6 @@ __metadata:
   dependencies:
     "@nomiclabs/hardhat-ethers": ^2.1.1
     "@semaphore-protocol/contracts": 3.15.2
-    circomlibjs: ^0.1.7
     ethers: ^5.7.1
     hardhat: ^2.0.0
     hardhat-dependency-compiler: ^1.1.3