feat: fix docker compose (#195)

* feat: fix docker compose

* fix: remove dev from launch_l1.bash

* feat: pin prometheus image

Author: greged93

crates/node/src/args.rs

@@ -264,7 +264,6 @@ impl ScrollRollupNodeConfig {
             .enable_eth_scroll_wire_bridge
             .then_some(network.eth_wire_block_listener().await?);
 
-        // Instantiate the signer
         // Instantiate the signer
         let signer = if self.test {
             // Use a random private key signer for testing
@@ -393,15 +392,15 @@ pub struct SignerArgs {
     #[arg(
         long = "signer.key-file",
         value_name = "FILE_PATH",
-        help = "Path to the hex-encoded private key file for the signer (optional 0x prefix). Mutually exclusive with AWS KMS key ID"
+        help = "Path to the hex-encoded private key file for the signer (optional 0x prefix). Mutually exclusive with --signer.aws-kms-key-id"
     )]
     pub key_file: Option<PathBuf>,
 
     /// AWS KMS Key ID for signing transactions
     #[arg(
         long = "signer.aws-kms-key-id",
         value_name = "KEY_ID",
-        help = "AWS KMS Key ID for signing transactions. Mutually exclusive with key file"
+        help = "AWS KMS Key ID for signing transactions. Mutually exclusive with --signer.key-file"
     )]
     pub aws_kms_key_id: Option<String>,
 }

docker-compose/.env

@@ -0,0 +1,4 @@
+# .env
+SHADOW_FORK=false
+FORK_BLOCK_NUMBER=8700000
+ENV=dev

docker-compose/.env.shadow-fork

@@ -1,10 +1,12 @@
 # Scroll Rollup Node Docker Compose
 
-This guide explains how to use Docker Compose to launch the Scroll Rollup Node, including standard and shadow-fork modes.
+This guide explains how to use Docker Compose to launch the Scroll Rollup Node, including standard and shadow-fork
+modes.
 
 ---
 
 ## Prerequisites
+
 - [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/) installed
 - Clone this repository
 
@@ -24,20 +26,20 @@ This guide explains how to use Docker Compose to launch the Scroll Rollup Node,
    This will launch the rollup node, Prometheus, and Grafana with default settings.
 
 3. **Access the services:**
