Change delimeter while replacing deny multiaddrs list

Former-commit-id: db27b07d99

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

@@ -13,6 +13,7 @@ services:
       CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
       CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
       CERC_RELAY_NODES: ${CERC_RELAY_NODES}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
       CERC_BUILD_DIR: "@cerc-io/mobymask-ui/build"
     working_dir: /scripts
     command: ["sh", "mobymask-app-start.sh"]
@@ -44,6 +45,7 @@ services:
       CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
       CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
       CERC_RELAY_NODES: ${CERC_RELAY_NODES}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
       CERC_BUILD_DIR: "@cerc-io/mobymask-ui-lxdao/build"
     working_dir: /scripts
     command: ["sh", "mobymask-app-start.sh"]

app/data/compose/docker-compose-peer-test-app.yml

@@ -10,6 +10,7 @@ services:
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_RELAY_NODES: ${CERC_RELAY_NODES}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
     command: ["sh", "test-app-start.sh"]
     volumes:
       - ../config/wait-for-it.sh:/scripts/wait-for-it.sh

app/data/compose/docker-compose-watcher-azimuth.yml

@@ -0,0 +1,304 @@
+version: '3.2'
+
+services:
+  # Starts the PostgreSQL database for watchers
+  watcher-db:
+    restart: unless-stopped
+    image: postgres:14-alpine
+    environment:
+      - POSTGRES_USER=vdbm
+      - POSTGRES_MULTIPLE_DATABASES=azimuth-watcher,azimuth-watcher-job-queue,censures-watcher,censures-watcher-job-queue,claims-watcher,claims-watcher-job-queue,conditional-star-release-watcher,conditional-star-release-watcher-job-queue,delegated-sending-watcher,delegated-sending-watcher-job-queue,ecliptic-watcher,ecliptic-watcher-job-queue,linear-star-release-watcher,linear-star-release-watcher-job-queue,polls-watcher,polls-watcher-job-queue
+      - POSTGRES_EXTENSION=azimuth-watcher-job-queue:pgcrypto,censures-watcher-job-queue:pgcrypto,claims-watcher-job-queue:pgcrypto,conditional-star-release-watcher-job-queue:pgcrypto,delegated-sending-watcher-job-queue:pgcrypto,ecliptic-watcher-job-queue:pgcrypto,linear-star-release-watcher-job-queue:pgcrypto,polls-watcher-job-queue:pgcrypto,
+      - POSTGRES_PASSWORD=password
+    volumes:
+      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
+      - watcher_db_data:/var/lib/postgresql/data
+    ports:
+      - "0.0.0.0:15432:5432"
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "5432"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 10s
+
+  # Starts the azimuth-watcher server
+  azimuth-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/azimuth-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/azimuth-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/azimuth-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/azimuth-watcher/start-server.sh
+    ports:
+      - "3001"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3001"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the censures-watcher server
+  censures-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/censures-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/censures-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/censures-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/censures-watcher/start-server.sh
+    ports:
+      - "3002"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3002"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the claims-watcher server
+  claims-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/claims-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/claims-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/claims-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/claims-watcher/start-server.sh
+    ports:
+      - "3003"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3003"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the conditional-star-release-watcher server
+  conditional-star-release-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/conditional-star-release-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/conditional-star-release-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/conditional-star-release-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/conditional-star-release-watcher/start-server.sh
+    ports:
+      - "3004"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3004"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the delegated-sending-watcher server
+  delegated-sending-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/delegated-sending-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/delegated-sending-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/delegated-sending-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/delegated-sending-watcher/start-server.sh
+    ports:
+      - "3005"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3005"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the ecliptic-watcher server
+  ecliptic-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/ecliptic-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/ecliptic-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/ecliptic-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/ecliptic-watcher/start-server.sh
+    ports:
+      - "3006"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3006"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the linear-star-release-watcher server
+  linear-star-release-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/linear-star-release-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/linear-star-release-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/linear-star-release-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/linear-star-release-watcher/start-server.sh
+    ports:
+      - "3007"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3007"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the polls-watcher server
+  polls-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/polls-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/polls-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/polls-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/polls-watcher/start-server.sh
+    ports:
+      - "3008"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3008"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the gateway-server for proxying queries
+  gateway-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      azimuth-watcher-server:
+        condition: service_healthy
+      censures-watcher-server:
+        condition: service_healthy
+      claims-watcher-server:
+        condition: service_healthy
+      conditional-star-release-watcher-server:
+        condition: service_healthy
+      delegated-sending-watcher-server:
+        condition: service_healthy
+      ecliptic-watcher-server:
+        condition: service_healthy
+      linear-star-release-watcher-server:
+        condition: service_healthy
+      polls-watcher-server:
+        condition: service_healthy
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+    working_dir: /app/packages/gateway-server
+    command: "yarn server"
+    volumes:
+      - ../config/watcher-azimuth/gateway-watchers.json:/app/packages/gateway-server/dist/watchers.json
+    ports:
+      - "0.0.0.0:4000:4000"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "4000"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+volumes:
+  watcher_db_data:

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

