Merge branch 'main' into wbnns/update-client-configs

Author: wbnns

.env.mainnet

@@ -92,4 +92,7 @@ STATSD_ADDRESS="172.17.0.1"
 # NOTE: This feature is experimental and may lead to syncing issues
 # OP_GETH_BOOTNODES=enode://87a32fd13bd596b2ffca97020e31aef4ddcc1bbd4b95bb633d16c1329f654f34049ed240a36b449fda5e5225d70fe40bc667f53c304b71f8e68fc9d448690b51@3.231.138.188:30301,enode://ca21ea8f176adb2e229ce2d700830c844af0ea941a1d8152a9513b966fe525e809c3a6c73a2c18a12b74ed6ec4380edf91662778fe0b79f6a591236e49e176f9@184.72.129.189:30301,enode://acf4507a211ba7c1e52cdf4eef62cdc3c32e7c9c47998954f7ba024026f9a6b2150cd3f0b734d9c78e507ab70d59ba61dfe5c45e1078c7ad0775fb251d7735a2@3.220.145.177:30301,enode://8a5a5006159bf079d06a04e5eceab2a1ce6e0f721875b2a9c96905336219dbe14203d38f70f3754686a6324f786c2f9852d8c0dd3adac2d080f4db35efc678c5@3.231.11.52:30301,enode://cdadbe835308ad3557f9a1de8db411da1a260a98f8421d62da90e71da66e55e98aaa8e90aa7ce01b408a54e4bd2253d701218081ded3dbe5efbbc7b41d7cef79@54.198.153.150:30301
 # OP_NETHERMIND_BOOTNODES=enode://87a32fd13bd596b2ffca97020e31aef4ddcc1bbd4b95bb633d16c1329f654f34049ed240a36b449fda5e5225d70fe40bc667f53c304b71f8e68fc9d448690b51@3.231.138.188:30301,enode://ca21ea8f176adb2e229ce2d700830c844af0ea941a1d8152a9513b966fe525e809c3a6c73a2c18a12b74ed6ec4380edf91662778fe0b79f6a591236e49e176f9@184.72.129.189:30301,enode://acf4507a211ba7c1e52cdf4eef62cdc3c32e7c9c47998954f7ba024026f9a6b2150cd3f0b734d9c78e507ab70d59ba61dfe5c45e1078c7ad0775fb251d7735a2@3.220.145.177:30301,enode://8a5a5006159bf079d06a04e5eceab2a1ce6e0f721875b2a9c96905336219dbe14203d38f70f3754686a6324f786c2f9852d8c0dd3adac2d080f4db35efc678c5@3.231.11.52:30301,enode://cdadbe835308ad3557f9a1de8db411da1a260a98f8421d62da90e71da66e55e98aaa8e90aa7ce01b408a54e4bd2253d701218081ded3dbe5efbbc7b41d7cef79@54.198.153.150:30301
-# OP_GETH_SYNCMODE=snap
+# OP_GETH_SYNCMODE=snap
+
+# FLASHBLOCKS (OPTIONAL - UNCOMMENT TO ENABLE)
+# RETH_FB_WEBSOCKET_URL=wss://mainnet.flashblocks.base.org/ws

.env.sepolia

@@ -92,4 +92,7 @@ STATSD_ADDRESS="172.17.0.1"
 # NOTE: This feature is experimental and may lead to syncing issues
 # OP_GETH_BOOTNODES=enode://87a32fd13bd596b2ffca97020e31aef4ddcc1bbd4b95bb633d16c1329f654f34049ed240a36b449fda5e5225d70fe40bc667f53c304b71f8e68fc9d448690b51@3.231.138.188:30301,enode://ca21ea8f176adb2e229ce2d700830c844af0ea941a1d8152a9513b966fe525e809c3a6c73a2c18a12b74ed6ec4380edf91662778fe0b79f6a591236e49e176f9@184.72.129.189:30301,enode://acf4507a211ba7c1e52cdf4eef62cdc3c32e7c9c47998954f7ba024026f9a6b2150cd3f0b734d9c78e507ab70d59ba61dfe5c45e1078c7ad0775fb251d7735a2@3.220.145.177:30301,enode://8a5a5006159bf079d06a04e5eceab2a1ce6e0f721875b2a9c96905336219dbe14203d38f70f3754686a6324f786c2f9852d8c0dd3adac2d080f4db35efc678c5@3.231.11.52:30301,enode://cdadbe835308ad3557f9a1de8db411da1a260a98f8421d62da90e71da66e55e98aaa8e90aa7ce01b408a54e4bd2253d701218081ded3dbe5efbbc7b41d7cef79@54.198.153.150:30301
 # OP_NETHERMIND_BOOTNODES=enode://87a32fd13bd596b2ffca97020e31aef4ddcc1bbd4b95bb633d16c1329f654f34049ed240a36b449fda5e5225d70fe40bc667f53c304b71f8e68fc9d448690b51@3.231.138.188:30301,enode://ca21ea8f176adb2e229ce2d700830c844af0ea941a1d8152a9513b966fe525e809c3a6c73a2c18a12b74ed6ec4380edf91662778fe0b79f6a591236e49e176f9@184.72.129.189:30301,enode://acf4507a211ba7c1e52cdf4eef62cdc3c32e7c9c47998954f7ba024026f9a6b2150cd3f0b734d9c78e507ab70d59ba61dfe5c45e1078c7ad0775fb251d7735a2@3.220.145.177:30301,enode://8a5a5006159bf079d06a04e5eceab2a1ce6e0f721875b2a9c96905336219dbe14203d38f70f3754686a6324f786c2f9852d8c0dd3adac2d080f4db35efc678c5@3.231.11.52:30301,enode://cdadbe835308ad3557f9a1de8db411da1a260a98f8421d62da90e71da66e55e98aaa8e90aa7ce01b408a54e4bd2253d701218081ded3dbe5efbbc7b41d7cef79@54.198.153.150:30301
