revert to rollup-client notation

op-rs · Oct 11, 2023 · 45a707a · 45a707a
1 parent a797ffd
commit 45a707a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 36 deletions.
diff --git a/crates/stages/src/stages/rollup.rs b/crates/stages/src/stages/rollup.rs
@@ -31,6 +31,7 @@ impl crate::Stage for Rollup {
         //     .as_ref()
         //     .ok_or(eyre::eyre!("missing addresses"))?;
 
+        tracing::info!(target: "stages", "Starting rollup client {}", &self.rollup_client);
         let start_rollup = Command::new("docker-compose")
             .args(["up", "-d", "--no-deps", "--build", "rollup-client"])
             .env("PWD", docker_dir)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -40,37 +40,10 @@ services:
       - "${PWD}/../.devnet/genesis-l2.json:/genesis.json"
       - "${PWD}/test-jwt-secret.txt:/config/test-jwt-secret.txt"
 
-  node:
-    depends_on:
-      - l1
-      - l2
+  rollup-client:
     build:
-      context: ../optimism
-      dockerfile: ./op-node/Dockerfile
-    command: >
-      op-node
-      --l1=ws://l1:8546
-      --l2=http://l2:8551
-      --l2.jwt-secret=/config/test-jwt-secret.txt
-      --sequencer.enabled
-      --sequencer.l1-confs=0
-      --verifier.l1-confs=0
-      --p2p.sequencer.key=8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
-      --rollup.config=/rollup.json
-      --rpc.addr=0.0.0.0
-      --rpc.port=8545
-      --p2p.listen.ip=0.0.0.0
-      --p2p.listen.tcp=9003
-      --p2p.listen.udp=9003
-      --p2p.scoring.peers=light
-      --p2p.ban.peers=true
-      --snapshotlog.file=/op_log/snapshot.log
-      --p2p.priv.path=/config/p2p-node-key.txt
-      --metrics.enabled
-      --metrics.addr=0.0.0.0
-      --metrics.port=7300
-      --pprof.enabled
-      --rpc.enable-admin
+      context: ../ # this is a hack to let us use all directories in the Dockerfile
+      dockerfile: "./docker/Dockerfile.rollup-${ROLLUP_CLIENT_CHOICE}"
     ports:
       - "7545:8545"
       - "9003:9003"
@@ -84,10 +57,6 @@ services:
       - op_log:/op_log
 
   proposer:
-    depends_on:
-      - l1
-      - l2
-      - node
     build:
       context: ../optimism
       dockerfile: ./op-proposer/Dockerfile
@@ -96,7 +65,7 @@ services:
       - "7302:7300"
     environment:
       OP_PROPOSER_L1_ETH_RPC: http://l1:8545
-      OP_PROPOSER_ROLLUP_RPC: http://node:8545
+      OP_PROPOSER_ROLLUP_RPC: http://rollup-client:8545
       OP_PROPOSER_POLL_INTERVAL: 1s
       OP_PROPOSER_NUM_CONFIRMATIONS: 1
       OP_PROPOSER_MNEMONIC: test test test test test test test test test test test junk
@@ -105,6 +74,7 @@ services:
       OP_PROPOSER_PPROF_ENABLED: "true"
       OP_PROPOSER_METRICS_ENABLED: "true"
       OP_PROPOSER_ALLOW_NON_FINALIZED: "true"
+
   batcher:
     build:
       context: ../optimism
@@ -116,7 +86,7 @@ services:
     environment:
       OP_BATCHER_L1_ETH_RPC: http://l1:8545
       OP_BATCHER_L2_ETH_RPC: http://l2:8545
-      OP_BATCHER_ROLLUP_RPC: http://node:8545
+      OP_BATCHER_ROLLUP_RPC: http://rollup-client:8545
       OP_BATCHER_MAX_CHANNEL_DURATION: 1
       OP_BATCHER_SUB_SAFETY_MARGIN: 4 # SWS is 15, ChannelTimeout is 40
       OP_BATCHER_POLL_INTERVAL: 1s
@@ -127,6 +97,14 @@ services:
       OP_BATCHER_METRICS_ENABLED: "true"
       OP_BATCHER_RPC_ENABLE_ADMIN: "true"
 
+  challenger:
+    build:
+      context: ../
+      dockerfile: "./docker/Dockerfile.challenger-${CHALLENGER_AGENT_CHOICE}"
+    ports:
+      - "9200:9200"
+      - "5545:8545"
+
   artifact-server:
     depends_on:
       - l1