Merge branch 'refs/heads/main' into afo/prover-e2e

matter-labs · Oct 10, 2024 · b4ad77e · b4ad77e
2 parents 46acabd + 0f45d24
commit b4ad77e
Show file tree

Hide file tree

Showing 28 changed files with 302 additions and 154 deletions.
diff --git a/docker/Makefile b/docker/Makefile
@@ -55,7 +55,7 @@ check-tools: check-nodejs check-yarn check-rust check-sqlx-cli check-docker chec
 
 # Check that contracts are checkout properly
 check-contracts:
-	@if [ ! -d ../contracts/l1-contracts/lib/forge-std/foundry.toml ] || [ -z "$$(ls -A ../contracts/l1-contracts/lib/forge-std/foundry.toml)" ]; then \
+	@if [ -z "$$(ls -A ../contracts/l1-contracts/lib/forge-std/foundry.toml)" ]; then \
 		echo "l1-contracts git submodule is missing. Please re-download repo with 'git clone --recurse-submodules https://github.com/matter-labs/zksync-era.git'"; \
 		exit 1; \
 	fi
@@ -65,8 +65,7 @@ check-contracts:
 prepare-contracts: check-tools check-contracts
 	@cd ../ && \
 	export ZKSYNC_HOME=$$(pwd) && \
-	export PATH=$$PATH:$${ZKSYNC_HOME}/bin && \
-	export PATH=$$PATH:$${ZKSYNC_HOME}/zkstack_cli/zkstackup && \
+	export PATH=$$PATH:$${ZKSYNC_HOME}/bin:$${ZKSYNC_HOME}/zkstack_cli/zkstackup && \
 	zkt || true && \
 	zk_supervisor contracts && \
 	mkdir -p contracts/l1-contracts/artifacts

diff --git a/docker/zk-environment/22.04_amd64_cuda_11_8.Dockerfile b/docker/zk-environment/22.04_amd64_cuda_11_8.Dockerfile
@@ -109,9 +109,7 @@ RUN wget -c https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2 && \
 
 # Setup the environment
 ENV ZKSYNC_HOME=/usr/src/zksync
-ENV PATH="${ZKSYNC_HOME}/bin:${PATH}" \
-    PATH="${ZKSYNC_HOME}/zkstack_cli/zkstackup:${PATH}" \
-    PATH="${HOME}/.local/bin:${PATH}"
+ENV PATH="${ZKSYNC_HOME}/bin:${ZKSYNC_HOME}/zkstack_cli/zkstackup:${HOME}/.local/bin:${PATH}"
 ENV CI=1
 RUN cargo install sccache
 ENV RUSTC_WRAPPER=/usr/local/cargo/bin/sccache

diff --git a/docker/zk-environment/22.04_amd64_cuda_12_0.Dockerfile b/docker/zk-environment/22.04_amd64_cuda_12_0.Dockerfile
@@ -98,9 +98,7 @@ RUN wget -c https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksol
 
 # Setup the environment
 ENV ZKSYNC_HOME=/usr/src/zksync
-ENV PATH="${ZKSYNC_HOME}/bin:${PATH}" \
-    PATH="${ZKSYNC_HOME}/zkstack_cli/zkstackup:${PATH}" \
-    PATH="${HOME}/.local/bin:${PATH}"
+ENV PATH="${ZKSYNC_HOME}/bin:${ZKSYNC_HOME}/zkstack_cli/zkstackup:${HOME}/.local/bin:${PATH}"
 ENV CI=1
 RUN cargo install sccache
 ENV RUSTC_WRAPPER=/usr/local/cargo/bin/sccache

diff --git a/docker/zk-environment/Dockerfile b/docker/zk-environment/Dockerfile
@@ -164,9 +164,7 @@ RUN wget -c https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2 && \
 
 # Setup the environment
 ENV ZKSYNC_HOME=/usr/src/zksync
-ENV PATH="${ZKSYNC_HOME}/bin:${PATH}" \
-    PATH="${ZKSYNC_HOME}/zkstack_cli/zkstackup:${PATH}" \
-    PATH="${HOME}/.local/bin:${PATH}"
+ENV PATH="${ZKSYNC_HOME}/bin:${ZKSYNC_HOME}/zkstack_cli/zkstackup:${HOME}/.local/bin:${PATH}"
 ENV CI=1
 ENV RUSTC_WRAPPER=/usr/local/cargo/bin/sccache
 

diff --git a/docs/guides/external-node/00_quick_start.md b/docs/guides/external-node/00_quick_start.md
@@ -6,6 +6,8 @@ Install `docker compose` and `Docker`
 
 ## Running ZKsync node locally
 
+These commands start ZKsync node locally inside docker.
+
 To start a mainnet instance, run:
 
 ```sh
@@ -34,9 +36,10 @@ cd docker-compose-examples
 sudo docker compose --file testnet-external-node-docker-compose.yml down --volumes
 ```
 
-You can see the status of the node (after recovery) in [local grafana dashboard](http://localhost:3000/dashboards).
+### Observability
 
-Those commands start ZKsync node locally inside docker.
+You can see the status of the node (after recovery) in [local grafana dashboard](http://localhost:3000/dashboards).
+You can also access a debug page with more information about the node [here](http://localhost:5000).
 
 The HTTP JSON-RPC API can be accessed on port `3060` and WebSocket API can be accessed on port `3061`.
 

diff --git a/...ides/external-node/docker-compose-examples/grafana/provisioning/dashboards/Consensus.json b/...ides/external-node/docker-compose-examples/grafana/provisioning/dashboards/Consensus.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 3,
+  "id": 2,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -1005,7 +1005,7 @@
         "type": "prometheus",
         "uid": "PBFA97CFB590B2093"
       },
-      "description": "Rate of RPC client requests, in packets per second.",
+      "description": "Rate of RPC client requests, in requests per second.",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1054,7 +1054,7 @@
               }
             ]
           },
-          "unit": "pps"
+          "unit": "reqps"
         },
         "overrides": []
       },
@@ -1098,7 +1098,7 @@
         "type": "prometheus",
         "uid": "PBFA97CFB590B2093"
       },
-      "description": "Rate of RPC server responses, in packets per second.",
+      "description": "Rate of RPC server responses, in requests per second.",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1147,7 +1147,7 @@
               }
             ]
           },
-          "unit": "pps"
+          "unit": "reqps"
         },
         "overrides": []
       },
@@ -1202,6 +1202,6 @@
   "timezone": "",
   "title": "Consensus",
   "uid": "STAAEORNk",
-  "version": 4,
+  "version": 2,
   "weekStart": ""
 }