app/data/compose/docker-compose-fixturenet-optimism.yml

@@ -80,6 +80,8 @@ services:
     environment:
       L1_RPC: "http://fixturenet-eth-geth-1:8545"
     depends_on:
+      fixturenet-eth-geth-1:
+        condition: service_healthy
       op-node:
         condition: service_healthy
       op-geth:

app/data/compose/docker-compose-watcher-mobymask-v2.yml

@@ -37,7 +37,7 @@ services:
     volumes:
       # TODO: add a script to set rpc endpoint from env
       #       add manually if running seperately
-      - ../config/watcher-mobymask-v2/secrets.json:/app/packages/server/secrets.json
+      - ../config/watcher-mobymask-v2/secrets-template.json:/app/packages/server/secrets-template.json
       - ../config/watcher-mobymask-v2/deploy-invite.sh:/app/packages/server/deploy-invite.sh
       - moby_data_server:/app/packages/server
       - fixturenet_geth_accounts:/geth-accounts:ro

app/data/config/watcher-mobymask-v2/deploy-invite.sh

@@ -6,6 +6,6 @@ set -e
 L1_PRIV_KEY=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
 
 # Set the private key
-jq --arg privateKey "$L1_PRIV_KEY" '.privateKey = ($privateKey)' secrets.json > tmp.json && mv tmp.json secrets.json
+jq --arg privateKey "$L1_PRIV_KEY" '.privateKey = ($privateKey)' secrets-template.json > secrets.json
 
 npm start

app/data/config/watcher-mobymask-v2/server-start.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Assign deployed contract address from server config
-CONTRACT_ADDRESS=`jq '.address' /server/config.json`
+CONTRACT_ADDRESS=$(jq -r '.address' /server/config.json | tr -d '"')
 L1_PRIV_KEY_2=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
 
 sed "s/REPLACE_WITH_PRIVATE_KEY/${L1_PRIV_KEY_2}/" environments/watcher-config-template.toml > environments/local.toml

app/data/config/watcher-mobymask-v2/watcher-config-template.toml

@@ -37,8 +37,8 @@
       enableDebugInfo = true
 
       [server.p2p.peer.l2TxConfig]
-        privateKey = REPLACE_WITH_PRIVATE_KEY
-        contractAddress = REPLACE_WITH_CONTRACT_ADDRESS
+        privateKey = 'REPLACE_WITH_PRIVATE_KEY'
+        contractAddress = 'REPLACE_WITH_CONTRACT_ADDRESS'
 
 [metrics]
   host = "0.0.0.0"

app/data/stacks/mobymask-v2/README.md

@@ -114,9 +114,7 @@ Follow the [demo](./demo.md) to try out the MobyMask app with L2 chain
 Stop all the services running in background run:
 
 ```bash
-laconic-so --stack mobymask-v2 deploy-system --include watcher-mobymask-v2 down
-
-laconic-so --stack mobymask-v2 deploy-system --include mobymask-laconicd down
+laconic-so --stack mobymask-v2 deploy-system down
 ```
 
 Clear volumes: