Split docker composes

flashbots · Sep 15, 2023 · 09195e1 · 09195e1
1 parent 9b8326b
commit 09195e1
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 59 deletions.
diff --git a/suave/devenv/README.md b/suave/devenv/README.md
@@ -1,18 +1,16 @@
-
-Run the devnet:
+## Run the devnet:
 `docker-compose up --build --force-recreate`
 
-Genesis info:
+## Genesis info
 Execution node's address: 0xb5feafbdd752ad52afb7e1bd2e40432a485bbb7f (private key: 6c45335a22461ccdb978b78ab61b238bad2fae4544fb55c14eb096c875ccfc52)
 Pre-funded private key: 0x784a372aac67e9da69be6e3d1125205700f0149ab3a166f19a607e58501ec899, Address: 0x96C609E6A635E6D9568641d9F9F4e8F805967149
 
-
-Monitoring redis:
+## Monitoring redis
 docker exec -it devenv_redis_1 redis-cli
 > auth default MTIzNDU2NzgK
 > MONITOR
 
-Do your thing. Examples:
+## Suave-cli
 ```
 docker exec -it devenv_suave-cli_1 suavecli deployMevShareContract -privkey 784a372aac67e9da69be6e3d1125205700f0149ab3a166f19a607e58501ec899 -suave_rpc=http://suave-mevm-1:8545
 docker exec -it devenv_suave-cli_1 suavecli sendBundle -ex_node_addr 0xb5feafbdd752ad52afb7e1bd2e40432a485bbb7f -goerli_rpc=http://suave-enabled-chain:8545 -privkey 784a372aac67e9da69be6e3d1125205700f0149ab3a166f19a607e58501ec899 -suave_rpc=http://suave-mevm-1:8545

diff --git a/suave/devenv/docker-compose-multinode.yml b/suave/devenv/docker-compose-multinode.yml
@@ -0,0 +1,81 @@
+version: "3.8"
+
+services:
+  suave-mevm-1:
+    build: ../..
+    command:
+      - --dev
+      - --dev.gaslimit=30000000
+      - --http
+      - --http.addr=0.0.0.0
+      - --http.vhosts=*
+      - --datadir=/data
+      - --keystore=/keystore/keystore
+      - --allow-insecure-unlock
+      - --unlock=0xB5fEAfbDD752ad52Afb7e1bD2E40432A485bBB7F
+      - --password=/keystore/password.txt
+      - --suave.eth.remote_endpoint=http://suave-enabled-chain:8555
+      - --suave.confidential.redis-pubsub-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/3
+      - --suave.confidential.redis-store-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/1
+    depends_on:
+      - suave-enabled-chain
+      - redis
+    links:
+      - redis
+    volumes:
+      - ./suave-ex-node:/keystore
+    ports:
+      - 8545:8545
+      - 8546:8546
+  suave-mevm-2:
+    build: ../..
+    command:
+      - --dev
+      - --dev.gaslimit=30000000
+      - --http
+      - --http.addr=0.0.0.0
+      - --http.vhosts=*
+      - --datadir=/data
+      - --keystore=/keystore/keystore
+      - --allow-insecure-unlock
+      - --unlock=0xB5fEAfbDD752ad52Afb7e1bD2E40432A485bBB7F
+      - --password=/keystore/password.txt
+      - --suave.eth.remote_endpoint=http://suave-enabled-chain:8555
+      - --suave.confidential.redis-pubsub-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/3
+      - --suave.confidential.redis-store-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/2
+    depends_on:
+      - suave-enabled-chain
+      - redis
+    links:
+      - redis
+    volumes:
+      - ./suave-ex-node-2:/keystore
+    ports:
+      - 8645:8545
+      - 8646:8546
+  redis:
+    image: redis:7.2-alpine
+    restart: always
+    ports:
+      - 6379:6379
+    command: redis-server --loglevel warning --requirepass MTIzNDU2NzgK
+  suave-enabled-chain:
+    build: ../..
+    command:
+      - --dev
+      - --dev.gaslimit=30000000
+      - --http
+      - --http.addr=0.0.0.0
+      - --http.vhosts=*
+    ports:
+      - 8555:8545
+  suave-cli:
+    build: 
+      context: ../..
+      dockerfile: suave/cmd/suavecli/Dockerfile.suavecli
+    links:
+      - suave-mevm-1
+      - suave-mevm-2
+      - suave-enabled-chain
+    entrypoint: ""
+    command: tail -f /dev/null
diff --git a/suave/devenv/docker-compose.yml b/suave/devenv/docker-compose.yml
@@ -1,81 +1,32 @@
 version: "3.8"
 
 services:
-  suave-mevm-1:
+  suave-mevm:
     build: ../..
     command:
       - --dev
       - --dev.gaslimit=30000000
       - --http
-      - --http.addr=0.0.0.0
-      - --http.vhosts=*
+      - --ws
       - --datadir=/data
       - --keystore=/keystore/keystore
       - --allow-insecure-unlock
       - --unlock=0xB5fEAfbDD752ad52Afb7e1bD2E40432A485bBB7F
       - --password=/keystore/password.txt
-      - --suave.eth.remote_endpoint=http://suave-enabled-chain:8555
-      - --suave.confidential.redis-pubsub-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/3
-      - --suave.confidential.redis-store-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/1
+      - --suave.eth.remote_endpoint=http://localhost:8555
     depends_on:
       - suave-enabled-chain
-      - redis
-    links:
-      - redis
     volumes:
       - ./suave-ex-node:/keystore
     ports:
       - 8545:8545
       - 8546:8546
-  suave-mevm-2:
-    build: ../..
-    command:
-      - --dev
-      - --dev.gaslimit=30000000
-      - --http
-      - --http.addr=0.0.0.0
-      - --http.vhosts=*
-      - --datadir=/data
-      - --keystore=/keystore/keystore
-      - --allow-insecure-unlock
-      - --unlock=0xB5fEAfbDD752ad52Afb7e1bD2E40432A485bBB7F
-      - --password=/keystore/password.txt
-      - --suave.eth.remote_endpoint=http://suave-enabled-chain:8555
-      - --suave.confidential.redis-pubsub-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/3
-      - --suave.confidential.redis-store-endpoint=redis://default:MTIzNDU2NzgK@redis:6379/2
-    depends_on:
-      - suave-enabled-chain
-      - redis
-    links:
-      - redis
-    volumes:
-      - ./suave-ex-node-2:/keystore
-    ports:
-      - 8645:8545
-      - 8646:8546
-  redis:
-    image: redis:7.2-alpine
-    restart: always
-    ports:
-      - 6379:6379
-    command: redis-server --loglevel warning --requirepass MTIzNDU2NzgK
   suave-enabled-chain:
     build: ../..
     command:
       - --dev
       - --dev.gaslimit=30000000
       - --http
-      - --http.addr=0.0.0.0
-      - --http.vhosts=*
+      - --ws
     ports:
       - 8555:8545
-  suave-cli:
-    build: 
-      context: ../..
-      dockerfile: suave/cmd/suavecli/Dockerfile.suavecli
-    links:
-      - suave-mevm-1
-      - suave-mevm-2
-      - suave-enabled-chain
-    entrypoint: ""
-    command: tail -f /dev/null