Version/4

.env.example

@@ -1,8 +1,8 @@
 DEFAULT_NETWORK=localhost
 INFURA_API_KEY=
 ETHEREUM_PRIVATE_KEY=ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-FEEDBACK_CONTRACT_ADDRESS=0x5fc8d32690cc91d4c39d9d3abcbd16989f875707
-SEMAPHORE_CONTRACT_ADDRESS=0xdc64a140aa3e981100a9beca4e685f962f0cf6c9
+FEEDBACK_CONTRACT_ADDRESS=0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9
+SEMAPHORE_CONTRACT_ADDRESS=0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0
 OPENZEPPELIN_AUTOTASK_WEBHOOK=
 GROUP_ID=42
 REPORT_GAS=false

.gitignore

@@ -52,7 +52,11 @@ node_modules/
 # Generate output
 dist
 build
+
+# Hardhat files
+artifacts
 cache
+typechain-types
 
 # Next.js
 .next/

.prettierignore

@@ -14,9 +14,13 @@ docs
 # production
 dist
 build
-cache
 contract-artifacts
 
+# Hardhat files
+artifacts
+cache
+typechain-types
+
 # github
 .github/ISSUE_TEMPLATE
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Ethereum Foundation
+Copyright (c) 2024 Ethereum Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -23,8 +23,8 @@
     </a>
 </p>
 
-| The repository is divided into two components: [web app](./apps/web-app) and [contracts](./apps/contracts). The app allows users to create their own Semaphore identity, join a group and then send their feedback anonymously (currently on Arbitrum Goerli). |
-| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| The repository is divided into two components: [web app](./apps/web-app) and [contracts](./apps/contracts). The app allows users to create their own Semaphore identity, join a group and then send their feedback anonymously (currently on Sepolia). |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 
 ## 🛠 Install
 
@@ -65,19 +65,30 @@ yarn dev
 1. Go to the `apps/contracts` directory and deploy your contract:
 
 ```bash
-yarn deploy --semaphore <semaphore-address> --group <group-id> --network arbitrum-goerli
+yarn deploy --semaphore <semaphore-address> --group <group-id> --network sepolia
 ```
 
 2. Update your `.env` file with your new contract address, the group id and the semaphore contract address.
 
