Flatten node runtime files

Author: danyalprout

reth/Dockerfile Dockerfilereth/Dockerfile renamed to Dockerfile

@@ -51,7 +51,7 @@ WORKDIR /app
 COPY --from=reth-base /app/target/maxperf/base-consensus ./
 COPY --from=reth-base /app/target/maxperf/base-reth-node ./
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY ./reth/reth-entrypoint ./execution-entrypoint
+COPY execution-entrypoint .
 COPY consensus-entrypoint .
 
 CMD ["/usr/bin/supervisord"]

README.md

@@ -78,12 +78,22 @@ The following are the hardware specifications we use in production:
 
 ### Optional Features
 
-- Flashblocks: set `RETH_FB_WEBSOCKET_URL`
+- Flashblocks: set `RETH_FB_WEBSOCKET_URL`. When set, the execution client runs in Flashblocks mode; otherwise it runs in vanilla mode.
 - Follow mode: set `BASE_NODE_SOURCE_L2_RPC`
 - Pruning: set `RETH_PRUNING_ARGS`
 
 For full configuration options, see `.env.mainnet` or `.env.sepolia`.
 
+### Testing Flashblocks RPC Methods
+
+When running in Flashblocks mode, 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
+```
+
 ## Snapshots
 
 Snapshots are available to help you sync your node more quickly. See [docs.base.org](https://docs.base.org/chain/run-a-base-node#snapshots) for links and more details on how to restore from a snapshot.
@@ -92,12 +102,12 @@ Snapshots are available to help you sync your node more quickly. See [docs.base.
 
 | Network | Status |
 | ------- | ------ |
-| Mainnet | Supported |
-| Testnet | Supported |
+| Mainnet | ✅ |
+| Testnet | ✅ |
 
 ## Troubleshooting
 
-For support please join our [Discord](https://discord.gg/buildonbase) and post in `node-operators`. You can alternatively open a new GitHub issue.
+For support please join our [Discord](https://discord.gg/buildonbase) and post in `🛠｜node-operators`. You can alternatively open a new GitHub issue.
 
 ## Disclaimer
 

consensus-entrypoint

@@ -21,39 +21,6 @@ get_public_ip() {
   return 1
 }
 
-fallback_env() {
-  local target="$1"
-  local source="$2"
-
-  if [[ -z "${!target:-}" && -n "${!source:-}" ]]; then
-    export "$target=${!source}"
-  fi
-}
-
-if [[ -z "${BASE_NODE_NETWORK:-}" && -n "${OP_NODE_NETWORK:-}" ]]; then
-  case "$OP_NODE_NETWORK" in
-    base-mainnet)
-      export BASE_NODE_NETWORK=base
-      ;;
-    *)
-      export BASE_NODE_NETWORK="$OP_NODE_NETWORK"
-      ;;
-  esac
-fi
-
-fallback_env BASE_NODE_L1_ETH_RPC OP_NODE_L1_ETH_RPC
-fallback_env BASE_NODE_L1_BEACON OP_NODE_L1_BEACON
-fallback_env BASE_NODE_L1_TRUST_RPC OP_NODE_L1_TRUST_RPC
-fallback_env BASE_NODE_L2_ENGINE_RPC OP_NODE_L2_ENGINE_RPC
-fallback_env BASE_NODE_P2P_LISTEN_IP OP_NODE_P2P_LISTEN_IP
-fallback_env BASE_NODE_P2P_ADVERTISE_TCP_PORT OP_NODE_P2P_LISTEN_TCP_PORT
-fallback_env BASE_NODE_P2P_ADVERTISE_UDP_PORT OP_NODE_P2P_LISTEN_UDP_PORT
-fallback_env BASE_NODE_P2P_BOOTNODES OP_NODE_P2P_BOOTNODES
-fallback_env BASE_NODE_LOG_FORMAT OP_NODE_LOG_FORMAT
-fallback_env BASE_NODE_METRICS_ENABLED OP_NODE_METRICS_ENABLED
-fallback_env BASE_NODE_METRICS_ADDR OP_NODE_METRICS_ADDR
-fallback_env BASE_NODE_METRICS_PORT OP_NODE_METRICS_PORT
-
 if [[ -z "${BASE_NODE_NETWORK:-}" ]]; then
   echo "expected BASE_NODE_NETWORK to be set" 1>&2
   exit 1

docker-compose.yml

@@ -1,6 +1,6 @@
 x-node-build: &node-build
   context: .
-  dockerfile: reth/Dockerfile
+  dockerfile: Dockerfile
 
 services:
   execution: