Merge pull request #163 from ethstorage/fixrunsh

Launch es-node fixes
ethstorage · Dec 21, 2023 · aa6e763 · aa6e763
2 parents 223cb1b + 2ebf36f
commit aa6e763
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,4 +21,4 @@ COPY --from=builder /es-node/run.sh /es-node/
 RUN chmod +x /es-node/run.sh
 WORKDIR /es-node
 
-EXPOSE 9545 9222 30305/udp
+EXPOSE 9545 9222 9222/udp
diff --git a/GUIDE.md b/GUIDE.md
@@ -77,9 +77,9 @@ docker run --name es  -d  \
           -e ES_NODE_SIGNER_PRIVATE_KEY=<private_key> \
           -p 9545:9545 \
           -p 9222:9222 \
-          -p 30305:30305/udp \
+          -p 9222:9222/udp \
           --entrypoint /es-node/run.sh \
-          ghcr.io/ethstorage/es-node
+          ghcr.io/ethstorage/es-node:v0.1.4
 ```
 
 You can check docker logs using the following command:

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     ports:
       - '9545:9545'
       - '9222:9222'
-      - '30305:30305/udp'
+      - '9222:9222/udp'
     volumes:
       - ./es-data:/es-node/es-data
     environment:

diff --git a/run-docker.sh b/run-docker.sh
@@ -47,7 +47,7 @@ else
             -e ES_NODE_SIGNER_PRIVATE_KEY=$ES_NODE_SIGNER_PRIVATE_KEY \
             -p 9545:9545 \
             -p 9222:9222 \
-            -p 30305:30305/udp \
+            -p 9222:9222/udp \
             -d \
             --entrypoint /es-node/run.sh \
             $image_name

diff --git a/run-rpc.sh b/run-rpc.sh
@@ -21,7 +21,6 @@ es_node_start=" --network devnet \
   --l1.beacon http://65.109.115.36:5052 \
   --l1.beacon-based-time 1701262812 \
   --l1.beacon-based-slot 1 \
-  --p2p.listen.udp 30305 \
   --p2p.max.request.size 4194304 \
   --p2p.sync.concurrency 32 \
   --p2p.bootnodes enr:-Li4QPFCNc7mLPqxoVrk1eKB0qa5hb8H75IBwhvdSGGdamx1egKibkKO1v1rtLt7r3pJvoVxv95ITlpSphYCAsunU6qGAYwkwuOpimV0aHN0b3JhZ2XbAYDY15S0tGvaqDX45LTY4gi2VZzSZ4UQUcGAgmlkgnY0gmlwhEFtcySJc2VjcDI1NmsxoQM9rkUZ7qWoJQT2UVrPzDRzmLqDrxCSR4zC4db-lgz1bYN0Y3CCJAaDdWRwgnZh \

diff --git a/run.sh b/run.sh
@@ -30,6 +30,7 @@ if [ ! -e  ${zkey_file} ]; then
   file_id="1ZLfhYeCXMnbk6wUiBADRAn1mZ8MI_zg-"
   html=`curl -c ./cookie -s -L "https://drive.google.com/uc?export=download&id=${file_id}"`
   curl -Lb ./cookie "https://drive.google.com/uc?export=download&`echo ${html}|grep -Eo 'confirm=[a-zA-Z0-9\-_]+'`&id=${file_id}" -o ${zkey_file}
+  rm cookie
 fi
 
 executable="./build/bin/es-node"
@@ -47,15 +48,13 @@ es_node_init="init --shard_index 0"
 
 # start node 
 # TODO remove --network
-# TODO remove --miner.priority-gas-price and --miner.gas-price when gas price query is available
 es_node_start=" --network devnet \
   --miner.enabled \
   --storage.files $storage_file_0 \
   --signer.private-key $ES_NODE_SIGNER_PRIVATE_KEY \
   --l1.beacon http://65.109.115.36:5052 \
   --l1.beacon-based-time 1701262812 \
   --l1.beacon-based-slot 1 \
-  --p2p.listen.udp 30305 \
   --download.thread 32 \
   --p2p.max.request.size 4194304 \
   --p2p.sync.concurrency 32 \