-# OP_GETH_SYNCMODE=snap
+# OP_GETH_SYNCMODE=snap
+
+# FLASHBLOCKS (OPTIONAL - UNCOMMENT TO ENABLE)
+# RETH_FB_WEBSOCKET_URL=wss://sepolia.flashblocks.base.org/ws

.gitignore

@@ -2,4 +2,4 @@
 /geth-data/
 /reth-data/
 /nethermind-data/
-.DS_Store
+.DS_Store

README.md

@@ -69,6 +69,15 @@ The following are the hardware specifications we use in production:
 - **Storage**: RAID 0 of all local NVMe drives (`/dev/nvme*`)
 - **Filesystem**: ext4
 
+[!NOTE]
+To run the node using a supported client, you can use the following command:
+`CLIENT=supported_client docker compose up --build`
+ 
+Supported clients:
+ - geth
+ - reth (with Flashblocks support option, see [Reth Node README](./reth/README.md))
+ - nethermind
+
 ## Configuration
 
 ### Required Settings

docker-compose.yml

@@ -12,6 +12,8 @@ services:
     command: ["bash", "./execution-entrypoint"]
     volumes:
       - ${HOST_DATA_DIR}:/data
+    environment:
+      - NODE_TYPE=${NODE_TYPE:-vanilla}
     env_file:
       - ${NETWORK_ENV:-.env.mainnet} # Use .env.mainnet by default, override with .env.sepolia for testnet
   node:

geth/Dockerfile

@@ -3,8 +3,8 @@ FROM golang:1.22 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.13.0
-ENV COMMIT=5f003211aed7469eed7df666291a62c025d1c46c
+ENV VERSION=v1.13.2
+ENV COMMIT=c8b9f62736a7dad7e569719a84c406605f4472e6
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
@@ -24,8 +24,8 @@ RUN apt-get update && \
     build-essential
 
 ENV REPO=https://github.com/ethereum-optimism/op-geth.git
-ENV VERSION=v1.101503.2
-ENV COMMIT=37be9e05e9d6843619c9bbaabc96abc0ce653f55
+ENV VERSION=v1.101503.4
+ENV COMMIT=2b9abb39077cb88f6e8a513f09a5ea2c2569dfed
 RUN git clone $REPO --branch $VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'

reth/Dockerfile

@@ -3,8 +3,8 @@ FROM golang:1.22 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.13.0
-ENV COMMIT=5f003211aed7469eed7df666291a62c025d1c46c
+ENV VERSION=v1.13.2
+ENV COMMIT=c8b9f62736a7dad7e569719a84c406605f4472e6
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
@@ -22,14 +22,31 @@ 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 VERSION=v1.3.11
-ENV COMMIT=e0e85aa10b98fa92d32c3e820c7ed2cee0b02931
+ENV VERSION=v1.3.12
+ENV COMMIT=6f8e7258f4733279080e4bd8345ce50538a40d6e
 RUN git clone $REPO --branch $VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
 
 RUN cargo build --bin op-reth --profile maxperf --manifest-path crates/optimism/bin/Cargo.toml
 