-3. Copy your contract artifacts from `apps/contracts/build/contracts/contracts` folder to `apps/web-app/contract-artifacts` folders manually. Or run `yarn copy:contract-artifacts` in the project root to do it automatically.
+3. Copy your contract artifacts from `apps/contracts/build/contracts/contracts` folder to `apps/web-app/contract-artifacts` folders.
 
 > **Note**  
 > Check the Semaphore contract addresses [here](https://semaphore.pse.dev/docs/deployed-contracts).
 
 > **Warning**  
 > The group id is a number!
 
+### Verify the contract
+
+Verify your contract on Etherscan:
+
+```bash
+yarn verify <your-contract-address> <semaphore-address> <group-id> --network sepolia
+```
+
+> **Note**  
+> Remember to set the Etherscan API Key in your .env file.
+
 ### Code quality and formatting
 
 Run [ESLint](https://eslint.org/) to analyze the code and catch bugs:

apps/contracts/contracts/Feedback.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: MIT
-pragma solidity ^0.8.4;
+pragma solidity ^0.8.23;
 
 import "@semaphore-protocol/contracts/interfaces/ISemaphore.sol";
 
@@ -12,19 +12,29 @@ contract Feedback {
         semaphore = ISemaphore(semaphoreAddress);
         groupId = _groupId;
 
-        semaphore.createGroup(groupId, 20, address(this));
+        semaphore.createGroup(groupId, address(this));
     }
 
     function joinGroup(uint256 identityCommitment) external {
         semaphore.addMember(groupId, identityCommitment);
     }
 
     function sendFeedback(
-        uint256 feedback,
+        uint256 merkleTreeDepth,
         uint256 merkleTreeRoot,
-        uint256 nullifierHash,
-        uint256[8] calldata proof
+        uint256 nullifier,
+        uint256 feedback,
+        uint256[8] calldata points
     ) external {
-        semaphore.verifyProof(groupId, merkleTreeRoot, feedback, nullifierHash, groupId, proof);
+        ISemaphore.SemaphoreProof memory proof = ISemaphore.SemaphoreProof(
+            merkleTreeDepth,
+            merkleTreeRoot,
+            nullifier,
+            feedback,
+            groupId,
+            points
+        );
+
+        semaphore.validateProof(groupId, proof);
     }
 }

apps/contracts/hardhat.config.ts

@@ -1,6 +1,6 @@
 import "@nomicfoundation/hardhat-chai-matchers"
-import "@nomiclabs/hardhat-ethers"
-import "@nomiclabs/hardhat-etherscan"
+import "@nomicfoundation/hardhat-ethers"
+import "@nomicfoundation/hardhat-verify"
 import "@semaphore-protocol/hardhat"
 import "@typechain/hardhat"
 import { config as dotenvConfig } from "dotenv"
@@ -9,7 +9,6 @@ import { HardhatUserConfig } from "hardhat/config"
 import { NetworksUserConfig } from "hardhat/types"
 import { resolve } from "path"
 import "solidity-coverage"
-import { config } from "./package.json"
 import "./tasks/deploy"
 
 dotenvConfig({ path: resolve(__dirname, "../../.env") })
@@ -23,11 +22,6 @@ function getNetworks(): NetworksUserConfig {
     const infuraApiKey = process.env.INFURA_API_KEY
 
     return {
-        goerli: {
-            url: `https://goerli.infura.io/v3/${infuraApiKey}`,
-            chainId: 5,
-            accounts
-        },
         sepolia: {
             url: `https://sepolia.infura.io/v3/${infuraApiKey}`,
             chainId: 11155111,
@@ -38,14 +32,14 @@ function getNetworks(): NetworksUserConfig {
             chainId: 80001,
             accounts
         },
-        "optimism-goerli": {
-            url: `https://optimism-goerli.infura.io/v3/${infuraApiKey}`,
-            chainId: 420,
+        "optimism-sepolia": {
+            url: `https://optimism-sepolia.infura.io/v3/${infuraApiKey}`,
+            chainId: 11155420,
             accounts
         },
-        "arbitrum-goerli": {
-            url: "https://goerli-rollup.arbitrum.io/rpc",
-            chainId: 421613,
+        "arbitrum-sepolia": {
+            url: "https://sepolia-rollup.arbitrum.io/rpc",
+            chainId: 421614,
             accounts
         },
         arbitrum: {
@@ -57,13 +51,7 @@ function getNetworks(): NetworksUserConfig {
 }
 
 const hardhatConfig: HardhatUserConfig = {
-    solidity: config.solidity,
-    paths: {
-        sources: config.paths.contracts,
-        tests: config.paths.tests,
-        cache: config.paths.cache,
-        artifacts: config.paths.build.contracts
-    },
+    solidity: "0.8.23",
     networks: {
         hardhat: {
             chainId: 1337
@@ -76,11 +64,13 @@ const hardhatConfig: HardhatUserConfig = {
         coinmarketcap: process.env.COINMARKETCAP_API_KEY
     },
     typechain: {
-        outDir: config.paths.build.typechain,
-        target: "ethers-v5"
+        target: "ethers-v6"
     },
     etherscan: {
         apiKey: process.env.ETHERSCAN_API_KEY
+    },
+    sourcify: {
+        enabled: true
     }
 }
 

apps/contracts/package.json

@@ -6,55 +6,38 @@
     "scripts": {
         "dev": "hardhat node & yarn compile && yarn deploy --network localhost",
         "compile": "hardhat compile",
-        "download:snark-artifacts": "hardhat run scripts/download-snark-artifacts.ts",
         "deploy": "yarn compile && hardhat deploy",
-        "test": "hardhat run scripts/download-snark-artifacts.ts && hardhat test",
+        "verify": "hardhat verify",
+        "test": "hardhat test",
         "test:report-gas": "REPORT_GAS=true hardhat test",
         "test:coverage": "hardhat coverage",
         "typechain": "hardhat typechain",
         "lint": "solhint 'contracts/**/*.sol'"
     },
     "devDependencies": {
-        "@nomicfoundation/hardhat-chai-matchers": "^1.0.5",
-        "@nomiclabs/hardhat-ethers": "^2.0.0",
-        "@nomiclabs/hardhat-etherscan": "^3.1.7",
-        "@semaphore-protocol/group": "3.15.0",
-        "@semaphore-protocol/hardhat": "3.15.0",
-        "@semaphore-protocol/identity": "3.15.0",
-        "@semaphore-protocol/proof": "3.15.0",
-        "@typechain/ethers-v5": "^10.0.0",
-        "@typechain/hardhat": "^6.0.0",
-        "@types/chai": "^4.3.1",
-        "@types/download": "^8.0.1",
+        "@nomicfoundation/hardhat-chai-matchers": "^2.0.3",
+        "@nomicfoundation/hardhat-ethers": "^3.0.0",
+        "@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-alpha.6",
+        "@semaphore-protocol/hardhat": "4.0.0-alpha.6",
+        "@typechain/ethers-v6": "^0.5.0",
+        "@typechain/hardhat": "^9.0.0",
+        "@types/chai": "^4.2.0",
         "@types/mocha": "^9.1.1",
         "chai": "^4.2.0",
         "dotenv": "^14.3.2",
-        "download": "^8.0.0",
-        "ethers": "^5.0.0",
-        "hardhat": "^2.8.4",
+        "ethers": "^6.4.0",
+        "hardhat": "^2.19.4",
         "hardhat-gas-reporter": "^1.0.8",
-        "prettier-plugin-solidity": "^1.0.0-beta.19",
+        "prettier-plugin-solidity": "^1.3.1",
         "solhint": "^3.3.6",
         "solhint-plugin-prettier": "^0.0.5",
-        "solidity-coverage": "^0.7.21",
-        "typechain": "^8.0.0"
+        "solidity-coverage": "^0.8.0",
+        "typechain": "^8.3.0"
     },
     "dependencies": {
-        "@semaphore-protocol/contracts": "3.15.0"
-    },
-    "config": {
-        "solidity": {
-            "version": "0.8.4"
-        },
-        "paths": {
-            "contracts": "./contracts",
-            "tests": "./test",
-            "cache": "./cache",
-            "build": {
-                "snark-artifacts": "./build/snark-artifacts",
-                "contracts": "./build/contracts",
-                "typechain": "./build/typechain"
-            }
-        }
+        "@semaphore-protocol/contracts": "4.0.0-alpha.6"
     }
 }

apps/contracts/tasks/deploy.ts

@@ -10,7 +10,7 @@ task("deploy", "Deploy a Feedback contract")
                 logs
             })
 
-            semaphoreAddress = semaphore.address
+            semaphoreAddress = await semaphore.getAddress()
         }
 
         if (!groupId) {
@@ -21,10 +21,8 @@ task("deploy", "Deploy a Feedback contract")
 
         const feedbackContract = await FeedbackFactory.deploy(semaphoreAddress, groupId)
 
-        await feedbackContract.deployed()
-
         if (logs) {
-            console.info(`Feedback contract has been deployed to: ${feedbackContract.address}`)
+            console.info(`Feedback contract has been deployed to: ${await feedbackContract.getAddress()}`)
         }
 
         return feedbackContract