squash me

debug
gitea test
2023-09-28 09:18:21 -04:00 · 2023-09-27 17:25:25 -04:00 · 2023-09-27 17:07:30 -04:00 · 2023-09-27 15:04:13 -06:00 · 2023-09-27 14:57:48 -06:00 · 2023-09-27 14:51:52 -06:00
90 changed files with 2373 additions and 1095 deletions
@@ -0,0 +1,51 @@
+name: Test Gitea
+
+on:
+  pull_request:
+    branches: '*'
+  push:
+    branches:
+      - main
+      - zach-test
+      - new-gitea-test
+
+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+
+jobs:
+  test:
+    name: "Run Gitea package registry test"
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Update'
+        run: apt-get update
+      - name: 'Setup jq'
+        run: apt-get install jq -y
+      - name: 'Check jq'
+        run: |
+          which jq
+          jq --version
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name: "Print Python version"
+        run: python3 --version
+      - name: "Install shiv"
+        run: pip install shiv
+      - name: "Generate build version file"
+        run: ./scripts/create_build_tag_file.sh
+      - name: "Build local shiv package"
+        run: ./scripts/build_shiv_package.sh
+      - name: Start dockerd # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
+      - name: "Run gitea tests"
+        run: |
+          export CERC_SCRIPT_DEBUG=true &
+          ./tests/gitea/test.sh
+
@@ -0,0 +1,29 @@
+name: Gitea Test
+
+on:
+  pull_request:
+    branches: '*'
+  push:
+    branches: '*'
+
+jobs:
+  test:
+    name: "Run basic test suite"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name: "Print Python version"
+        run: python3 --version
+      - name: "Install shiv"
+        run: pip install shiv
+      - name: "Generate build version file"
+        run: ./scripts/create_build_tag_file.sh
+      - name: "Build local shiv package"
+        run: ./scripts/build_shiv_package.sh
+      - name: "Run gitea tests"
+        run: ./tests/gitea/test.sh
@@ -0,0 +1,21 @@
+name: Lint Checks
+
+on:
+  pull_request:
+    branches: '*'
+  push:
+    branches: '*'
+
+jobs:
+  test:
+    name: "Run linter"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name : "Run flake8"
+        uses: py-actions/flake8@v2
@@ -16,6 +16,7 @@ Ensure that the following are already installed:
 - [Python3](https://wiki.python.org/moin/BeginnersGuide/Download): `python3 --version` >= `3.8.10` (the Python3 shipped in Ubuntu 20+ is good to go)
 - [Docker](https://docs.docker.com/get-docker/): `docker --version` >= `20.10.21`
 - [jq](https://stedolan.github.io/jq/download/): `jq --version` >= `1.5`
+- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git): `git --version` >= `2.10.3`

 Note: if installing docker-compose via package manager on Linux (as opposed to Docker Desktop), you must [install the plugin](https://docs.docker.com/compose/install/linux/#install-the-plugin-manually), e.g. :

@@ -49,6 +50,13 @@ laconic-so version
 Version: 1.1.0-7a607c2-202304260513
 ```

+### Update
+If Stack Orchestrator was installed using the process described above, it is able to subsequently self-update to the current latest version by running:
+
+```bash
+laconic-so update
+```
+
 ## Usage

 The various [stacks](/app/data/stacks) each contain instructions for running different stacks based on your use case. For example:
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -63,7 +63,8 @@ class package_registry_stack(base_stack):
                self.url = "http://gitea.local:3000/api/packages/cerc-io/npm/"
            else:
                # If not, print a message about how to start it and return fail to the caller
-                print("ERROR: The package-registry stack is not running, and no external registry specified with CERC_NPM_REGISTRY_URL")
+                print("ERROR: The package-registry stack is not running, and no external registry "
+                      "specified with CERC_NPM_REGISTRY_URL")
                print("ERROR: Start the local package registry with: laconic-so --stack package-registry deploy-system up")
                return False
        return True
@@ -75,5 +76,7 @@ class package_registry_stack(base_stack):
 def get_npm_registry_url():
    # If an auth token is not defined, we assume the default should be the cerc registry
    # If an auth token is defined, we assume the local gitea should be used.
-    default_npm_registry_url = "http://gitea.local:3000/api/packages/cerc-io/npm/" if config("CERC_NPM_AUTH_TOKEN", default=None) else "https://git.vdb.to/api/packages/cerc-io/npm/"
+    default_npm_registry_url = "http://gitea.local:3000/api/packages/cerc-io/npm/" if config(
+        "CERC_NPM_AUTH_TOKEN", default=None
+        ) else "https://git.vdb.to/api/packages/cerc-io/npm/"
    return config("CERC_NPM_REGISTRY_URL", default=default_npm_registry_url)
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -86,6 +86,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
    # TODO: make this configurable
    container_build_env = {
        "CERC_NPM_REGISTRY_URL": get_npm_registry_url(),
+        "CERC_GO_AUTH_TOKEN": config("CERC_GO_AUTH_TOKEN", default=""),
        "CERC_NPM_AUTH_TOKEN": config("CERC_NPM_AUTH_TOKEN", default=""),
        "CERC_REPO_BASE_DIR": dev_root_path,
        "CERC_CONTAINER_BASE_DIR": container_build_dir,
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -30,10 +30,12 @@ from app.util import include_exclude_check, get_parsed_stack_config

 builder_js_image_name = "cerc/builder-js:local"

+
@click.command()
@click.option('--include', help="only build these packages")
@click.option('--exclude', help="don\'t build these packages")
-@click.option("--force-rebuild", is_flag=True, default=False, help="Override existing target package version check -- force rebuild")
+@click.option("--force-rebuild", is_flag=True, default=False,
+              help="Override existing target package version check -- force rebuild")
@click.option("--extra-build-args", help="Supply extra arguments to build")
@click.pass_context
 def command(ctx, include, exclude, force_rebuild, extra_build_args):
@@ -122,7 +124,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
            # envs = {"CERC_NPM_AUTH_TOKEN": npm_registry_url_token} | ({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
            # but that isn't available in Python 3.8 (default in Ubuntu 20) so for now we use dict.update:
            envs = {"CERC_NPM_AUTH_TOKEN": npm_registry_url_token,
-                    "LACONIC_HOSTED_CONFIG_FILE": "config-hosted.yml" # Convention used by our web app packages
+                    "LACONIC_HOSTED_CONFIG_FILE": "config-hosted.yml"  # Convention used by our web app packages
                    }
            envs.update({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
            envs.update({"CERC_FORCE_REBUILD": "true"} if force_rebuild else {})
@@ -130,8 +132,8 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
            try:
                docker.run(builder_js_image_name,
                           remove=True,
-                           interactive=True,
-                           tty=True,
+                           interactive=False,
+                           tty=False,
                           user=f"{os.getuid()}:{os.getgid()}",
                           envs=envs,
                           # TODO: detect this host name in npm_registry_url rather than hard-wiring it
@@ -1,4 +1,4 @@
-# Copyright © 2023 Cerc
+# Copyright © 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -15,7 +15,7 @@ services:
      - "6060"
      - "26657"
      - "26656"
-      - "9473:9473"
+      - "9473"
      - "8545"
      - "8546"
      - "9090"
@@ -20,7 +20,7 @@ services:
      - SYS_PTRACE
    environment:
      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-      CERC_RUN_STATEDIFF: "detect"
+      CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect}
      CERC_STATEDIFF_DB_NODE_ID: 1
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
    env_file:
@@ -6,9 +6,6 @@ services:
        condition: service_healthy
      ipfs:
        condition: service_healthy
-      # Uncomment when running against fixturenet-lotus to wait for the Lotus node to come up
-      # lotus-node-1:
-      #   condition: service_healthy
    extra_hosts:
      - host.docker.internal:host-gateway
    environment:
@@ -18,9 +15,13 @@ services:
      postgres_user: graph-node
      postgres_pass: password
      postgres_db: graph-node
-      ethereum: ${NETWORK:-filecoin}:${ETH_RPC_ENDPOINT:-https://archive.lotus.vdb.to/rpc/v1}
+      ethereum: ${ETH_NETWORKS:-lotus-fixturenet:http://lotus-node-1:1234/rpc/v1}
      GRAPH_LOG: debug
      ETHEREUM_REORG_THRESHOLD: 3
+    entrypoint: ["bash", "-c"]
+    # Wait for ETH RPC endpoint to be up when running with fixturenet-lotus
+    command: |
+      "wait_for ${ETH_RPC_HOST:-lotus-node-1}:${ETH_RPC_PORT:-1234} -t 1800 -- start"
    ports:
      - "8000"
      - "8001"
@@ -17,7 +17,7 @@ services:
      - "6060"
      - "26657"
      - "26656"
-      - "9473:9473"
+      - "9473"
      - "8545"
      - "8546"
      - "9090"
@@ -0,0 +1,39 @@
+version: '3.2'
+
+services:
+  # Builds and serves the MobyMask v3 react-app
+  mobymask-v3-app:
+    restart: unless-stopped
+    image: cerc/mobymask-ui:local
+    env_file:
+      - ../config/watcher-mobymask-v3/mobymask-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_CHAIN_ID: ${CERC_CHAIN_ID}
+      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
+      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+      CERC_PUBSUB: ${CERC_PUBSUB}
+      CERC_GOSSIPSUB_DIRECT_PEERS: ${CERC_GOSSIPSUB_DIRECT_PEERS}
+      CERC_RELEASE: "laconic-v3"
+      CERC_NA_ADDRESS: ${CERC_NA_ADDRESS}
+      CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
+      CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
+      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
+      CERC_PAYMENT_NITRO_ADDRESS: ${CERC_PAYMENT_NITRO_ADDRESS}
+      CERC_SNAP_URL: ${CERC_SNAP_URL}
+    working_dir: /scripts
+    command: ["sh", "mobymask-app-start.sh"]
+    volumes:
+      - ../config/watcher-mobymask-v3/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
+      - ../config/watcher-mobymask-v2/mobymask-app-config.json:/app/src/mobymask-app-config.json
+    ports:
+      - "127.0.0.1:3004:80"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "80"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 10s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
@@ -14,7 +14,8 @@ services:
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
-      CERC_RELEASE: "v0.1.5"
+      CERC_PUBSUB: ${CERC_PUBSUB}
+      CERC_RELEASE: "v0.1.7"
      CERC_USE_NPM: true
      CERC_CONFIG_FILE: "src/config.json"
    working_dir: /scripts
@@ -48,7 +49,8 @@ services:
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
-      CERC_RELEASE: "v0.1.5-lxdao-0.1.1"
+      CERC_PUBSUB: ${CERC_PUBSUB}
+      CERC_RELEASE: "v0.1.7-lxdao-0.1.1"
      CERC_USE_NPM: false
      CERC_CONFIG_FILE: "src/utils/config.json"
    working_dir: /scripts
@@ -84,6 +84,7 @@ services:
      CERC_PRIVATE_KEY_PEER: ${CERC_PRIVATE_KEY_PEER}
      CERC_RELAY_PEERS: ${CERC_RELAY_PEERS}
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+      CERC_PUBSUB: ${CERC_PUBSUB}
      CERC_RELAY_ANNOUNCE_DOMAIN: ${CERC_RELAY_ANNOUNCE_DOMAIN}
      CERC_ENABLE_PEER_L2_TXS: ${CERC_ENABLE_PEER_L2_TXS}
      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
@@ -0,0 +1,128 @@
+version: '3.2'
+
+services:
+  # Starts the PostgreSQL database for watcher
+  mobymask-watcher-db:
+    restart: unless-stopped
+    image: postgres:14-alpine
+    environment:
+      - POSTGRES_USER=vdbm
+      - POSTGRES_MULTIPLE_DATABASES=mobymask-watcher,mobymask-watcher-job-queue
+      - POSTGRES_EXTENSION=mobymask-watcher-job-queue:pgcrypto
+      - POSTGRES_PASSWORD=password
+    volumes:
+      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
+      - mobymask_watcher_db_data:/var/lib/postgresql/data
+    ports:
+      - "127.0.0.1:15432:5432"
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "5432"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 10s
+
+  # Deploys the MobyMask contract and generates an invite link
+  # Deployment is skipped if CERC_DEPLOYED_CONTRACT env is set
+  mobymask:
+    image: cerc/mobymask:local
+    working_dir: /app/packages/server
+    env_file:
+      - ../config/watcher-mobymask-v3/mobymask-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      ENV: "PROD"
+      CERC_L2_GETH_RPC: ${CERC_L2_GETH_RPC}
+      CERC_L1_ACCOUNTS_CSV_URL: ${CERC_L1_ACCOUNTS_CSV_URL}
+      CERC_PRIVATE_KEY_DEPLOYER: ${CERC_PRIVATE_KEY_DEPLOYER}
+      CERC_MOBYMASK_APP_BASE_URI: ${CERC_MOBYMASK_APP_BASE_URI}
+      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
+      CERC_L2_GETH_HOST: ${CERC_L2_GETH_HOST}
+      CERC_L2_GETH_PORT: ${CERC_L2_GETH_PORT}
+      CERC_L2_NODE_HOST: ${CERC_L2_NODE_HOST}
+      CERC_L2_NODE_PORT: ${CERC_L2_NODE_PORT}
+    command: ["sh", "deploy-and-generate-invite.sh"]
+    volumes:
+      - ../config/network/wait-for-it.sh:/app/packages/server/wait-for-it.sh
+      - ../config/watcher-mobymask-v2/secrets-template.json:/app/packages/server/secrets-template.json
+      - ../config/watcher-mobymask-v2/deploy-and-generate-invite.sh:/app/packages/server/deploy-and-generate-invite.sh
+      - mobymask_deployment:/app/packages/server
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Creates peer-id files if they don't exist
+  peer-ids-gen:
+    image: cerc/watcher-ts:local
+    restart: on-failure
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+    working_dir: /app/packages/peer
+    command: ["sh", "generate-peer-ids.sh"]
+    volumes:
+      - ../config/watcher-mobymask-v2/generate-peer-ids.sh:/app/packages/peer/generate-peer-ids.sh
+      - peers_ids:/peer-ids
+
+  # Optionally deploys the Nitro contracts; sets them at the required path
+  # Starts the MobyMask v3 watcher server
+  mobymask-watcher-server:
+    image: cerc/watcher-mobymask-v3:local
+    restart: unless-stopped
+    depends_on:
+      mobymask-watcher-db:
+        condition: service_healthy
+      peer-ids-gen:
+        condition: service_completed_successfully
+      mobymask:
+        condition: service_completed_successfully
+    env_file:
+      - ../config/watcher-mobymask-v3/mobymask-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_L2_GETH_RPC: ${CERC_L2_GETH_RPC}
+      CERC_L1_ACCOUNTS_CSV_URL: ${CERC_L1_ACCOUNTS_CSV_URL}
+      CERC_PRIVATE_KEY_DEPLOYER: ${CERC_PRIVATE_KEY_DEPLOYER}
+      CERC_RELAY_PEERS: ${CERC_RELAY_PEERS}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+      CERC_PUBSUB: ${CERC_PUBSUB}
+      CERC_RELAY_ANNOUNCE_DOMAIN: ${CERC_RELAY_ANNOUNCE_DOMAIN}
+      CERC_ENABLE_PEER_L2_TXS: ${CERC_ENABLE_PEER_L2_TXS}
+      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
+      CERC_NA_ADDRESS: ${CERC_NA_ADDRESS}
+      CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
+      CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
+      CERC_PRIVATE_KEY_PEER: ${CERC_PRIVATE_KEY_PEER}
+      CERC_PRIVATE_KEY_NITRO: ${CERC_PRIVATE_KEY_NITRO}
+      CERC_PEER_ID: ${CERC_PEER_ID}
+    entrypoint: ["bash", "-c"]
+    command: ["./deploy-nitro-contracts.sh && ./start-server.sh"]
+    volumes:
+      - ../config/watcher-mobymask-v3/deploy-nitro-contracts.sh:/app/deploy-nitro-contracts.sh
+      - ../config/watcher-mobymask-v3/deploy-nitro-contracts.ts:/app/deploy-nitro-contracts.ts
+      - ../config/watcher-mobymask-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
+      - ../config/watcher-mobymask-v3/watcher-config-rates.toml:/app/environments/rates.toml
+      - ../config/watcher-mobymask-v3/keys:/app/keys
+      - ../config/watcher-mobymask-v3/start-server.sh:/app/start-server.sh
+      - nitro_data:/app/out/nitro-db
+      - peers_ids:/app/peers
+      - nitro_addresses:/nitro
+      - mobymask_deployment:/server
+    # Expose GQL, metrics and relay node ports
+    ports:
+      - "127.0.0.1:3001:3001"
+      - "127.0.0.1:9001:9001"
+      - "127.0.0.1:9090:9090"
+    healthcheck:
+      test: ["CMD", "busybox", "nc", "localhost", "9090"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+volumes:
+  mobymask_watcher_db_data:
+  peers_ids:
+  mobymask_deployment:
+  nitro_addresses:
+  nitro_data:
@@ -17,8 +17,8 @@ module.exports = {
    whitelistedTokenAddresses: [
      'NATIVE_ADDRESS',
    ],
-    stableTokenAddresses: [
-    ],
+    stableTokenAddresses: [],
+    nativePricePool: '0x0000000000000000000000000000000000000000',
    minimumEthLocked: 1.5
  }
 }
@@ -101,7 +101,8 @@ if __name__ == "__main__":
            if args.ssh_host:
                dst_dbport = random.randint(11000, 12000)
                print(
-                    f"Establishing SSH tunnel from 127.0.0.1:{dst_dbport} to {args.ssh_host}->{args.dst_dbhost}:{args.dst_dbport}... ",
+                    f"Establishing SSH tunnel from 127.0.0.1:{dst_dbport} to "
+                    "{args.ssh_host}->{args.dst_dbhost}:{args.dst_dbport}... ",
                    end="",
                )
                with Connection(
@@ -10,6 +10,13 @@ scrape_configs:
    static_configs:
    - targets: ['mainnet-eth-geth-1:6060']

+  # lighthouse
+  - job_name: 'lighthouse'
+    metrics_path: /metrics
+    scheme: http
+    static_configs:
+    - targets: ['mainnet-eth-lighthouse-1:5054']
+
  # keycloak
  - job_name: 'keycloak'
    scrape_interval: 5s
@@ -8,6 +8,7 @@ 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_PUBSUB="${CERC_PUBSUB:-${DEFAULT_CERC_PUBSUB}}"
 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
@@ -41,7 +42,8 @@ jq --arg address "$CERC_DEPLOYED_CONTRACT" \
  --argjson chainId "$CERC_CHAIN_ID" \
  --argjson relayNodes "$CERC_RELAY_NODES" \
  --argjson denyMultiaddrs "$CERC_DENY_MULTIADDRS" \
-  '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes | .peer.denyMultiaddrs = $denyMultiaddrs' \
+  --arg pubsub "$CERC_PUBSUB" \
+  '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes | .peer.denyMultiaddrs = $denyMultiaddrs | .peer.pubsub = $pubsub' \
  /app/src/mobymask-app-config.json > /app/${CERC_CONFIG_FILE}

 if [ "${CERC_USE_NPM}" = "true" ]; then
@@ -27,3 +27,6 @@ DEFAULT_CERC_RELAY_NODES=[]

 # Set of multiaddrs to be avoided while dialling
 DEFAULT_CERC_DENY_MULTIADDRS=[]
+
+# Type of pubsub to be used
+DEFAULT_CERC_PUBSUB=""
@@ -9,6 +9,7 @@ CERC_L1_ACCOUNTS_CSV_URL="${CERC_L1_ACCOUNTS_CSV_URL:-${DEFAULT_CERC_L1_ACCOUNTS

 CERC_RELAY_PEERS="${CERC_RELAY_PEERS:-${DEFAULT_CERC_RELAY_PEERS}}"
 CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"
+CERC_PUBSUB="${CERC_PUBSUB:-${DEFAULT_CERC_PUBSUB}}"
 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}}"
@@ -50,6 +51,7 @@ 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_PUBSUB/${CERC_PUBSUB}/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; \
@@ -30,6 +30,7 @@
      denyMultiaddrs = REPLACE_WITH_CERC_DENY_MULTIADDRS
      peerIdFile = './peers/relay-id.json'
      announce = 'REPLACE_WITH_CERC_RELAY_ANNOUNCE_DOMAIN'
+      pubsub = 'REPLACE_WITH_CERC_PUBSUB'
      enableDebugInfo = true

    [server.p2p.peer]
@@ -37,6 +38,7 @@
      pubSubTopic = 'mobymask'
      denyMultiaddrs = REPLACE_WITH_CERC_DENY_MULTIADDRS
      peerIdFile = './peers/peer-id.json'
+      pubsub = 'REPLACE_WITH_CERC_PUBSUB'
      enableDebugInfo = true
      enableL2Txs = REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+CERC_NA_ADDRESS="${CERC_NA_ADDRESS:-${DEFAULT_CERC_NA_ADDRESS}}"
+CERC_VPA_ADDRESS="${CERC_VPA_ADDRESS:-${DEFAULT_CERC_VPA_ADDRESS}}"
+CERC_CA_ADDRESS="${CERC_CA_ADDRESS:-${DEFAULT_CERC_CA_ADDRESS}}"
+
+NITRO_ADDRESSES_FILE_PATH="/nitro/nitro-addresses.json"
+
+# Check if CERC_NA_ADDRESS environment variable set to skip contract deployment
+if [ -n "$CERC_NA_ADDRESS" ]; then
+  echo "CERC_NA_ADDRESS is set to '$CERC_NA_ADDRESS'"
+  echo "CERC_VPA_ADDRESS is set to '$CERC_VPA_ADDRESS'"
+  echo "CERC_CA_ADDRESS is set to '$CERC_CA_ADDRESS'"
+  echo "Using the above addresses and skipping Nitro contracts deployment"
+
+  # Create the required JSON and write it to a file
+  nitro_addresses_json=$(jq -n \
+    --arg na "$CERC_NA_ADDRESS" \
+    --arg vpa "$CERC_VPA_ADDRESS" \
+    --arg ca "$CERC_CA_ADDRESS" \
+    '.nitroAdjudicatorAddress = $na | .virtualPaymentAppAddress = $vpa | .consensusAppAddress = $ca')
+  echo "$nitro_addresses_json" > "${NITRO_ADDRESSES_FILE_PATH}"
+
+  exit
+fi
+
+# Check and exit if a deployment already exists (on restarts)
+if [ -f ${NITRO_ADDRESSES_FILE_PATH} ]; then
+  echo "${NITRO_ADDRESSES_FILE_PATH} already exists, skipping Nitro contracts deployment"
+  exit
+fi
+
+echo "Using L2 RPC endpoint ${CERC_L2_GETH_RPC}"
+
+if [ -n "$CERC_L1_ACCOUNTS_CSV_URL" ] && \
+  l1_accounts_response=$(curl -L --write-out '%{http_code}' --silent --output /dev/null "$CERC_L1_ACCOUNTS_CSV_URL") && \
+  [ "$l1_accounts_response" -eq 200 ];
+then
+  echo "Fetching L1 account credentials using provided URL"
+  mkdir -p /geth-accounts
+  wget -O /geth-accounts/accounts.csv "$CERC_L1_ACCOUNTS_CSV_URL"
+
+  # Read the private key of an L1 account to deploy contract
+  CERC_PRIVATE_KEY_DEPLOYER=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
+else
+  echo "Couldn't fetch L1 account credentials, using CERC_PRIVATE_KEY_DEPLOYER from env"
+fi
+
+echo "RPC_URL=${CERC_L2_GETH_RPC}" > .env
+echo "NITRO_ADDRESSES_FILE_PATH=${NITRO_ADDRESSES_FILE_PATH}" >> .env
+echo "PRIVATE_KEY=${CERC_PRIVATE_KEY_DEPLOYER}" >> .env
+
+yarn ts-node --esm deploy-nitro-contracts.ts
@@ -0,0 +1,49 @@
+import 'dotenv/config';
+import fs from 'fs';
+import { providers, Wallet } from 'ethers';
+import { deployContracts } from '@cerc-io/nitro-util';
+
+async function main () {
+  const rpcURL = process.env.RPC_URL;
+  const addressesFilePath = process.env.NITRO_ADDRESSES_FILE_PATH;
+  const deployerKey = process.env.PRIVATE_KEY;
+
+  if (!rpcURL) {
+    console.log('RPC_URL not set, skipping deployment');
+    return;
+  }
+
+  if (!addressesFilePath) {
+    console.log('NITRO_ADDRESSES_FILE_PATH not set, skipping deployment');
+    return;
+  }
+
+  if (!deployerKey) {
+    console.log('PRIVATE_KEY not set, skipping deployment');
+    return;
+  }
+
+  const provider = new providers.JsonRpcProvider(process.env.RPC_URL);
+  const signer = new Wallet(deployerKey, provider);
+
+  const [
+    nitroAdjudicatorAddress,
+    virtualPaymentAppAddress,
+    consensusAppAddress
+  ] = await deployContracts(signer as any);
+
+  const output = {
+    nitroAdjudicatorAddress,
+    virtualPaymentAppAddress,
+    consensusAppAddress
+  };
+
+  fs.writeFileSync(addressesFilePath, JSON.stringify(output, null, 2));
+  console.log('Nitro contracts deployed, addresses written to', addressesFilePath);
+  console.log('Result:', JSON.stringify(output, null, 2));
+}
+
+main()
+  .catch((err) => {
+    console.log(err);
+  });
@@ -0,0 +1,11 @@
+{
+  "peerId": {
+    "id": "12D3KooWAMjBkFCT9DtCnSDcxftxJzSuTBvzVojabv64cnEvX4AZ",
+    "privKey": "CAESQAKCrnY0QKTky1I18fqn+VPydXGUv1NYiV+nVKqBFkw/CAjE9sKKIDGnYAo8mivnI6dngFenERY+0Q8AJrPTaXY=",
+    "pubKey": "CAESIAgIxPbCiiAxp2AKPJor5yOnZ4BXpxEWPtEPACaz02l2"
+  },
+  "consensus": {
+    "publicKey": "02cd17b05ca998955be5ca7bf4fd4531243d438f1aae7ce8a0ed5159f53cee5b40",
+    "privateKey": "67d80505614bdf61fca11cbad31d93acb2c7df1c653dc25975d77d05f05f154f"
+  }
+}
@@ -0,0 +1,11 @@
+{
+  "peerId": {
+    "id": "12D3KooWBNEbY3QS4y23ngupDw9PDc4bvNvRJGVRejjV9EZLjux5",
+    "privKey": "CAESQGSTw0ymvn8+wX9Dbvyr4/Gib1q2voe0CC0VyeClMQP6FwW14x0fpRbBIx0XhLdxWHkRndphVg3gVAHyC+7ZI8o=",
+    "pubKey": "CAESIBcFteMdH6UWwSMdF4S3cVh5EZ3aYVYN4FQB8gvu2SPK"
+  },
+  "consensus": {
+    "publicKey": "029c8035b3e9401b8f178f7c37285b5cb22501e017340e2058b3b842f2a1f0ae45",
+    "privateKey": "0261008e8e3ec808168e99333599da38ca59a056a2ae4510a6ad3d8b5cb0918c"
+  }
+}
@@ -0,0 +1,11 @@
+{
+  "peerId": {
+    "id": "12D3KooWSRH6ftgkAZsKZK7UX1Zr6Hx6YAsEepHqzopFszqfTxxi",
+    "privKey": "CAESQHBjlHxfVhZ2gXsBItrIEEgSGKcjMkFiGs3PPz9E3ace9qyWEkvR4oit5ve9SAROVoh20hoa42IC91NIafMaqws=",
+    "pubKey": "CAESIPaslhJL0eKIreb3vUgETlaIdtIaGuNiAvdTSGnzGqsL"
+  },
+  "consensus": {
+    "publicKey": "039160c244a7ad8be16a64bdb69e6dbacdcfe20b37076792a0d06032a8097468ca",
+    "privateKey": "8894685fe81001d75662b079905472699373967451d1255ee5fc669d0a09a9ca"
+  }
+}
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+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_PUBSUB="${CERC_PUBSUB:-${DEFAULT_CERC_PUBSUB}}"
+CERC_GOSSIPSUB_DIRECT_PEERS="${CERC_GOSSIPSUB_DIRECT_PEERS:-${DEFAULT_CERC_GOSSIPSUB_DIRECT_PEERS}}"
+
+echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES"
+
+if [ -z "$CERC_DEPLOYED_CONTRACT" ]; then
+  echo "CERC_DEPLOYED_CONTRACT not set"
+  exit 1
+else
+  echo "Using CERC_DEPLOYED_CONTRACT ${CERC_DEPLOYED_CONTRACT} from env as the MobyMask contract address"
+fi
+
+# Checkout to the required release/branch
+cd /app
+git checkout $CERC_RELEASE
+
+# Check if CERC_NA_ADDRESS is set
+if [ -n "$CERC_NA_ADDRESS" ]; then
+  echo "CERC_NA_ADDRESS is set to '$CERC_NA_ADDRESS'"
+  echo "CERC_VPA_ADDRESS is set to '$CERC_VPA_ADDRESS'"
+  echo "CERC_CA_ADDRESS is set to '$CERC_CA_ADDRESS'"
+  echo "Using the above Nitro addresses"
+
+  # Create the required JSON and write it to a file
+  nitro_addresses_json=$(jq -n \
+    --arg na "$CERC_NA_ADDRESS" \
+    --arg vpa "$CERC_VPA_ADDRESS" \
+    --arg ca "$CERC_CA_ADDRESS" \
+    '.nitroAdjudicatorAddress = $na | .virtualPaymentAppAddress = $vpa | .consensusAppAddress = $ca')
+  echo "$nitro_addresses_json" > /app/src/utils/nitro-addresses.json
+else
+  echo "Nitro addresses not provided"
+  exit 1
+fi
+
+# Export config values in a json file
+jq --arg address "$CERC_DEPLOYED_CONTRACT" \
+  --argjson chainId "$CERC_CHAIN_ID" \
+  --argjson relayNodes "$CERC_RELAY_NODES" \
+  --argjson denyMultiaddrs "$CERC_DENY_MULTIADDRS" \
+  --arg pubsub "$CERC_PUBSUB" \
+  --argjson directPeers "$CERC_GOSSIPSUB_DIRECT_PEERS" \
+  '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes | .peer.denyMultiaddrs = $denyMultiaddrs | .peer.pubsub = $pubsub | .peer.directPeers = $directPeers' \
+  /app/src/mobymask-app-config.json > /app/src/utils/config.json
+
+yarn install
+
+REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" \
+REACT_APP_PAY_TO_NITRO_ADDRESS="$CERC_PAYMENT_NITRO_ADDRESS" \
+REACT_APP_SNAP_ORIGIN="local:$CERC_SNAP_URL" \
+yarn build
+
+http-server -p 80 /app/build
@@ -0,0 +1,37 @@
+# Defaults
+
+# Set of relay peers to connect to from the relay node
+DEFAULT_CERC_RELAY_PEERS=[]
+
+# Domain to be used in the relay node's announce address
+DEFAULT_CERC_RELAY_ANNOUNCE_DOMAIN=
+
+# Base URI for mobymask-app (used for generating invite)
+DEFAULT_CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3004/#"
+
+# Set to false for disabling watcher peer to send txs to L2
+DEFAULT_CERC_ENABLE_PEER_L2_TXS=true
+
+# Set deployed MobyMask contract address to avoid deploying contract in stack
+# mobymask-app will use this contract address in config if run separately
+DEFAULT_CERC_DEPLOYED_CONTRACT=
+
+# Chain ID is used by mobymask web-app for txs
+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=[]
+
+# Type of pubsub to be used
+DEFAULT_CERC_PUBSUB=""
+
+# Set of direct peers to be used when pubsub is set to gossipsub
+DEFAULT_CERC_GOSSIPSUB_DIRECT_PEERS=[]
+
+# Set deployed Nitro addresses to avoid deploying them in the stack
+DEFAULT_CERC_NA_ADDRESS=
+DEFAULT_CERC_VPA_ADDRESS=
+DEFAULT_CERC_CA_ADDRESS=
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+CERC_L2_GETH_RPC="${CERC_L2_GETH_RPC:-${DEFAULT_CERC_L2_GETH_RPC}}"
+
+CERC_RELAY_PEERS="${CERC_RELAY_PEERS:-${DEFAULT_CERC_RELAY_PEERS}}"
+CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"
+CERC_PUBSUB="${CERC_PUBSUB:-${DEFAULT_CERC_PUBSUB}}"
+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}}"
+
+nitro_addresses_file="/nitro/nitro-addresses.json"
+nitro_addresses_destination_file="./src/nitro-addresses.json"
+
+watcher_keys_dir="./keys"
+
+echo "Using L2 RPC endpoint ${CERC_L2_GETH_RPC}"
+
+# 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
+  CONTRACT_ADDRESS="${CERC_DEPLOYED_CONTRACT}"
+else
+  # Assign deployed contract address from server config (created by mobymask container after deploying contract)
+  CONTRACT_ADDRESS=$(jq -r '.address' /server/config.json | tr -d '"')
+fi
+
+# Copy the deployed Nitro addresses to the required path
+if [ -f "$nitro_addresses_file" ]; then
+  cat "$nitro_addresses_file" > "$nitro_addresses_destination_file"
+  echo "Nitro addresses set to ${nitro_addresses_destination_file}"
+
+  # Build after setting the Nitro addresses
+  yarn build
+else
+  echo "File ${nitro_addresses_file} does not exist"
+  exit 1
+fi
+
+echo "Using CERC_PRIVATE_KEY_PEER (account with funds) from env for sending txs to L2"
+echo "Using CERC_PRIVATE_KEY_NITRO from env for Nitro account"
+
+if [ -n "$CERC_PEER_ID" ]; then
+  echo "Using CERC_PEER_ID ${CERC_PEER_ID} from env for watcher fixture"
+  echo "Consensus module enabled"
+
+  # Set corresponding variables
+  PEER_ID_FILE='./peer-id.json'
+  CONSENSUS_ENABLED=true
+  WATCHER_PARTY_PEERS_FILE='./watcher-party-peers.json'
+
+  # Create watcher party array
+  watcher_parties=()
+
+  # Iterate over each fixture JSON file
+  for peer_data_file in "$watcher_keys_dir"/*.json; do
+    # Extract the filename without the path and extension
+    peer_id=$(basename "$peer_data_file" .json)
+
+    # Read the consensus keys
+    consensus_public_key=$(jq -r '.consensus.publicKey' "$peer_data_file")
+    consensus_private_key=$(jq -r '.consensus.privateKey' "$peer_data_file")
+
+    # Append watcher party
+    watcher_party=$(jq -n \
+      --arg peerId "$peer_id" \
+      --arg publicKey "$consensus_public_key" \
+      '.peerId = $peerId | .publicKey = $publicKey')
+    watcher_parties+=("$watcher_party")
+
+    if [ "$peer_id" = "$CERC_PEER_ID" ]; then
+      # Export peer id
+      peer_id_data=$(jq '.peerId' "$peer_data_file")
+      echo "$peer_id_data" > "${PEER_ID_FILE}"
+
+      # Set consensus keys for this peer
+      CONSENSUS_PUBLIC_KEY=${consensus_public_key}
+      CONSENSUS_PRIVATE_KEY=${consensus_private_key}
+    fi
+  done
+
+  # Export watcher party file
+  watcher_parties_json=$(printf '%s\n' "${watcher_parties[@]}" | jq -s .)
+  echo "$watcher_parties_json" > "${WATCHER_PARTY_PEERS_FILE}"
+  echo "Watcher party peers exported to ${WATCHER_PARTY_PEERS_FILE}"
+else
+  echo "Using generated peer id"
+  echo "Consensus module disabled"
+
+  # Set corresponding variables
+  PEER_ID_FILE='./peers/peer-id.json'
+  CONSENSUS_ENABLED=false
+  WATCHER_PARTY_PEERS_FILE=''
+  CONSENSUS_PUBLIC_KEY=''
+  CONSENSUS_PRIVATE_KEY=''
+fi
+
+# 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_RELAY_PEERS|${CERC_RELAY_PEERS}|g; \
+          s|REPLACE_WITH_CERC_DENY_MULTIADDRS|${CERC_DENY_MULTIADDRS}|g; \
+          s/REPLACE_WITH_CERC_PUBSUB/${CERC_PUBSUB}/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_PEER_ID_FILE|${PEER_ID_FILE}|g; \
+          s/REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS/${CERC_ENABLE_PEER_L2_TXS}/g; \
+          s/REPLACE_WITH_CERC_PRIVATE_KEY_PEER/${CERC_PRIVATE_KEY_PEER}/g; \
+          s/REPLACE_WITH_CERC_PRIVATE_KEY_NITRO/${CERC_PRIVATE_KEY_NITRO}/g; \
+          s/REPLACE_WITH_CONTRACT_ADDRESS/${CONTRACT_ADDRESS}/g; \
+          s/REPLACE_WITH_CONSENSUS_ENABLED/${CONSENSUS_ENABLED}/g; \
+          s/REPLACE_WITH_CONSENSUS_PUBLIC_KEY/${CONSENSUS_PUBLIC_KEY}/g; \
+          s/REPLACE_WITH_CONSENSUS_PRIVATE_KEY/${CONSENSUS_PRIVATE_KEY}/g; \
+          s|REPLACE_WITH_WATCHER_PARTY_PEERS_FILE|${WATCHER_PARTY_PEERS_FILE}|g; \
+          s|REPLACE_WITH_CERC_L2_GETH_RPC_ENDPOINT|${CERC_L2_GETH_RPC}| ")
+
+# Write the modified content to a new file
+echo "$WATCHER_CONFIG" > environments/local.toml
+
+echo 'yarn server'
+yarn server
@@ -0,0 +1,14 @@
+freeQueriesLimit = 10
+
+freeQueriesList = []
+
+[queries]
+  multiNonce = '50'
+  _owner = '50'
+  isRevoked = '50'
+  isPhisher = '50'
+  isMember = '50'
+
+[mutations]
+  invoke = '100'
+  revoke = '100'
@@ -0,0 +1,103 @@
+[server]
+  host = "0.0.0.0"
+  port = 3001
+  kind = "lazy"
+
+  # Checkpointing state.
+  checkpointing = true
+
+  # Checkpoint interval in number of blocks.
+  checkpointInterval = 2000
+
+  # Enable state creation
+  enableState = true
+
+  # Boolean to filter logs by contract.
+  filterLogs = true
+
+  # Max block range for which to return events in eventsInRange GQL query.
+  # Use -1 for skipping check on block range.
+  maxEventsBlockRange = -1
+
+  [server.p2p]
+    enableRelay = true
+    enablePeer = true
+
+    [server.p2p.relay]
+      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'
+      pubsub = 'REPLACE_WITH_CERC_PUBSUB'
+      enableDebugInfo = true
+
+    [server.p2p.peer]
+      relayMultiaddr = 'REPLACE_WITH_CERC_RELAY_MULTIADDR'
+      pubSubTopic = 'mobymask'
+      denyMultiaddrs = REPLACE_WITH_CERC_DENY_MULTIADDRS
+      peerIdFile = 'REPLACE_WITH_PEER_ID_FILE'
+      pubsub = 'REPLACE_WITH_CERC_PUBSUB'
+      enableDebugInfo = true
+      enableL2Txs = REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS
+
+      [server.p2p.peer.l2TxsConfig]
+        privateKey = 'REPLACE_WITH_CERC_PRIVATE_KEY_PEER'
+        contractAddress = 'REPLACE_WITH_CONTRACT_ADDRESS'
+
+    [server.p2p.nitro]
+      store = './out/nitro-db'
+      privateKey = 'REPLACE_WITH_CERC_PRIVATE_KEY_NITRO'
+      chainPrivateKey = 'REPLACE_WITH_CERC_PRIVATE_KEY_PEER'
+
+      [server.p2p.nitro.payments]
+        ratesFile = './environments/rates.toml'
+        requestTimeoutInSecs = 10
+
+        [server.p2p.nitro.payments.cache]
+          maxAccounts = 1000
+          accountTTLInSecs = 1800
+          maxVouchersPerAccount = 1000
+          voucherTTLInSecs = 300
+          maxPaymentChannels = 10000
+          paymentChannelTTLInSecs = 1800
+
+    [server.p2p.consensus]
+      enabled = REPLACE_WITH_CONSENSUS_ENABLED
+      publicKey = 'REPLACE_WITH_CONSENSUS_PUBLIC_KEY'
+      privateKey = 'REPLACE_WITH_CONSENSUS_PRIVATE_KEY'
+      watcherPartyFile = 'REPLACE_WITH_WATCHER_PARTY_PEERS_FILE'
+
+[metrics]
+  host = "0.0.0.0"
+  port = 9000
+  [metrics.gql]
+    port = 9001
+
+[database]
+  type = "postgres"
+  host = "mobymask-watcher-db"
+  port = 5432
+  database = "mobymask-watcher"
+  username = "vdbm"
+  password = "password"
+  synchronize = true
+  logging = false
+
+[upstream]
+  [upstream.ethServer]
+    gqlApiEndpoint = "http://ipld-eth-server:8083/graphql"
+    rpcProviderEndpoint = "REPLACE_WITH_CERC_L2_GETH_RPC_ENDPOINT"
+    blockDelayInMilliSecs = 60000
+
+  [upstream.cache]
+    name = "requests"
+    enabled = false
+    deleteOnStart = false
+
+[jobQueue]
+  dbConnectionString = "postgres://vdbm:password@mobymask-watcher-db/mobymask-watcher-job-queue"
+  maxCompletionLagInSecs = 300
+  jobDelayInMilliSecs = 100
+  eventsInBatch = 50
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Usage: build-npm-package-local-dependencies.sh <registry-url> <publish-with-this-version>
 # Runs build-npm-package.sh after first fixing up yarn.lock to use a local
-# npm registry for all packages in a specific scope (currently @cerc-io, @lirewine and @muknsys)
+# npm registry for all packages in a specific scope (currently @cerc-io and @lirewine)
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
    set -x
 fi
@@ -18,7 +18,7 @@ set -e
 local_npm_registry_url=$1
 package_publish_version=$2
 # If we need to handle an additional scope, add it to the list below:
-npm_scopes_to_handle=("@cerc-io" "@lirewine" "@muknsys")
+npm_scopes_to_handle=("@cerc-io" "@lirewine")
 for npm_scope_for_local in ${npm_scopes_to_handle[@]}
 do
    # We need to configure the local registry
@@ -1,9 +1,25 @@
 #!/bin/bash
 # Usage: build-npm-package.sh <registry-url> <publish-with-this-version>
 # Note: supply the registry auth token in CERC_NPM_AUTH_TOKEN
+#
+
+
 if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
    set -x
 fi
+
+echo "GITEA ACTIONS 1 is: $GITEA_ACTIONS"
+echo "GITEA ACTIONS 2 is: ${GITEA_ACTIONS}"
+
+echo "token 1 is: $CERC_NPM_AUTH_TOKEN"
+echo "token 2 is: ${CERC_NPM_AUTH_TOKEN}"
+
+if [[ "$GITEA_ACTIONS" = "true" ]]; then
+	echo "WORKS"
+else
+	echo "WTF"
+fi
+
 if ! [[ $# -eq 1 || $# -eq 2 ]]; then
    echo "Illegal number of parameters" >&2
    exit 1
@@ -24,22 +40,24 @@ package_name=$( cat package.json | jq -r .name )
 local_npm_registry_url=$1
 npm config set @cerc-io:registry ${local_npm_registry_url}
 npm config set @lirewine:registry ${local_npm_registry_url}
-npm config set @muknsys:registry ${local_npm_registry_url}
 # Workaround bug in npm unpublish where it needs the url to be of the form //<foo> and not http://<foo>
 local_npm_registry_url_fixed=$( echo ${local_npm_registry_url} | sed -e 's/^http[s]\{0,1\}://')
 npm config set -- ${local_npm_registry_url_fixed}:_authToken ${CERC_NPM_AUTH_TOKEN}
 # First check if the version of this package we're trying to build already exists in the registry
+# but this line: "jq -r .data.dist.tarball" fails only in gitea, so skip this block
+if [[ "${GITEA_ACTIONS}" != "true" ]]; then
 package_exists=$( yarn info --json ${package_name}@${package_publish_version} 2>/dev/null | jq -r .data.dist.tarball )
-if [[ ! -z "$package_exists" && "$package_exists" != "null" ]]; then
-    echo "${package_publish_version} of ${package_name} already exists in the registry"
-    if [[ ${CERC_FORCE_REBUILD} == "true" ]]; then
-        # Attempt to unpublish the existing package
-        echo "NOTE: unpublishing existing package version since force rebuild is enabled"
-        npm unpublish --force ${package_name}@${package_publish_version}
-    else
-        echo "skipping build since target version already exists"
-        exit 0
-    fi
+  if [[ ! -z "$package_exists" && "$package_exists" != "null" ]]; then
+      echo "${package_publish_version} of ${package_name} already exists in the registry"
+      if [[ ${CERC_FORCE_REBUILD} == "true" ]]; then
+          # Attempt to unpublish the existing package
+          echo "NOTE: unpublishing existing package version since force rebuild is enabled"
+          npm unpublish --force ${package_name}@${package_publish_version}
+      else
+          echo "skipping build since target version already exists"
+          exit 0
+      fi
+  fi
 fi
 echo "Build and publish ${package_name} version ${package_publish_version}"
 yarn install
@@ -1,5 +1,4 @@
 from web3.auto import w3
-import json
 import ruamel.yaml as yaml
 import sys

@@ -1,6 +1,6 @@
 # Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=18-bullseye
 FROM node:${VARIANT}

 ARG USERNAME=node
@@ -37,7 +37,7 @@ RUN yarn global add http-server

 WORKDIR /app
 COPY . .
-RUN npm install
+RUN yarn install

 # Expose port for http
 EXPOSE 80
@@ -1,4 +1,10 @@
 #!/usr/bin/env bash
 # Build cerc/plugeth-statediff
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/plugeth-statediff:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth-statediff
+# This container build currently requires access to private dependencies in gitea
+# so we check that the necessary access token has been supplied here, then pass it o the build
+if [[ -z "${CERC_GO_AUTH_TOKEN}" ]]; then
+    echo "ERROR: CERC_GO_AUTH_TOKEN is not set" >&2
+    exit 1
+fi
+docker build -t cerc/plugeth-statediff:local ${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN} ${CERC_REPO_BASE_DIR}/plugeth-statediff
@@ -1,4 +1,10 @@
 #!/usr/bin/env bash
 # Build cerc/plugeth
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/plugeth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth
+# This container build currently requires access to private dependencies in gitea
+# so we check that the necessary access token has been supplied here, then pass it o the build
+if [[ -z "${CERC_GO_AUTH_TOKEN}" ]]; then
+    echo "ERROR: CERC_GO_AUTH_TOKEN is not set" >&2
+    exit 1
+fi
+docker build -t cerc/plugeth:local ${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN} ${CERC_REPO_BASE_DIR}/plugeth
@@ -0,0 +1,20 @@
+FROM ubuntu:22.04
+
+RUN apt-get update \
+  && apt-get install -y curl wget gnupg build-essential \
+  && curl --silent --location https://deb.nodesource.com/setup_18.x | bash - \
+  && apt-get update \
+  && apt-get install -y nodejs git busybox jq \
+  && node -v
+
+RUN corepack enable \
+  && yarn --version
+
+WORKDIR /app
+
+COPY . .
+
+RUN echo "Building mobymask-v2-watcher-ts" && \
+  yarn && yarn build
+
+WORKDIR /app
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Build cerc/watcher-mobymask-v3
+
+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-mobymask-v3:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/mobymask-v2-watcher-ts
@@ -50,3 +50,4 @@ cerc/watcher-sushiswap
 cerc/graph-node
 cerc/sushiswap-subgraphs
 cerc/webapp-base
+cerc/watcher-mobymask-v3
@@ -35,3 +35,5 @@ contract-sushiswap
 graph-node
 sushiswap-subgraph-v3
 fixturenet-sushiswap-subgraph-v3
+watcher-mobymask-v3
+mobymask-app-v3
@@ -1,5 +1,5 @@
 version: "1.2"
 name: build-support
-decription: "Build Support Components"
+description: "Build Support Components"
 containers:
  - cerc/builder-js
@@ -1,6 +1,6 @@
 version: "1.0"
 name: chain-chunker
-decription: "Stack to build containers for chain-chunker"
+description: "Stack to build containers for chain-chunker"
 repos:
  - github.com/cerc-io/ipld-eth-state-snapshot@v5
  - github.com/cerc-io/eth-statediff-service@v5
@@ -1,6 +1,6 @@
 version: "1.0"
 name: fixturenet-eth-loaded
-decription: "Loaded Ethereum Fixturenet"
+description: "Loaded Ethereum Fixturenet"
 repos:
  - github.com/cerc-io/go-ethereum
  - github.com/cerc-io/tx-spammer
@@ -1,6 +1,6 @@
 version: "1.2"
 name: fixturenet-eth-tx
-decription: "Ethereum Fixturenet w/ tx-spammer"
+description: "Ethereum Fixturenet w/ tx-spammer"
 repos:
  - github.com/cerc-io/go-ethereum
  - github.com/cerc-io/tx-spammer
@@ -1,6 +1,6 @@
 version: "1.1"
 name: fixturenet-eth
-decription: "Ethereum Fixturenet"
+description: "Ethereum Fixturenet"
 repos:
  - github.com/cerc-io/go-ethereum
  - github.com/cerc-io/lighthouse
@@ -1,3 +0,0 @@
-# Graph-Node Fixturenet
-
-Experimental
@@ -1,12 +0,0 @@
-version: "1.0"
-name: fixturenet-graph-node
-description: "A graph-node fixturenet"
-repos:
-  - github.com/filecoin-project/lotus
-  - github.com/graphprotocol/graph-node
-containers:
-  - cerc/lotus
-  - cerc/graph-node
-pods:
-  - fixturenet-lotus
-  - graph-node
@@ -4,6 +4,8 @@ Testing a "Loaded" fixturenet with console.

 Instructions for deploying a local Laconic blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator.

+**Note:** For building some NPMs, access to the @lirewine repositories is required. If you don't have access, see [this tutorial](/docs/laconicd-fixturenet.md) to run this stack
+
 ## 1. Install Laconic Stack Orchestrator
 Installation is covered in detail [here](https://github.com/cerc-io/stack-orchestrator#user-mode) but if you're on Linux and already have docker installed it should be as simple as:
 ```
@@ -30,24 +32,24 @@ $ export CERC_NPM_AUTH_TOKEN=<my-token>

 ## 3. Clone required repositories
 ```
-$ laconic-so --stack fixturenet-laconicd setup-repositories
+$ laconic-so --stack fixturenet-laconic-loaded setup-repositories
 ```
 ## 4. Build the stack's packages and containers
 ```
-$ laconic-so --stack fixturenet-laconicd build-npms
-$ laconic-so --stack fixturenet-laconicd build-containers
+$ laconic-so --stack fixturenet-laconic-loaded build-npms
+$ laconic-so --stack fixturenet-laconic-loaded build-containers
 ```
 ## 5. Deploy the stack
 ```
-$ laconic-so --stack fixturenet-laconicd deploy up
+$ laconic-so --stack fixturenet-laconic-loaded deploy up
 ```
 Correct operation should be verified by checking the laconicd container's logs with:
 ```
-$ laconic-so --stack fixturenet-laconicd deploy logs
+$ laconic-so --stack fixturenet-laconic-loaded deploy logs
 ```
 ## 6. Test with the Registry CLI
 ```
-$ laconic-so --stack fixturenet-laconicd deploy exec cli "laconic cns status"
+$ laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns status"
 ```
 ## 7. View the laconic console
 Get the URL for the console web app with this command (the port number will be different for each deployment):
@@ -18,6 +18,11 @@ Build the container images:

 ```bash
 laconic-so --stack fixturenet-optimism build-containers
+
+# If redeploying with changes in the stack containers
+laconic-so --stack fixturenet-optimism build-containers --force-rebuild
+
+# If errors are thrown during build, old images used by this stack would have to be deleted
 ```

 Note: this will take >10 mins depending on the specs of your machine, and **requires** 16GB of memory or greater.
@@ -1,6 +1,6 @@
 version: "1.0"
 name: fixturenet-optimism
-decription: "Optimism Fixturenet"
+description: "Optimism Fixturenet"
 repos:
  - github.com/cerc-io/go-ethereum
  - github.com/cerc-io/lighthouse
@@ -12,6 +12,7 @@ See `stacks/fixturenet-eth/README.md` for more information.
 * cerc/tx-spammer

 ## Deploy the stack
+Note: since some Go dependencies are currently private, `CERC_GO_AUTH_TOKEN` must be set to a valid Gitea access token before running the `build-containers` command.
 ```
 $ laconic-so --stack fixturenet-plugeth-tx setup-repositories
 $ laconic-so --stack fixturenet-plugeth-tx build-containers
@@ -1,6 +1,6 @@
 version: "1.2"
 name: fixturenet-plugeth-tx
-decription: "plugeth Ethereum Fixturenet w/ tx-spammer"
+description: "plugeth Ethereum Fixturenet w/ tx-spammer"
 repos:
  - git.vdb.to/cerc-io/plugeth@statediff
  - git.vdb.to/cerc-io/plugeth-statediff
@@ -32,21 +32,10 @@ laconic-so --stack fixturenet-sushiswap-subgraph build-containers

 ## Deploy

-
-Create an env file with the following contents to be used in the next step:
-
-```bash
-# Network and ETH RPC endpoint to run graph-node against
-NETWORK=lotus-fixturenet
-ETH_RPC_ENDPOINT=http://lotus-node-1:1234/rpc/v1
-```
-
-Uncomment the dependency on `lotus-node-1` in the [graph-node compose file](../../compose/docker-compose-graph-node.yml)
-
 Deploy the stack:

 ```bash
-laconic-so --stack fixturenet-sushiswap-subgraph deploy --cluster sushigraph --env-file <PATH_TO_ENV_FILE> up
+laconic-so --stack fixturenet-sushiswap-subgraph deploy --cluster sushigraph up

 # Note: Remove any existing volumes for the cluster for a fresh start
 ```
@@ -154,6 +143,42 @@ http://127.0.0.1:<HOST_PORT>/subgraphs/name/sushiswap/v3-lotus/graphql
  docker exec -it sushigraph-sushiswap-v3-core-1 pnpm run pool:burn:docker --pool $POOL_ADDRESS --amount 10
  ```

+* Query the sushiswap v3-lotus subgraph GQL after running above commands
+
+  ```graphql
+  {
+    _meta {
+      block {
+        number
+      }
+      deployment
+      hasIndexingErrors
+    }
+    
+    factories {
+      poolCount
+      id
+    }
+    
+    pools {
+      id
+      token0 {
+        id
+        name
+        symbol
+      }
+      mints {
+        id
+        owner
+      }
+      burns {
+        id
+        owner
+      }
+    }
+  }
+  ```
+
 ## Clean up

 Stop all the services running in background run:
@@ -0,0 +1,157 @@
+# Graph Node
+
+## Setup
+
+Clone required repositories:
+
+```bash
+laconic-so --stack graph-node setup-repositories --pull
+```
+
+Checkout to a non-default branch in the cloned repos if required:
+
+```bash
+# Default repo base dir
+cd ~/cerc
+
+# Example
+cd graph-node
+git checkout <your-branch> && git pull
+
+# Remove the corresponding docker image if it already exists
+docker image rm cerc/graph-node:local
+# Remove any dangling images
+docker image prune
+```
+
+Build the container images:
+
+```bash
+laconic-so --stack graph-node build-containers
+```
+
+## Create a deployment
+
+Initialize deployment and create "spec" file:
+
+```bash
+laconic-so --stack graph-node deploy init --output graph-node-spec.yml
+```
+
+We need to assign fixed ports: `8000` for subgraph GQL endpoint, `8020` for subgraph deployment and `5001` for IPFS. The values can be
+customized by editing the "spec" file generated by `laconic-so deploy init`.
+```
+$ cat graph-node-spec.yml
+stack: graph-node
+ports:
+  graph-node:
+    - '8000:8000'
+    - '8001'
+    - '8020:8020'
+    - '8030'
+  ipfs:
+    - '8080'
+    - '4001'
+    - '5001:5001'
+...
+```
+
+Create deployment:
+
+```bash
+laconic-so deploy create --spec-file graph-node-spec.yml --deployment-dir graph-node-deployment
+```
+
+## Start the stack
+
+Create an env file with the following values to be set before starting the stack:
+
+```bash
+# Set ETH RPC endpoint the graph node will use
+
+# Host and port of the ETH RPC endpoint to check before starting graph-node
+export ETH_RPC_HOST=
+export ETH_RPC_PORT=
+
+# The etherum network(s) graph-node will connect to
+# Set this to a space-separated list of the networks where each entry has the form NAME:URL
+export ETH_NETWORKS=
+```
+
+Example env file:
+
+```bash
+export ETH_RPC_HOST=filecoin.chainup.net
+export ETH_RPC_PORT=443
+
+export ETH_NETWORKS=filecoin:https://filecoin.chainup.net/rpc/v1
+```
+
+Set the environment variables:
+
+```bash
+source <PATH_TO_ENV_FILE>
+```
+
+Deploy the stack:
+
+```bash
+laconic-so deployment --dir graph-node-deployment start
+
+# Note: Remove any existing volumes in the cluster for a fresh start
+```
+
+After all services have started, follow `graph-node` logs:
+
+```bash
+laconic-so deployment --dir graph-node-deployment logs -f graph-node
+```
+
+Subgraphs can now be deployed to the graph-node.
+Follow [Deploy the Subgraph](https://github.com/graphprotocol/graph-node/blob/v0.32.0/docs/getting-started.md#24-deploy-the-subgraph) section in graph-node docs for an existing subgraph.
+
+## Set environment variables
+
+* The graph-node environment variable `ETHEREUM_REORG_THRESHOLD` can be set in the deployment compose file
+  ```bash
+  $ cat graph-node-deployment/compose/docker-compose-graph-node.yml
+  services:
+    graph-node:
+      image: cerc/graph-node:local
+      ...
+      environment:
+        ...
+        GRAPH_LOG: debug
+        ETHEREUM_REORG_THRESHOLD: 3
+  ```
+  Change `ETHEREUM_REORG_THRESHOLD` to desired value
+
+  * To restart graph-node with updated values
+    * Stop the stack first
+      ```bash
+      laconic-so deployment --dir graph-node-deployment stop
+      ```
+    * Start the stack again
+      ```
+      laconic-so deployment --dir graph-node-deployment start
+      ```
+  * To check if environment variable has been updated in graph-node container
+      ```bash
+      $ laconic-so deployment --dir graph-node-deployment exec graph-node bash
+      root@dc4d3abe1615:/# echo $ETHEREUM_REORG_THRESHOLD
+      16
+      ```
+
+## Clean up
+
+Stop all the services running in background run:
+
+```bash
+laconic-so deployment --dir graph-node-deployment stop
+```
+
+Clear volumes created by this stack:
+
+```bash
+laconic-so deployment --dir graph-node-deployment stop --delete-volumes
+```
@@ -0,0 +1,68 @@
+# Deploying Subgraph
+
+## Setup
+
+We will use the [ethereum-gravatar](https://github.com/graphprotocol/graph-tooling/tree/%40graphprotocol/graph-cli%400.58.0/examples/ethereum-gravatar) example subgraph from `graphprotocol/graph-tooling` repo
+
+- Clone the repo
+  ```bash
+  git clone git@github.com:graphprotocol/graph-tooling.git
+  
+  cd graph-tooling
+  ```
+
+- Install dependencies
+  ```bash
+  pnpm install
+  ```
+
+- Change directory to example-subgraph
+  ```bash
+  cd examples/ethereum-gravatar
+  ```
+
+## Deploy
+
+The following steps should be similar for every subgraph
+
+- Change the network and address in `subgraph.yaml`
+  ```yaml
+  ...
+  dataSources:
+  - kind: ethereum/contract
+    name: Gravity
+    network: <NETWORK_NAME>
+    source:
+      address: '<CONTRACT_ADDRESS>'
+      abi: Gravity
+      startBlock: <START_BLOCK>
+  ...
+  ```
+  - `CONTRACT_ADDRESS` is the address of the deployed contract on the desired network
+  - `START_BLOCK` is the block number after which we want to process events
+  - `NETWORK_NAME` is the name of the network specified when deploying graph-node
+    - When deploying graph-node `ETH_NETWORKS` env is set to a space-separated list of the networks where each entry has the form `NAME:URL`
+    - The `NAME` can be used in subgraph to specify which network to use
+    - More details can be seen in [Start the stack](./README.md#start-the-stack) section
+
+- Build the subgraph
+  ```bash
+  pnpm codegen
+  pnpm build
+  ```
+
+- Create and deploy the subgraph
+  ```bash
+  pnpm graph create example --node <GRAPH_NODE_DEPLOY_ENDPOINT>
+  
+  pnpm graph deploy example --ipfs <GRAPH_NODE_IPFS_ENDPOINT> --node <GRAPH_NODE_DEPLOY_ENDPOINT>
+  ```
+  - `GRAPH_NODE_DEPLOY_ENDPOINT` and `GRAPH_NODE_IPFS_ENDPOINT` will be available after graph-node has been deployed
+  - More details can be seen in [Create a deployment](./README.md#create-a-deployment) section 
+
+- The subgraph GQL endpoint will be seen after deploy command runs successfully
+
+- To remove the subgraph
+  ```bash
+  pnpm graph remove --node <GRAPH_NODE_DEPLOY_ENDPOINT> example
+  ```
@@ -0,0 +1,9 @@
+version: "1.0"
+name: graph-node
+description: "Stack for running graph-node"
+repos:
+  - github.com/graphprotocol/graph-node
+containers:
+  - cerc/graph-node
+pods:
+  - graph-node
@@ -17,7 +17,7 @@ $ laconic-so --stack mainnet-eth build-containers
 ## Create a deployment

 ```
-$ laconic-so --stack mainnet-eth deploy init --output mainnet-eth-spec.yml
+$ laconic-so --stack mainnet-eth deploy init --map-ports-to-host any-same --output mainnet-eth-spec.yml
 $ laconic-so deploy create --spec-file mainnet-eth-spec.yml --deployment-dir mainnet-eth-deployment
 ```
 ## Start the stack
@@ -73,7 +73,7 @@ After deleting the volumes, any subsequent re-start will begin chain sync from c

 ## Ports
 It is usually necessary to expose certain container ports on one or more the host's addresses to allow incoming connections.
-Any ports defined in the Docker compose file are exposed by default with random port assignments, but the values can be
+Any ports defined in the Docker compose file are exposed by default with random port assignments, bound to "any" interface (IP address 0.0.0.0), but the port mappings can be
 customized by editing the "spec" file generated by `laconic-so deploy init`.

 In this example, ports `8545` and `5052` have been assigned to a specific addresses/port combination on the host, while
@@ -92,7 +92,15 @@ volumes:
  mainnet_eth_geth_1_data: ./data/mainnet_eth_geth_1_data
  mainnet_eth_lighthouse_1_data: ./data/mainnet_eth_lighthouse_1_data
 ```
-
+In addition, a stack-wide port mapping "recipe" can be applied at the time the 
+`laconic-so deploy init` command is run, by supplying the  desired recipe with the `--map-ports-to-host` option. The following recipes are supported:
+| Recipe | Host Port Mapping |
+|--------|-------------------|
+| any-variable-random | Bind to 0.0.0.0 using a random port assigned at start time (default) |
+| localhost-same | Bind to 127.0.0.1 using the same port number as exposed by the containers |
+| any-same | Bind to 0.0.0.0 using the same port number as exposed by the containers |
+| localhost-fixed-random | Bind to 127.0.0.1 using a random port number selected at the time the command is run (not checked for already in use)|
+| any-fixed-random | Bind to 0.0.0.0 using a random port number selected at the time the command is run (not checked for already in use) |
 ## Data volumes
 Container data volumes are bind-mounted to specified paths in the host filesystem.
 The default setup (generated by `laconic-so deploy init`) places the volumes in the `./data` subdirectory of the deployment directory:
@@ -130,4 +138,4 @@ $ sudo du -h mainnet-eth-deployment/data/
 860G    mainnet-eth-deployment/data/mainnet_eth_geth_1_data/geth
 860G    mainnet-eth-deployment/data/mainnet_eth_geth_1_data
 885G    mainnet-eth-deployment/data/
-```
+```
@@ -1,4 +1,4 @@
-# Copyright © 2023 Cerc
+# Copyright © 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -15,6 +15,7 @@

 from secrets import token_hex

+
 def init(ctx):
    return None

@@ -1,13 +1,12 @@
-version: "1.1"
+version: "1.2"
 name: mainnet-eth
-decription: "Ethereum Mainnet"
+description: "Ethereum Mainnet"
 repos:
  - github.com/cerc-io/go-ethereum
  - github.com/cerc-io/lighthouse
  - github.com/dboreham/foundry
  - git.vdb.to/cerc-io/keycloak-reg-api
  - git.vdb.to/cerc-io/keycloak-reg-ui
-  - github.com/vulcanize/eth-api-proxy
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
@@ -17,10 +16,8 @@ containers:
  - cerc/webapp-base
  - cerc/keycloak-reg-api
  - cerc/keycloak-reg-ui
-  - cerc/eth-api-proxy
 pods:
  - mainnet-eth
  - mainnet-eth-keycloak
  - mainnet-eth-metrics
-  - mainnet-eth-api-proxy
  - foundry
@@ -1,6 +1,6 @@
 version: "1.1"
 name: mainnet-opera
-decription: "Fantom mainnet node"
+description: "Fantom mainnet node"
 repos:
  - github.com/Fantom-foundation/go-opera@release/1.1.2-rc.5
 containers:
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.

 from app.util import get_yaml
-from app.deploy_types import DeployCommandContext, LaconicStackSetupCommand
+from app.deploy_types import DeployCommandContext, LaconicStackSetupCommand, DeploymentContext
 from app.stack_state import State
 from app.deploy_util import VolumeMapping, run_container_command
 from app.command_types import CommandOptions
@@ -32,9 +32,6 @@ default_spec_file_content = """config:
    chain_id: my-chain-id
 """

-init_help_text = """Add helpful text here on setting config variables.
-"""
-

 class SetupPhase(Enum):
    INITIALIZE = 1
@@ -113,17 +110,22 @@ def _remove_persistent_peers(options: CommandOptions, network_dir: Path):
        output_file.write(config_file_content)


-def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCommand, extra_args):
+def _insert_persistent_peers(options: CommandOptions, config_dir: Path, new_persistent_peers: str):
+    config_file_path = config_dir.joinpath("config.toml")
+    if not config_file_path.exists():
+        print("Error: config.toml not found")
+        sys.exit(1)
+    with open(config_file_path, "r") as input_file:
+        config_file_content = input_file.read()
+        persistent_peers_pattern = '^persistent_peers = ""'
+        replace_with = f"persistent_peers = \"{new_persistent_peers}\""
+        config_file_content = re.sub(persistent_peers_pattern, replace_with, config_file_content, flags=re.MULTILINE)
+    with open(config_file_path, "w") as output_file:
+        output_file.write(config_file_content)

-    options = command_context.cluster_context.options
-
-    currency = "stake"  # Does this need to be a parameter?
-
-    if options.debug:
-        print(f"parameters: {parameters}")

+def _phase_from_params(parameters):
    phase = SetupPhase.ILLEGAL
-
    if parameters.initialize_network:
        if parameters.join_network or parameters.create_network:
            print("Can't supply --join-network or --create-network with --initialize-network")
@@ -146,6 +148,19 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo
            print("Can't supply --initialize-network or --join-network with --create-network")
            sys.exit(1)
        phase = SetupPhase.CREATE
+    return phase
+
+
+def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCommand, extra_args):
+
+    options = command_context.cluster_context.options
+
+    currency = "stake"  # Does this need to be a parameter?
+
+    if options.debug:
+        print(f"parameters: {parameters}")
+
+    phase = _phase_from_params(parameters)

    network_dir = Path(parameters.network_dir).absolute()
    laconicd_home_path_in_container = "/laconicd-home"
@@ -187,20 +202,22 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo
            f"laconicd add-genesis-account {parameters.key_name} 12900000000000000000000{currency}\
                --home {laconicd_home_path_in_container} --keyring-backend test",
            mounts)
-        print(f"Command output: {output2}")
+        if options.debug:
+            print(f"Command output: {output2}")
        output3, status3 = run_container_command(
            command_context,
            "laconicd",
            f"laconicd gentx  {parameters.key_name} 90000000000{currency} --home {laconicd_home_path_in_container}\
                --chain-id {chain_id} --keyring-backend test",
            mounts)
-        print(f"Command output: {output3}")
+        if options.debug:
+            print(f"Command output: {output3}")
        output4, status4 = run_container_command(
            command_context,
            "laconicd",
            f"laconicd keys show  {parameters.key_name} -a --home {laconicd_home_path_in_container} --keyring-backend test",
            mounts)
-        print(f"Command output: {output4}")
+        print(f"Node validator address: {output4}")

    elif phase == SetupPhase.CREATE:
        if not os.path.exists(network_dir):
@@ -219,6 +236,9 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo
            copyfile(genesis_file_path, os.path.join(network_dir, "config", os.path.basename(genesis_file_path)))
        else:
            # We're generating the genesis file
+            if not parameters.gentx_file_list:
+                print("Error: --gentx-files must be supplied")
+                sys.exit(1)
            # First look in the supplied gentx files for the other nodes' keys
            other_node_keys = _get_node_keys_from_gentx_files(options, parameters.gentx_file_list)
            # Add those keys to our genesis, with balances we determine here (why?)
@@ -226,13 +246,15 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo
                outputk, statusk = run_container_command(
                    command_context, "laconicd", f"laconicd add-genesis-account {other_node_key} 12900000000000000000000{currency}\
                        --home {laconicd_home_path_in_container} --keyring-backend test", mounts)
-            print(f"Command output: {outputk}")
+            if options.debug:
+                print(f"Command output: {outputk}")
            # Copy the gentx json files into our network dir
            _copy_gentx_files(options, network_dir, parameters.gentx_file_list)
            # Now we can run collect-gentxs
            output1, status1 = run_container_command(
                command_context, "laconicd", f"laconicd collect-gentxs --home {laconicd_home_path_in_container}", mounts)
-            print(f"Command output: {output1}")
+            if options.debug:
+                print(f"Command output: {output1}")
            print(f"Generated genesis file, please copy to other nodes as required: \
                {os.path.join(network_dir, 'config', 'genesis.json')}")
            # Last thing, collect-gentxs puts a likely bogus set of persistent_peers in config.toml so we remove that now
@@ -240,15 +262,15 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo
        # In both cases we validate the genesis file now
        output2, status1 = run_container_command(
            command_context, "laconicd", f"laconicd validate-genesis --home {laconicd_home_path_in_container}", mounts)
-        print(f"Command output: {output2}")
+        print(f"validate-genesis result: {output2}")

    else:
        print("Illegal parameters supplied")
        sys.exit(1)


-def create(command_context: DeployCommandContext, extra_args):
-    network_dir = extra_args
+def create(context: DeploymentContext, extra_args):
+    network_dir = extra_args[0]
    if network_dir is None:
        print("Error: --network-dir must be supplied")
        sys.exit(1)
@@ -266,16 +288,19 @@ def create(command_context: DeployCommandContext, extra_args):
        sys.exit(1)
    # Copy the network directory contents into our deployment
    # TODO: change this to work with non local paths
-    deployment_config_dir = command_context.deployment_dir.joinpath("data", "laconicd-config")
+    deployment_config_dir = context.deployment_dir.joinpath("data", "laconicd-config")
    copytree(config_dir_path, deployment_config_dir, dirs_exist_ok=True)
+    # If supplied, add the initial persistent peers to the config file
+    if extra_args[1]:
+        initial_persistent_peers = extra_args[1]
+        _insert_persistent_peers(context.command_context.cluster_context.options, deployment_config_dir, initial_persistent_peers)
    # Copy the data directory contents into our deployment
    # TODO: change this to work with non local paths
-    deployment_data_dir = command_context.deployment_dir.joinpath("data", "laconicd-data")
+    deployment_data_dir = context.deployment_dir.joinpath("data", "laconicd-data")
    copytree(data_dir_path, deployment_data_dir, dirs_exist_ok=True)


 def init(command_context: DeployCommandContext):
-    print(init_help_text)
    yaml = get_yaml()
    return yaml.load(default_spec_file_content)

@@ -60,6 +60,9 @@ Create and update an env file to be used in the next step ([defaults](../../conf
  # (Optional) Set of multiaddrs to be avoided while dialling
  CERC_DENY_MULTIADDRS=[]

+  # (Optional) Type of pubsub to be used
+  CERC_PUBSUB=""
+
  # Set to false for disabling watcher peer to send txs to L2
  CERC_ENABLE_PEER_L2_TXS=true

@@ -119,4 +122,8 @@ docker volume ls -q --filter "name=mobymask_v2"

 # Remove all the listed volumes
 docker volume rm $(docker volume ls -q --filter "name=mobymask_v2")
+
+# WARNING: To avoid changing peer ids for the watcher, `peers_ids` volume can be persisted
+# To delete all volumes except for `peers_ids`
+docker volume rm $(docker volume ls -q --filter "name=mobymask_v2" | grep -v "peers_ids$")
 ```
@@ -6,8 +6,8 @@ repos:
  - github.com/dboreham/foundry
  - github.com/ethereum-optimism/optimism@v1.0.4
  - github.com/ethereum-optimism/op-geth@v1.101105.2
-  - github.com/cerc-io/watcher-ts@v0.2.55
-  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.1.2
+  - github.com/cerc-io/watcher-ts@v0.2.56
+  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.1.3
  - github.com/cerc-io/MobyMask@v0.1.3
  - github.com/cerc-io/mobymask-ui
 containers:
@@ -6,6 +6,12 @@ Instructions to setup and deploy MobyMask and Peer Test web apps

 Prerequisite: Watcher with GQL and relay node endpoints

+Clone required repositories:
+
+```bash
+laconic-so --stack mobymask-v2 setup-repositories --include github.com/cerc-io/mobymask-ui
+```
+
 Build the container images:

 ```bash
@@ -39,6 +45,9 @@ Create and update an env file to be used in the next step ([defaults](../../conf

  # L2 Chain ID used by mobymask web-app for L2 txs
  CERC_CHAIN_ID=42069
+
+  # (Optional) Type of pubsub to be used ("floodsub" | "gossipsub")
+  CERC_PUBSUB=""
  ```

 * NOTE: If watcher is running on the host machine, use `host.docker.internal` as the hostname to access the host port
@@ -0,0 +1,6 @@
+# MobyMask v3
+
+Instructions to setup and deploy MobyMask v3 stack (watcher + web-app) using [laconic-stack-orchestrator](/README.md#install)
+
+* Follow [watcher.md](./watcher.md) for deploying the watcher
+* Follow [web-app.md](./web-app.md) for deploying the app
@@ -0,0 +1,16 @@
+version: "1.0"
+description: "MobyMask v3 stack"
+name: mobymask-v3
+repos:
+  - github.com/cerc-io/watcher-ts@v0.2.57
+  - github.com/cerc-io/mobymask-v2-watcher-ts@v3
+  - github.com/cerc-io/MobyMask@v0.1.3
+  - github.com/cerc-io/mobymask-ui
+containers:
+  - cerc/watcher-ts
+  - cerc/watcher-mobymask-v3
+  - cerc/mobymask
+  - cerc/mobymask-ui
+pods:
+  - watcher-mobymask-v3
+  - mobymask-app-v3
@@ -0,0 +1,135 @@
+# MobyMask v3 Watcher
+
+## Setup
+
+Prerequisite: L2 Optimism Geth and Node RPC endpoints
+
+Clone required repositories:
+
+```bash
+laconic-so --stack mobymask-v3 setup-repositories --pull --exclude github.com/cerc-io/mobymask-ui
+```
+
+Build the container images:
+
+```bash
+laconic-so --stack mobymask-v3 build-containers --exclude cerc/mobymask-ui
+```
+
+## Deploy
+
+### Configuration
+
+Create and update an env file to be used in the next step ([defaults](../../config/watcher-mobymask-v3/mobymask-params.env)):
+
+  ```bash
+  # External L2 endpoints
+  CERC_L2_GETH_RPC=
+
+  # Endpoints waited on before contract deployment
+  CERC_L2_GETH_HOST=
+  CERC_L2_GETH_PORT=
+
+  CERC_L2_NODE_HOST=
+  CERC_L2_NODE_PORT=
+
+  # URL (fixturenet-eth-bootnode-lighthouse) to get CSV with credentials for accounts on L1 to perform txs on L2
+  CERC_L1_ACCOUNTS_CSV_URL=
+
+  # OR
+  # Specify the required account credentials
+  CERC_PRIVATE_KEY_DEPLOYER=
+
+  # Base URI for mobymask-app
+  # (used for generating a root invite link after deploying the contract)
+  CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3004/#"
+
+  # (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) Set of multiaddrs to be avoided while dialling
+  CERC_DENY_MULTIADDRS=[]
+
+  # (Optional) Type of pubsub to be used
+  CERC_PUBSUB=""
+
+  # Set to false for disabling watcher peer to send txs to L2
+  CERC_ENABLE_PEER_L2_TXS=true
+
+  # (Optional) Set already deployed MobyMask contract address to avoid deploying contract in the stack
+  CERC_DEPLOYED_CONTRACT=
+
+  # (Optional) Set already deployed Nitro addresses to avoid deploying them in the stack
+  CERC_NA_ADDRESS=
+  CERC_VPA_ADDRESS=
+  CERC_CA_ADDRESS=
+
+  # Specify private key of a funded account for sending txs to L2
+  CERC_PRIVATE_KEY_PEER=
+
+  # Specify private key for the Nitro account
+  CERC_PRIVATE_KEY_NITRO=
+
+  # (Optional) Set a pre-existing peer id to be used (enables consensus)
+  # Uses a generated peer id if not set (disables consensus)
+  CERC_PEER_ID=
+  ```
+
+* NOTE: If Optimism is running on the host machine, use `host.docker.internal` as the hostname to access the host port
+
+### Deploy the stack
+
+```bash
+laconic-so --stack mobymask-v3 deploy --cluster mobymask_v3 --include watcher-mobymask-v3 --env-file <PATH_TO_ENV_FILE> up
+```
+
+* To list down and monitor the running containers:
+
+  ```bash
+  laconic-so --stack mobymask-v3 deploy --cluster mobymask_v3 --include watcher-mobymask-v3 ps
+
+  # With status
+  docker ps -a
+
+  # Check logs for a container
+  docker logs -f <CONTAINER_ID>
+  ```
+
+* The watcher endpoint is exposed on host port `3001` and the relay node endpoint is exposed on host port `9090`
+
+* Check the logs of the MobyMask contract deployment container to get the deployed contract's address and generated root invite link:
+
+  ```bash
+  docker logs -f $(docker ps -aq --filter name="mobymask-1")
+  ```
+
+* Check the logs of the watcher server container to get the deployed Nitro contracts' addresses:
+
+```bash
+docker exec -it $(docker ps -q --filter name="mobymask-watcher-server") bash -c "cat /nitro/nitro-addresses.json"
+```
+
+## Clean up
+
+Stop all services running in the background:
+
+```bash
+laconic-so --stack mobymask-v3 deploy --cluster mobymask_v3 --include watcher-mobymask-v3 down
+```
+
+Clear volumes created by this stack:
+
+```bash
+# List all relevant volumes
+docker volume ls -q --filter "name=mobymask_v3"
+
+# Remove all the listed volumes
+docker volume rm $(docker volume ls -q --filter "name=mobymask_v3")
+
+# WARNING: To avoid changing peer ids for the watcher, `peers_ids` volume can be persisted
+# To delete all volumes except for `peers_ids`
+docker volume rm $(docker volume ls -q --filter "name=mobymask_v3" | grep -v "peers_ids$")
+```
@@ -0,0 +1,89 @@
+# MobyMask v3 App
+
+## Setup
+
+Prerequisite: Watcher with GQL and relay node endpoints
+
+Clone required repositories:
+
+```bash
+laconic-so --stack mobymask-v3 setup-repositories --pull --include github.com/cerc-io/mobymask-ui
+```
+
+Build the container images:
+
+```bash
+laconic-so --stack mobymask-v3 build-containers --include cerc/mobymask-ui
+```
+
+## Deploy
+
+### Configuration
+
+Create and update an env file to be used in the next step ([defaults](../../config/watcher-mobymask-v3/mobymask-params.env)):
+
+  ```bash
+  # Set of relay nodes to be used by the web-app
+  # (use double quotes " for strings, avoid space after commas)
+  # 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
+  CERC_APP_WATCHER_URL="http://127.0.0.1:3001"
+
+  # Set deployed MobyMask contract address to be used in MobyMask app's config
+  CERC_DEPLOYED_CONTRACT=
+
+  # L2 Chain ID used by mobymask web-app for L2 txs
+  CERC_CHAIN_ID=42069
+
+  # (Optional) Type of pubsub to be used ("floodsub" | "gossipsub")
+  CERC_PUBSUB=""
+
+  # (Optional) Set of direct peers to be used when pubsub is set to gossipsub
+  CERC_GOSSIPSUB_DIRECT_PEERS=[]
+
+  # Set Nitro addresses
+  CERC_NA_ADDRESS=
+  CERC_VPA_ADDRESS=
+  CERC_CA_ADDRESS=
+
+  # Nitro account address to make the query and mutation payments to
+  CERC_PAYMENT_NITRO_ADDRESS=
+
+  # Endpoint for Mobymask snap installation
+  CERC_SNAP_URL=
+  ```
+
+### Deploy the stack
+
+```bash
+laconic-so --stack mobymask-v3 deploy --cluster mobymask_v3 --include mobymask-app-v3 --env-file <PATH_TO_ENV_FILE> up
+
+# Runs the MobyMask v3 app on host port 3004
+```
+
+To list down and monitor the running containers:
+
+```bash
+laconic-so --stack mobymask-v3 deploy --cluster mobymask_v3 --include mobymask-app-v3 ps
+
+# With status
+docker ps -a
+
+# Check logs for a container
+docker logs -f <CONTAINER_ID>
+```
+
+## Clean up
+
+Stop all services running in the background:
+
+```bash
+laconic-so --stack mobymask-v3 deploy --cluster mobymask_v3 --include mobymask-app-v3 down
+```
@@ -1,6 +1,6 @@
 version: "1.1"
 name: package-registry
-decription: "Local Package Registry"
+description: "Local Package Registry"
 repos:
  - github.com/cerc-io/hosting
  - gitea.com/gitea/act_runner
@@ -1,6 +1,6 @@
 version: "1.1"
 name: reth
-decription: "Reth node"
+description: "Reth node"
 repos:
  - github.com/paradigmxyz/reth
 containers:
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -23,9 +23,6 @@ default_spec_file_content = """config:
    config_variable: test-value
 """

-init_help_text = """Add helpful text here on setting config variables.
-"""
-

 # Output a known string to a know file in the bind mounted directory ./container-output-dir
 # for test purposes -- test checks that the file was written.
@@ -40,7 +37,6 @@ def setup(command_context: DeployCommandContext, parameters, extra_args):


 def init(command_context: DeployCommandContext):
-    print(init_help_text)
    yaml = get_yaml()
    return yaml.load(default_spec_file_content)

@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -140,8 +140,8 @@ def exec_operation(ctx, extra_args):
            print(f"Running compose exec {service_name} {command_to_exec}")
        try:
            ctx.obj.docker.compose.execute(service_name, command_to_exec, envs=container_exec_env)
-        except DockerException as error:
-            print(f"container command returned error exit status")
+        except DockerException:
+            print("container command returned error exit status")


 def logs_operation(ctx, tail: int, follow: bool, extra_args: str):
@@ -1,4 +1,4 @@
-# Copyright © 2023 Cerc
+# Copyright © 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,6 +19,7 @@ from pathlib import Path
 from python_on_whales import DockerClient
 from app.command_types import CommandOptions

+
@dataclass
 class ClusterContext:
    options: CommandOptions  # TODO: this should be in its own object not stuffed in here
@@ -64,4 +65,4 @@ class LaconicStackSetupCommand:

@dataclass
 class LaconicStackCreateCommand:
-    network_dir: str
+    network_dir: str
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +19,7 @@ from app.deploy_types import DeployCommandContext, VolumeMapping
 from app.util import get_parsed_stack_config, get_yaml, get_compose_file_dir


-def _container_image_from_service(stack :str, service: str):
+def _container_image_from_service(stack: str, service: str):
    # Parse the compose files looking for the image name of the specified service
    image_name = None
    parsed_stack = get_parsed_stack_config(stack)
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,8 +17,8 @@ import click
 from dataclasses import dataclass
 from pathlib import Path
 import sys
-from app.deploy import up_operation, down_operation, ps_operation, port_operation, exec_operation, logs_operation, create_deploy_context
-from app.util import global_options
+from app.deploy import up_operation, down_operation, ps_operation, port_operation
+from app.deploy import exec_operation, logs_operation, create_deploy_context


@dataclass
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,6 +17,7 @@ import click
 from importlib import util
 import os
 from pathlib import Path
+import random
 from shutil import copyfile, copytree
 import sys
 from app.util import get_stack_file_path, get_parsed_deployment_spec, get_parsed_stack_config, global_options, get_yaml
@@ -40,7 +41,7 @@ def _get_ports(stack):
            for svc_name, svc in parsed_pod_file["services"].items():
                if "ports" in svc:
                    # Ports can appear as strings or numbers.  We normalize them as strings.
-                    ports[svc_name] = [ str(x) for x in svc["ports"] ]
+                    ports[svc_name] = [str(x) for x in svc["ports"]]
    return ports


@@ -166,10 +167,50 @@ def _find_extra_config_dirs(parsed_pod_file, pod):
    return config_dirs


+def _get_mapped_ports(stack: str, map_recipe: str):
+    port_map_recipes = ["any-variable-random", "localhost-same", "any-same", "localhost-fixed-random", "any-fixed-random"]
+    ports = _get_ports(stack)
+    if ports:
+        # Implement any requested mapping recipe
+        if map_recipe:
+            if map_recipe in port_map_recipes:
+                for service in ports.keys():
+                    ports_array = ports[service]
+                    for x in range(0, len(ports_array)):
+                        orig_port = ports_array[x]
+                        # Strip /udp suffix if present
+                        bare_orig_port = orig_port.replace("/udp", "")
+                        random_port = random.randint(20000, 50000)  # Beware: we're relying on luck to not collide
+                        if map_recipe == "any-variable-random":
+                            # This is the default so take no action
+                            pass
+                        elif map_recipe == "localhost-same":
+                            # Replace instances of "- XX" with "- 127.0.0.1:XX"
+                            ports_array[x] = f"127.0.0.1:{bare_orig_port}:{orig_port}"
+                        elif map_recipe == "any-same":
+                            # Replace instances of "- XX" with "- 0.0.0.0:XX"
+                            ports_array[x] = f"0.0.0.0:{bare_orig_port}:{orig_port}"
+                        elif map_recipe == "localhost-fixed-random":
+                            # Replace instances of "- XX" with "- 127.0.0.1:<rnd>:XX"
+                            ports_array[x] = f"127.0.0.1:{random_port}:{orig_port}"
+                        elif map_recipe == "any-fixed-random":
+                            # Replace instances of "- XX" with "- 0.0.0.0:<rnd>:XX"
+                            ports_array[x] = f"0.0.0.0:{random_port}:{orig_port}"
+                        else:
+                            print("Error: bad map_recipe")
+            else:
+                print(f"Error: --map-ports-to-host must specify one of: {port_map_recipes}")
+                sys.exit(1)
+    return ports
+
+
@click.command()
@click.option("--output", required=True, help="Write yaml spec file here")
+@click.option("--map-ports-to-host", required=False,
+              help="Map ports to the host as one of: any-variable-random (default), "
+              "localhost-same, any-same, localhost-fixed-random, any-fixed-random")
@click.pass_context
-def init(ctx, output):
+def init(ctx, output, map_ports_to_host):
    yaml = get_yaml()
    stack = global_options(ctx).stack
    verbose = global_options(ctx).verbose
@@ -180,9 +221,8 @@ def init(ctx, output):
    if verbose:
        print(f"Creating spec file for stack: {stack}")

-    ports = _get_ports(stack)
-    if ports:
-        spec_file_content["ports"] = ports
+    ports = _get_mapped_ports(stack, map_ports_to_host)
+    spec_file_content["ports"] = ports

    named_volumes = _get_named_volumes(stack)
    if named_volumes:
@@ -200,8 +240,9 @@ def init(ctx, output):
@click.option("--deployment-dir", help="Create deployment files in this directory")
 # TODO: Hack
@click.option("--network-dir", help="Network configuration supplied in this directory")
+@click.option("--initial-peers", help="Initial set of persistent peers")
@click.pass_context
-def create(ctx, spec_file, deployment_dir, network_dir):
+def create(ctx, spec_file, deployment_dir, network_dir, initial_peers):
    # This function fails with a useful error message if the file doens't exist
    parsed_spec = get_parsed_deployment_spec(spec_file)
    stack_name = parsed_spec['stack']
@@ -249,7 +290,7 @@ def create(ctx, spec_file, deployment_dir, network_dir):
    deployment_command_context = ctx.obj
    deployment_command_context.stack = stack_name
    deployment_context = DeploymentContext(Path(deployment_dir), deployment_command_context)
-    call_stack_deploy_create(deployment_context, network_dir)
+    call_stack_deploy_create(deployment_context, [network_dir, initial_peers])


 # TODO: this code should be in the stack .py files but
@@ -1,4 +1,4 @@
-# Copyright © 2022 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -76,7 +76,7 @@ def _get_repo_current_branch_or_tag(full_filesystem_repo_path):
    try:
        current_repo_branch_or_tag = git.Repo(full_filesystem_repo_path).active_branch.name
        is_branch = True
-    except TypeError as error:
+    except TypeError:
        # This means that the current ref is not a branch, so possibly a tag
        # Let's try to get the tag
        current_repo_branch_or_tag = git.Repo(full_filesystem_repo_path).git.describe("--tags", "--exact-match")
@@ -96,7 +96,9 @@ def process_repo(verbose, quiet, dry_run, pull, check_only, git_ssh, dev_root_pa
    repoName = repo_path.split("/")[-1]
    full_filesystem_repo_path = os.path.join(dev_root_path, repoName)
    is_present = os.path.isdir(full_filesystem_repo_path)
-    (current_repo_branch_or_tag, is_branch) = _get_repo_current_branch_or_tag(full_filesystem_repo_path) if is_present else (None, None)
+    (current_repo_branch_or_tag, is_branch) = _get_repo_current_branch_or_tag(
+        full_filesystem_repo_path
+        ) if is_present else (None, None)
    if not quiet:
        present_text = f"already exists active {'branch' if is_branch else 'tag'}: {current_repo_branch_or_tag}" if is_present \
            else 'Needs to be fetched'
@@ -116,7 +118,7 @@ def process_repo(verbose, quiet, dry_run, pull, check_only, git_ssh, dev_root_pa
                        origin = git_repo.remotes.origin
                        origin.pull(progress=None if quiet else GitProgress())
                    else:
-                        print(f"skipping pull because this repo checked out a tag")
+                        print("skipping pull because this repo checked out a tag")
                else:
                    print("(git pull skipped)")
    if not is_present:
@@ -143,7 +145,10 @@ def process_repo(verbose, quiet, dry_run, pull, check_only, git_ssh, dev_root_pa
        branch_to_checkout = repo_branch

    if branch_to_checkout:
-        if current_repo_branch_or_tag is None or (current_repo_branch_or_tag and (current_repo_branch_or_tag != branch_to_checkout)):
+        if current_repo_branch_or_tag is None or (
+            current_repo_branch_or_tag and (
+                current_repo_branch_or_tag != branch_to_checkout)
+                ):
            if not quiet:
                print(f"switching to branch {branch_to_checkout} in repo {repo_path}")
            git_repo = git.Repo(full_filesystem_repo_path)
@@ -1,4 +1,4 @@
-# Copyright © 2023 Cerc
+# Copyright © 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -0,0 +1,90 @@
+# Copyright © 2023 Vulcanize
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
+
+import click
+import datetime
+import filecmp
+import os
+from pathlib import Path
+import requests
+import sys
+import stat
+import shutil
+import validators
+from app.util import get_yaml
+
+
+def _download_url(url: str, file_path: Path):
+    r = requests.get(url, stream=True)
+    r.raw.decode_content = True
+    with open(file_path, 'wb') as f:
+        shutil.copyfileobj(r.raw, f)
+
+
+def _error_exit(s: str):
+    print(s)
+    sys.exit(1)
+
+
+# Note at present this probably won't work on non-Unix based OSes like Windows
+@click.command()
+@click.option("--check-only", is_flag=True, default=False, help="only check, don't update")
+@click.pass_context
+def command(ctx, check_only):
+    '''update shiv binary from a distribution url'''
+    # Get the distribution URL from config
+    config_key = 'distribution-url'
+    config_file_path = Path(os.path.expanduser("~/.laconic-so/config.yml"))
+    if not config_file_path.exists():
+        _error_exit(f"Error: Config file: {config_file_path} not found")
+    yaml = get_yaml()
+    config = yaml.load(open(config_file_path, "r"))
+    if "distribution-url" not in config:
+        _error_exit(f"Error: {config_key} not defined in {config_file_path}")
+    distribution_url = config[config_key]
+    # Sanity check the URL
+    if not validators.url(distribution_url):
+        _error_exit(f"ERROR: distribution url: {distribution_url} is not valid")
+    # Figure out the filename for ourselves
+    shiv_binary_path = Path(sys.argv[0])
+    timestamp_filename = f"laconic-so-download-{datetime.datetime.now().strftime('%y%m%d-%H%M%S')}"
+    temp_download_path = shiv_binary_path.parent.joinpath(timestamp_filename)
+    # Download the file to a temp filename
+    if ctx.obj.verbose:
+        print(f"Downloading from: {distribution_url} to {temp_download_path}")
+    _download_url(distribution_url, temp_download_path)
+    # Set the executable bit
+    existing_mode = os.stat(temp_download_path)
+    os.chmod(temp_download_path, existing_mode.st_mode | stat.S_IXUSR)
+    # Switch the new file for the path we ran from
+    # Check if the downloaded file is identical to the existing one
+    same = filecmp.cmp(temp_download_path, shiv_binary_path)
+    if same:
+        if not ctx.obj.quiet or check_only:
+            print("No update available, latest version already installed")
+    else:
+        if not ctx.obj.quiet:
+            print("Update available")
+        if check_only:
+            if not ctx.obj.quiet:
+                print("Check-only node, update not installed")
+        else:
+            if not ctx.obj.quiet:
+                print("Installing...")
+            if ctx.obj.verbose:
+                print(f"Replacing: {shiv_binary_path} with {temp_download_path}")
+            os.replace(temp_download_path, shiv_binary_path)
+            if not ctx.obj.quiet:
+                print("Run \"laconic-so version\" to see the newly installed version")
@@ -1,4 +1,4 @@
-# Copyright © 2022, 2023 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright © 2023 Cerc
+# Copyright © 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,6 +16,7 @@
 import click
 import importlib.resources

+
@click.command()
@click.pass_context
 def command(ctx):
@@ -1,4 +1,4 @@
-# Copyright © 2022 Cerc
+# Copyright © 2022, 2023 Vulcanize

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.

 import click
-from dataclasses import dataclass

 from app.command_types import CommandOptions
 from app import setup_repositories
@@ -23,6 +22,7 @@ from app import build_npms
 from app import deploy
 from app import version
 from app import deployment
+from app import update

 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])

@@ -49,3 +49,4 @@ cli.add_command(deploy.command, "deploy")  # deploy is an alias for deploy-syste
 cli.add_command(deploy.command, "deploy-system")
 cli.add_command(deployment.command, "deployment")
 cli.add_command(version.command, "version")
+cli.add_command(update.command, "update")
@@ -7,3 +7,4 @@ PyYAML>=6.0.1
 ruamel.yaml>=0.17.32
 pydantic==1.10.9
 tomli==2.0.1
+validators==0.22.0
@@ -5,6 +5,9 @@ fi

 install_dir=~/bin

+# Skip the package install stuff if so directed
+if ! [[ -n "$CERC_SO_INSTALL_SKIP_PACKAGES" ]]; then
+
 # First display a reasonable warning to the user unless run with -y
 if ! [[ $# -eq 1 && $1 == "-y" ]]; then
  echo "**************************************************************************************"
@@ -128,13 +131,20 @@ sudo apt -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin d
 # Allow the current user to use Docker
 sudo usermod -aG docker $USER

+# End of long if block: Skip the package install stuff if so directed
+fi
+
 echo "**************************************************************************************"
 echo "Installing laconic-so"
 # install latest `laconic-so`
+distribution_url=https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
 install_filename=${install_dir}/laconic-so
 mkdir -p  ${install_dir}
-curl -L -o ${install_filename} https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
+curl -L -o ${install_filename} ${distribution_url}
 chmod +x ${install_filename}
+# Set up config file for self-update feature
+mkdir ~/.laconic-so
+echo "distribution-url: ${distribution_url}" >  ~/.laconic-so/config.yml

 echo "**************************************************************************************"
 # Check if our PATH line is already there
@@ -19,8 +19,7 @@ setup(
    install_requires=[requirements],
    python_requires='>=3.7',
    include_package_data=True,
-    # See: https://github.com/pypa/setuptools/issues/1806
-    package_data={'': ['data/*', 'data/*/*', 'data/*/*/*', 'data/*/*/*/*', 'data/*/*/*/*/*']},
+    package_data={'': ['data/**']},
    classifiers=[
        "Programming Language :: Python :: 3.8",
        "Operating System :: OS Independent",
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -e
+
+export CERC_SCRIPT_DEBUG=true
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+# Dump environment variables for debugging
+echo "Environment variables:"
+env
+
+echo "holla 1 $GITEA_ACTIONS"
+echo "Running gitea test"
+
+# Bit of a hack, test the most recent package
+TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
+# Set a non-default repo dir
+export CERC_REPO_BASE_DIR=~/stack-orchestrator-gitea-test
+echo "Testing this package: $TEST_TARGET_SO"
+echo "Test version command"
+reported_version_string=$( $TEST_TARGET_SO version )
+echo "Version reported is: ${reported_version_string}"
+echo "Cloning repositories into: $CERC_REPO_BASE_DIR"
+rm -rf $CERC_REPO_BASE_DIR
+mkdir -p $CERC_REPO_BASE_DIR
+
+$TEST_TARGET_SO --stack build-support build-containers
+$TEST_TARGET_SO --stack package-registry setup-repositories
+$TEST_TARGET_SO --stack package-registry build-containers
+output=$($TEST_TARGET_SO --stack package-registry deploy-system up)
+token=$(echo $output | grep -o 'export CERC_NPM_AUTH_TOKEN=[^ ]*' | cut -d '=' -f 2)
+export CERC_NPM_AUTH_TOKEN=$token
+export GITEA_ACTIONS=true
+echo "holla 2 $GITEA_ACTIONS"
+$TEST_TARGET_SO --stack fixturenet-laconicd setup-repositories 
+$TEST_TARGET_SO --stack fixturenet-laconicd --verbose --debug build-npms --include laconic-sdk
+
+# Clean up
+$TEST_TARGET_SO --stack package-registry deploy-system down
+echo "Test passed"
Author	SHA1	Message	Date
zramsay	067c618321	squash me debug	2023-09-28 09:18:21 -04:00
zramsay	c8c8ce9788	gitea test	2023-09-27 17:25:25 -04:00
Zach	bc78c5e0d6	Update README.md (#544 )	2023-09-27 17:07:30 -04:00
dboreham	7fd2439aa9	Fix output text (#548 )	2023-09-27 15:04:13 -06:00
dboreham	eca5aae991	Document self-update command (#547 )	2023-09-27 14:57:48 -06:00
dboreham	5beaf69a36	Implement --check-only (#546 )	2023-09-27 14:51:52 -06:00
dboreham	06c4a77afe	Simple self-update feature (#545 ) * Simple self-update feature * Update quick install script for self-update	2023-09-27 14:24:41 -06:00
nabarun	aafadbbed6	Add readme to deploy subgraphs (#543 )	2023-09-27 12:15:51 +05:30
nabarun	be519e9ca0	Split graph-node stack to run independently (#541 ) * Split graph-node stack to run independently * Fix sushiswap subgraph config in fixturenet stack	2023-09-26 17:31:00 +05:30
Zach	e56a910260	remove old npm scope (#538 )	2023-09-25 09:43:06 -04:00
prathamesh0andShreerang Kale	e3dc75118b	Add support for direct peers when pubsub is set to gossipsub (#539 ) Co-authored-by: Shreerang Kale <shreerangkale@gmail.com>	2023-09-25 14:55:53 +05:30
roysc	e0b5318ebe	Plugeth stack fixX (#537 )	2023-09-20 14:26:58 -05:00
Zach	2425aa8556	fix readme (#519 )	2023-09-20 10:31:14 -04:00
prathamesh0	3dc9cd584a	Add a mobymask-v3 stack (#531 ) * Add a mobymask-v3 stack * Fix Nitro deployment script and add watcher container * Setup Nitro config * Run build after setting Nitro addresses * Setup consensus config * Add a container for web-app * Use node 18 for the web-app * Persist Nitro node data to a volume * Add clean up steps * Update query rates	2023-09-20 09:48:15 +05:30
telackey	ed9c253f61	Simplified, improved default dashboard for mainnet-eth-metrics. (#536 ) * Simplified, improved default dashboard for mainnet-eth-metrics. * Add missing lighthouse prometheus config.	2023-09-19 20:29:08 -05:00
telackey	bdf4f069b4	Include all of app/data regardless of depth. (#535 )	2023-09-19 20:26:48 -05:00
dboreham	5f9c3c14b2	Add port mapping option	2023-09-19 14:06:29 -06:00
dboreham	0b512db693	Handle udp ports mapped (#534 ) * Handle udp ports mapped * Fix lint error	2023-09-19 13:27:34 -06:00
dboreham	e0ecbc3ab3	Remove private repo from stack (#532 )	2023-09-19 10:36:05 -06:00
dborehamandDavid Boreham	626cc17373	Update copyright messages (#530 ) Co-authored-by: David Boreham <david@bozemanpas.com>	2023-09-10 13:28:26 -06:00
dboreham	c30c779535	Pass through auth token to plugeth container builds (#529 )	2023-09-08 15:37:59 -06:00
prathamesh0andnabarun	3011a485ee	Update mobymask-v2 stack with pubsub option (#527 ) * Add steps to force rebuild and persist peers_ids volume * Update mobymask-v2 stack with pubsub option * Update watcher-ts version --------- Co-authored-by: Nabarun <nabarun@deepstacksoft.com>	2023-09-06 14:48:32 +05:30
dboreham	d505664781	Fix bug in deploy setup (#526 )	2023-09-04 19:33:36 -06:00
dboreham	4197d39b0c	Fix lint errors (#525 )	2023-09-04 15:23:22 -06:00
dboreham	8dcebe3737	Configure laconicd initial peers (#524 ) * Configure initial peers through deploy create command * Re-write config file	2023-09-04 15:13:23 -06:00
dboreham	50d17c3282	Fix lint errors (#523 ) * Fix lint errors * Fix more lint errors	2023-09-04 13:00:23 -06:00
dboreham	2c930bdbc3	Add flake8 lint check in CI (#522 )	2023-09-04 12:46:16 -06:00
dboreham	f48f4978aa	Host port mapping recipes (#521 ) * Implement --map-ports-to-host feature	2023-09-04 12:14:05 -06:00
nabarun	e89f7c9526	Upgrade mobymask app versions (#520 )	2023-09-04 17:51:59 +05:30
Zach	ae9dff553e	typo (#515 )	2023-09-01 11:15:07 -04:00