Skip to content

Commit 15ffd26

Browse files
cedoorcedoor
committed
chore: remove goerli from supported networks
re #352
1 parent 6f8cecb commit 15ffd26

File tree

23 files changed

+99
-111
lines changed

23 files changed

+99
-111
lines changed

‎apps/subgraph/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242

4343
## Networks
4444

45-
| Semaphore version | Sepolia | Goerli | Mumbai | Optimism Goerli | Arbitrum Goerli | Arbitrum One |
46-
| ----------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
47-
| v2.0 | N/A | N/A | N/A | N/A | N/A | [semaphore-protocol/arbitrum](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/arbitrum) |
48-
| v2.5 | N/A | [semaphore-protocol/goerli](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/goerli) | N/A | N/A | N/A | N/A |
49-
| v2.6 | N/A | [semaphore-protocol/goerli-5259d3](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/goerli-5259d3) | N/A | N/A | N/A | [semaphore-protocol/arbitrum-86337c](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/arbitrum-86337c) |
50-
| v3.0 - v3.1 | N/A | [semaphore-protocol/goerli-89490c](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/goerli-89490c) | N/A | N/A | N/A | [semaphore-protocol/arbitrum-72dca3](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/arbitrum-72dca3) |
51-
| >= v3.2 | [semaphore-sepolia](https://api.studio.thegraph.com/query/14377/semaphore-sepolia/v3.6.1) | [semaphore-goerli](https://api.studio.thegraph.com/query/14377/semaphore-goerli/v3.6.1) | [semaphore-mumbai](https://api.studio.thegraph.com/query/14377/semaphore-mumbai/v3.6.1) | [semaphore-optimism-goerli](https://api.studio.thegraph.com/query/14377/semaphore-optimism-goerli/v3.6.1) | [semaphore-arbitrum-goerli](https://api.studio.thegraph.com/query/14377/semaphore-arbitrum-goerli/v3.6.1) | [semaphore-arbitrum](https://api.studio.thegraph.com/query/14377/semaphore-arbitrum/v3.6.1) |
45+
| Semaphore version | Sepolia | Mumbai | Optimism Sepolia | Arbitrum Sepolia | Arbitrum One |
46+
| ----------------- | ----------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
47+
| v2.0 | N/A | N/A | N/A | N/A | [semaphore-protocol/arbitrum](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/arbitrum) |
48+
| v2.5 | N/A | N/A | N/A | N/A | N/A |
49+
| v2.6 | N/A | N/A | N/A | N/A | [semaphore-protocol/arbitrum-86337c](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/arbitrum-86337c) |
50+
| v3.0 - v3.1 | N/A | N/A | N/A | N/A | [semaphore-protocol/arbitrum-72dca3](https://thegraph.com/hosted-service/subgraph/semaphore-protocol/arbitrum-72dca3) |
51+
| >= v3.2 | [semaphore-sepolia](https://api.studio.thegraph.com/query/14377/semaphore-sepolia/v3.6.1) | [semaphore-mumbai](https://api.studio.thegraph.com/query/14377/semaphore-mumbai/v3.6.1) | N/A | N/A | [semaphore-arbitrum](https://api.studio.thegraph.com/query/14377/semaphore-arbitrum/v3.6.1) |
5252

5353
## 🛠 Install
5454

‎apps/subgraph/docker-compose-graph.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
postgres_port: 5432
2121
ipfs: "ipfs:5001"
2222
ethereum: "localhost:http://host.docker.internal:8545" # Should use the `localhost` as network name in subgraph.yml
23-
# ethereum: 'goerli:https://goerli.infura.io/v3/YOUR-API-KEY'
23+
# ethereum: 'sepolia:https://sepolia.infura.io/v3/YOUR-API-KEY'
2424
GRAPH_LOG: info
2525
GRAPH_ALLOW_NON_DETERMINISTIC_IPFS: 1
2626
networks:

‎apps/subgraph/networks.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,19 @@
55
"startBlock": 3231111
66
}
77
},
8-
"goerli": {
9-
"Semaphore": {
10-
"address": "0x3889927F0B5Eb1a02C6E2C20b39a1Bd4EAd76131",
11-
"startBlock": 8777695
12-
}
13-
},
148
"mumbai": {
159
"Semaphore": {
1610
"address": "0x3889927F0B5Eb1a02C6E2C20b39a1Bd4EAd76131",
1711
"startBlock": 33995010
1812
}
1913
},
20-
"optimism-goerli": {
14+
"optimism-sepolia": {
2115
"Semaphore": {
2216
"address": "0x3889927F0B5Eb1a02C6E2C20b39a1Bd4EAd76131",
2317
"startBlock": 7632846
2418
}
2519
},
26-
"arbitrum-goerli": {
20+
"arbitrum-sepolia": {
2721
"Semaphore": {
2822
"address": "0x3889927F0B5Eb1a02C6E2C20b39a1Bd4EAd76131",
2923
"startBlock": 15174410

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"private": true,
99
"scripts": {
1010
"build:libraries": "yarn workspaces foreach -t --no-private run build",
11-
"build:subgraph": "yarn workspace semaphore-subgraph codegen goerli && yarn workspace semaphore-subgraph build",
11+
"build:subgraph": "yarn workspace semaphore-subgraph codegen sepolia && yarn workspace semaphore-subgraph build",
1212
"compile:contracts": "yarn workspace semaphore-contracts compile",
1313
"remove:template-files": "ts-node scripts/remove-template-files.ts",
1414
"test": "yarn test:libraries && yarn test:contracts && yarn test:circuits && yarn test:subgraph",
@@ -23,6 +23,8 @@
2323
"version:bump": "yarn workspaces foreach --no-private version -d ${0} && yarn version apply --all && git commit -am \"chore: v${0}\" && git tag v${0}",
2424
"version:publish": "yarn build:libraries && yarn remove:template-files && yarn workspaces foreach --no-private npm publish --tolerate-republish --access public",
2525
"version:release": "changelogithub",
26+
"clean": "rimraf node_modules docs coverage packages/*/node_modules packages/*/dist apps/*/node_modules apps/*/build apps/*/.next apps/*/generated",
27+
"clean:contracts": "rimraf packages/contracts/artifacts packages/contracts/typechain-types packages/contracts/cache",
2628
"commit": "cz",
2729
"precommit": "lint-staged",
2830
"postinstall": "husky install"

‎packages/cli-template-contracts-hardhat/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cp .env.example .env
4444
3. And deploy your contract.
4545

4646
```bash
47-
yarn deploy --semaphore <semaphore-address> --group <group-id> --network goerli
47+
yarn deploy --semaphore <semaphore-address> --group <group-id> --network sepolia
4848
```
4949

5050
> **Note**

‎packages/cli-template-contracts-hardhat/hardhat.config.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ function getNetworks(): NetworksUserConfig {
2121
const infuraApiKey = process.env.INFURA_API_KEY
2222

2323
return {
24-
goerli: {
25-
url: `https://goerli.infura.io/v3/${infuraApiKey}`,
26-
chainId: 5,
27-
accounts
28-
},
2924
sepolia: {
3025
url: `https://sepolia.infura.io/v3/${infuraApiKey}`,
3126
chainId: 11155111,
@@ -36,13 +31,18 @@ function getNetworks(): NetworksUserConfig {
3631
chainId: 80001,
3732
accounts
3833
},
39-
"optimism-goerli": {
40-
url: `https://optimism-goerli.infura.io/v3/${infuraApiKey}`,
41-
chainId: 420,
34+
"optimism-sepolia": {
35+
url: `https://optimism-sepolia.infura.io/v3/${infuraApiKey}`,
36+
chainId: 11155420,
37+
accounts
38+
},
39+
"arbitrum-sepolia": {
40+
url: "https://sepolia-rollup.arbitrum.io/rpc",
41+
chainId: 7745327,
4242
accounts
4343
},
4444
arbitrum: {
45-
url: `https://arbitrum-mainnet.infura.io/v3/${infuraApiKey}`,
45+
url: "https://arb1.arbitrum.io/rpc",
4646
chainId: 42161,
4747
accounts
4848
}

‎packages/cli-template-monorepo-ethers/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ yarn dev
2525
1. Go to the `apps/contracts` directory and deploy your contract:
2626

2727
```bash
28-
yarn deploy --semaphore <semaphore-address> --group <group-id> --network arbitrum-goerli
28+
yarn deploy --semaphore <semaphore-address> --group <group-id> --network arbitrum-sepolia
2929
```
3030

3131
2. Update your `.env` file with your new contract address, the group id and the semaphore contract address.

‎packages/cli-template-monorepo-ethers/apps/contracts/hardhat.config.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ function getNetworks(): NetworksUserConfig {
2323
const infuraApiKey = process.env.INFURA_API_KEY
2424

2525
return {
26-
goerli: {
27-
url: `https://goerli.infura.io/v3/${infuraApiKey}`,
28-
chainId: 5,
29-
accounts
30-
},
3126
sepolia: {
3227
url: `https://sepolia.infura.io/v3/${infuraApiKey}`,
3328
chainId: 11155111,
@@ -38,14 +33,14 @@ function getNetworks(): NetworksUserConfig {
3833
chainId: 80001,
3934
accounts
4035
},
41-
"optimism-goerli": {
42-
url: `https://optimism-goerli.infura.io/v3/${infuraApiKey}`,
43-
chainId: 420,
36+
"optimism-sepolia": {
37+
url: `https://optimism-sepolia.infura.io/v3/${infuraApiKey}`,
38+
chainId: 11155420,
4439
accounts
4540
},
46-
"arbitrum-goerli": {
47-
url: "https://goerli-rollup.arbitrum.io/rpc",
48-
chainId: 421613,
41+
"arbitrum-sepolia": {
42+
url: "https://sepolia-rollup.arbitrum.io/rpc",
43+
chainId: 7745327,
4944
accounts
5045
},
5146
arbitrum: {

‎packages/cli-template-monorepo-subgraph/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ yarn dev
2525
1. Go to the `apps/contracts` directory and deploy your contract:
2626

2727
```bash
28-
yarn deploy --semaphore <semaphore-address> --group <group-id> --network arbitrum-goerli
28+
yarn deploy --semaphore <semaphore-address> --group <group-id> --network arbitrum-sepolia
2929
```
3030

3131
2. Update your `.env` file with your new contract address, the group id and the semaphore contract address.

‎packages/cli-template-monorepo-subgraph/apps/contracts/hardhat.config.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ function getNetworks(): NetworksUserConfig {
2323
const infuraApiKey = process.env.INFURA_API_KEY
2424

2525
return {
26-
goerli: {
27-
url: `https://goerli.infura.io/v3/${infuraApiKey}`,
28-
chainId: 5,
29-
accounts
30-
},
3126
sepolia: {
3227
url: `https://sepolia.infura.io/v3/${infuraApiKey}`,
3328
chainId: 11155111,
@@ -38,14 +33,14 @@ function getNetworks(): NetworksUserConfig {
3833
chainId: 80001,
3934
accounts
4035
},
41-
"optimism-goerli": {
42-
url: `https://optimism-goerli.infura.io/v3/${infuraApiKey}`,
43-
chainId: 420,
36+
"optimism-sepolia": {
37+
url: `https://optimism-sepolia.infura.io/v3/${infuraApiKey}`,
38+
chainId: 11155420,
4439
accounts
4540
},
46-
"arbitrum-goerli": {
47-
url: "https://goerli-rollup.arbitrum.io/rpc",
48-
chainId: 421613,
41+
"arbitrum-sepolia": {
42+
url: "https://sepolia-rollup.arbitrum.io/rpc",
43+
chainId: 7745327,
4944
accounts
5045
},
5146
arbitrum: {

‎packages/cli/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ Options:
7676
7777
Commands:
7878
create [options] [project-directory] Create a Semaphore project with a supported template.
79-
get-groups [options] Get the list of groups from a supported network (e.g. goerli or arbitrum).
80-
get-group [options] [group-id] Get the data of a group from a supported network (e.g. goerli or arbitrum).
81-
get-members [options] [group-id] Get the members of a group from a supported network (e.g. goerli or arbitrum).
82-
get-proofs [options] [group-id] Get the proofs of a group from a supported network (e.g. goerli or arbitrum).
79+
get-groups [options] Get the list of groups from a supported network (e.g. sepolia or arbitrum).
80+
get-group [options] [group-id] Get the data of a group from a supported network (e.g. sepolia or arbitrum).
81+
get-members [options] [group-id] Get the members of a group from a supported network (e.g. sepolia or arbitrum).
82+
get-proofs [options] [group-id] Get the proofs of a group from a supported network (e.g. sepolia or arbitrum).
8383
help [command] Display help for a specific command.
8484
```

‎packages/cli/src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ program
117117

118118
program
119119
.command("get-groups")
120-
.description("Get the list of groups from a supported network (e.g. goerli or arbitrum).")
120+
.description("Get the list of groups from a supported network (e.g. sepolia or arbitrum).")
121121
.option("-n, --network <network-name>", "Supported Ethereum network.")
122122
.allowExcessArguments(false)
123123
.action(async ({ network }) => {
@@ -146,7 +146,7 @@ program
146146

147147
program
148148
.command("get-group")
149-
.description("Get the data of a group from a supported network (e.g. goerli or arbitrum).")
149+
.description("Get the data of a group from a supported network (e.g. sepolia or arbitrum).")
150150
.argument("[group-id]", "Identifier of the group.")
151151
.option("-n, --network <network-name>", "Supported Ethereum network.")
152152
.allowExcessArguments(false)
@@ -217,7 +217,7 @@ program
217217

218218
program
219219
.command("get-members")
220-
.description("Get the members of a group from a supported network (e.g. goerli or arbitrum).")
220+
.description("Get the members of a group from a supported network (e.g. sepolia or arbitrum).")
221221
.argument("[group-id]", "Identifier of the group.")
222222
.option("-n, --network <network-name>", "Supported Ethereum network.")
223223
.allowExcessArguments(false)
@@ -283,7 +283,7 @@ program
283283

284284
program
285285
.command("get-proofs")
286-
.description("Get the proofs of a group from a supported network (e.g. goerli or arbitrum).")
286+
.description("Get the proofs of a group from a supported network (e.g. sepolia or arbitrum).")
287287
.argument("[group-id]", "Identifier of the group.")
288288
.option("-n, --network <network-name>", "Supported Ethereum network.")
289289
.allowExcessArguments(false)

‎packages/contracts/contracts/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ yarn deploy:semaphore --semaphoreVerifier <address>
107107
> **Note**
108108
> Run `yarn deploy:semaphore --help` to see the complete list.
109109
110-
If you want to deploy your contract in a specific network you can set up the `DEFAULT_NETWORK` variable in your `.env` file with the name of one of our supported networks (hardhat, localhost, goerli, arbitrum). Or you can specify it as an option:
110+
If you want to deploy your contract in a specific network you can set up the `DEFAULT_NETWORK` variable in your `.env` file with the name of one of our supported networks (hardhat, localhost, sepolia, arbitrum). Or you can specify it as an option:
111111

112112
```bash
113-
yarn deploy:semaphore --network goerli
114113
yarn deploy:semaphore --network sepolia
115114
yarn deploy:semaphore --network mumbai
116-
yarn deploy:semaphore --network optimism-goerli
115+
yarn deploy:semaphore --network optimism-sepolia
116+
yarn deploy:semaphore --network arbitrum-sepolia
117117
yarn deploy:semaphore --network arbitrum
118118
```
119119

120-
If you want to deploy contracts on Goerli or Arbitrum, remember to provide a valid private key and an Infura API in your `.env` file.
120+
If you want to deploy contracts on Sepolia or Arbitrum, remember to provide a valid private key and an Infura API in your `.env` file.

0 commit comments

Comments
 (0)