@@ -83,6 +83,7 @@ services:
       CERC_L1_ACCOUNTS_CSV_URL: ${CERC_L1_ACCOUNTS_CSV_URL}
       CERC_PRIVATE_KEY_PEER: ${CERC_PRIVATE_KEY_PEER}
       CERC_RELAY_PEERS: ${CERC_RELAY_PEERS}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
       CERC_RELAY_ANNOUNCE_DOMAIN: ${CERC_RELAY_ANNOUNCE_DOMAIN}
       CERC_ENABLE_PEER_L2_TXS: ${CERC_ENABLE_PEER_L2_TXS}
       CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}

app/data/config/watcher-azimuth/gateway-watchers.json

@@ -0,0 +1,34 @@
+[
+  {
+    "endpoint": "http://azimuth-watcher-server:3001/graphql",
+    "prefix": "azimuth"
+  },
+  {
+    "endpoint": "http://censures-watcher-server:3002/graphql",
+    "prefix": "censures"
+  },
+  {
+    "endpoint": "http://claims-watcher-server:3003/graphql",
+    "prefix": "claims"
+  },
+  {
+    "endpoint": "http://conditional-star-release-watcher-server:3004/graphql",
+    "prefix": "conditionalStarRelease"
+  },
+  {
+    "endpoint": "http://delegated-sending-watcher-server:3005/graphql",
+    "prefix": "delegatedSending"
+  },
+  {
+    "endpoint": "http://ecliptic-watcher-server:3006/graphql",
+    "prefix": "ecliptic"
+  },
+  {
+    "endpoint": "http://linear-star-release-watcher-server:3007/graphql",
+    "prefix": "linearStarRelease"
+  },
+  {
+    "endpoint": "http://polls-watcher-server:3008/graphql",
+    "prefix": "polls"
+  }
+]

app/data/config/watcher-azimuth/merge-toml.js

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const tomlJS = require('toml-js');
+const toml = require('toml');
+const { merge } = require('lodash')
+
+const main = () => {
+  const overrideConfigString = fs.readFileSync('environments/watcher-config.toml', 'utf-8');
+  const configString = fs.readFileSync('environments/local.toml', 'utf-8');
+  const overrideConfig = toml.parse(overrideConfigString)
+  const config = toml.parse(configString)
+
+  // Merge configs
+  const updatedConfig = merge(config, overrideConfig);
+
+  // Form dbConnectionString for jobQueue DB
+  const parts = config.jobQueue.dbConnectionString.split("://");
+  const credsAndDB = parts[1].split("@");
+  const creds = credsAndDB[0].split(":");
+  creds[0] = overrideConfig.database.username;
+  creds[1] = overrideConfig.database.password;
+  credsAndDB[0] = creds.join(":");
+  const dbName = credsAndDB[1].split("/")[1]
+  credsAndDB[1] = [overrideConfig.database.host, dbName].join("/");
+  parts[1] = credsAndDB.join("@");
+
+  updatedConfig.jobQueue.dbConnectionString = parts.join("://");
+
+  fs.writeFileSync('environments/local.toml', tomlJS.dump(updatedConfig), 'utf-8');
+}
+
+main();

