Skip to content

Commit 19ccfe0

Browse files
Merge pull request 0xPolygon#233 from 0xPolygon/km/more-sharon-updates
CDK deploy rollup review and updates
2 parents 024edc5 + 2bc20c0 commit 19ccfe0

File tree

8 files changed

+57
-18
lines changed

8 files changed

+57
-18
lines changed

docs/cdk/get-started/deploy-rollup/configure-node-deployment.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
3. Go to the `zkevm/zkevm-config` directory and create an `.env` file and open it for editing.
2121

2222
```sh
23-
cd ../zkevm-config/
23+
cd ~/zkevm/zkevm-config/
2424
nano .env
2525
```
2626

@@ -32,7 +32,7 @@
3232
ZKEVM_NODE_POOLDB_DATA_DIR = "~/zkevm/data/pooldb"
3333
```
3434

35-
!!! warning
35+
!!! warning "Workaround if you have configuration issues"
3636
- You may have to hardcode these variables into the `mainnet/docker-compose.yaml` file.
3737
- Also, the `ZKEVM_NETWORK` variable which you can set to `mainnet`.
3838
- Note, there are more than one references to hardcode in.
@@ -87,10 +87,10 @@
8787

8888
## Update node config
8989

90-
Add the missing parameters in the `~/zkevm/mainnet/config/environments/mainnet/public.node.config.toml` file.
90+
Add the following missing parameters to the `~/zkevm/mainnet/config/environments/mainnet/public.node.config.toml` file.
9191

9292
!!! warning
93-
Rename the file if necessary.
93+
If you're having trouble locating the configuration file, try looking for `node.config.toml`, since it may exist under that name in some cases. Once you've added the missing parameters, rename the file to `public.node.config.toml`.
9494

9595
- `ApiKey` # for Etherscan
9696
- `URL` # for Goerli node, under [ETHERMAN]

docs/cdk/get-started/deploy-rollup/create-wallets.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ npm i
6464
2. Set the following variables.
6565
6666
```sh
67-
`MNEMONIC`="..." # from wallets.txt Deployment Address mnemonic
68-
`INFURA_API_KEY`="..." # your API Key from Infura account
69-
`ETHERSCAN_API_KEY`="..." # your Etherscan API key
67+
MNEMONIC="..." # from wallets.txt Deployment Address mnemonic
68+
INFURA_API_KEY="..." # your API Key from Infura account
69+
ETHERSCAN_API_KEY="..." # your Etherscan API key
7070
```
7171
7272
3. Send 0.5 GöETH to the deployment address wallet listed in `wallets.txt`.
@@ -88,7 +88,8 @@ npm i
8888
- `admin`: deployment address in `wallets.txt`.
8989
- `zkEVMOwner`: deployment address in `wallets.txt`.
9090
- `timelockAddress`: deployment address in `wallets.txt`.
91-
- `initialZkEVMDeployer`: deployment address in `wallets.txt`.
91+
- `initialZkEVMDeployerAddress`: deployment address in `wallets.txt`.
92+
- `zkEVMDeployerAddress`: deployment address in `wallets.txt`.
9293
9394
## Deploy contracts
9495

docs/cdk/get-started/deploy-rollup/intro.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ The process is split into the following sections:
1818

1919
6. [Configure prover](configure-prover.md): Configure the prover database and the prover service.
2020

21-
7. [Start services](start-services.md): Start the services.
21+
7. [Start node](start-node.md): Start the node.
22+
23+
8. [Start services](start-services.md): Start the services.

docs/cdk/get-started/deploy-rollup/prerequisites.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ The commands on the [install dependencies page](install-dependencies.md) fulfill
1717
!!! info
1818
The mock prover is a light resource by skipping validation and instead adding a `Valid ✅` checkmark to every batch.
1919

20+
21+
<!-- TODO: Add link to full prover instructions -->
22+
2023
- 4-core CPU
2124
- 8GB RAM (16GB recommended)
2225

docs/cdk/get-started/deploy-rollup/start-node.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,31 @@ This command spins up the following services:
4343
zkevm-rpc | /src/db/db.go:53 github.com/0xPolygonHermez/zkevm-node/db.CheckMigrations()
4444
zkevm-rpc | /src/cmd/run.go:263 main.checkStateMigrations()
4545
zkevm-rpc | /src/cmd/run.go:70 main.start()
46-
zkevm-state-db | 2024-01-24 13:49:21.909 UTC [78] ERROR: relation "public.gorp_migrations" does not exist at character 22
46+
zkevm-state-db | 2024-01-24 13:49:21.909 UTC [78] ERROR: relation "public.gorp_migrations" does not exist at character 22
47+
48+
## Troubleshooting
49+
50+
### Configuration issues
51+
52+
If you have errors related to configuration issues, see the warning at step 4 in the [configure node deployment](configure-node-deployment.md#set-up) section.
53+
54+
### Process binding issue
55+
56+
If you need to restart, make sure you kill any hanging db processes with the following commands.
57+
58+
!!! info
59+
You can find the port number from the log warnings.
60+
61+
```sh
62+
sudo lsof -t -i:<DB_PORT>
63+
kill -9 <PID>
64+
```
65+
66+
### Kill all Docker containers and images
67+
68+
You can fix many restart issues and persistent errors by stopping and deleting all Docker containers and images.
69+
70+
```sh
71+
docker rm $(docker ps -aq)
72+
docker rmi $(docker images -q)
73+
```

docs/cdk/get-started/quickstart-rollup.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,13 @@ make run
6969

7070
The `make run` command spins up the containers that run the environment, but nothing else. This means that the L2 has no data yet.
7171

72-
### 3.2 Test with data
73-
74-
Test a use case from the [test with sample data](#4-test-with-sample-data) section.
75-
76-
### 3.3 Stop the environment
72+
### 3.2 Stop the environment
7773

7874
```bash
7975
make stop
8076
```
8177

82-
### 3.4 Restart the environment
78+
### 3.3 Restart the environment
8379

8480
```bash
8581
make restart

docs/cdk/get-started/quickstart-validium.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
This quick start guide shows you how to set up a CDK validium on your local machine.
1+
This quick start guide shows you how to set up a CDK validium on your local machine that sets up and runs the following components:
2+
3+
- zkEVM databases: data node, event, explorer L1 and L2, pool, state, and bridge service
4+
- zkEVM node components: aggregator, approve service, sequencer and sequence sender, sync
5+
- L1 network (mock)
6+
- Prover
7+
- Explorers L1, L2
8+
- JSON RPC explorer
9+
- L2 gas pricer
10+
- DAC: data availability service, dac setup committee
11+
- zkEVM bridge service and UI
212

313
!!! note
414
- The documentation describes standard deployments.

docs/cdk/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ hide:
1313
<div class="hero-image"><img src="../img/cdk/cdk.svg" loading="lazy" class="hero-image" style="width: 40%; float: right;"></div>
1414
<div class="hero-left">
1515
<h1 class="hero-heading">Polygon CDK</h1>
16-
<p class="hero-subtext">Polygon Chain Development Kit (CDK) is a modular, open source software toolkit for blockchain developers to launch new L2 chains on Ethereum.</p>
16+
<p class="hero-subtext">Polygon Chain Development Kit (CDK) is a modular, open source software toolkit allowing blockchain developers to launch new zero-knowledge proof (zkEVM plus optional validium) L2 chains chains on Ethereum.</p>
1717
</div>
1818
</br>
1919
</div>

0 commit comments

Comments
 (0)