Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit b9126a5

Browse files
committed
switch to zkthunder
1 parent e3a7d87 commit b9126a5

File tree

10 files changed

+491
-67
lines changed

10 files changed

+491
-67
lines changed

README.md

+409-38
Large diffs are not rendered by default.

README_zksync.md

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# ZKsync Era: A ZK Rollup For Scaling Ethereum
2+
3+
[![Logo](eraLogo.png)](https://zksync.io/)
4+
5+
ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or
6+
decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring
7+
or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers
8+
write smart contracts in C++, Rust and other popular languages.
9+
10+
## Knowledge Index
11+
12+
The following questions will be answered by the following resources:
13+
14+
| Question | Resource |
15+
| ------------------------------------------------------- | ---------------------------------------------- |
16+
| What do I need to develop the project locally? | [development.md](docs/guides/development.md) |
17+
| How can I set up my dev environment? | [setup-dev.md](docs/guides/setup-dev.md) |
18+
| How can I run the project? | [launch.md](docs/guides/launch.md) |
19+
| What is the logical project structure and architecture? | [architecture.md](docs/guides/architecture.md) |
20+
| Where can I find protocol specs? | [specs.md](docs/specs/README.md) |
21+
| Where can I find developer docs? | [docs](https://docs.zksync.io) |
22+
23+
## Policies
24+
25+
- [Security policy](SECURITY.md)
26+
- [Contribution policy](CONTRIBUTING.md)
27+
28+
## License
29+
30+
ZKsync Era is distributed under the terms of either
31+
32+
- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
33+
- MIT license ([LICENSE-MIT](LICENSE-MIT) or <https://opensource.org/blog/license/mit/>)
34+
35+
at your option.
36+
37+
## Official Links
38+
39+
- [Website](https://zksync.io/)
40+
- [GitHub](https://github.com/matter-labs)
41+
- [ZK Credo](https://github.com/zksync/credo)
42+
- [Twitter](https://twitter.com/zksync)
43+
- [Twitter for Developers](https://twitter.com/zkSyncDevs)
44+
- [Discord](https://join.zksync.dev/)
45+
- [Mirror](https://zksync.mirror.xyz/)
46+
- [Youtube](https://www.youtube.com/@zkSync-era)
47+
48+
## Disclaimer
49+
50+
ZKsync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go
51+
through more audits and bug bounty programs. We would love to hear our community's thoughts and suggestions about it! It
52+
is important to state that forking it now can potentially lead to missing important security updates, critical features,
53+
and performance improvements.

core/node/eth_sender/src/eth_tx_aggregator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ impl EthTxAggregator {
393393
.await?;
394394
Self::report_eth_tx_saving(storage, &agg_op, &tx).await;
395395

396-
// zkmintlayer: A method `save_mintlayer_tx` to send the op to ipfs and mintlayer.
396+
// zkthunder: A method `save_mintlayer_tx` to send the op to ipfs and mintlayer.
397397
self.save_mintlayer_tx(&agg_op).await;
398398
}
399399

docker/local-node/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Image is always built from the server image to reuse the common parts
22
# This image is expected to be built locally beforehand (implemented in the `zk` tool)
33
# ARG BASE_VERSION=latest2.0
4-
ARG BASE_VERSION=zkmintlayer
4+
ARG BASE_VERSION=zkthunder
55
FROM matterlabs/server-v2:${BASE_VERSION}
66

77
WORKDIR /

local-setup-test/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Make sure to get the correct bridgehub address (in this example: 0x35A3783781DE0
3131
reth: only "reth:v0.2.0-beta.2"
3232
instance-type:
3333

34-
- zkmintlayer: can deploy contract and transfer
34+
- zkthunder: can deploy contract and transfer
3535
- latest2.0: can transfer
3636
- hyperlocal: can deploy contract and transfer
3737

local-setup/docker-compose-dev.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
# - L1 (reth) with explorer (blockscout)
33
# - a single postgres (with all the databases)
4-
# - L2 zkmintlayer chain, together with its explorer
4+
# - L2 zkthunder chain, together with its explorer
55

66
# Ports:
77
# - l1 explorer: http://localhost:25001 (also using 25001, 25002, 25003)
88
# - L1 chain (reth):
99
# - 25045 - rpc
10-
# - L2 chain (zkmintlayer):
10+
# - L2 chain (zkthunder):
1111
# - 25100 - http
1212
# - 25101 - ws
1313

@@ -52,10 +52,10 @@ services:
5252
POSTGRES_PORT: 5432
5353
restart: unless-stopped
5454

55-
zkmintlayer:
55+
zkthunder:
5656
stdin_open: true
5757
tty: true
58-
image: matterlabs/local-node:${INSTANCE_TYPE:-zkmintlayer-dev}
58+
image: matterlabs/local-node:${INSTANCE_TYPE:-zkthunder-dev}
5959
healthcheck:
6060
test: curl --fail http://localhost:3071/health || exit 1
6161
interval: 10s
@@ -72,7 +72,7 @@ services:
7272
- ML_BATCH_SIZE=10 # change if necessary
7373
- 4EVERLAND_API_KEY=5F2R8SK2EQNSNCHSRWIK # only for test
7474
- 4EVERLAND_SECRET_KEY=sCGfIdQZfis8YVCXnQP53SL8cPdRxyzjPLh1KYmF # only for test
75-
- 4EVERLAND_BUCKET_NAME=zkmintlayer # only for test
75+
- 4EVERLAND_BUCKET_NAME=zkthunder # only for test
7676
ports:
7777
- 127.0.0.1:25100:3050 # JSON RPC HTTP port
7878
- 127.0.0.1:25101:3051 # JSON RPC WS port

local-setup/docker-compose.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# This docker compose is setting up the full ZKMintlayer network, consisting of:
1+
# This docker compose is setting up the full zkthunder network, consisting of:
22
#
33
# - L1 (private reth) with explorer (blockscout)
44
# - a single postgres (with all the databases)
55
# - a ipfs node
6-
# - L2 zkmintlayer chain, together with its explorer
6+
# - L2 zkthunder chain, together with its explorer
77
# - hyperexplorer to merge L1, L2 all together.
88

99
# Ports (if a port is written in the form http://localhost:PORT, it means that it can be accessed from the other machine):
@@ -17,7 +17,7 @@
1717
# - http://localhost:15002 -
1818
# - http://localhost:15003 -
1919

20-
# - L2 chain (zkmintlayer):
20+
# - L2 chain (zkthunder):
2121
# - http://localhost:15100 - http rpc
2222
# - http://localhost:15101 - ws rpc
2323
# - L2 explorer:
@@ -30,7 +30,7 @@
3030
# Database is on 15432
3131
# pgAdmin to manage PostgreSQL DB is on 15430
3232

33-
# Besides, mintlayer rpc is on 13034/3034, change this in the zkmintlayer service if needed.
33+
# Besides, mintlayer rpc is on 13034/3034, change this in the zkthunder service if needed.
3434

3535
services:
3636
reth:
@@ -90,18 +90,18 @@ services:
9090
POSTGRES_PORT: 5432
9191
restart: unless-stopped
9292

93-
# zkmintlayer
93+
# zkthunder
9494
proxy-relay:
9595
image: alpine/socat:latest
9696
network_mode: host
9797
command: TCP-LISTEN:13034,fork,bind=host.docker.internal TCP-CONNECT:127.0.0.1:13034
9898
extra_hosts:
9999
- host.docker.internal:host-gateway
100100

101-
zkmintlayer:
101+
zkthunder:
102102
stdin_open: true
103103
tty: true
104-
image: matterlabs/local-node:${INSTANCE_TYPE:-zkmintlayer}
104+
image: matterlabs/local-node:${INSTANCE_TYPE:-zkthunder}
105105
healthcheck:
106106
test: curl --fail http://localhost:3071/health || exit 1
107107
interval: 10s
@@ -118,7 +118,7 @@ services:
118118
- ML_BATCH_SIZE=10 # change if necessary
119119
- 4EVERLAND_API_KEY=5F2R8SK2EQNSNCHSRWIK # only for test
120120
- 4EVERLAND_SECRET_KEY=sCGfIdQZfis8YVCXnQP53SL8cPdRxyzjPLh1KYmF # only for test
121-
- 4EVERLAND_BUCKET_NAME=zkmintlayer # only for test
121+
- 4EVERLAND_BUCKET_NAME=zkthunder # only for test
122122
ports:
123123
- 15100:3050 # JSON RPC HTTP port
124124
- 15101:3051 # JSON RPC WS port
@@ -139,7 +139,7 @@ services:
139139
environment:
140140
- PORT=3040
141141
- LOG_LEVEL=verbose
142-
- BLOCKCHAIN_RPC_URL=http://zkmintlayer:3050
142+
- BLOCKCHAIN_RPC_URL=http://zkthunder:3050
143143
ports:
144144
- 127.0.0.1:15104:3040
145145
restart: unless-stopped
@@ -155,7 +155,7 @@ services:
155155
- DATABASE_USER=postgres
156156
- DATABASE_PASSWORD=notsecurepassword
157157
- DATABASE_NAME=block-explorer
158-
- BLOCKCHAIN_RPC_URL=http://zkmintlayer:3050
158+
- BLOCKCHAIN_RPC_URL=http://zkthunder:3050
159159
- DATA_FETCHER_URL=http://data-fetcher-main:3040
160160
- BATCHES_PROCESSING_POLLING_INTERVAL=1000
161161
ports:
@@ -264,7 +264,7 @@ services:
264264

265265
hyperexplorer:
266266
depends_on:
267-
zkmintlayer:
267+
zkthunder:
268268
condition: service_healthy
269269
image: ghcr.io/mm-zk/zksync_tools:latest
270270
ports:

local-setup/hyperexplorer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"shared_bridges": {
99
"kl_exp": {
1010
"chains": {
11-
"zkmintlayer": {
11+
"zkthunder": {
1212
"chain_id": "0x10e",
13-
"l2_url": "http://zkmintlayer:3050",
13+
"l2_url": "http://zkthunder:3050",
1414
"explorer": "http://localhost:15005/?network=local",
1515
"type": "rollup"
1616
}

local-setup/start-dev.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
# see https://hub.docker.com/r/matterlabs/local-node/tags for full list.
77
# latest2.0 - is the 'main' one.
88

9-
INSTANCE_TYPE=${1:-zkmintlayer-dev}
9+
INSTANCE_TYPE=${1:-zkthunder-dev}
1010

1111
export INSTANCE_TYPE=$INSTANCE_TYPE
12-
echo "Starting ZKMintlayer Dev with instance type: $INSTANCE_TYPE"
12+
echo "Starting zkthunder Dev with instance type: $INSTANCE_TYPE"
1313
docker compose -f docker-compose-dev.yml pull
1414
docker compose -f docker-compose-dev.yml up
1515
# docker compose -f docker-compose-dev.yml up -d
1616

1717
check_all_services_healthy() {
18-
service="zkmintlayer"
18+
service="zkthunder"
1919
# service="zksync"
2020
(docker compose ps $service | grep "(healthy)")
2121
if [ $? -eq 0 ]; then
@@ -39,7 +39,7 @@ DARKGRAY='\033[0;30m'
3939
ORANGE='\033[0;33m'
4040
echo -e "${GREEN}"
4141

42-
echo -e "SUCCESS, Your local ZKMintlayer Dev is now running! Find the information below for accessing each service."
42+
echo -e "SUCCESS, Your local zkthunder Dev is now running! Find the information below for accessing each service."
4343
echo -e "┌──────────────────────────┬────────────────────────┬──────────────────────────────────────────────────┐"
4444
echo -e "│ Service │ URL │ Description │"
4545
echo -e "├──────────────────────────┼────────────────────────┼──────────────────────────────────────────────────┤"

local-setup/start.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
# see https://hub.docker.com/r/matterlabs/local-node/tags for full list.
77
# latest2.0 - is the 'main' one.
88

9-
INSTANCE_TYPE=${1:-zkmintlayer}
9+
INSTANCE_TYPE=${1:-zkthunder}
1010

1111
export INSTANCE_TYPE=$INSTANCE_TYPE
12-
echo "Starting ZKMintlayer with instance type: $INSTANCE_TYPE"
12+
echo "Starting zkthunder with instance type: $INSTANCE_TYPE"
1313
docker compose pull
1414
# docker compose up
1515
docker compose up
1616

1717
check_all_services_healthy() {
18-
service="zkmintlayer"
18+
service="zkthunder"
1919
# service="zksync"
2020
(docker compose ps $service | grep "(healthy)")
2121
if [ $? -eq 0 ]; then
@@ -39,7 +39,7 @@ DARKGRAY='\033[0;30m'
3939
ORANGE='\033[0;33m'
4040
echo -e "${GREEN}"
4141

42-
echo -e "SUCCESS, Your local ZKMintlayer is now running! Find the information below for accessing each service."
42+
echo -e "SUCCESS, Your local zkthunder is now running! Find the information below for accessing each service."
4343
echo -e "┌──────────────────────────┬────────────────────────┬──────────────────────────────────────────────────┐"
4444
echo -e "│ Service │ URL │ Description │"
4545
echo -e "├──────────────────────────┼────────────────────────┼──────────────────────────────────────────────────┤"

0 commit comments

Comments
 (0)