From 153cd4f03f4acae0b75ceb1062eab5b8147e5bf3 Mon Sep 17 00:00:00 2001
From: marioevz <marioevz@gmail.com>
Date: Wed, 5 Apr 2023 16:43:06 -0500
Subject: [PATCH 1/2] clients/ethereumjs: Change git branch

---
 clients/ethereumjs/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/ethereumjs/Dockerfile b/clients/ethereumjs/Dockerfile
index 3c00c29c76..44386d9bf2 100644
--- a/clients/ethereumjs/Dockerfile
+++ b/clients/ethereumjs/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:16-alpine as build
 RUN apk update && apk add --no-cache bash git jq curl python3 gcc make g++ && rm -rf /var/cache/apk/*
-RUN git clone --depth 1 https://github.com/ethereumjs/ethereumjs-monorepo.git && \
+RUN git clone --depth 1 -b develop-v7 https://github.com/ethereumjs/ethereumjs-monorepo.git && \
     (cd ethereumjs-monorepo && npm i)
 
 RUN cd ethereumjs-monorepo/packages/client && npm ethereumjs --version > /version.txt

From 09d10f0b37007d449999c77ad4f3635a46003456 Mon Sep 17 00:00:00 2001
From: marioevz <marioevz@gmail.com>
Date: Wed, 5 Apr 2023 17:18:53 -0500
Subject: [PATCH 2/2] clients/ethereumjs: Fix bash script issues

---
 clients/ethereumjs/ethereumjs.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/clients/ethereumjs/ethereumjs.sh b/clients/ethereumjs/ethereumjs.sh
index 2fecac56ea..14e073e57d 100644
--- a/clients/ethereumjs/ethereumjs.sh
+++ b/clients/ethereumjs/ethereumjs.sh
@@ -64,7 +64,7 @@ cat /genesis.json
 if [ "$HIVE_CLIQUE_PRIVATEKEY" != "" ]; then
     # Create password file.
     echo "Importing clique key..."
-    echo "$HIVE_CLIQUE_PRIVATEKEY" > ./private_key.txt
+    echo -n "$HIVE_CLIQUE_PRIVATEKEY" > ./private_key.txt
     # Ensure password file is used when running ethereumjs in mining mode.
     if [ "$HIVE_MINER" != "" ]; then
         FLAGS="$FLAGS --mine --unlock ./private_key.txt --minerCoinbase $HIVE_MINER"
@@ -84,6 +84,8 @@ if [ -f /chain.rlp ]; then
   echo "Warning: chain.rlp not found."
 fi
 
-FLAGS="$FLAGS --bootnodes=$HIVE_BOOTNODE"
+if [ "$HIVE_BOOTNODE" != "" ]; then
+    FLAGS="$FLAGS --bootnodes=$HIVE_BOOTNODE"
+fi
 echo "Running ethereumjs with flags $FLAGS"
 $ethereumjs $FLAGS