From a714d7788eb6dd8a275b095615223df811b722a0 Mon Sep 17 00:00:00 2001
From: Nico Flaig <nflaig@protonmail.com>
Date: Mon, 29 Jan 2024 10:36:52 +0100
Subject: [PATCH 1/2] Remove --force flag

---
 lodestar-vc-only.yml | 2 --
 lodestar.yml         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lodestar-vc-only.yml b/lodestar-vc-only.yml
index 28e8cc329..c7a03d061 100644
--- a/lodestar-vc-only.yml
+++ b/lodestar-vc-only.yml
@@ -66,7 +66,6 @@ services:
       - ${LOG_LEVEL}
       - --suggestedFeeRecipient
       - ${FEE_RECIPIENT}
-      - --force
     labels:
       - metrics.scrape=true
       - metrics.path=/metrics
@@ -97,7 +96,6 @@ services:
       - ${LOG_LEVEL}
       - --network
       - ${NETWORK}
-      - --force
 
   validator-keys:
     profiles: ["tools"]
diff --git a/lodestar.yml b/lodestar.yml
index b82fd51c2..42ea12574 100644
--- a/lodestar.yml
+++ b/lodestar.yml
@@ -139,7 +139,6 @@ services:
       - ${LOG_LEVEL}
       - --suggestedFeeRecipient
       - ${FEE_RECIPIENT}
-      - --force
     labels:
       - metrics.scrape=true
       - metrics.path=/metrics
@@ -170,7 +169,6 @@ services:
       - ${LOG_LEVEL}
       - --network
       - ${NETWORK}
-      - --force
 
   validator-keys:
     profiles: ["tools"]

From b21e489643cc49257d1386f899356e8ec5b695e4 Mon Sep 17 00:00:00 2001
From: Nico Flaig <nflaig@protonmail.com>
Date: Mon, 29 Jan 2024 10:43:20 +0100
Subject: [PATCH 2/2] Update deprecated CLI flags

---
 lodestar-cl-only.yml          | 2 +-
 lodestar-vc-only.yml          | 4 ++--
 lodestar.yml                  | 6 +++---
 lodestar/docker-entrypoint.sh | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lodestar-cl-only.yml b/lodestar-cl-only.yml
index 1ddba3117..29bad7253 100644
--- a/lodestar-cl-only.yml
+++ b/lodestar-cl-only.yml
@@ -72,7 +72,7 @@ services:
       - 0.0.0.0
       - --execution.urls
       - ${EL_NODE}
-      - --jwt-secret
+      - --jwtSecret
       - /var/lib/lodestar/consensus/ee-secret/jwtsecret
       - --targetPeers
       - ${CL_MIN_PEER_COUNT:-50}
diff --git a/lodestar-vc-only.yml b/lodestar-vc-only.yml
index c7a03d061..d61e0c658 100644
--- a/lodestar-vc-only.yml
+++ b/lodestar-vc-only.yml
@@ -90,9 +90,9 @@ services:
       - voluntary-exit
       - --dataDir
       - /var/lib/lodestar/validators
-      - --server
+      - --beaconNodes
       - ${CL_NODE:-http://consensus:5052}
-      -  --logLevel
+      - --logLevel
       - ${LOG_LEVEL}
       - --network
       - ${NETWORK}
diff --git a/lodestar.yml b/lodestar.yml
index 42ea12574..fd926ddb2 100644
--- a/lodestar.yml
+++ b/lodestar.yml
@@ -74,7 +74,7 @@ services:
       - 0.0.0.0
       - --execution.urls
       - ${EL_NODE}
-      - --jwt-secret
+      - --jwtSecret
       - /var/lib/lodestar/consensus/ee-secret/jwtsecret
       - --targetPeers
       - ${CL_MAX_PEER_COUNT:-50}
@@ -163,9 +163,9 @@ services:
       - voluntary-exit
       - --dataDir
       - /var/lib/lodestar/validators
-      - --server
+      - --beaconNodes
       - http://consensus:5052
-      -  --logLevel
+      - --logLevel
       - ${LOG_LEVEL}
       - --network
       - ${NETWORK}
diff --git a/lodestar/docker-entrypoint.sh b/lodestar/docker-entrypoint.sh
index 9bd92897d..4efddaa44 100755
--- a/lodestar/docker-entrypoint.sh
+++ b/lodestar/docker-entrypoint.sh
@@ -56,7 +56,7 @@ fi
 
 # Check whether we should use MEV Boost
 if [ "${MEV_BOOST}" = "true" ]; then
-  __mev_boost="--builder --builder.urls=${MEV_NODE:-http://mev-boost:18550}"
+  __mev_boost="--builder --builder.url=${MEV_NODE:-http://mev-boost:18550}"
   echo "MEV Boost enabled"
 else
   __mev_boost=""