Skip to content

Commit 578d426

Browse files
committed
chore(cli): v3.0.0-beta.5
Former-commit-id: 9a2db4b
1 parent 362b025 commit 578d426

File tree

5 files changed

+18
-26
lines changed

5 files changed

+18
-26
lines changed

packages/cli-template-hardhat/contracts/Greeter.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import "@semaphore-protocol/contracts/interfaces/ISemaphore.sol";
66
/// @title Greeter contract.
77
/// @dev The following code is just a example to show how Semaphore can be used.
88
contract Greeter {
9-
event NewGreeting(bytes32 greeting);
9+
event NewGreeting(uint256 greeting);
1010
event NewUser(uint256 identityCommitment, bytes32 username);
1111

1212
ISemaphore public semaphore;
@@ -18,7 +18,7 @@ contract Greeter {
1818
semaphore = ISemaphore(semaphoreAddress);
1919
groupId = _groupId;
2020

21-
semaphore.createGroup(groupId, 20, 0, address(this));
21+
semaphore.createGroup(groupId, 20, address(this));
2222
}
2323

2424
function joinGroup(uint256 identityCommitment, bytes32 username) external {
@@ -30,7 +30,7 @@ contract Greeter {
3030
}
3131

3232
function greet(
33-
bytes32 greeting,
33+
uint256 greeting,
3434
uint256 merkleTreeRoot,
3535
uint256 nullifierHash,
3636
uint256[8] calldata proof

packages/cli-template-hardhat/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@semaphore-protocol/cli-template-hardhat",
3-
"version": "0.5.0",
3+
"version": "3.0.0-beta.5",
44
"description": "Semaphore Hardhat template.",
55
"license": "Unlicense",
66
"files": [
@@ -33,10 +33,10 @@
3333
"@nomicfoundation/hardhat-toolbox": "^2.0.0",
3434
"@nomiclabs/hardhat-ethers": "^2.0.0",
3535
"@nomiclabs/hardhat-etherscan": "^3.0.0",
36-
"@semaphore-protocol/group": "2.6.1",
37-
"@semaphore-protocol/hardhat": "^0.1.0",
38-
"@semaphore-protocol/identity": "2.6.1",
39-
"@semaphore-protocol/proof": "2.6.1",
36+
"@semaphore-protocol/group": "3.0.0-beta.5",
37+
"@semaphore-protocol/hardhat": "3.0.0-beta.5",
38+
"@semaphore-protocol/identity": "3.0.0-beta.5",
39+
"@semaphore-protocol/proof": "3.0.0-beta.5",
4040
"@typechain/ethers-v5": "^10.1.0",
4141
"@typechain/hardhat": "^6.1.2",
4242
"@types/chai": "^4.2.0",
@@ -55,6 +55,6 @@
5555
"typescript": ">=4.5.0"
5656
},
5757
"dependencies": {
58-
"@semaphore-protocol/contracts": "2.6.1"
58+
"@semaphore-protocol/contracts": "3.0.0-beta.5"
5959
}
6060
}

packages/cli-template-hardhat/tasks/deploy.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,11 @@ task("deploy", "Deploy a Greeter contract")
66
.addOptionalParam("logs", "Print the logs", true, types.boolean)
77
.setAction(async ({ logs, semaphore: semaphoreAddress, group: groupId }, { ethers, run }) => {
88
if (!semaphoreAddress) {
9-
const { address: verifierAddress } = await run("deploy:verifier", { logs, merkleTreeDepth: 20 })
10-
11-
const { address } = await run("deploy:semaphore", {
12-
logs,
13-
verifiers: [
14-
{
15-
merkleTreeDepth: 20,
16-
contractAddress: verifierAddress
17-
}
18-
]
9+
const { semaphore } = await run("deploy:semaphore", {
10+
logs
1911
})
2012

21-
semaphoreAddress = address
13+
semaphoreAddress = semaphore.address
2214
}
2315

2416
const Greeter = await ethers.getContractFactory("Greeter")

packages/cli-template-hardhat/test/Greeter.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe("Greeter", () => {
1515

1616
const users: any[] = []
1717
const groupId = "42"
18-
const group = new Group()
18+
const group = new Group(groupId)
1919

2020
before(async () => {
2121
if (!existsSync(`${snarkArtifactsPath}/semaphore.wasm`)) {
@@ -35,8 +35,8 @@ describe("Greeter", () => {
3535
username: ethers.utils.formatBytes32String("anon2")
3636
})
3737

38-
group.addMember(users[0].identity.generateCommitment())
39-
group.addMember(users[1].identity.generateCommitment())
38+
group.addMember(users[0].identity.commitment)
39+
group.addMember(users[1].identity.commitment)
4040
})
4141

4242
describe("# joinGroup", () => {
@@ -61,7 +61,7 @@ describe("Greeter", () => {
6161

6262
const transaction = greeter.greet(
6363
greeting,
64-
fullProof.publicSignals.merkleRoot,
64+
fullProof.publicSignals.merkleTreeRoot,
6565
fullProof.publicSignals.nullifierHash,
6666
solidityProof
6767
)

packages/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@semaphore-protocol/cli",
33
"type": "module",
4-
"version": "0.5.0",
4+
"version": "3.0.0-beta.5",
55
"description": "A command line tool to set up your Semaphore project and get group data.",
66
"license": "MIT",
77
"bin": {
@@ -40,7 +40,7 @@
4040
"typedoc": "^0.22.11"
4141
},
4242
"dependencies": {
43-
"@semaphore-protocol/subgraph": "2.6.1",
43+
"@semaphore-protocol/subgraph": "3.0.0-beta.5",
4444
"chalk": "^5.1.2",
4545
"commander": "^9.4.1",
4646
"download": "^8.0.0",

0 commit comments

Comments
 (0)