45 improper sourcing of nodekey

.github/workflows/docker-publish.yml

@@ -7,7 +7,7 @@ name: Docker
 
 on:
   push:
-    branches: [ "master", "development", "27-btc-sync-optimizations" ]
+    branches: [ "master", "development" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:

app/src/app.rs

@@ -129,29 +129,29 @@ impl App {
     }
 
     fn init_tracing(&self) {
-        // let rust_log_level = Level::from_str(
-        //     std::env::var("RUST_LOG")
-        //         .unwrap_or("info".to_string())
-        //         .as_str(),
-        // )
-        // .unwrap();
+        let rust_log_level = Level::from_str(
+            std::env::var("RUST_LOG")
+                .unwrap_or("info".to_string())
+                .as_str(),
+        )
+        .unwrap();
 
-        let filter = EnvFilter::builder().from_env_lossy();
+        let filter = EnvFilter::builder().parse_lossy(rust_log_level.as_str());
 
         let main_layer = tracing_subscriber::fmt::layer().with_target(true);
 
-        // let layers = if rust_log_level == Level::DEBUG || rust_log_level == Level::TRACE {
-        //     vec![main_layer
-        //         .with_file(true)
-        //         .with_line_number(true)
-        //         .with_filter(filter)
-        //         .boxed()]
-        // } else {
-        //     vec![main_layer.with_filter(filter).boxed()]
-        // };
+        let layers = if rust_log_level == Level::DEBUG || rust_log_level == Level::TRACE {
+            vec![main_layer
+                .with_file(true)
+                .with_line_number(true)
+                .with_filter(filter)
+                .boxed()]
+        } else {
+            vec![main_layer.with_filter(filter).boxed()]
+        };
 
         tracing_subscriber::registry()
-            .with(vec![main_layer.with_filter(filter).boxed()])
+            .with(layers)
             .init();
     }
 

commit.sh

@@ -154,7 +154,7 @@ while true; do
     fi
 done
 
-COMMIT_BODY=$(echo -e "$GIT_COMMIT_TYPE$BREAKING_CHANGE: $GIT_COMMIT_MESSAGE\n\n$BODY\n\nISSUE: $GITHUB_ISSUE\n")
+COMMIT_BODY=$(echo -e "$GIT_COMMIT_TYPE$BREAKING_CHANGE: $GIT_COMMIT_MESSAGE\n\n$BODY\n\nISSUE: #$GITHUB_ISSUE\n")
 
 echo -e "\n============================================================\n"
 

etc/generate-jwt.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # Borrowed from EthStaker's prepare for the merge guide
 # See https://github.com/remyroy/ethstaker/blob/main/prepare-for-the-merge.md#configuring-a-jwt-token-file
 

scripts/regtest_pegout.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/utils/shared.sh

scripts/start_full_node.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/utils/shared.sh

scripts/start_geth.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # Load utility functions from geth.sh
 SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 BASE_DIR=$(realpath "$SCRIPT_DIR/../")

scripts/start_network.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/utils/shared.sh

scripts/start_reth.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

scripts/tests/1_produce_signed_blocks.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/../utils/shared.sh

scripts/tests/2_merged_mining.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/../utils/shared.sh

scripts/tests/3_peg_in.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/../utils/shared.sh

scripts/tests/4_evm.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/../utils/shared.sh

scripts/tests/5_peg_out.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/../utils/shared.sh

scripts/tests/6_network_e2e.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # includes
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 . $SCRIPT_DIR/../utils/shared.sh

scripts/utils/geth.sh

@@ -21,6 +21,17 @@ function start_geth() {
     local LOG_FILE=$(get_log_path $NUM)
 
 
+    # Define the file path
+    FILE_PATH="${BASE_DIR}/etc/data/execution/node_${NUM}/bootnode.key"
+
+    # Check if the file exists
+    if [ -f "$FILE_PATH" ]; then
+        # File exists, include the argument
+        ARGUMENT="--nodekey \"${BASE_DIR}/etc/data/execution/node_${NUM}/bootnode.key\""
+    else
+        # File does not exist, do not include the argument
+        ARGUMENT=""
+    fi
     # rm -rf "${BASE_DIR}/etc/data/execution/node_${NUM}"
     # mkdir -p "${BASE_DIR}/etc/data/execution/node_${NUM}" "${BASE_DIR}/etc/data/logs"
     # touch "$LOG_FILE"
@@ -63,7 +74,7 @@ function start_geth() {
          --metrics.expensive \
          --miner.gasprice 1 \
          --history.state 0 \
-         --nodekey "${BASE_DIR}/etc/data/execution/node_0/bootnode.key"
+          $ARGUMENT &
     GETH_PIDS[$NUM]=$!
 }