feat: the mock prover network can be started(l1 is b2node) , l2 can t…

…ransfer ether b2network/b2-node#20
b2network · Nov 8, 2023 · 413547f · 413547f
1 parent 43f84ae
commit 413547f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 34 deletions.
diff --git a/test/.env b/test/.env
@@ -2,7 +2,8 @@
 # B2_ZKEVM_PROVER_IMAGE=ghcr.io/b2network/b2-zkevm-prover:20231107-163409-c78044e
 # B2_ZKEVM_PROVER_IMAGE=ghcr.io/b2network/b2-zkevm-prover:20231107-205241-c78044e
 B2_ZKEVM_PROVER_IMAGE=ghcr.io/b2network/b2-zkevm-prover:20231107-210123-c78044e
-B2_ZKEVM_NODE_IMAGE=ghcr.io/b2network/b2-zkevm-node:develop-v0.2.0-RC1-20231027-120130-f3ea9bee
+# B2_ZKEVM_NODE_IMAGE=ghcr.io/b2network/b2-zkevm-node:develop-v0.2.0-RC1-20231027-120130-f3ea9bee
+B2_ZKEVM_NODE_IMAGE=ghcr.io/b2network/b2-zkevm-node:develop-list-20231107-220652-ef1b3337
 B2_NODE_IMAGE=ghcr.io/b2network/b2-node:20231031-175311-eb3cc87
 GRAFANA_IMAGE=grafana/grafana
 TELEGRAF_IMAGE=telegraf

diff --git a/test/Makefile b/test/Makefile
@@ -473,17 +473,16 @@ run: ## Runs a full node
 	$(RUNL1NETWORK)
 	sleep 5 
 	$(RUNZKPROVER)
-	sleep 15 
 	$(RUNAPPROVE)
-	# sleep 5
-	# $(RUNSYNC)
-	# sleep 10
-	# $(RUNETHTXMANAGER)
-	# $(RUNSEQUENCER)
-	# $(RUNSEQUENCESENDER)
-	# $(RUNL2GASPRICER)
-	# $(RUNAGGREGATOR)
-	# $(RUNJSONRPC)
+	sleep 5
+	$(RUNSYNC)
+	sleep 10
+	$(RUNETHTXMANAGER)
+	$(RUNSEQUENCER)
+	$(RUNSEQUENCESENDER)
+	$(RUNL2GASPRICER)
+	$(RUNAGGREGATOR)
+	$(RUNJSONRPC)
 
 .PHONY: stop
 stop: ## Stops all services

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -63,10 +63,11 @@ services:
       - ./config/test.genesis.config.json:/app/genesis.json
       - ./:/datastreamer
       # - ./strace-out:/strace-out
+    entrypoint:
+      - /bin/sh
     command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequencer"
+      - -c
+      - /app/b2-zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequencer
 
   zkevm-sequence-sender:
     container_name: zkevm-sequence-sender
@@ -82,10 +83,11 @@ services:
       - ./config/test.node.config.toml:/app/config.toml
       - ./config/test.genesis.config.json:/app/genesis.json
       # - ./strace-out:/strace-out
+    entrypoint:
+      - /bin/sh
     command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequence-sender"
+      - -c
+      - /app/b2-zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequence-sender
 
   zkevm-json-rpc:
     container_name: zkevm-json-rpc
@@ -102,11 +104,11 @@ services:
     volumes:
       - ./config/test.node.config.toml:/app/config.toml
       - ./config/test.genesis.config.json:/app/genesis.json
-      - ./strace-out:/strace-out
+    entrypoint:
+      - /bin/sh
     command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components rpc"
+      - -c
+      - /app/b2-zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components rpc
 
   zkevm-aggregator:
     container_name: zkevm-aggregator
@@ -121,10 +123,11 @@ services:
       - ./config/test.node.config.toml:/app/config.toml
       - ./config/test.genesis.config.json:/app/genesis.json
       # - ./strace-out:/strace-out
+    entrypoint:
+      - /bin/sh
     command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components aggregator"
+      - -c
+      - /app/b2-zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components aggregator
 
   zkevm-sync:
     container_name: zkevm-sync
@@ -138,11 +141,11 @@ services:
     volumes:
       - ./config/test.node.config.toml:/app/config.toml
       - ./config/test.genesis.config.json:/app/genesis.json
-      # - ./strace-out:/strace-out
+    entrypoint:
+      - /bin/sh
     command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components synchronizer"
+      - -c
+      - /app/b2-zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components synchronizer
 
   zkevm-eth-tx-manager:
     container_name: zkevm-eth-tx-manager
@@ -157,10 +160,11 @@ services:
       - ./config/test.node.config.toml:/app/config.toml
       - ./config/test.genesis.config.json:/app/genesis.json
       # - ./strace-out:/strace-out
+    entrypoint:
+      - /bin/sh
     command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components eth-tx-manager"
+      - -c
+      - /app/b2-zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components eth-tx-manager
 
   zkevm-l2gaspricer:
     container_name: zkevm-l2gaspricer
@@ -172,10 +176,11 @@ services:
       - ./config/test.node.config.toml:/app/config.toml
       - ./config/test.genesis.config.json:/app/genesis.json
       # - ./strace-out:/strace-out
+    entrypoint:
+      - /bin/sh
     command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components l2gaspricer"
+      - -c
+      - /app/b2-zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components l2gaspricer
 
   zkevm-state-db:
     container_name: zkevm-state-db