[pull] main from base-org:main (#7)

See [Commits](//pull/7/commits) and
[Changes](//pull/7/files) for more details.

-----
Created by [<img src="https://prod.download/pull-18h-svg"
valign="bottom"/> **pull[bot]**](https://github.com/wei/pull)

_Can you help keep this open source service alive? **[💖 Please sponsor :
)](https://prod.download/pull-pr-sponsor)**_

.dockerignore

@@ -0,0 +1,2 @@
+geth-data/
+reth-data/

.gitignore

@@ -1,3 +1,4 @@
 /.idea/
 /geth-data/
-/reth-data/
+/reth-data/
+.DS_Store

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" ]'

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}"

reth/Dockerfile

@@ -3,26 +3,25 @@ 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" ]'
 
 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
 
 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=ffd71a0b024e6c20f15cb95bcdf1b4882fc91093
 RUN git clone $REPO . && git checkout $COMMIT
 
 RUN cargo build --bin op-reth --locked --features $FEATURES --profile maxperf