app/data/config/watcher-azimuth/start-server.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+CERC_IPLD_ETH_RPC="${CERC_IPLD_ETH_RPC:-${DEFAULT_CERC_IPLD_ETH_RPC}}"
+CERC_IPLD_ETH_GQL="${CERC_IPLD_ETH_GQL:-${DEFAULT_CERC_IPLD_ETH_GQL}}"
+
+echo "Using IPLD ETH RPC endpoint ${CERC_IPLD_ETH_RPC}"
+echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL}"
+
+# Replace env variables in template TOML file
+# Read in the config template TOML file and modify it
+WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
+WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
+  sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}|g; \
+          s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}| ")
+
+# Write the modified content to a new file
+echo "$WATCHER_CONFIG" > environments/watcher-config.toml
+
+# Merge SO watcher config with existing config file
+node merge-toml.js
+
+echo 'yarn server'
+yarn server

app/data/config/watcher-azimuth/watcher-config-template.toml

@@ -0,0 +1,14 @@
+[server]
+  host = "0.0.0.0"
+  maxSimultaneousRequests = -1
+
+[database]
+  host = "watcher-db"
+  port = 5432
+  username = "vdbm"
+  password = "password"
+
+[upstream]
+  [upstream.ethServer]
+    gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL"
+    rpcProviderEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_RPC"

app/data/config/watcher-azimuth/watcher-params.env

@@ -0,0 +1,5 @@
+# Defaults
+
+# ipld-eth-server endpoints
+DEFAULT_CERC_IPLD_ETH_RPC=
+DEFAULT_CERC_IPLD_ETH_GQL=

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

@@ -7,6 +7,7 @@ fi
 CERC_CHAIN_ID="${CERC_CHAIN_ID:-${DEFAULT_CERC_CHAIN_ID}}"
 CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"
 CERC_RELAY_NODES="${CERC_RELAY_NODES:-${DEFAULT_CERC_RELAY_NODES}}"
+CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"
 CERC_APP_WATCHER_URL="${CERC_APP_WATCHER_URL:-${DEFAULT_CERC_APP_WATCHER_URL}}"
 
 # If not set (or []), check the mounted volume for relay peer id
@@ -37,5 +38,6 @@ yq -n ".address = env(CERC_DEPLOYED_CONTRACT)" > /config/config.yml
 yq ".watcherUrl = env(CERC_APP_WATCHER_URL)" -i /config/config.yml
 yq ".chainId = env(CERC_CHAIN_ID)" -i /config/config.yml
 yq ".relayNodes = strenv(CERC_RELAY_NODES)" -i /config/config.yml
+yq ".denyMultiaddrs = strenv(CERC_DENY_MULTIADDRS)" -i /config/config.yml
 
 /scripts/start-serving-app.sh

app/data/config/watcher-mobymask-v2/mobymask-params.env

@@ -24,3 +24,6 @@ DEFAULT_CERC_CHAIN_ID=42069
 
 # Set of relay nodes to be used by web-apps
 DEFAULT_CERC_RELAY_NODES=[]
+
+# Set of multiaddrs to be avoided while dialling
+DEFAULT_CERC_DENY_MULTIADDRS=[]

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

@@ -8,13 +8,20 @@ CERC_L2_GETH_RPC="${CERC_L2_GETH_RPC:-${DEFAULT_CERC_L2_GETH_RPC}}"
 CERC_L1_ACCOUNTS_CSV_URL="${CERC_L1_ACCOUNTS_CSV_URL:-${DEFAULT_CERC_L1_ACCOUNTS_CSV_URL}}"
 
 CERC_RELAY_PEERS="${CERC_RELAY_PEERS:-${DEFAULT_CERC_RELAY_PEERS}}"
+CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"
 CERC_RELAY_ANNOUNCE_DOMAIN="${CERC_RELAY_ANNOUNCE_DOMAIN:-${DEFAULT_CERC_RELAY_ANNOUNCE_DOMAIN}}"
 CERC_ENABLE_PEER_L2_TXS="${CERC_ENABLE_PEER_L2_TXS:-${DEFAULT_CERC_ENABLE_PEER_L2_TXS}}"
 CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"
 
 echo "Using L2 RPC endpoint ${CERC_L2_GETH_RPC}"
 
-CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/$(jq -r '.id' /app/peers/relay-id.json)"
+# Use public domain for relay multiaddr in peer config if specified
+# Otherwise, use the docker container's host IP
+if [ -n "$CERC_RELAY_ANNOUNCE_DOMAIN" ]; then
+  CERC_RELAY_MULTIADDR="/dns4/${CERC_RELAY_ANNOUNCE_DOMAIN}/tcp/443/wss/p2p/$(jq -r '.id' /app/peers/relay-id.json)"
+else
+  CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/$(jq -r '.id' /app/peers/relay-id.json)"
+fi
 
 # Use contract address from environment variable or set from config.json in mounted volume
 if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
@@ -42,6 +49,7 @@ fi
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
   sed -E "s|REPLACE_WITH_CERC_RELAY_PEERS|${CERC_RELAY_PEERS}|g; \
+          s|REPLACE_WITH_CERC_DENY_MULTIADDRS|${CERC_DENY_MULTIADDRS}|g; \
           s/REPLACE_WITH_CERC_RELAY_ANNOUNCE_DOMAIN/${CERC_RELAY_ANNOUNCE_DOMAIN}/g; \
           s|REPLACE_WITH_CERC_RELAY_MULTIADDR|${CERC_RELAY_MULTIADDR}|g; \
           s/REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS/${CERC_ENABLE_PEER_L2_TXS}/g; \

app/data/config/watcher-mobymask-v2/test-app-config.json

@@ -1,6 +1,7 @@
 {
   "relayNodes": [],
   "peer": {
+    "denyMultiaddrs": [],
     "enableDebugInfo": true
   }
 }

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

@@ -5,6 +5,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 
 CERC_RELAY_NODES="${CERC_RELAY_NODES:-${DEFAULT_CERC_RELAY_NODES}}"
+CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"
 
 # If not set (or []), check the mounted volume for relay peer id
 if [ -z "$CERC_RELAY_NODES" ] || [ "$CERC_RELAY_NODES" = "[]" ]; then
@@ -16,5 +17,6 @@ echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES"
 
 # Use yq to create config.yml with environment variables
 yq -n ".relayNodes = strenv(CERC_RELAY_NODES)" > /config/config.yml
+yq ".denyMultiaddrs = strenv(CERC_DENY_MULTIADDRS)" -i /config/config.yml
 
 /scripts/start-serving-app.sh

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

@@ -27,6 +27,7 @@
       host = "0.0.0.0"
       port = 9090
       relayPeers = REPLACE_WITH_CERC_RELAY_PEERS
+      denyMultiaddrs = REPLACE_WITH_CERC_DENY_MULTIADDRS
       peerIdFile = './peers/relay-id.json'
       announce = 'REPLACE_WITH_CERC_RELAY_ANNOUNCE_DOMAIN'
       enableDebugInfo = true
@@ -34,6 +35,7 @@
     [server.p2p.peer]
       relayMultiaddr = 'REPLACE_WITH_CERC_RELAY_MULTIADDR'
       pubSubTopic = 'mobymask'
+      denyMultiaddrs = REPLACE_WITH_CERC_DENY_MULTIADDRS
       peerIdFile = './peers/peer-id.json'
       enableDebugInfo = true
       enableL2Txs = REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS

app/data/container-build/cerc-mobymask-ui/Dockerfile

@@ -50,9 +50,9 @@ RUN yarn global add http-server
 
 # Globally install both versions of the payload web app package
 # Install old version of MobyMask web app
-RUN yarn global add @cerc-io/mobymask-ui@0.1.3
+RUN yarn global add @cerc-io/mobymask-ui@0.1.4
 # Install the LXDAO version of MobyMask web app
-RUN yarn global add @cerc-io/mobymask-ui-lxdao@npm:@cerc-io/mobymask-ui@0.1.3-lxdao-0.1.1
+RUN yarn global add @cerc-io/mobymask-ui-lxdao@npm:@cerc-io/mobymask-ui@0.1.4-lxdao-0.1.1
 
 # Expose port for http
 EXPOSE 80

app/data/container-build/cerc-mobymask-ui/apply-webapp-config.sh

