From cbbffec7f545de30a94ab17662eb93e6ef4ce12b Mon Sep 17 00:00:00 2001 From: prathamesh0 Date: Fri, 21 Apr 2023 17:23:59 +0530 Subject: [PATCH] Fix mobymask contract deployment script --- app/data/compose/docker-compose-fixturenet-optimism.yml | 6 +++--- .../watcher-mobymask-v2/deploy-and-generate-invite.sh | 2 +- .../container-build/cerc-watcher-mobymask-v2/Dockerfile | 2 +- app/data/stacks/mobymask-v2/watcher-p2p-network.md | 4 +--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/data/compose/docker-compose-fixturenet-optimism.yml b/app/data/compose/docker-compose-fixturenet-optimism.yml index c651e5a7..02b0cbc3 100644 --- a/app/data/compose/docker-compose-fixturenet-optimism.yml +++ b/app/data/compose/docker-compose-fixturenet-optimism.yml @@ -31,7 +31,7 @@ services: - l2_accounts:/l2-accounts - l1_deployment:/app/packages/contracts-bedrock extra_hosts: - - "host.docker.internal:host-gateway" + - "host.docker.internal:host-gateway" # Generates the config files required for L2 (outputs to volume l2_config) op-node-l2-config-gen: @@ -50,7 +50,7 @@ services: - l2_config:/app command: ["sh", "/app/generate-l2-config.sh"] extra_hosts: - - "host.docker.internal:host-gateway" + - "host.docker.internal:host-gateway" # Initializes and runs the L2 execution client (outputs to volume l2_geth_data) op-geth: @@ -123,7 +123,7 @@ services: command: | "/wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- /run-op-batcher.sh" extra_hosts: - - "host.docker.internal:host-gateway" + - "host.docker.internal:host-gateway" volumes: l1_deployment: diff --git a/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh b/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh index c7fc1c70..e574c56b 100755 --- a/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh +++ b/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh @@ -48,7 +48,7 @@ CERC_L2_GETH_PORT="${CERC_L2_GETH_PORT:-${DEFAULT_CERC_L2_GETH_PORT}}" CERC_L2_NODE_HOST="${CERC_L2_NODE_HOST:-${DEFAULT_CERC_L2_NODE_HOST}}" CERC_L2_NODE_PORT="${CERC_L2_NODE_PORT:-${DEFAULT_CERC_L2_NODE_PORT}}" ./wait-for-it.sh -h "${CERC_L2_GETH_HOST}" -p "${CERC_L2_GETH_PORT}" -s -t 0 -./wait-for-it.sh -h "${CERC_L2_GETH_PORT}" -p "${CERC_L2_NODE_PORT}" -s -t 0 +./wait-for-it.sh -h "${CERC_L2_NODE_HOST}" -p "${CERC_L2_NODE_PORT}" -s -t 0 export RPC_URL="${CERC_L2_GETH_RPC}" diff --git a/app/data/container-build/cerc-watcher-mobymask-v2/Dockerfile b/app/data/container-build/cerc-watcher-mobymask-v2/Dockerfile index c572658d..6c100091 100644 --- a/app/data/container-build/cerc-watcher-mobymask-v2/Dockerfile +++ b/app/data/container-build/cerc-watcher-mobymask-v2/Dockerfile @@ -14,7 +14,7 @@ WORKDIR /app COPY . . -RUN echo "Building watcher-ts" && \ +RUN echo "Building mobymask-v2-watcher-ts" && \ yarn && yarn build WORKDIR /app diff --git a/app/data/stacks/mobymask-v2/watcher-p2p-network.md b/app/data/stacks/mobymask-v2/watcher-p2p-network.md index 563012e8..5fbaf79e 100644 --- a/app/data/stacks/mobymask-v2/watcher-p2p-network.md +++ b/app/data/stacks/mobymask-v2/watcher-p2p-network.md @@ -99,9 +99,8 @@ laconic-so --stack mobymask-v2 deploy --cluster mobymask_v2 --include watcher-mo # Expected output (ignore the "The X variable is not set. Defaulting to a blank string." warnings): -# [+] Running 10/10 +# [+] Running 9/9 # ✔ Network mobymask_v2_default Created 0.1s -# ✔ Volume "mobymask_v2_fixturenet_geth_accounts" Created 0.0s # ✔ Volume "mobymask_v2_peers_ids" Created 0.0s # ✔ Volume "mobymask_v2_mobymask_watcher_db_data" Created 0.0s # ✔ Volume "mobymask_v2_mobymask_deployment" Created 0.0s @@ -291,7 +290,6 @@ Clear volumes created by this stack: # Expected output: - # mobymask_v2_fixturenet_geth_accounts # mobymask_v2_mobymask_deployment # mobymask_v2_mobymask_watcher_db_data # mobymask_v2_peers_ids -- 2.45.2