Skip to content

Commit 04516e3

Browse files
authored
Merge pull request #17 from AstarNetwork/use-astarnetwork
use astarnetwork
2 parents 064b776 + 4239661 commit 04516e3

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Project Overview :page_facing_up:
2-
[![Build Integration](https://github.com/PlasmNetwork/ZKRollups/actions/workflows/evm.yml/badge.svg)](https://github.com/PlasmNetwork/ZKRollups/actions/workflows/evm.yml)
2+
[![Build Integration](https://github.com/AstarNetwork/ZKRollups/actions/workflows/evm.yml/badge.svg)](https://github.com/AstarNetwork/ZKRollups/actions/workflows/evm.yml)
33

44
### Diclaimer
55
As a first step, we use Matter Labs' ZK Rollups contracts. Regarding the contracts, all credits goes to Matter Labs. What makes this implementation unique is that we will make a ZK Rollups Substrate pallet.
@@ -35,10 +35,10 @@ $ sh scripts/integration.sh
3535
```
3636
This script executes the following sequence.
3737

38-
1. Build Zk Rollup contracts [code](https://github.com/PlasmNetwork/ZKRollups/blob/master/scripts/integration.sh#L3)
39-
2. Build operator and prover containers [code](https://github.com/PlasmNetwork/ZKRollups/blob/master/scripts/build.sh#L30)
40-
3. Run substrate-based chain, operator, and prover, database containers [code](https://github.com/PlasmNetwork/ZKRollups/blob/master/scripts/integration.sh#L28)
41-
4. Run integration test container [code](https://github.com/PlasmNetwork/ZKRollups/blob/master/scripts/integration.sh#L29)
38+
1. Build Zk Rollup contracts [code](https://github.com/AstarNetwork/ZKRollups/blob/master/scripts/integration.sh#L3)
39+
2. Build operator and prover containers [code](https://github.com/AstarNetwork/ZKRollups/blob/master/scripts/build.sh#L30)
40+
3. Run substrate-based chain, operator, and prover, database containers [code](https://github.com/AstarNetwork/ZKRollups/blob/master/scripts/integration.sh#L28)
41+
4. Run integration test container [code](https://github.com/AstarNetwork/ZKRollups/blob/master/scripts/integration.sh#L29)
4242

4343
#### Containers
4444

docker-compose.ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
substrate:
4-
image: docker.pkg.github.com/plasmnetwork/zkrollups/substrate:latest
4+
image: docker.pkg.github.com/astarnetwork/zkrollups/substrate:latest
55
container_name: substrate
66
tty: true
77
stdin_open: true
@@ -41,7 +41,7 @@ services:
4141
- /app/node_modules
4242
- /app/build
4343
operator:
44-
image: docker.pkg.github.com/plasmnetwork/zkrollups/operator:latest
44+
image: docker.pkg.github.com/astarnetwork/zkrollups/operator:latest
4545
container_name: operator
4646
tty: true
4747
stdin_open: true
@@ -55,14 +55,14 @@ services:
5555
- "3030:3030"
5656
- "8088:8088"
5757
prover:
58-
image: docker.pkg.github.com/plasmnetwork/zkrollups/prover:latest
58+
image: docker.pkg.github.com/astarnetwork/zkrollups/prover:latest
5959
container_name: prover
6060
tty: true
6161
stdin_open: true
6262
env_file:
6363
- ./env/common.env
6464
postgres:
65-
image: docker.pkg.github.com/plasmnetwork/zkrollups/postgres:latest
65+
image: docker.pkg.github.com/astarnetwork/zkrollups/postgres:latest
6666
container_name: postgres
6767
tty: true
6868
stdin_open: true

docker-compose.test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
substrate:
4-
image: docker.pkg.github.com/plasmnetwork/zkrollups/substrate:latest
4+
image: docker.pkg.github.com/astarnetwork/zkrollups/substrate:latest
55
container_name: substrate
66
tty: true
77
stdin_open: true
@@ -10,21 +10,21 @@ services:
1010
- "5000:5000"
1111
- "6000:6000"
1212
test:
13-
image: docker.pkg.github.com/plasmnetwork/zkrollups/test:latest
13+
image: docker.pkg.github.com/astarnetwork/zkrollups/test:latest
1414
container_name: test
1515
tty: true
1616
stdin_open: true
1717
env_file:
1818
- ./env/integration.env
1919
setup:
20-
image: docker.pkg.github.com/plasmnetwork/zkrollups/setup:latest
20+
image: docker.pkg.github.com/astarnetwork/zkrollups/setup:latest
2121
container_name: setup
2222
tty: true
2323
stdin_open: true
2424
env_file:
2525
- ./env/integration.env
2626
operator:
27-
image: docker.pkg.github.com/plasmnetwork/zkrollups/operator:latest
27+
image: docker.pkg.github.com/astarnetwork/zkrollups/operator:latest
2828
container_name: operator
2929
tty: true
3030
stdin_open: true
@@ -38,14 +38,14 @@ services:
3838
- "3030:3030"
3939
- "8088:8088"
4040
prover:
41-
image: docker.pkg.github.com/plasmnetwork/zkrollups/prover:latest
41+
image: docker.pkg.github.com/astarnetwork/zkrollups/prover:latest
4242
container_name: prover
4343
tty: true
4444
stdin_open: true
4545
env_file:
4646
- ./env/common.env
4747
postgres:
48-
image: docker.pkg.github.com/plasmnetwork/zkrollups/postgres:latest
48+
image: docker.pkg.github.com/astarnetwork/zkrollups/postgres:latest
4949
container_name: postgres
5050
tty: true
5151
stdin_open: true

scripts/build.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@ git submodule update --init --recursive
55

66
if [ "$1" = "all" ]; then
77
echo "Prepare Substrate Container Image..."
8-
docker build blockchain -t docker.pkg.github.com/plasmnetwork/zkrollups/substrate:latest
9-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/substrate:latest
10-
docker rmi docker.pkg.github.com/plasmnetwork/zkrollups/substrate
8+
docker build blockchain -t docker.pkg.github.com/astarnetwork/zkrollups/substrate:latest
9+
docker push docker.pkg.github.com/astarnetwork/zkrollups/substrate:latest
10+
docker rmi docker.pkg.github.com/astarnetwork/zkrollups/substrate
1111

1212
echo "Prepare Operator Container Image..."
13-
DOCKER_BUILDKIT=1 docker build --ssh default=$HOME/.ssh/id_rsa -f test/src/zksync/docker/server/Dockerfile test/src/zksync -t docker.pkg.github.com/plasmnetwork/zkrollups/operator:latest
14-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/operator:latest
15-
docker rmi docker.pkg.github.com/plasmnetwork/zkrollups/operator
13+
DOCKER_BUILDKIT=1 docker build --ssh default=$HOME/.ssh/id_rsa -f test/src/zksync/docker/server/Dockerfile test/src/zksync -t docker.pkg.github.com/astarnetwork/zkrollups/operator:latest
14+
docker push docker.pkg.github.com/astarnetwork/zkrollups/operator:latest
15+
docker rmi docker.pkg.github.com/astarnetwork/zkrollups/operator
1616

1717
echo "Prepare Prover Contaienr Image..."
18-
DOCKER_BUILDKIT=1 docker build --ssh default=$HOME/.ssh/id_rsa -f test/src/zksync/docker/prover/Dockerfile test/src/zksync -t docker.pkg.github.com/plasmnetwork/zkrollups/prover:latest
19-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/prover:latest
20-
docker rmi docker.pkg.github.com/plasmnetwork/zkrollups/prover
18+
DOCKER_BUILDKIT=1 docker build --ssh default=$HOME/.ssh/id_rsa -f test/src/zksync/docker/prover/Dockerfile test/src/zksync -t docker.pkg.github.com/astarnetwork/zkrollups/prover:latest
19+
docker push docker.pkg.github.com/astarnetwork/zkrollups/prover:latest
20+
docker rmi docker.pkg.github.com/astarnetwork/zkrollups/prover
2121

2222
echo "Prepare Postgres And Integration, Setup Container Images..."
23-
docker build test/src/zksync/core/lib/storage/migrations -t docker.pkg.github.com/plasmnetwork/zkrollups/postgres:latest
24-
docker build test -t docker.pkg.github.com/plasmnetwork/zkrollups/test:latest
25-
docker build test -t docker.pkg.github.com/plasmnetwork/zkrollups/setup:latest -f test/DockerSetup
26-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/postgres:latest
27-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/test:latest
28-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/setup:latest
23+
docker build test/src/zksync/core/lib/storage/migrations -t docker.pkg.github.com/astarnetwork/zkrollups/postgres:latest
24+
docker build test -t docker.pkg.github.com/astarnetwork/zkrollups/test:latest
25+
docker build test -t docker.pkg.github.com/astarnetwork/zkrollups/setup:latest -f test/DockerSetup
26+
docker push docker.pkg.github.com/astarnetwork/zkrollups/postgres:latest
27+
docker push docker.pkg.github.com/astarnetwork/zkrollups/test:latest
28+
docker push docker.pkg.github.com/astarnetwork/zkrollups/setup:latest
2929
elif [ "$1" = "test" ]; then
3030
echo "Prepare Integration And Setup Container Images..."
31-
docker build test -t docker.pkg.github.com/plasmnetwork/zkrollups/test:latest
32-
docker build test -t docker.pkg.github.com/plasmnetwork/zkrollups/setup:latest -f test/DockerSetup
33-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/test:latest
34-
docker push docker.pkg.github.com/plasmnetwork/zkrollups/setup:latest
31+
docker build test -t docker.pkg.github.com/astarnetwork/zkrollups/test:latest
32+
docker build test -t docker.pkg.github.com/astarnetwork/zkrollups/setup:latest -f test/DockerSetup
33+
docker push docker.pkg.github.com/astarnetwork/zkrollups/test:latest
34+
docker push docker.pkg.github.com/astarnetwork/zkrollups/setup:latest
3535
else
3636
echo "Build Server And Prover..."
3737
DOCKER_BUILDKIT=1 docker build --ssh default=$HOME/.ssh/id_rsa -f test/src/zksync/docker/server/Dockerfile test/src/zksync -t zksync/server

scripts/integration.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ yarn build
1313
if [ "$1" = "actions" ]; then
1414
echo "Pull Container Images..."
1515
docker pull matterlabs/dev-ticker:latest &
16-
docker pull docker.pkg.github.com/plasmnetwork/zkrollups/prover:latest &
17-
docker pull docker.pkg.github.com/plasmnetwork/zkrollups/operator:latest &
18-
docker pull docker.pkg.github.com/plasmnetwork/zkrollups/postgres:latest &
19-
docker pull docker.pkg.github.com/plasmnetwork/zkrollups/test:latest &
20-
docker pull docker.pkg.github.com/plasmnetwork/zkrollups/setup:latest
21-
docker pull docker.pkg.github.com/plasmnetwork/zkrollups/substrate:latest
16+
docker pull docker.pkg.github.com/astarnetwork/zkrollups/prover:latest &
17+
docker pull docker.pkg.github.com/astarnetwork/zkrollups/operator:latest &
18+
docker pull docker.pkg.github.com/astarnetwork/zkrollups/postgres:latest &
19+
docker pull docker.pkg.github.com/astarnetwork/zkrollups/test:latest &
20+
docker pull docker.pkg.github.com/astarnetwork/zkrollups/setup:latest
21+
docker pull docker.pkg.github.com/astarnetwork/zkrollups/substrate:latest
2222

2323
echo "Start Integration Test..."
2424
docker-compose -f docker-compose.test.yml up -d substrate postgres ticker setup

0 commit comments

Comments
 (0)