@@ -33,7 +33,7 @@ do
     echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"
 
     # TODO: Pass keys to be replaced without double quotes
-    if [[ "$template_string_to_replace" =~ ^${config_prefix}_(relayNodes|chainId)$ ]]; then
+    if [[ "$template_string_to_replace" =~ ^${config_prefix}_(relayNodes|chainId|denyMultiaddrs)$ ]]; then
         find ${webapp_files_dir} -type f -exec sed -i 's#"'"${template_string_to_replace}"'"#'"${template_value_to_substitute}"'#g' {} +
     else
         # Note: we do not escape our strings, on the expectation they do not container the '#' char.

app/data/container-build/cerc-react-peer/Dockerfile

@@ -21,7 +21,7 @@ RUN mkdir -p /config
 RUN yarn global add http-server
 
 # Globally install the payload web app package
-RUN yarn global add @cerc-io/test-app@0.2.33
+RUN yarn global add @cerc-io/test-app@0.2.34
 
 # Expose port for http
 EXPOSE 80

app/data/container-build/cerc-react-peer/apply-webapp-config.sh

@@ -33,7 +33,7 @@ do
     echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"
 
     # TODO: Pass keys to be replaced without double quotes
-    if [[ "$template_string_to_replace" == "${config_prefix}_relayNodes" ]]; then
+    if [[ "$template_string_to_replace" =~ ^${config_prefix}_(relayNodes|denyMultiaddrs)$ ]]; then
         find ${webapp_files_dir} -type f -exec sed -i 's#"'"${template_string_to_replace}"'"#'"${template_value_to_substitute}"'#g' {} +
     else
         # Note: we do not escape our strings, on the expectation they do not container the '#' char.

app/data/container-build/cerc-watcher-azimuth/Dockerfile

@@ -0,0 +1,13 @@
+FROM node:18.16.0-alpine3.16
+
+RUN apk --update --no-cache add git python3 alpine-sdk
+
+WORKDIR /app
+
+COPY . .
+
+RUN echo "Building azimuth-watcher-ts" && \
+    yarn && yarn build
+
+RUN echo "Install toml-js to update watcher config files" && \
+    yarn add --dev --ignore-workspace-root-check toml-js

app/data/container-build/cerc-watcher-azimuth/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Build cerc/watcher-azimuth
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+# See: https://stackoverflow.com/a/246128/1701505
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/watcher-azimuth:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/azimuth-watcher-ts

app/data/container-image-list.txt

@@ -37,3 +37,4 @@ cerc/optimism-op-batcher
 cerc/optimism-op-node
 cerc/optimism-op-proposer
 cerc/pocket
+cerc/watcher-azimuth

app/data/pod-list.txt

@@ -25,3 +25,4 @@ kubo
 foundry
 fixturenet-optimism
 fixturenet-pocket
+watcher-azimuth

app/data/repository-list.txt

@@ -29,3 +29,4 @@ ethereum-optimism/op-geth
 ethereum-optimism/optimism
 pokt-network/pocket-core
 pokt-network/pocket-core-deployments
+cerc-io/azimuth-watcher-ts

app/data/stacks/azimuth/README.md

@@ -0,0 +1,72 @@
+# Azimuth Watcher
+
+Instructions to setup and deploy Azimuth Watcher stack
+
+## Setup
+
+Prerequisite: ipld-eth-server RPC and GQL endpoints
+
+Clone required repositories:
+
+```bash
+laconic-so --stack azimuth setup-repositories
+```
+
+NOTE: If the repository already exists and checked out to a different version, `setup-repositories` command will throw an error.
+For getting around this, the `azimuth-watcher-ts` repository can be removed and then run the command.
+
+Checkout to the required versions and branches in repos
+
+```bash
+# azimuth-watcher-ts
+cd ~/cerc/azimuth-watcher-ts
+git checkout v0.1.0
+```
+
+Build the container images:
+
+```bash
+laconic-so --stack azimuth build-containers
+```
+
+This should create the required docker images in the local image registry.
+
+### Configuration
+
+* Create and update an env file to be used in the next step:
+
+  ```bash
+  # External ipld-eth-server endpoints
+  CERC_IPLD_ETH_RPC=
+  CERC_IPLD_ETH_GQL=
+  ```
+
+* NOTE: If ipld-eth-server is running on the host machine, use `host.docker.internal` as the hostname to access host ports
+
+### Deploy the stack
+
+* Deploy the containers:
+
+  ```bash
+  laconic-so --stack azimuth deploy-system --env-file <PATH_TO_ENV_FILE> up
+  ```
+
+* List and check the health status of all the containers using `docker ps` and wait for them to be `healthy`
+
+## Clean up
+
+Stop all the services running in background run:
+
+```bash
+laconic-so --stack azimuth deploy-system down
+```
+
+Clear volumes created by this stack:
+
+```bash
+# List all relevant volumes
+docker volume ls -q --filter "name=.*watcher_db_data"
+
+# Remove all the listed volumes
+docker volume rm $(docker volume ls -q --filter "name=.*watcher_db_data")
+```

