@semaphore-protocol/cli-template-contracts-hardhat 4.0.0-beta.4 → 4.0.0-beta.6

package/.env.example

@@ -1,4 +1,3 @@
-INFURA_API_KEY=
 ETHEREUM_PRIVATE_KEY=
 REPORT_GAS=false
 ETHERSCAN_API_KEY=

package/contracts/Feedback.sol

@@ -8,11 +8,10 @@ contract Feedback {
 
     uint256 public groupId;
 
-    constructor(address semaphoreAddress, uint256 _groupId) {
+    constructor(address semaphoreAddress) {
         semaphore = ISemaphore(semaphoreAddress);
-        groupId = _groupId;
 
-        semaphore.createGroup(groupId, address(this));
+        groupId = semaphore.createGroup();
     }
 
     function joinGroup(uint256 identityCommitment) external {

package/hardhat.config.ts

@@ -1,54 +1,17 @@
-import { HardhatUserConfig } from "hardhat/config"
-import { NetworksUserConfig } from "hardhat/types"
 import "@nomicfoundation/hardhat-toolbox"
-import "dotenv/config"
 import "@semaphore-protocol/hardhat"
+import { getHardhatNetworks } from "@semaphore-protocol/utils"
+import "dotenv/config"
+import { HardhatUserConfig } from "hardhat/config"
 import "./tasks/deploy"
 
-function getNetworks(): NetworksUserConfig {
-    if (!process.env.INFURA_API_KEY || !process.env.ETHEREUM_PRIVATE_KEY) {
-        return {}
-    }
-
-    const accounts = [`0x${process.env.ETHEREUM_PRIVATE_KEY}`]
-    const infuraApiKey = process.env.INFURA_API_KEY
-
-    return {
-        sepolia: {
-            url: `https://sepolia.infura.io/v3/${infuraApiKey}`,
-            chainId: 11155111,
-            accounts
-        },
-        mumbai: {
-            url: `https://polygon-mumbai.infura.io/v3/${infuraApiKey}`,
-            chainId: 80001,
-            accounts
-        },
-        "optimism-sepolia": {
-            url: `https://optimism-sepolia.infura.io/v3/${infuraApiKey}`,
-            chainId: 11155420,
-            accounts
-        },
-        "arbitrum-sepolia": {
-            url: "https://sepolia-rollup.arbitrum.io/rpc",
-            chainId: 421614,
-            accounts
-        },
-        arbitrum: {
-            url: "https://arb1.arbitrum.io/rpc",
-            chainId: 42161,
-            accounts
-        }
-    }
-}
-
 const config: HardhatUserConfig = {
     solidity: "0.8.23",
     networks: {
         hardhat: {
             chainId: 1337
         },
-        ...getNetworks()
+        ...getHardhatNetworks(process.env.ETHEREUM_PRIVATE_KEY)
     },
     gasReporter: {
         currency: "USD",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@semaphore-protocol/cli-template-contracts-hardhat",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.6",
   "description": "Semaphore Hardhat template.",
   "license": "Unlicense",
   "files": [
@@ -41,8 +41,9 @@
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.0",
-    "@semaphore-protocol/core": "4.0.0-beta.4",
-    "@semaphore-protocol/hardhat": "4.0.0-beta.4",
+    "@semaphore-protocol/core": "4.0.0-beta.6",
+    "@semaphore-protocol/hardhat": "4.0.0-beta.6",
+    "@semaphore-protocol/utils": "4.0.0-beta.6",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.0.0",
     "@types/chai": "^4.2.0",
@@ -70,7 +71,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@semaphore-protocol/contracts": "4.0.0-beta.4"
+    "@semaphore-protocol/contracts": "4.0.0-beta.6"
   },
   "packageManager": "yarn@4.1.0"
 }

package/tasks/deploy.ts

@@ -2,9 +2,8 @@ import { task, types } from "hardhat/config"
 
 task("deploy", "Deploy a Feedback contract")
     .addOptionalParam("semaphore", "Semaphore contract address", undefined, types.string)
-    .addOptionalParam("group", "Group id", "42", types.string)
     .addOptionalParam("logs", "Print the logs", true, types.boolean)
-    .setAction(async ({ logs, semaphore: semaphoreAddress, group: groupId }, { ethers, run }) => {
+    .setAction(async ({ logs, semaphore: semaphoreAddress }, { ethers, run }) => {
         if (!semaphoreAddress) {
             const { semaphore } = await run("deploy:semaphore", {
                 logs
@@ -13,13 +12,9 @@ task("deploy", "Deploy a Feedback contract")
             semaphoreAddress = await semaphore.getAddress()
         }
 
-        if (!groupId) {
-            groupId = process.env.GROUP_ID
-        }
-
         const FeedbackFactory = await ethers.getContractFactory("Feedback")
 
-        const feedbackContract = await FeedbackFactory.deploy(semaphoreAddress, groupId)
+        const feedbackContract = await FeedbackFactory.deploy(semaphoreAddress)
 
         if (logs) {
             console.info(`Feedback contract has been deployed to: ${await feedbackContract.getAddress()}`)

package/test/Feedback.ts

@@ -9,8 +9,6 @@ import { Feedback, ISemaphore } from "../typechain-types"
 
 describe("Feedback", () => {
     async function deployFeedbackFixture() {
-        const groupId = "42"
-
         const { semaphore } = await run("deploy:semaphore", {
             logs: false
         })
@@ -19,10 +17,11 @@ describe("Feedback", () => {
 
         const feedbackContract: Feedback = await run("deploy", {
             logs: false,
-            group: groupId,
             semaphore: await semaphoreContract.getAddress()
         })
 
+        const groupId = await feedbackContract.groupId()
+
         return { semaphoreContract, feedbackContract, groupId }
     }