From 495978848581df69094af12c7989ae32a6e223fe Mon Sep 17 00:00:00 2001
From: Luka Gulin <lg@shardlabs.io>
Date: Wed, 11 Oct 2023 15:40:37 +0200
Subject: [PATCH] Bump upstream and change state schema

---
 Dockerfile         |  2 ++
 docker-compose.yml | 17 +++++++++++++----
 entrypoint.sh      | 17 +----------------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 650bcea..c3c67aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,6 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 
 RUN apk update && apk add curl
 
+ENV GETH_AUTHRPC_ADDR=0.0.0.0 GETH_AUTHRPC_PORT=8551 GETH_AUTHRPC_VHOSTS=*
+
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 0e226c8..988c969 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,26 @@
 version: "3.4"
 services:
   geth.dnp.dappnode.eth:
-    image: "geth.dnp.dappnode.eth:0.1.38"
+    image: "geth.dnp.dappnode.eth:0.1.43"
     build:
       context: .
       args:
-        UPSTREAM_VERSION: v1.12.0
+        UPSTREAM_VERSION: v1.13.2
     volumes:
       - "geth:/root/.ethereum"
     environment:
       - "EXTRA_OPTION=--http.api eth,engine,net,web3,txpool"
-      - P2P_PORT=30403
-      - SYNCMODE=snap
+      - GETH_HTTP=true
+      - GETH_HTTP_ADDR=0.0.0.0
+      - GETH_HTTP_CORSDOMAIN=*
+      - GETH_HTTP_VHOSTS=*
+      - GETH_SYNCMODE=snap
+      - GETH_WS=true
+      - GETH_WS_ADDR=0.0.0.0
+      - GETH_PORT=30403
+      - GETH_METRICS=true
+      - GETH_METRICS_ADDR=0.0.0.0
+      - GETH_STATE_SCHEME=path
     ports:
       - "30403:30403/tcp"
       - "30403:30403/udp"
diff --git a/entrypoint.sh b/entrypoint.sh
index 650396a..df817ab 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -31,19 +31,4 @@ esac
 JWT=$(cat $JWT_PATH)
 curl -X POST "http://my.dappnode/data-send?key=jwt&data=${JWT}"
 
-exec geth \
-  --http --http.addr 0.0.0.0 \
-  --http.corsdomain "*" \
-  --http.vhosts "*" \
-  --syncmode ${SYNCMODE:-snap} \
-  --ws \
-  --ws.origins "*" \
-  --ws.addr 0.0.0.0 \
-  --port ${P2P_PORT} \
-  --metrics \
-  --metrics.addr 0.0.0.0 \
-  --authrpc.addr 0.0.0.0 \
-  --authrpc.port 8551 \
-  --authrpc.vhosts "*" \
-  --authrpc.jwtsecret ${JWT_PATH} \
-  $EXTRA_OPTION
+exec geth --authrpc.jwtsecret ${JWT_PATH} $EXTRA_OPTION