app/data/stacks/azimuth/stack.yml

@@ -0,0 +1,8 @@
+version: "1.0"
+name: azimuth
+repos:
+  - cerc-io/azimuth-watcher-ts
+containers:
+  - cerc/watcher-azimuth
+pods:
+  - watcher-azimuth

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

@@ -23,11 +23,11 @@ Checkout to the required versions and branches in repos
 ```bash
 # watcher-ts
 cd ~/cerc/watcher-ts
-git checkout v0.2.39
+git checkout v0.2.41
 
 # mobymask-v2-watcher-ts
 cd ~/cerc/mobymask-v2-watcher-ts
-git checkout v0.1.0
+git checkout v0.1.1
 
 # MobyMask
 cd ~/cerc/MobyMask

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

@@ -19,11 +19,11 @@ Checkout to the required versions and branches in repos:
 ```bash
 # watcher-ts
 cd ~/cerc/watcher-ts
-git checkout v0.2.39
+git checkout v0.2.41
 
 # mobymask-v2-watcher-ts
 cd ~/cerc/mobymask-v2-watcher-ts
-git checkout v0.1.0
+git checkout v0.1.1
 
 # MobyMask
 cd ~/cerc/MobyMask
@@ -67,11 +67,14 @@ Create and update an env file to be used in the next step ([defaults](../../conf
   # (used for generating a root invite link after deploying the contract)
   CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3002/#"
 
+  # (Optional) Domain to be used in the relay node's announce address
+  CERC_RELAY_ANNOUNCE_DOMAIN=
+
   # (Optional) Set of relay peers to connect to from the relay node
   CERC_RELAY_PEERS=[]
 
-  # (Optional) Domain to be used in the relay node's announce address
-  CERC_RELAY_ANNOUNCE_DOMAIN=
+  # (Optional) Set of multiaddrs to be avoided while dialling
+  CERC_DENY_MULTIADDRS=[]
 
   # Set to false for disabling watcher peer to send txs to L2
   CERC_ENABLE_PEER_L2_TXS=true

app/data/stacks/mobymask-v2/watcher-p2p-network/watcher.md

@@ -35,11 +35,11 @@ Checkout to the required versions and branches in repos:
   ```bash
   # watcher-ts
   cd ~/cerc/watcher-ts
-  git checkout v0.2.39
+  git checkout v0.2.41
 
   # mobymask-v2-watcher-ts
   cd ~/cerc/mobymask-v2-watcher-ts
-  git checkout v0.1.0
+  git checkout v0.1.1
 
   # MobyMask
   cd ~/cerc/MobyMask

app/data/stacks/mobymask-v2/web-apps.md

@@ -26,6 +26,9 @@ Create and update an env file to be used in the next step ([defaults](../../conf
   # Eg. CERC_RELAY_NODES=["/dns4/example.com/tcp/443/wss/p2p/12D3KooWGHmDDCc93XUWL16FMcTPCGu2zFaMkf67k8HZ4gdQbRDr"]
   CERC_RELAY_NODES=[]
 
+  # Set of multiaddrs to be avoided while dialling
+  CERC_DENY_MULTIADDRS=[]
+
   # Also add if running MobyMask app:
 
   # Watcher endpoint used by the app for GQL queries