From e4372e2832d76008e824332884d8aeb3f7970cfa Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Fri, 12 Jan 2024 02:19:17 -0800
Subject: [PATCH 01/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index b13f134ca7..45f0524c4a 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 set -exu
 
+GETH_BIN_PATH=${GETH_BIN_PATH:-geth}
 GENESIS_L1_PATH=${GENESIS_L1_PATH:-/genesis.json}
 VERBOSITY=3
 GETH_DATA_DIR=${GETH_DATA_DIR:-/data}
@@ -16,7 +17,7 @@ if [ ! -d "$GETH_KEYSTORE_DIR" ] && [ "$GETH_NODE_TYPE" = "signer" ]; then
 	echo "$GETH_KEYSTORE_DIR missing, running account import"
 	echo -n "pwd" > "$GETH_DATA_DIR"/password
 	echo -n "$BLOCK_SIGNER_PRIVATE_KEY" | sed 's/0x//' > "$GETH_DATA_DIR"/block-signer-key
-	geth --verbosity="$VERBOSITY" \
+	"$GETH_BIN_PATH" --verbosity="$VERBOSITY" \
 		--nousb \
 		account import \
 		--datadir="$GETH_DATA_DIR" \
@@ -30,7 +31,7 @@ fi
 if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
 	echo "$GETH_CHAINDATA_DIR missing, running init"
 	echo "Initializing genesis."
-	geth --verbosity="$VERBOSITY" \
+	"$GETH_BIN_PATH" --verbosity="$VERBOSITY" \
 		--nousb \
 		--state.scheme=path \
 		--db.engine=pebble \
@@ -49,7 +50,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
 	# Generate boot.key
 	echo "$BOOT_KEY" > $GETH_DATA_DIR/boot.key
 
-	exec geth \
+	exec "$GETH_BIN_PATH" \
 		--verbosity="$VERBOSITY" \
 		--datadir="$GETH_DATA_DIR" \
 		--port 30301 \
@@ -85,7 +86,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
 elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 	echo "Starting signer node"
 
-	exec geth \
+	exec "$GETH_BIN_PATH" \
 		--verbosity="$VERBOSITY" \
 		--datadir="$GETH_DATA_DIR" \
 		--port 30311 \
@@ -129,7 +130,7 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 elif [ "$GETH_NODE_TYPE" = "member" ]; then
 	echo "Starting member node"
 
-	exec geth \
+	exec "$GETH_BIN_PATH" \
 		--verbosity="$VERBOSITY" \
 		--datadir="$GETH_DATA_DIR" \
 		--port 30311 \

From 8a5b2eed87f0311205d799f89882df4c7dd3e832 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Fri, 12 Jan 2024 18:46:16 -0800
Subject: [PATCH 02/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index 45f0524c4a..3bee25e478 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -43,6 +43,11 @@ fi
 
 # Obtain assigned container IP for p2p
 NODE_IP=${NODE_IP:-$(hostname -i)}
+PUBLIC_NODE_IP=${PUBLIC_NODE_IP:-$NODE_IP}
+
+# (Optional) Echo the values for verification
+echo "NODE_IP is set to: $NODE_IP"
+echo "EXTERNAL_NODE_IP is set to: $PUBLIC_NODE_IP"
 
 if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
 	echo "Starting bootnode"
@@ -79,7 +84,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
         	--pprof.port=60601 \
 		--nodekey $GETH_DATA_DIR/boot.key \
 		--netrestrict $NET_RESTRICT \
-		--nat extip:$NODE_IP \
+		--nat extip:$PUBLIC_NODE_IP \
 		--txpool.accountqueue=512 \
 		--rpc.allow-unprotected-txs
 
@@ -125,7 +130,7 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 		--authrpc.port="8551" \
 		--authrpc.vhosts="*" \
 		--txpool.accountqueue=512 \
-		--nat extip:$NODE_IP
+		--nat extip:$PUBLIC_NODE_IP
 
 elif [ "$GETH_NODE_TYPE" = "member" ]; then
 	echo "Starting member node"
@@ -163,7 +168,7 @@ elif [ "$GETH_NODE_TYPE" = "member" ]; then
 		--authrpc.port="8551" \
 		--authrpc.vhosts="*" \
 		--txpool.accountqueue=512 \
-		--nat extip:$NODE_IP
+		--nat extip:$PUBLIC_NODE_IP
 else
 	echo "Invalid GETH_NODE_TYPE specified"
 fi

From 72f3e6cbffb75e90bbd60d226deb3d8cfa2690c4 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Sat, 13 Jan 2024 02:56:21 -0800
Subject: [PATCH 03/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index 3bee25e478..268e0b3aaa 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -43,7 +43,13 @@ fi
 
 # Obtain assigned container IP for p2p
 NODE_IP=${NODE_IP:-$(hostname -i)}
-PUBLIC_NODE_IP=${PUBLIC_NODE_IP:-$NODE_IP}
+
+if [ -n "$PUBLIC_NODE_IP" ]; then
+    NAT_FLAG="--nat extip:$PUBLIC_NODE_IP"
+else
+    NAT_FLAG="--nat none"
+fi
+
 
 # (Optional) Echo the values for verification
 echo "NODE_IP is set to: $NODE_IP"
@@ -84,7 +90,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
         	--pprof.port=60601 \
 		--nodekey $GETH_DATA_DIR/boot.key \
 		--netrestrict $NET_RESTRICT \
-		--nat extip:$PUBLIC_NODE_IP \
+		$NAT_FLAG \
 		--txpool.accountqueue=512 \
 		--rpc.allow-unprotected-txs
 
@@ -130,7 +136,7 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 		--authrpc.port="8551" \
 		--authrpc.vhosts="*" \
 		--txpool.accountqueue=512 \
-		--nat extip:$PUBLIC_NODE_IP
+		$NAT_FLAG
 
 elif [ "$GETH_NODE_TYPE" = "member" ]; then
 	echo "Starting member node"
@@ -168,7 +174,7 @@ elif [ "$GETH_NODE_TYPE" = "member" ]; then
 		--authrpc.port="8551" \
 		--authrpc.vhosts="*" \
 		--txpool.accountqueue=512 \
-		--nat extip:$PUBLIC_NODE_IP
+		$NAT_FLAG
 else
 	echo "Invalid GETH_NODE_TYPE specified"
 fi

From bca8f13241dee123fddab7ee4a37107d136a36d2 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Sat, 13 Jan 2024 02:59:19 -0800
Subject: [PATCH 04/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index 268e0b3aaa..37bfce41bc 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -90,7 +90,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
         	--pprof.port=60601 \
 		--nodekey $GETH_DATA_DIR/boot.key \
 		--netrestrict $NET_RESTRICT \
-		$NAT_FLAG \
+		"$NAT_FLAG" \
 		--txpool.accountqueue=512 \
 		--rpc.allow-unprotected-txs
 
@@ -136,7 +136,7 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 		--authrpc.port="8551" \
 		--authrpc.vhosts="*" \
 		--txpool.accountqueue=512 \
-		$NAT_FLAG
+		"$NAT_FLAG"
 
 elif [ "$GETH_NODE_TYPE" = "member" ]; then
 	echo "Starting member node"
@@ -174,7 +174,7 @@ elif [ "$GETH_NODE_TYPE" = "member" ]; then
 		--authrpc.port="8551" \
 		--authrpc.vhosts="*" \
 		--txpool.accountqueue=512 \
-		$NAT_FLAG
+		"$NAT_FLAG"
 else
 	echo "Invalid GETH_NODE_TYPE specified"
 fi

From 0a869b40b0fa9bb6fa380b7dbeb6a18d49850b25 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Sat, 13 Jan 2024 03:24:21 -0800
Subject: [PATCH 05/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index 37bfce41bc..bd75afab9e 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -45,9 +45,9 @@ fi
 NODE_IP=${NODE_IP:-$(hostname -i)}
 
 if [ -n "$PUBLIC_NODE_IP" ]; then
-    NAT_FLAG="--nat extip:$PUBLIC_NODE_IP"
+    NAT_FLAG="--nat=extip:$PUBLIC_NODE_IP"
 else
-    NAT_FLAG="--nat none"
+    NAT_FLAG="--nat=none"
 fi
 
 

From e75c17b6426c2cf99bbb5bbeb0ee9c168e451eee Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Sat, 13 Jan 2024 03:32:38 -0800
Subject: [PATCH 06/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index bd75afab9e..b7bc421d5b 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -44,7 +44,7 @@ fi
 # Obtain assigned container IP for p2p
 NODE_IP=${NODE_IP:-$(hostname -i)}
 
-if [ -n "$PUBLIC_NODE_IP" ]; then
+if [ -n "${PUBLIC_NODE_IP:-}" ]; then
     NAT_FLAG="--nat=extip:$PUBLIC_NODE_IP"
 else
     NAT_FLAG="--nat=none"

From 3ce0effb21f733f5a8b364c302d05f946e468ce9 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Sat, 13 Jan 2024 03:40:59 -0800
Subject: [PATCH 07/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index b7bc421d5b..ec53ef2712 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -43,17 +43,19 @@ fi
 
 # Obtain assigned container IP for p2p
 NODE_IP=${NODE_IP:-$(hostname -i)}
+echo "NODE_IP is set to: $NODE_IP"
 
-if [ -n "${PUBLIC_NODE_IP:-}" ]; then
+PUBLIC_NODE_IP=${PUBLIC_NODE_IP:-""}
+echo "EXTERNAL_NODE_IP is set to: $PUBLIC_NODE_IP"
+
+# Set NAT_FLAG based on whether PUBLIC_NODE_IP is empty or not
+if [ -n "$PUBLIC_NODE_IP" ]; then
     NAT_FLAG="--nat=extip:$PUBLIC_NODE_IP"
 else
     NAT_FLAG="--nat=none"
 fi
 
-
 # (Optional) Echo the values for verification
-echo "NODE_IP is set to: $NODE_IP"
-echo "EXTERNAL_NODE_IP is set to: $PUBLIC_NODE_IP"
 
 if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
 	echo "Starting bootnode"

From 0bc5bc172c0afbeff20d6fda98d555b8e16acbcd Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Fri, 19 Jan 2024 02:29:14 -0800
Subject: [PATCH 08/18] Update deploy_create2.sh

---
 geth-poa/util/deploy_create2.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/geth-poa/util/deploy_create2.sh b/geth-poa/util/deploy_create2.sh
index eda40615ee..197ff8b5f2 100755
--- a/geth-poa/util/deploy_create2.sh
+++ b/geth-poa/util/deploy_create2.sh
@@ -4,11 +4,13 @@
 
 set -e
 
-if [ -z "$1" ]; then
-    echo "Usage: $0 <JSON_RPC_URL>"
+# Use the first command line argument, if provided. Otherwise, use the environment variable.
+JSON_RPC="${1:-$JSON_RPC_URL}"
+
+if [ -z "$JSON_RPC" ]; then
+    echo "Usage: $0 <JSON_RPC_URL> or set the JSON_RPC_URL environment variable."
     exit 1
 fi
-JSON_RPC="$1"
 
 if ! [ -x "$(command -v curl)" ]; then
     echo "Curl must be installed to deploy the create2 proxy" >&2

From 4859ed5e58909fe09c67592f7edfb0cfd5e81121 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:09:52 -0800
Subject: [PATCH 09/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index ec53ef2712..4894acf9f1 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -98,6 +98,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
 
 elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 	echo "Starting signer node"
+ 	echo "BOOTNODE_ENDPOINT is set to: $BOOTNODE_ENDPOINT"
 
 	exec "$GETH_BIN_PATH" \
 		--verbosity="$VERBOSITY" \
@@ -142,6 +143,7 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 
 elif [ "$GETH_NODE_TYPE" = "member" ]; then
 	echo "Starting member node"
+	echo "BOOTNODE_ENDPOINT is set to: $BOOTNODE_ENDPOINT"
 
 	exec "$GETH_BIN_PATH" \
 		--verbosity="$VERBOSITY" \

From 417a74a6ad1b528c50c9bed4e80ae066af08efdc Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:13:53 -0800
Subject: [PATCH 10/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index 4894acf9f1..ce627caeb0 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -52,7 +52,7 @@ echo "EXTERNAL_NODE_IP is set to: $PUBLIC_NODE_IP"
 if [ -n "$PUBLIC_NODE_IP" ]; then
     NAT_FLAG="--nat=extip:$PUBLIC_NODE_IP"
 else
-    NAT_FLAG="--nat=none"
+    NAT_FLAG="--nat=any"
 fi
 
 # (Optional) Echo the values for verification

From 4390d07b67fac0946260d55be0e38f97450c32bb Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Sat, 20 Jan 2024 00:06:34 -0800
Subject: [PATCH 11/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index ce627caeb0..4894acf9f1 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -52,7 +52,7 @@ echo "EXTERNAL_NODE_IP is set to: $PUBLIC_NODE_IP"
 if [ -n "$PUBLIC_NODE_IP" ]; then
     NAT_FLAG="--nat=extip:$PUBLIC_NODE_IP"
 else
-    NAT_FLAG="--nat=any"
+    NAT_FLAG="--nat=none"
 fi
 
 # (Optional) Echo the values for verification

From e680d3588b07f5b49b25ab297a643312ec729747 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Sat, 20 Jan 2024 02:22:08 -0800
Subject: [PATCH 12/18] Update entrypoint.sh

---
 geth-poa/entrypoint.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index 4894acf9f1..b67afa50ff 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -99,11 +99,12 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
 elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 	echo "Starting signer node"
  	echo "BOOTNODE_ENDPOINT is set to: $BOOTNODE_ENDPOINT"
+  	GETH_PORT="${GETH_PORT:-30311}"
 
 	exec "$GETH_BIN_PATH" \
 		--verbosity="$VERBOSITY" \
 		--datadir="$GETH_DATA_DIR" \
-		--port 30311 \
+		--port="$GETH_PORT" \
 		--syncmode=full \
 		--gcmode=full \
 		--state.scheme=path \
@@ -144,11 +145,12 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 elif [ "$GETH_NODE_TYPE" = "member" ]; then
 	echo "Starting member node"
 	echo "BOOTNODE_ENDPOINT is set to: $BOOTNODE_ENDPOINT"
+	GETH_PORT="${GETH_PORT:-30311}"
 
 	exec "$GETH_BIN_PATH" \
 		--verbosity="$VERBOSITY" \
 		--datadir="$GETH_DATA_DIR" \
-		--port 30311 \
+		--port="$GETH_PORT" \
 		--syncmode=full \
 		--gcmode=full \
 		--state.scheme=path \

From 28b1f1cfd84da8001c66647867a699419438be33 Mon Sep 17 00:00:00 2001
From: mrekucci <4932785+mrekucci@users.noreply.github.com>
Date: Mon, 22 Jan 2024 18:14:05 +0100
Subject: [PATCH 13/18] chore: add goreleaser

---
 .github/workflows/goreleaser.yaml | 35 ++++++++++++++++++++++++
 .goreleaser.yaml                  | 45 +++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 .github/workflows/goreleaser.yaml
 create mode 100644 .goreleaser.yaml

diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml
new file mode 100644
index 0000000000..2ccc284a94
--- /dev/null
+++ b/.github/workflows/goreleaser.yaml
@@ -0,0 +1,35 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
+        run: echo "flags=--snapshot" >> $GITHUB_ENV
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.21
+          cache: true
+      - name: GHCR Docker Login
+        run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - uses: goreleaser/goreleaser-action@v5
+        with:
+          distribution: goreleaser
+          version: latest
+          args: release --clean ${{ env.flags }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
new file mode 100644
index 0000000000..67ca320417
--- /dev/null
+++ b/.goreleaser.yaml
@@ -0,0 +1,45 @@
+version: 1
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    goarm:
+      - 7
+    ignore:
+      - goos: windows
+        goarch: arm64
+    main: ./cmd/geth
+    binary: geth
+
+archives:
+  - format: tar.gz
+    # This name template makes the OS and Arch compatible with the results of `uname`.
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # Use zip for windows archives.
+    format_overrides:
+      - goos: windows
+        format: zip
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"

From aebed35c1df2aecda34c48703be2d4ebb1e9172f Mon Sep 17 00:00:00 2001
From: Shawn <44221603+shaspitz@users.noreply.github.com>
Date: Tue, 23 Jan 2024 19:04:57 -0800
Subject: [PATCH 14/18] expose rpc port as 9545 for mock l1 bootnode

---
 geth-poa/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/geth-poa/docker-compose.yml b/geth-poa/docker-compose.yml
index 78b13c160b..20a169ce18 100644
--- a/geth-poa/docker-compose.yml
+++ b/geth-poa/docker-compose.yml
@@ -177,6 +177,8 @@ services:
     networks:
       l1_net:
         ipv4_address: '172.14.0.2'
+    ports:
+      - 9545:8545 # Expose RPC port to host as 9545
     volumes:
       - geth-data-l1-bootnode:/data
     profiles:

From 25d385ff12d3d5ee392ed3b8465c3c55a9e8bd19 Mon Sep 17 00:00:00 2001
From: mrekucci <4932785+mrekucci@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:40:45 +0100
Subject: [PATCH 15/18] feat: allow change the geth verbosity by env variable

---
 geth-poa/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index b67afa50ff..f0543ef1cf 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -3,7 +3,7 @@ set -exu
 
 GETH_BIN_PATH=${GETH_BIN_PATH:-geth}
 GENESIS_L1_PATH=${GENESIS_L1_PATH:-/genesis.json}
-VERBOSITY=3
+VERBOSITY=${VERBOSITY:-3}
 GETH_DATA_DIR=${GETH_DATA_DIR:-/data}
 GETH_CHAINDATA_DIR="$GETH_DATA_DIR/geth/chaindata"
 GETH_KEYSTORE_DIR="$GETH_DATA_DIR/keystore"

From 9bfa79f50032cc8c208a22b2c936da1c4bc809ba Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:41:24 -0800
Subject: [PATCH 16/18] Update genesis.json

---
 geth-poa/genesis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geth-poa/genesis.json b/geth-poa/genesis.json
index 1d40705a8a..fe7543d605 100644
--- a/geth-poa/genesis.json
+++ b/geth-poa/genesis.json
@@ -15,7 +15,7 @@
       "arrowGlacierBlock": 0,
       "grayGlacierBlock": 0,
       "clique": {
-        "period": 200,
+        "period": 2000,
         "epoch": 30000
       }
     },

From cd9fafc825f0b747004c292cdb15d36ba3042f55 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:51:00 -0800
Subject: [PATCH 17/18] Update genesis.json

---
 geth-poa/genesis.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geth-poa/genesis.json b/geth-poa/genesis.json
index fe7543d605..0ec549625d 100644
--- a/geth-poa/genesis.json
+++ b/geth-poa/genesis.json
@@ -15,7 +15,7 @@
       "arrowGlacierBlock": 0,
       "grayGlacierBlock": 0,
       "clique": {
-        "period": 2000,
+        "period": 200,
         "epoch": 30000
       }
     },
@@ -23,7 +23,7 @@
     "timestamp": "0x6546df6d",
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000d9cd8E5DE6d55f796D980B818D350C0746C25b97788EBABe5c3dD422Ef92Ca6714A69e2eabcE1Ee40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": "0x1c9c380",
-    "difficulty": "0x1",
+    "difficulty": "0x3",
     "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "coinbase": "0x0000000000000000000000000000000000000000",
     "alloc": {

From e930493ed0c4eef0a51b568379d7a93d63e14590 Mon Sep 17 00:00:00 2001
From: kant777 <61204489+kant777@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:53:20 -0800
Subject: [PATCH 18/18] Update genesis.json

---
 geth-poa/genesis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geth-poa/genesis.json b/geth-poa/genesis.json
index 0ec549625d..1d40705a8a 100644
--- a/geth-poa/genesis.json
+++ b/geth-poa/genesis.json
@@ -23,7 +23,7 @@
     "timestamp": "0x6546df6d",
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000d9cd8E5DE6d55f796D980B818D350C0746C25b97788EBABe5c3dD422Ef92Ca6714A69e2eabcE1Ee40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": "0x1c9c380",
-    "difficulty": "0x3",
+    "difficulty": "0x1",
     "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "coinbase": "0x0000000000000000000000000000000000000000",
     "alloc": {