+FROM rust:1.85 AS reth-base
+
+WORKDIR /app
+
+RUN apt-get update && apt-get -y upgrade && \
+    apt-get install -y git libclang-dev pkg-config curl build-essential && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV REPO=https://github.com/base/node-reth.git
+ENV VERSION=main
+ENV COMMIT=3f3d84634cb3fccd429a9df6ea039a77be2b907b
+RUN git clone $REPO --branch $VERSION --single-branch . && \
+    git switch -c branch-$VERSION && \
+    bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' || (echo "Commit hash verification failed" && exit 1)
+
+RUN cargo build --bin base-reth-node --release
+
 FROM ubuntu:22.04
 
 RUN apt-get update && \
@@ -41,6 +58,7 @@ WORKDIR /app
 
 COPY --from=op /app/op-node/bin/op-node ./
 COPY --from=reth /app/target/maxperf/op-reth ./
+COPY --from=reth-base /app/target/release/base-reth-node ./
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY ./reth/reth-entrypoint ./execution-entrypoint
 COPY op-node-entrypoint .

reth/README.md

@@ -0,0 +1,45 @@
+# Running a Reth Node
+
+This is a unified implementation of the Reth node set up that supports running both standard Reth or Base Reth with Flashblocks support.
+
+## Setup
+
+- See hardware requirements mentioned in the master README
+- For Base Reth mode: Access to a Flashblocks websocket endpoint (for `RETH_FB_WEBSOCKET_URL`)
+  - We provide public websocket endpoints for mainnet and devnet, included in `.env.mainnet` and `.env.sepolia`
+
+## Node Type Selection
+
+Use the `NODE_TYPE` environment variable to select the implementation:
+
+- `NODE_TYPE=vanilla` - Standard Reth implementation (default)
+- `NODE_TYPE=base` - Base L2 Reth implementation with Flashblocks support
+
+## Running the Node
+
+The node follows the standard `docker-compose` workflow in the master README.
+
+```bash
+# Run standard Reth node
+CLIENT=reth docker-compose up
+
+# Run Base L2 Reth node with Flashblocks support
+NODE_TYPE=base CLIENT=reth docker-compose up
+```
+
+## Testing Flashblocks RPC Methods
+
+When running in Base mode (`NODE_TYPE=base`), you can query a pending block using the Flashblocks RPC:
+
+```bash
+curl -X POST \
+  --data '{"jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["pending", false],"id":1}' \
+  http://localhost:8545
+```
+
+## Additional RPC Methods
+
+For a complete list of supported RPC methods, refer to:
+
+- [Standard Ethereum JSON-RPC](https://ethereum.org/en/developers/docs/apis/json-rpc/)
+- [Flashblocks RPC Methods](https://docs.base.org/chain/flashblocks#rpc-api) (Base mode only)

reth/reth-entrypoint

@@ -8,16 +8,32 @@ WS_PORT="${WS_PORT:-8546}"
 AUTHRPC_PORT="${AUTHRPC_PORT:-8551}"
 METRICS_PORT="${METRICS_PORT:-6060}"
 ADDITIONAL_ARGS=""
+NODE_TYPE="${NODE_TYPE:-vanilla}"
 
 if [[ -z "$RETH_CHAIN" ]]; then
     echo "expected RETH_CHAIN to be set" 1>&2
     exit 1
 fi
 
+# Add Flashblocks support for base mode
+if [[ "$NODE_TYPE" == "base" && -n "$RETH_FB_WEBSOCKET_URL" ]]; then
+    ADDITIONAL_ARGS="--websocket-url=$RETH_FB_WEBSOCKET_URL"
+    echo "Enabling Flashblocks support with endpoint: $RETH_FB_WEBSOCKET_URL"
+fi
+
+# Select binary based on NODE_TYPE
+if [[ "$NODE_TYPE" == "base" ]]; then
+    echo "Starting Base Reth node"
+    BINARY="./base-reth-node"
+else
+    echo "Starting vanilla Reth node"
+    BINARY="./op-reth"
+fi
+
 mkdir -p $RETH_DATA_DIR
 echo "$OP_NODE_L2_ENGINE_AUTH_RAW" > "$OP_NODE_L2_ENGINE_AUTH"
 
-exec ./op-reth node \
+exec $BINARY node \
   -vvv \
   --datadir="$RETH_DATA_DIR" \
   --log.stdout.format json \
@@ -38,6 +54,6 @@ exec ./op-reth node \
   --metrics=0.0.0.0:"$METRICS_PORT" \
   --max-outbound-peers=100 \
   --chain "$RETH_CHAIN" \
-  --rollup.sequencer-http=$OP_RETH_SEQUENCER_HTTP \
+  --rollup.sequencer-http=$RETH_SEQUENCER_HTTP \
   --rollup.disable-tx-pool-gossip \
-  $ADDITIONAL_ARGS # intentionally unquoted
+  $ADDITIONAL_ARGS