Merge pull request #350 from yorickdowne/main

Nimbus and Erigon changes

README.md

@@ -18,4 +18,4 @@ For a quick testnet start, you can install prerequisites and configure eth-docke
 
 # Version
 
-This is eth-docker v1.6.3
+This is eth-docker v1.6.4

default.env

@@ -35,12 +35,14 @@ CC_HOST=cc
 DDNS_SUBDOMAIN=
 DDNS_PROXY=true
 
-# Teku/Lighthouse/Lodestar rapid sync via initial state/checkpoint. For Teku or Lighthouse, please create an Infura
+# Teku/Lighthouse/Nimbus/Lodestar rapid sync via initial state/checkpoint. For Teku, Lighthouse or Nimbus, please create an Infura
 # eth2/beacon project first, then replace the {projectid} and {secret} here and use one of these lines instead of the empty one
 #TEKU_RAPID_SYNC=--initial-state=https://{projectid}:{secret}@eth2-beacon-${NETWORK}.infura.io/eth/v1/debug/beacon/states/finalized
 #LH_RAPID_SYNC=--checkpoint-sync-url=https://{projectid}:{secret}@eth2-beacon-${NETWORK}.infura.io/
+#NIMBUS_RAPID_SYNC=--trusted-node-url=https://{projectid}:{secret}@eth2-beacon-${NETWORK}.infura.io/
 TEKU_RAPID_SYNC=
 LH_RAPID_SYNC=
+NIMBUS_RAPID_SYNC=
 # Set this to true to rapid sync Lodestar
 LS_RAPID_SYNC=false
 

erigon.yml

@@ -65,6 +65,8 @@ services:
       - /var/lib/erigon
       - --private.api.addr
       - erigon:9090
+      - --txpool.api.addr
+      - erigon:9090
       - --http.addr
       - 0.0.0.0
       - --http.vhosts=*

ethd

@@ -226,9 +226,9 @@ envmigrate() {
              PRYSM_PEER_COUNT LH_PEER_COUNT TEKU_PEER_COUNT NIM_PEER_COUNT DOMAIN ACME_EMAIL \
              CF_EMAIL CF_API_TOKEN AWS_PROFILE AWS_HOSTED_ZONE_ID GRAFANA_HOST PRYSM_HOST \
              EC_HOST EC_WS_HOST CC_HOST DDNS_SUBDOMAIN DDNS_PROXY TEKU_RAPID_SYNC LH_RAPID_SYNC LS_RAPID_SYNC  \
-             CC_NODE BEACON_STATS_API BEACON_STATS_MACHINE EC_P2P_PORT LH_PORT PRYSM_PORT PRYSM_UDP_PORT \
-             NIM_PORT TEKU_PORT GRAFANA_PORT PRYSM_WEB_PORT TRAEFIK_WEB_PORT TRAEFIK_WEB_HTTP_PORT EC_RPC_PORT \
-             EC_WS_PORT RESTART LOG_LEVEL GETH_CACHE ERIGON_PRUNE )
+	     NIMBUS_RAPID_SYNC CC_NODE BEACON_STATS_API BEACON_STATS_MACHINE EC_P2P_PORT LH_PORT PRYSM_PORT  \
+	     PRYSM_UDP_PORT NIM_PORT TEKU_PORT GRAFANA_PORT PRYSM_WEB_PORT TRAEFIK_WEB_PORT TRAEFIK_WEB_HTTP_PORT \
+	     EC_RPC_PORT EC_WS_PORT RESTART LOG_LEVEL GETH_CACHE ERIGON_PRUNE )
     TARGET_VARS=( NIM_SRC_BUILD_TARGET NIM_DOCKER_TAG NIM_DOCKERFILE TEKU_SRC_BUILD_TARGET TEKU_DOCKER_TAG \
                 TEKU_DOCKERFILE LH_SRC_BUILD_TARGET LH_DOCKER_TAG LH_DOCKERFILE PRYSM_SRC_BUILD_TARGET \
                 PRYSM_DOCKER_TAG PRYSM_DOCKERFILE ERIGON_SRC_BUILD_TARGET ERIGON_DOCKER_TAG ERIGON_DOCKERFILE \
@@ -483,11 +483,67 @@ config () {
         if (whiptail --title "Select Option" --yesno "Do you want to use Teku rapid sync with remote beacon, e.g. Infura?" 10 60) then
             query_remote_beacon
             TEKU_RAPID_SYNC="--initial-state=${REMOTE_BEACON}/eth/v1/debug/beacon/states/finalized"
+            LH_RAPID_SYNC=""
+            LS_RAPID_SYNC="false"
+            NIMBUS_RAPID_SYNC=""
+            PRYSM_RAPID_SYNC=""
         else
             TEKU_RAPID_SYNC=""
+            LH_RAPID_SYNC=""
+            LS_RAPID_SYNC="false"
+            NIMBUS_RAPID_SYNC=""
+            PRYSM_RAPID_SYNC=""
+        fi
+    elif [[ "${CONSENSUS_CLIENT}" == "lh-base.yml" ]]; then
+        if (whiptail --title "Select Option" --yesno "Do you want to use Lighthouse rapid sync with remote beacon, e.g. Infura?" 10 60) then
+            query_remote_beacon
+            LH_RAPID_SYNC="--checkpoint-sync-url=${REMOTE_BEACON}"
+            TEKU_RAPID_SYNC=""
+            LS_RAPID_SYNC="false"
+            NIMBUS_RAPID_SYNC=""
+            PRYSM_RAPID_SYNC=""
+        else
+            LH_RAPID_SYNC=""
+            TEKU_RAPID_SYNC=""
+            LS_RAPID_SYNC="false"
+            NIMBUS_RAPID_SYNC=""
+            PRYSM_RAPID_SYNC=""
+        fi
+#    elif [[ "${CONSENSUS_CLIENT}" == "nimbus-base.yml" ]]; then
+#        if (whiptail --title "Select Option" --yesno "Do you want to use Nimbus rapid sync with remote beacon, e.g. Infura?" 10 60) then
+#            query_remote_beacon
+#            NIMBUS_RAPID_SYNC="--trusted-node-url=${REMOTE_BEACON}"
+#            LH_RAPID_SYNC=""
+#            TEKU_RAPID_SYNC=""
+#            LS_RAPID_SYNC="false"
+#            PRYSM_RAPID_SYNC=""
+#        else
+#            NIMBUS_RAPID_SYNC=""
+#            LH_RAPID_SYNC=""
+#            TEKU_RAPID_SYNC=""
+#            LS_RAPID_SYNC="false"
+#            PRYSM_RAPID_SYNC=""
+#        fi
+    elif [[ "${CONSENSUS_CLIENT}" == "lodestar-base.yml" ]]; then
+        if (whiptail --title "Select Option" --yesno "Do you want to use Lodestar rapid sync with remote beacon?" 10 60) then
+            LS_RAPID_SYNC="true"
+            NIMBUS_RAPID_SYNC=""
+            LH_RAPID_SYNC=""
+            TEKU_RAPID_SYNC=""
+            PRYSM_RAPID_SYNC=""
+        else
+            LS_RAPID_SYNC="false"
+            NIMBUS_RAPID_SYNC=""
+            LH_RAPID_SYNC=""
+            TEKU_RAPID_SYNC=""
+            PRYSM_RAPID_SYNC=""
         fi
     else
        TEKU_RAPID_SYNC=""
+       LH_RAPID_SYNC=""
+       LS_RAPID_SYNC="false"
+       NIMBUS_RAPID_SYNC=""
+       PRYSM_RAPID_SYNC=""
     fi
 
     COMPOSE_FILE="${CONSENSUS_CLIENT}"
@@ -506,6 +562,14 @@ config () {
     set_value_in_env
     var=TEKU_RAPID_SYNC
     set_value_in_env
+    var=LH_RAPID_SYNC
+    set_value_in_env
+    var=LS_RAPID_SYNC
+    set_value_in_env
+    var=NIMBUS_RAPID_SYNC
+    set_value_in_env
+#    var=PRYSM_RAPID_SYNC
+#    set_value_in_env
     var=COMPOSE_FILE
     set_value_in_env
     var=EC_NODE

nimbus-base.yml

@@ -50,6 +50,7 @@ services:
       - --rest-port=5052
       - --num-threads=0
       - --enr-auto-update=true
+    command: ${NIMBUS_RAPID_SYNC}
   validator-import:
     restart: "no"
     image: nimbus:local

nimbus-consensus.yml

@@ -48,6 +48,7 @@ services:
       - --subscribe-all-subnets
       - --enr-auto-update=true
       - --num-threads=0
+    command: ${NIMBUS_RAPID_SYNC}
     labels:
       - traefik.enable=true
       - traefik.http.routers.cc.service=cc