update local testnet Geth version and test Electra by default

Makefile

@@ -235,7 +235,7 @@ local-testnet-minimal:
 		--remote-validators-count 512 \
 		--signer-type $(SIGNER_TYPE) \
 		--deneb-fork-epoch 0 \
-		--electra-fork-epoch 50 \
+		--electra-fork-epoch 2 \
 		--stop-at-epoch 6 \
 		--disable-htop \
 		--enable-payload-builder \
@@ -264,7 +264,7 @@ local-testnet-mainnet:
 		--data-dir $@ \
 		--nodes 2 \
 		--deneb-fork-epoch 0 \
-		--electra-fork-epoch 50 \
+		--electra-fork-epoch 2 \
 		--stop-at-epoch 6 \
 		--disable-htop \
 		--base-port $$(( $(MAINNET_TESTNET_BASE_PORT) + EXECUTOR_NUMBER * 400 + 0 )) \

scripts/execution_genesis.json.template

@@ -14,6 +14,23 @@
     "londonBlock":0,
     "shanghaiTime":SHANGHAI_FORK_TIME,
     "cancunTime":CANCUN_FORK_TIME,
+    "blobSchedule": {
+      "cancun": {
+        "target": 3,
+        "max": 6,
+        "baseFeeUpdateFraction": 3338477
+      },
+      "prague": {
+        "target": 6,
+        "max": 9,
+        "baseFeeUpdateFraction": 5007716
+      },
+      "osaka": {
+        "target": 9,
+        "max": 12,
+        "baseFeeUpdateFraction": 5007716
+      }
+    },
     "pragueTime":PRAGUE_FORK_TIME,
     "mergeForkBlock":0,
     "mergeNetsplitBlock":0,

scripts/geth_binaries.sh

@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -16,12 +16,11 @@ source "${SCRIPTS_DIR}/bash_utils.sh"
 
 : ${CURL_BINARY:="curl"}
 : ${STABLE_GETH_BINARY:="${BUILD_DIR}/downloads/geth$EXE_EXTENSION"}
-: ${GETH_CAPELLA_BINARY:="$STABLE_GETH_BINARY"}
 : ${GETH_DENEB_BINARY:="$STABLE_GETH_BINARY"}
 
 download_geth_stable() {
   if [[ ! -e "${STABLE_GETH_BINARY}" ]]; then
-    GETH_VERSION="1.14.12-293a300d"  # https://geth.ethereum.org/downloads
+    GETH_VERSION="1.15.0-756cca7c"  # https://geth.ethereum.org/downloads
     GETH_URL="https://gethstore.blob.core.windows.net/builds/"
 
     case "${OS}-${ARCH}" in
@@ -106,10 +105,6 @@ download_status_geth_binary() {
   fi
 }
 
-download_geth_capella() {
-  download_geth_stable
-}
-
 download_geth_deneb() {
   download_geth_stable
 }

scripts/launch_local_testnet.sh

@@ -443,13 +443,8 @@ LAST_SIGNER_NODE_IDX=$(( SIGNER_NODES - 1 ))
 if [[ "${RUN_GETH}" == "1" ]]; then
   source "${SCRIPTS_DIR}/geth_binaries.sh"
 
-  if [[ $DENEB_FORK_EPOCH -lt $STOP_AT_EPOCH ]]; then
-    download_geth_deneb
-    GETH_BINARY="$GETH_DENEB_BINARY"
-  else
-    download_geth_capella
-    GETH_BINARY="$GETH_CAPELLA_BINARY"
-  fi
+  download_geth_deneb
+  GETH_BINARY="$GETH_DENEB_BINARY"
 
   source ./scripts/geth_vars.sh
 fi
@@ -810,7 +805,7 @@ if [[ "$REUSE_EXISTING_DATA_DIR" == "0" ]]; then
     --out-secrets-dir="${SECRETS_DIR}" \
     --out-deposits-file="${DEPOSITS_FILE}" \
     --threshold=${REMOTE_SIGNER_THRESHOLD} \
-    --remote-validators-count=${REMOTE_VALIDATORS_COUNT} \
+    --remote-validators-count="${REMOTE_VALIDATORS_COUNT}" \
     ${REMOTE_URLS}
 fi
 
@@ -898,7 +893,7 @@ done
   --genesis-time=$GENESIS_TIME \
   --capella-fork-epoch=0 \
   --deneb-fork-epoch=$DENEB_FORK_EPOCH \
-  --electra-fork-epoch=$ELECTRA_FORK_EPOCH \
+  --electra-fork-epoch="${ELECTRA_FORK_EPOCH}" \
   --execution-genesis-block="$EXECUTION_GENESIS_BLOCK_JSON"
 
 DIRECTPEER_ENR=$(
@@ -995,7 +990,7 @@ CONTAINER_BOOTSTRAP_ENR="${CONTAINER_DATA_DIR}/node${BOOTSTRAP_NODE}/beacon_node
 #  --web3-url="$MAIN_WEB3_URL" \
 #  --deposit-contract=$DEPOSIT_CONTRACT_ADDRESS > "$DATA_DIR/log_deposit_maker.txt" 2>&1 &
 
-for NUM_NODE in $(seq 1 $NUM_NODES); do
+for NUM_NODE in $(seq 1 "${NUM_NODES}"); do
   # Copy validators to individual nodes.
   # The first $NODES_WITH_VALIDATORS nodes split them equally between them,
   # after skipping the first $USER_VALIDATORS.
@@ -1077,19 +1072,19 @@ for NUM_NODE in $(seq 1 "${NUM_NODES}"); do
   NODE_DATA_DIR="${DATA_DIR}/node${NUM_NODE}"
   CONTAINER_NODE_DATA_DIR="${CONTAINER_DATA_DIR}/node${NUM_NODE}"
   VALIDATOR_DATA_DIR="${DATA_DIR}/validator${NUM_NODE}"
-  if [[ ${NUM_NODE} == ${BOOTSTRAP_NODE} ]]; then
+  if [[ ${NUM_NODE} == "${BOOTSTRAP_NODE}" ]]; then
     # Due to star topology, the bootstrap node must relay all attestations,
     # even if it itself is not interested. --subscribe-all-subnets could be
     # removed by switching to a fully-connected topology.
     BOOTSTRAP_ARG="--netkey-file=${CONTAINER_BOOTSTRAP_NETWORK_KEYFILE} --insecure-netkey-password=true --subscribe-all-subnets --direct-peer=$DIRECTPEER_ENR"
-  elif [[ ${NUM_NODE} == ${DIRECTPEER_NODE} ]]; then
+  elif [[ ${NUM_NODE} == "${DIRECTPEER_NODE}" ]]; then
     # Start a node using the Direct Peer functionality instead of regular bootstraping
     BOOTSTRAP_ARG="--netkey-file=${DIRECTPEER_NETWORK_KEYFILE} --direct-peer=$(cat $CONTAINER_BOOTSTRAP_ENR) --insecure-netkey-password=true"
   else
     BOOTSTRAP_ARG="--bootstrap-file=${CONTAINER_BOOTSTRAP_ENR}"
   fi
 
-  if [[ ${NUM_NODE} != ${BOOTSTRAP_NODE} ]]; then
+  if [[ ${NUM_NODE} != "${BOOTSTRAP_NODE}" ]]; then
     if [[ "${CONST_PRESET}" == "minimal" ]]; then
       # The fast epoch and slot times in the minimal config might cause the
       # mesh to break down due to re-subscriptions happening within the prune