-   - Rollup Node JSON-RPC: [http://localhost:8545](http://localhost:8545)
-   - Rollup Node WebSocket: [ws://localhost:8546](ws://localhost:8546)
-   - Prometheus: [http://localhost:19090](http://localhost:19090)
-   - Grafana: [http://localhost:13000](http://localhost:13000)
+    - Rollup Node JSON-RPC: [http://localhost:8545](http://localhost:8545)
+    - Rollup Node WebSocket: [ws://localhost:8546](ws://localhost:8546)
+    - Prometheus: [http://localhost:19090](http://localhost:19090)
+    - Grafana: [http://localhost:13000](http://localhost:13000)
 
 ---
 
 ## Shadow-Fork Mode
 
 Shadow-fork mode allows you to run the node against a forked L1 chain for testing and development.
 
-### 1. Edit the `.env.shadow-fork` file
+### 1. Edit the `.env` file
 
-The file `docker-compose/.env.shadow-fork` contains environment variables for shadow-fork mode:
+The file `docker-compose/.env` contains environment variables for enabling shadow-fork mode:
 
 ```
 SHADOW_FORK=true
@@ -50,40 +52,34 @@ ENV=sepolia                # Or 'mainnet' for mainnet fork
 **Recommended (Docker Compose v1.28+):**
 
 ```sh
-docker compose --env-file .env.shadow-fork --profile shadow-fork up -d
+docker compose --env-file .env --profile shadow-fork up -d
 ```
 
 - This will start both the L1 devnet and the rollup node in shadow-fork mode.
 - The `FORK_BLOCK_NUMBER` and `ENV` variables control the fork point and network.
 
-**Alternative:**
-You can also copy or rename `.env.shadow-fork` to `.env` if you want it to be loaded automatically:
-
-```sh
-cp .env.shadow-fork .env
-# Then run:
-docker compose --profile shadow-fork up -d
-```
-
 ---
 
 ## Stopping the Stack
 
 To stop all services:
+
 ```sh
 docker compose down
 ```
 
 ---
 
 ## Troubleshooting
+
 - Make sure the ports (8545, 8546, 19090, 13000) are not used by other processes.
 - If you change environment variables, restart the stack with `docker compose down && docker compose up -d`.
 - For shadow-fork mode, always ensure you specify the correct `--env-file` or have the right `.env` file in place.
 
 ---
 
 ## More
+
 - See `docker-compose/docker-compose.yml` for all available services and configuration options.
 - For advanced usage, refer to the official [Docker Compose documentation](https://docs.docker.com/compose/).
 

docker-compose/README.md

@@ -8,10 +8,7 @@ services:
     profiles:
       - shadow-fork
     env_file:
-      - .env.shadow-fork
-    environment:
-      - ENV=${ENV}
-      - FORK_BLOCK_NUMBER=${FORK_BLOCK_NUMBER}
+      - .env
     ports:
       - "8543:8545"  # JSON-RPC
       - "8544:8546"  # WebSocket
@@ -26,10 +23,8 @@ services:
     container_name: rollup-node
     entrypoint: ["bash", "/launch_rollup_node.bash"]
     env_file:
-      - .env.shadow-fork
+      - .env
     environment:
-      - ENV=${ENV:-dev}
-      - SHADOW_FORK=${SHADOW_FORK:-false}
       - RUST_LOG=sqlx=off,info
     ports:
       - "8545:8545"  # JSON-RPC
@@ -42,7 +37,7 @@ services:
       - scroll-network
 
   prometheus:
-    image: prom/prometheus:latest
+    image: prom/prometheus:v3.3.1
     container_name: prometheus
     ports:
       - "19090:9090"  # Prometheus Web UI

docker-compose/docker-compose.yml

@@ -6,8 +6,8 @@ if [ "${FORK_BLOCK_NUMBER}" != "" ]; then
   EXTRA_PARAMS="--fork-block-number ${FORK_BLOCK_NUMBER}"
 fi
 
-if [ "${ENV:-}" = "sepolia" ]; then
-  exec anvil --fork-url http://l1reth-rpc.sepolia.scroll.tech:8545 --chain-id 11155111 --host 0.0.0.0 --block-time 12 $EXTRA_PARAMS
-elif [ "${ENV:-}" = "mainnet" ]; then
+if [ "${ENV:-}" = "mainnet" ]; then
   exec anvil --fork-url http://l1geth-rpc.mainnet.scroll.tech:8545/l1 --chain-id 1 --host 0.0.0.0 --block-time 12 $EXTRA_PARAMS
-fi 
+elif [ "${ENV:-}" = "sepolia" ]; then
+  exec anvil --fork-url http://l1reth-rpc.sepolia.scroll.tech:8545 --chain-id 11155111 --host 0.0.0.0 --block-time 12 $EXTRA_PARAMS
+fi

docker-compose/launch_l1.bash

@@ -9,7 +9,13 @@ wait_for_l1_devnet() {
 }
 
 if [ "${ENV:-}" = "dev" ]; then
-  exec rollup-node node --chain dev --datadir=/l2reth  --metrics=0.0.0.0:6060 --disable-discovery --http --http.addr=0.0.0.0 --http.port=8545 --http.corsdomain "*" --http.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev --ws --ws.addr=0.0.0.0 --ws.port=8546 --ws.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev --log.stdout.format log-fmt -vvv --sequencer.enabled --sequencer.block-time 250 --sequencer.payload-building-duration 230 --txpool.pending-max-count=1000000 --builder.gaslimit=10000000000 --rpc.max-connections=5000
+  exec rollup-node node --chain dev --datadir=/l2reth  --metrics=0.0.0.0:6060 --disable-discovery \
+    --http --http.addr=0.0.0.0 --http.port=8545 --http.corsdomain "*" --http.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \
+    --ws --ws.addr=0.0.0.0 --ws.port=8546 --ws.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \
+    --log.stdout.format log-fmt -vvv \
+    --test \
+    --sequencer.enabled --sequencer.block-time 250 --sequencer.payload-building-duration 230 --txpool.pending-max-count=1000000 --builder.gaslimit=10000000000 \
+    --rpc.max-connections=5000
 elif [ "${ENV:-}" = "sepolia" ]; then
   if [ "${SHADOW_FORK}" = "true" ]; then
     wait_for_l1_devnet