From 37a3020738b3a65e32fa6eab255b063da19f22de Mon Sep 17 00:00:00 2001
From: Danyal Prout <git@dany.al>
Date: Wed, 7 Aug 2024 15:58:54 -0500
Subject: [PATCH 1/4] chore: update reth version & return to upstream (#308)

---
 .dockerignore   | 2 ++
 .gitignore      | 3 ++-
 reth/Dockerfile | 5 ++---
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..5628ed5
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+geth-data/
+reth-data/
diff --git a/.gitignore b/.gitignore
index b8be14d..b2f231e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.idea/
 /geth-data/
-/reth-data/
\ No newline at end of file
+/reth-data/
+.DS_Store
diff --git a/reth/Dockerfile b/reth/Dockerfile
index 0cae8fa..862add0 100644
--- a/reth/Dockerfile
+++ b/reth/Dockerfile
@@ -20,9 +20,8 @@ WORKDIR /app
 
 RUN apt-get update && apt-get -y upgrade && apt-get install -y git libclang-dev pkg-config curl build-essential
 
-#TODO: Revert to upstream, once https://github.com/paradigmxyz/reth/pull/9105 is merged.
-ENV REPO=https://github.com/danyalprout/reth.git
-ENV COMMIT=c79cbf4a918480556bd37204942a2d69827fed9f
+ENV REPO=https://github.com/paradigmxyz/reth.git
+ENV COMMIT=29dc8fc05f74111c9ff67ddcd03638ee081b1dc0
 RUN git clone $REPO . && git checkout $COMMIT
 
 RUN cargo build --bin op-reth --locked --features $FEATURES --profile maxperf

From 90f047f3b51b7ff7a2268ee28baca1c5827e3146 Mon Sep 17 00:00:00 2001
From: Henri Devieux <henri.devieux@gmail.com>
Date: Wed, 7 Aug 2024 17:38:52 -0400
Subject: [PATCH 2/4] Update op-node to 1.9.0 and op-geth to v1.101315.3 (#309)

---
 geth/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/geth/Dockerfile b/geth/Dockerfile
index 818a86a..7790cd6 100644
--- a/geth/Dockerfile
+++ b/geth/Dockerfile
@@ -3,8 +3,8 @@ FROM golang:1.21 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.7.7
-ENV COMMIT=f8143c8cbc4cc0c83922c53f17a1e47280673485
+ENV VERSION=v1.9.0
+ENV COMMIT=ec45f6634ab2855a4ae5d30c4e240d79f081d689
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
@@ -17,8 +17,8 @@ FROM golang:1.21 AS geth
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/op-geth.git
-ENV VERSION=v1.101315.2
-ENV COMMIT=7c2819836018bfe0ca07c4e4955754834ffad4e0
+ENV VERSION=v1.101315.3
+ENV COMMIT=8af19cf20261c0b62f98cc27da3a268f542822ee
 RUN git clone $REPO --branch $VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'

From d1639e1598195b91e2b8f8cec1302a66a253bda5 Mon Sep 17 00:00:00 2001
From: Danyal Prout <git@dany.al>
Date: Fri, 9 Aug 2024 21:00:24 -0500
Subject: [PATCH 3/4] chore: update reth (v1.0.5), op-node (v1.9.0) (#310)

* chore: update reth (v1.0.5), op-node (v1.9.0)

* bump rust container version
---
 reth/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/reth/Dockerfile b/reth/Dockerfile
index 862add0..771c309 100644
--- a/reth/Dockerfile
+++ b/reth/Dockerfile
@@ -3,8 +3,8 @@ FROM golang:1.21 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.7.7
-ENV COMMIT=f8143c8cbc4cc0c83922c53f17a1e47280673485
+ENV VERSION=v1.9.0
+ENV COMMIT=ec45f6634ab2855a4ae5d30c4e240d79f081d689
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
@@ -12,7 +12,7 @@ RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
 RUN cd op-node && \
     make VERSION=$VERSION op-node
 
-FROM rust:1.79 AS reth
+FROM rust:1.80 AS reth
 
 ARG FEATURES=jemalloc,asm-keccak,optimism
 
@@ -21,7 +21,7 @@ WORKDIR /app
 RUN apt-get update && apt-get -y upgrade && apt-get install -y git libclang-dev pkg-config curl build-essential
 
 ENV REPO=https://github.com/paradigmxyz/reth.git
-ENV COMMIT=29dc8fc05f74111c9ff67ddcd03638ee081b1dc0
+ENV COMMIT=ffd71a0b024e6c20f15cb95bcdf1b4882fc91093
 RUN git clone $REPO . && git checkout $COMMIT
 
 RUN cargo build --bin op-reth --locked --features $FEATURES --profile maxperf

From 5234654b23478fd3d044a927b669bcdb742564f4 Mon Sep 17 00:00:00 2001
From: web3-nodeops <p.marston@asphere.xyz>
Date: Mon, 12 Aug 2024 17:38:37 +0300
Subject: [PATCH 4/4] Update geth-entrypoint (#311)

use env var for GETH_DATA_DIR if set
---
 geth/geth-entrypoint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geth/geth-entrypoint b/geth/geth-entrypoint
index 8d09e4f..eb4512d 100755
--- a/geth/geth-entrypoint
+++ b/geth/geth-entrypoint
@@ -2,7 +2,7 @@
 set -eu
 
 VERBOSITY=${GETH_VERBOSITY:-3}
-GETH_DATA_DIR=/data
+GETH_DATA_DIR=${GETH_DATA_DIR:-/data}
 RPC_PORT="${RPC_PORT:-8545}"
 WS_PORT="${WS_PORT:-8546}"
 AUTHRPC_PORT="${AUTHRPC_PORT:-8551}"