From 0b5a159c34fa876072d58b9c75285d0334186a86 Mon Sep 17 00:00:00 2001
From: mattstam <mattstam@live.com>
Date: Thu, 18 Jul 2024 10:52:47 -0700
Subject: [PATCH] chore: rebase all succinct specific changes

---
 default.env                     | 4 ++--
 lighthouse-cl-only.yml          | 2 +-
 lighthouse.yml                  | 5 ++---
 lighthouse/docker-entrypoint.sh | 2 +-
 reth.yml                        | 8 ++++++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/default.env b/default.env
index d154b8f6..e171081c 100644
--- a/default.env
+++ b/default.env
@@ -200,11 +200,11 @@ TEKU_DOCKERFILE=Dockerfile.binary
 
 # Lighthouse
 # SRC build target can be a tag, a branch, or a pr as "pr-ID"
-LH_SRC_BUILD_TARGET=stable
+LH_SRC_BUILD_TARGET=unstable
 LH_SRC_REPO=https://github.com/sigp/lighthouse
 LH_DOCKER_TAG=latest
 LH_DOCKER_REPO=sigp/lighthouse
-LH_DOCKERFILE=Dockerfile.binary
+LH_DOCKERFILE=Dockerfile.source
 
 # Lighthouse Siren
 SIREN_DOCKER_TAG=latest
diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml
index 11dcd912..6a7a2351 100644
--- a/lighthouse-cl-only.yml
+++ b/lighthouse-cl-only.yml
@@ -36,7 +36,7 @@ services:
       - BEACON_STATS_API=${BEACON_STATS_API}
       - BEACON_STATS_MACHINE=${BEACON_STATS_MACHINE}
       - CL_EXTRAS=${CL_EXTRAS:-}
-      - ARCHIVE_NODE=${ARCHIVE_NODE:-false}
+      - ARCHIVE_NODE=${ARCHIVE_NODE:-true}
       - IPV6=${IPV6:-false}
       - CL_P2P_PORT=${CL_P2P_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
diff --git a/lighthouse.yml b/lighthouse.yml
index 1eacac90..be46e2fb 100644
--- a/lighthouse.yml
+++ b/lighthouse.yml
@@ -4,8 +4,7 @@ x-logging: &logging
     options:
       max-size: 100m
       max-file: "3"
-      tag: '{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}'
-
+      tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
 
 x-build: &lh-build
   context: ./lighthouse
@@ -38,7 +37,7 @@ services:
       - BEACON_STATS_API=${BEACON_STATS_API}
       - BEACON_STATS_MACHINE=${BEACON_STATS_MACHINE}
       - CL_EXTRAS=${CL_EXTRAS:-}
-      - ARCHIVE_NODE=${ARCHIVE_NODE:-false}
+      - ARCHIVE_NODE=${ARCHIVE_NODE:-true}
       - IPV6=${IPV6:-false}
       - CL_P2P_PORT=${CL_P2P_PORT:-9000}
       - CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
diff --git a/lighthouse/docker-entrypoint.sh b/lighthouse/docker-entrypoint.sh
index c0b0aa0c..b08f0c69 100755
--- a/lighthouse/docker-entrypoint.sh
+++ b/lighthouse/docker-entrypoint.sh
@@ -59,7 +59,7 @@ if [ -n "${RAPID_SYNC_URL}" ]; then
   echo "Checkpoint sync enabled"
   if [ "${ARCHIVE_NODE}" = "true" ]; then
     echo "Lighthouse archive node without pruning"
-    __prune="--reconstruct-historic-states --genesis-backfill"
+    __prune="--reconstruct-historic-states"
   else
     __prune=""
   fi
diff --git a/reth.yml b/reth.yml
index 5e2bd204..56a98957 100644
--- a/reth.yml
+++ b/reth.yml
@@ -4,7 +4,7 @@ x-logging: &logging
     options:
       max-size: 100m
       max-file: "3"
-      tag: '{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}'
+      tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
 
 services:
   execution:
@@ -70,12 +70,16 @@ services:
       - 0.0.0.0
       - --http.port
       - ${EL_RPC_PORT:-8545}
+      - --http.api
+      - web3,eth,net,debug,trace,txpool,rpc
       - --http.corsdomain=*
       - --ws
       - --ws.addr
       - 0.0.0.0
       - --ws.port
       - ${EL_WS_PORT:-8546}
+      - --ws.api
+      - web3,eth,net,debug,trace,txpool,rpc
       - --ws.origins=*
       - --authrpc.addr
       - 0.0.0.0
@@ -97,7 +101,7 @@ services:
     restart: "no"
     volumes:
       - reth-el-data:/var/lib/reth
-    entrypoint: ["/bin/sh","-c"]
+    entrypoint: ["/bin/sh", "-c"]
     command: /bin/sh
 
 volumes: