Change delimeter while replacing deny multiaddrs list

Former-commit-id: db27b07d99
Use provided domain for relay multiaddr in peer config
2023-05-05 13:28:57 +05:30 · 2023-05-05 10:27:26 +05:30 · 2023-05-04 20:01:38 +05:30 · 2023-05-04 20:00:58 +05:30 · 2023-05-04 18:42:45 +05:30 · 2023-05-04 15:35:04 +05:30
85 changed files with 2264 additions and 202 deletions
@@ -0,0 +1,27 @@
+name: Fixturenet-Eth-Test
+
+on:
+  push:
+    branches: 'ci-test'
+
+jobs:
+  test:
+    name: "Run an Ethereum fixturenet test"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: cerc-io/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 fixturenet-eth tests"
+        run: ./tests/fixturenet-eth/run-test.sh
@@ -1,10 +1,16 @@
-name: Test
+name: Integration Test

 on:
  pull_request:
    branches: '*'
  push:
-    branches: '*'
+    branches:
+      - main
+      - ci-test
+
+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock

 jobs:
  test:
@@ -25,5 +31,9 @@ jobs:
        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 smoke tests"
        run: ./tests/smoke-test/run-smoke-test.sh
@@ -35,58 +35,28 @@ curl -L -o ~/bin/laconic-so https://github.com/cerc-io/stack-orchestrator/releas
 ```

 Give it execute permissions:
+
 ```bash
 chmod +x ~/bin/laconic-so
 ```

 Ensure `laconic-so` is on the [`PATH`](https://unix.stackexchange.com/a/26059)

-Verify operation (your version will probably be different, just check here that you see some version outut and not an error):
+Verify operation (your version will probably be different, just check here that you see some version output and not an error):

 ```
 laconic-so version
-Version: v1.0.27-7831078
+Version: 1.1.0-7a607c2-202304260513
 ```

 ## Usage

-Three sub-commands: `setup-repositories`, `build-containers` and `deploy-system` are generally run in order. The following is a slim example for standing up the `erc20-watcher`. Go further with the [erc20 watcher demo](/app/data/stacks/erc20) and other pieces of the stack, within the [`stacks` directory](/app/data/stacks).
+The various [stacks](/app/data/stacks) each contain instructions for running different stacks based on your use case. For example:

-### Setup Repositories
-
-Clone the set of git repositories necessary to build a system:
-
-```bash
-laconic-so --stack erc20 setup-repositories
-```
-
-This will default to cloning git reposiories into: `~/cerc` or - if set - the environment variable `CERC_REPO_BASE_DIR`
-
-### Build Containers
-
-Build the set of docker container images required to run a system. It takes around 10 minutes to build all the containers from scratch.
-
-```bash
-laconic-so --stack erc20 build-containers
-```
-
-### Deploy System
-
-Uses `docker compose` to deploy a system (with most recently built container images).
-
-```bash
-laconic-so --stack erc20 deploy-system up
-```
-
-Check out he GraphQL playground here: [http://localhost:3002/graphql](http://localhost:3002/graphql)
-
-See the [erc20 watcher demo](/app/data/stacks/erc20) to continue further.
-
-### Cleanup
-
-```bash
-laconic-so --stack erc20 deploy-system down
-```
+- [self-hosted Gitea](/app/data/stacks/build-support)
+- [an Optimism Fixturenet](/app/data/stacks/fixturenet-optimism)
+- [laconicd with console and CLI](app/data/stacks/fixturenet-laconic-loaded)
+- [kubo (IPFS)](app/data/stacks/kubo)

 ## Contributing

@@ -95,6 +95,9 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
    container_build_env.update({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
    container_build_env.update({"CERC_FORCE_REBUILD": "true"} if force_rebuild else {})
    container_build_env.update({"CERC_CONTAINER_EXTRA_BUILD_ARGS": extra_build_args} if extra_build_args else {})
+    docker_host_env = os.getenv("DOCKER_HOST")
+    if docker_host_env:
+        container_build_env.update({"DOCKER_HOST": docker_host_env})

    def process_container(container):
        if not quiet:
@@ -27,7 +27,6 @@ services:
      - ../config/fixturenet-eth/fixturenet-eth.env
    image: cerc/fixturenet-eth-geth:local
    volumes:
-      - fixturenet_geth_accounts:/opt/testnet/build/el
      - fixturenet_eth_geth_1_data:/root/ethdata
    healthcheck:
      test: ["CMD", "nc", "-v", "localhost", "8545"]
@@ -50,6 +49,8 @@ services:
      timeout: 10s
      retries: 10
      start_period: 3s
+    environment:
+      CERC_KEEP_RUNNING_AFTER_GETH_EXIT: "true"
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
    image: cerc/fixturenet-eth-geth:local
@@ -63,8 +64,6 @@ services:
    environment:
      RUN_BOOTNODE: "true"
    image: cerc/fixturenet-eth-lighthouse:local
-    volumes:
-      - fixturenet_eth_bootnode_lighthouse_data:/opt/testnet/build/cl

  fixturenet-eth-lighthouse-1:
    hostname: fixturenet-eth-lighthouse-1
@@ -116,10 +115,8 @@ services:
        condition: service_healthy

 volumes:
-  fixturenet_geth_accounts:
  fixturenet_eth_bootnode_geth_data:
  fixturenet_eth_geth_1_data:
  fixturenet_eth_geth_2_data:
-  fixturenet_eth_bootnode_lighthouse_data:
  fixturenet_eth_lighthouse_1_data:
  fixturenet_eth_lighthouse_2_data:
@@ -13,6 +13,7 @@ services:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_L1_CHAIN_ID: ${CERC_L1_CHAIN_ID}
      CERC_L1_RPC: ${CERC_L1_RPC}
+      CERC_L1_ACCOUNTS_CSV_URL: ${CERC_L1_ACCOUNTS_CSV_URL}
      CERC_L1_ADDRESS: ${CERC_L1_ADDRESS}
      CERC_L1_PRIV_KEY: ${CERC_L1_PRIV_KEY}
      CERC_L1_ADDRESS_2: ${CERC_L1_ADDRESS_2}
@@ -27,11 +28,10 @@ services:
      - ../container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts
      - ../config/fixturenet-optimism/optimism-contracts/update-config.js:/app/packages/contracts-bedrock/update-config.js
      - ../config/fixturenet-optimism/optimism-contracts/run.sh:/app/packages/contracts-bedrock/run.sh
-      - fixturenet_geth_accounts:/geth-accounts:ro
      - l2_accounts:/l2-accounts
      - l1_deployment:/app/packages/contracts-bedrock
    extra_hosts:
-    - "host.docker.internal:host-gateway"
+      - "host.docker.internal:host-gateway"

  # Generates the config files required for L2 (outputs to volume l2_config)
  op-node-l2-config-gen:
@@ -50,7 +50,7 @@ services:
      - l2_config:/app
    command: ["sh", "/app/generate-l2-config.sh"]
    extra_hosts:
-    - "host.docker.internal:host-gateway"
+      - "host.docker.internal:host-gateway"

  # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
  op-geth:
@@ -122,11 +122,37 @@ services:
    # Waits for L1 endpoint to be up before running the batcher
    command: |
      "/wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- /run-op-batcher.sh"
+    ports:
+      - "127.0.0.1:8548:8548"
    extra_hosts:
-    - "host.docker.internal:host-gateway"
+      - "host.docker.internal:host-gateway"
+
+  # Runs the proposer (periodically submits new state roots to L1)
+  op-proposer:
+    image: cerc/optimism-op-proposer:local
+    depends_on:
+      op-node:
+        condition: service_healthy
+    env_file:
+      - ../config/fixturenet-optimism/l1-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_L1_RPC: ${CERC_L1_RPC}
+    volumes:
+      - ../config/wait-for-it.sh:/wait-for-it.sh
+      - ../config/fixturenet-optimism/run-op-proposer.sh:/run-op-proposer.sh
+      - l1_deployment:/contracts-bedrock:ro
+      - l2_accounts:/l2-accounts:ro
+    entrypoint: ["sh", "-c"]
+    # Waits for L1 endpoint to be up before running the proposer
+    command: |
+      "/wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- /run-op-proposer.sh"
+    ports:
+      - "127.0.0.1:8560:8560"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"

 volumes:
-  fixturenet_geth_accounts:
  l1_deployment:
  l2_accounts:
  l2_config:
@@ -0,0 +1,18 @@
+version: "3.2"
+services:
+  pocket:
+    restart: unless-stopped
+    image: cerc/pocket:local
+    # command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
+    entrypoint: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
+    volumes:
+      # TODO: look at folding these scripts into the container
+      - ../config/fixturenet-pocket/create-fixturenet.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh
+      - ../config/fixturenet-pocket/chains.json:/home/app/pocket-configs/chains.json
+      - ../config/fixturenet-pocket/genesis.json:/home/app/pocket-configs/genesis.json
+    ports:
+      - "8081:8081" # pocket relay rpc
+networks:
+  net1:
+    name: fixturenet-eth_default
+    external: true
@@ -8,6 +8,6 @@ services:
      - ./ipfs/import:/import
      - ./ipfs/data:/data/ipfs
    ports:
-      - "8080"
-      - "4001"
-      - "5001"
+      - "0.0.0.0:8080:8080"
+      - "0.0.0.0:4001:4001"
+      - "0.0.0.0:5001:5001"
@@ -13,13 +13,10 @@ services:
      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+      CERC_BUILD_DIR: "@cerc-io/mobymask-ui/build"
    working_dir: /scripts
-    # Waits for watcher server to be up before app build
-    # Required when running with watcher stack to get deployed contract address
-    command:
-      - sh
-      - -c
-      - ./wait-for-it.sh -h ${CERC_WATCHER_HOST:-$${DEFAULT_CERC_WATCHER_HOST}} -p ${CERC_WATCHER_PORT:-$${DEFAULT_CERC_WATCHER_PORT}} -s -t 0 -- ./mobymask-app-start.sh
+    command: ["sh", "mobymask-app-start.sh"]
    volumes:
      - ../config/wait-for-it.sh:/scripts/wait-for-it.sh
      - ../config/watcher-mobymask-v2/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
@@ -28,12 +25,43 @@ services:
    ports:
      - "0.0.0.0:3002:80"
    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "80"]
+      test: ["CMD", "nc", "-vz", "localhost", "80"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 10s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Builds and serves the LXDAO version of MobyMask react-app
+  lxdao-mobymask-app:
+    restart: unless-stopped
+    image: cerc/mobymask-ui:local
+    env_file:
+      - ../config/watcher-mobymask-v2/mobymask-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_CHAIN_ID: ${CERC_CHAIN_ID}
+      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
+      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
+      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+      CERC_BUILD_DIR: "@cerc-io/mobymask-ui-lxdao/build"
+    working_dir: /scripts
+    command: ["sh", "mobymask-app-start.sh"]
+    volumes:
+      - ../config/wait-for-it.sh:/scripts/wait-for-it.sh
+      - ../config/watcher-mobymask-v2/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
+      - peers_ids:/peers
+      - mobymask_deployment:/server
+    ports:
+      - "0.0.0.0:3004:80"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "80"]
      interval: 20s
      timeout: 5s
      retries: 15
      start_period: 10s
-    shm_size: '1GB'
    extra_hosts:
      - "host.docker.internal:host-gateway"

@@ -10,10 +10,8 @@ services:
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
-    command:
-      - sh
-      - -c
-      - ./wait-for-it.sh -h ${CERC_WATCHER_HOST:-$${DEFAULT_CERC_WATCHER_HOST}} -p ${CERC_WATCHER_PORT:-$${DEFAULT_CERC_WATCHER_PORT}} -s -t 0 -- ./test-app-start.sh
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+    command: ["sh", "test-app-start.sh"]
    volumes:
      - ../config/wait-for-it.sh:/scripts/wait-for-it.sh
      - ../config/watcher-mobymask-v2/test-app-start.sh:/scripts/test-app-start.sh
@@ -0,0 +1,304 @@
+version: '3.2'
+
+services:
+  # Starts the PostgreSQL database for watchers
+  watcher-db:
+    restart: unless-stopped
+    image: postgres:14-alpine
+    environment:
+      - POSTGRES_USER=vdbm
+      - POSTGRES_MULTIPLE_DATABASES=azimuth-watcher,azimuth-watcher-job-queue,censures-watcher,censures-watcher-job-queue,claims-watcher,claims-watcher-job-queue,conditional-star-release-watcher,conditional-star-release-watcher-job-queue,delegated-sending-watcher,delegated-sending-watcher-job-queue,ecliptic-watcher,ecliptic-watcher-job-queue,linear-star-release-watcher,linear-star-release-watcher-job-queue,polls-watcher,polls-watcher-job-queue
+      - POSTGRES_EXTENSION=azimuth-watcher-job-queue:pgcrypto,censures-watcher-job-queue:pgcrypto,claims-watcher-job-queue:pgcrypto,conditional-star-release-watcher-job-queue:pgcrypto,delegated-sending-watcher-job-queue:pgcrypto,ecliptic-watcher-job-queue:pgcrypto,linear-star-release-watcher-job-queue:pgcrypto,polls-watcher-job-queue:pgcrypto,
+      - POSTGRES_PASSWORD=password
+    volumes:
+      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
+      - watcher_db_data:/var/lib/postgresql/data
+    ports:
+      - "0.0.0.0:15432:5432"
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "5432"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 10s
+
+  # Starts the azimuth-watcher server
+  azimuth-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/azimuth-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/azimuth-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/azimuth-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/azimuth-watcher/start-server.sh
+    ports:
+      - "3001"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3001"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the censures-watcher server
+  censures-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/censures-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/censures-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/censures-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/censures-watcher/start-server.sh
+    ports:
+      - "3002"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3002"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the claims-watcher server
+  claims-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/claims-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/claims-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/claims-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/claims-watcher/start-server.sh
+    ports:
+      - "3003"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3003"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the conditional-star-release-watcher server
+  conditional-star-release-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/conditional-star-release-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/conditional-star-release-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/conditional-star-release-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/conditional-star-release-watcher/start-server.sh
+    ports:
+      - "3004"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3004"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the delegated-sending-watcher server
+  delegated-sending-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/delegated-sending-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/delegated-sending-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/delegated-sending-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/delegated-sending-watcher/start-server.sh
+    ports:
+      - "3005"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3005"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the ecliptic-watcher server
+  ecliptic-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/ecliptic-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/ecliptic-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/ecliptic-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/ecliptic-watcher/start-server.sh
+    ports:
+      - "3006"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3006"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the linear-star-release-watcher server
+  linear-star-release-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/linear-star-release-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/linear-star-release-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/linear-star-release-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/linear-star-release-watcher/start-server.sh
+    ports:
+      - "3007"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3007"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the polls-watcher server
+  polls-watcher-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    env_file:
+      - ../config/watcher-azimuth/watcher-params.env
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
+    working_dir: /app/packages/polls-watcher
+    command: "./start-server.sh"
+    volumes:
+      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/polls-watcher/environments/watcher-config-template.toml
+      - ../config/watcher-azimuth/merge-toml.js:/app/packages/polls-watcher/merge-toml.js
+      - ../config/watcher-azimuth/start-server.sh:/app/packages/polls-watcher/start-server.sh
+    ports:
+      - "3008"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3008"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Starts the gateway-server for proxying queries
+  gateway-server:
+    image: cerc/watcher-azimuth:local
+    restart: unless-stopped
+    depends_on:
+      azimuth-watcher-server:
+        condition: service_healthy
+      censures-watcher-server:
+        condition: service_healthy
+      claims-watcher-server:
+        condition: service_healthy
+      conditional-star-release-watcher-server:
+        condition: service_healthy
+      delegated-sending-watcher-server:
+        condition: service_healthy
+      ecliptic-watcher-server:
+        condition: service_healthy
+      linear-star-release-watcher-server:
+        condition: service_healthy
+      polls-watcher-server:
+        condition: service_healthy
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+    working_dir: /app/packages/gateway-server
+    command: "yarn server"
+    volumes:
+      - ../config/watcher-azimuth/gateway-watchers.json:/app/packages/gateway-server/dist/watchers.json
+    ports:
+      - "0.0.0.0:4000:4000"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "4000"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+volumes:
+  watcher_db_data:
@@ -34,23 +34,20 @@ services:
      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}
-    # Waits for L2 Optimism Geth and Node servers to be up before deploying contract
-    command:
-      - sh
-      - -c
-      - |
-        ./wait-for-it.sh -h ${CERC_L2_GETH_HOST:-$${DEFAULT_CERC_L2_GETH_HOST}} -p ${CERC_L2_GETH_PORT:-$${DEFAULT_CERC_L2_GETH_PORT}} -s -t 0 && \
-        ./wait-for-it.sh -h ${CERC_L2_NODE_HOST:-$${DEFAULT_CERC_L2_NODE_HOST}} -p ${CERC_L2_NODE_PORT:-$${DEFAULT_CERC_L2_NODE_PORT}} -s -t 0 && \
-        ./deploy-and-generate-invite.sh
+      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/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
-      - fixturenet_geth_accounts:/geth-accounts:ro
    extra_hosts:
      - "host.docker.internal:host-gateway"

@@ -83,8 +80,10 @@ services:
    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_PEER: ${CERC_PRIVATE_KEY_PEER}
      CERC_RELAY_PEERS: ${CERC_RELAY_PEERS}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
      CERC_RELAY_ANNOUNCE_DOMAIN: ${CERC_RELAY_ANNOUNCE_DOMAIN}
      CERC_ENABLE_PEER_L2_TXS: ${CERC_ENABLE_PEER_L2_TXS}
      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
@@ -94,7 +93,6 @@ services:
      - ../config/watcher-mobymask-v2/start-server.sh:/app/start-server.sh
      - peers_ids:/app/peers
      - mobymask_deployment:/server
-      - fixturenet_geth_accounts:/geth-accounts:ro
    # Expose GQL, metrics and relay node ports
    ports:
      - "0.0.0.0:3001:3001"
@@ -135,4 +133,3 @@ volumes:
  mobymask_watcher_db_data:
  peers_ids:
  mobymask_deployment:
-  fixturenet_geth_accounts:
@@ -6,9 +6,7 @@ DEFAULT_CERC_L1_RPC="http://fixturenet-eth-geth-1:8545"
 DEFAULT_CERC_L1_HOST="fixturenet-eth-geth-1"
 DEFAULT_CERC_L1_PORT=8545

-# Credentials for accounts on L1 to send balance to Optimism Proxy contract from
+# URL to get CSV with credentials for accounts on L1
+# that are used to send balance to Optimism Proxy contract
 # (enables them to do transactions on L2)
-DEFAULT_CERC_L1_ADDRESS=
-DEFAULT_CERC_L1_PRIV_KEY=
-DEFAULT_CERC_L1_ADDRESS_2=
-DEFAULT_CERC_L1_PRIV_KEY_2=
+DEFAULT_CERC_L1_ACCOUNTS_CSV_URL="http://fixturenet-eth-bootnode-geth:9898/accounts.csv"
@@ -7,10 +7,7 @@ fi
 CERC_L1_CHAIN_ID="${CERC_L1_CHAIN_ID:-${DEFAULT_CERC_L1_CHAIN_ID}}"
 CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"

-CERC_L1_ADDRESS="${CERC_L1_ADDRESS:-${DEFAULT_CERC_L1_ADDRESS}}"
-CERC_L1_PRIV_KEY="${CERC_L1_PRIV_KEY:-${DEFAULT_CERC_L1_PRIV_KEY}}"
-CERC_L1_ADDRESS_2="${CERC_L1_ADDRESS_2:-${DEFAULT_CERC_L1_ADDRESS_2}}"
-CERC_L1_PRIV_KEY_2="${CERC_L1_PRIV_KEY_2:-${DEFAULT_CERC_L1_PRIV_KEY_2}}"
+CERC_L1_ACCOUNTS_CSV_URL="${CERC_L1_ACCOUNTS_CSV_URL:-${DEFAULT_CERC_L1_ACCOUNTS_CSV_URL}}"

 echo "Using L1 RPC endpoint ${CERC_L1_RPC}"

@@ -62,17 +59,30 @@ PROPOSER_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Proposer.address')
 BATCHER_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Batcher.address')
 SEQUENCER_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Sequencer.address')

-# Read the private key of L1 accounts
-if [ -f /geth-accounts/accounts.csv ]; then
-  echo "Using L1 account credentials from the mounted volume"
+# Get the private keys of L1 accounts
+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"
+
  CERC_L1_ADDRESS=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 2)
  CERC_L1_PRIV_KEY=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
  CERC_L1_ADDRESS_2=$(awk -F, 'NR==2{print $(NF-1)}' /geth-accounts/accounts.csv)
  CERC_L1_PRIV_KEY_2=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
 else
-  echo "Using L1 account credentials from env"
+  echo "Couldn't fetch L1 account credentials, using them from env"
 fi

+# Send balances to the above L2 addresses
+yarn hardhat send-balance --to "${ADMIN_ADDRESS}" --amount 2 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
+yarn hardhat send-balance --to "${PROPOSER_ADDRESS}" --amount 5 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
+yarn hardhat send-balance --to "${BATCHER_ADDRESS}" --amount 1000 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
+
+echo "Balances sent to L2 accounts"
+
 # Select a finalized L1 block as the starting point for roll ups
 until FINALIZED_BLOCK=$(cast block finalized --rpc-url "$CERC_L1_RPC"); do
    echo "Waiting for a finalized L1 block to exist, retrying after 10s"
@@ -85,13 +95,6 @@ L1_BLOCKTIMESTAMP=$(echo "$FINALIZED_BLOCK" | awk '/timestamp/{print $2}')

 echo "Selected L1 block ${L1_BLOCKNUMBER} as the starting block for roll ups"

-# Send balances to the above L2 addresses
-yarn hardhat send-balance --to "${ADMIN_ADDRESS}" --amount 2 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
-yarn hardhat send-balance --to "${PROPOSER_ADDRESS}" --amount 5 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
-yarn hardhat send-balance --to "${BATCHER_ADDRESS}" --amount 1000 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
-
-echo "Balances sent to L2 accounts"
-
 # Update the deployment config
 sed -i 's/"l2OutputOracleStartingTimestamp": TIMESTAMP/"l2OutputOracleStartingTimestamp": '"$L1_BLOCKTIMESTAMP"'/g' deploy-config/getting-started.json
 jq --arg chainid "$CERC_L1_CHAIN_ID" '.l1ChainID = ($chainid | tonumber)' deploy-config/getting-started.json > tmp.json && mv tmp.json deploy-config/getting-started.json
@@ -107,7 +110,7 @@ echo "PRIVATE_KEY_DEPLOYER=$ADMIN_PRIV_KEY" >> .env
 echo "Deploying the L1 smart contracts, this will take a while..."

 # Deploy the L1 smart contracts
-yarn hardhat deploy --network getting-started
+yarn hardhat deploy --network getting-started --tags l1

 echo "Deployed the L1 smart contracts"

@@ -6,7 +6,7 @@ fi

 CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"

-# Get BACTHER_KEY from keys.json
+# Get Batcher key from keys.json
 BATCHER_KEY=$(jq -r '.Batcher.privateKey' /l2-accounts/keys.json | tr -d '"')

 cleanup() {
@@ -18,6 +18,7 @@ cleanup() {
 }
 trap 'cleanup' INT TERM

+# Run op-batcher
 op-batcher \
  --l2-eth-rpc=http://op-geth:8545 \
  --rollup-rpc=http://op-node:8547 \
@@ -30,7 +31,6 @@ op-batcher \
  --rpc.port=8548 \
  --rpc.enable-admin \
  --max-channel-duration=1 \
-  --target-l1-tx-size-bytes=2048 \
  --l1-eth-rpc=$CERC_L1_RPC \
  --private-key=$BATCHER_KEY \
  &
@@ -8,7 +8,7 @@ fi
 echo "Installing jq"
 apk update && apk add jq

-# Get SEQUENCER key from keys.json
+# Get Sequencer key from keys.json
 SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')

 # Initialize op-geth if datadir/geth not found
@@ -70,7 +70,7 @@ geth \
  --ws.origins="*" \
  --ws.api=debug,eth,txpool,net,engine \
  --syncmode=full \
-  --gcmode=full \
+  --gcmode=archive \
  --nodiscover \
  --maxpeers=0 \
  --networkid=42069 \
@@ -6,9 +6,10 @@ fi

 CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"

-# Get SEQUENCER KEY from keys.json
+# Get Sequencer key from keys.json
 SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')

+# Run op-node
 op-node \
  --l2=http://op-geth:8551 \
  --l2.jwt-secret=/op-node-data/jwt.txt \
@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
+
+# Read the L2OutputOracle contract address from the deployment
+L2OO_DEPLOYMENT=$(cat /contracts-bedrock/deployments/getting-started/L2OutputOracle.json)
+L2OO_ADDR=$(echo "$L2OO_DEPLOYMENT" | jq -r '.address')
+
+# Get Proposer key from keys.json
+PROPOSER_KEY=$(jq -r '.Proposer.privateKey' /l2-accounts/keys.json | tr -d '"')
+
+cleanup() {
+    echo "Signal received, cleaning up..."
+    kill ${proposer_pid}
+
+    wait
+    echo "Done"
+}
+trap 'cleanup' INT TERM
+
+# Run op-proposer
+op-proposer \
+  --poll-interval 12s \
+  --rpc.port 8560 \
+  --rollup-rpc http://op-node:8547 \
+  --l2oo-address $L2OO_ADDR \
+  --private-key $PROPOSER_KEY \
+  --l1-eth-rpc $CERC_L1_RPC \
+  &
+
+proposer_pid=$!
+wait $proposer_pid
@@ -0,0 +1,18 @@
+[
+  {
+    "id": "0001",
+    "url": "http://127.0.0.1:8081/",
+    "basic_auth": {
+      "username": "",
+      "password": ""
+    }
+  },
+  {
+    "id": "0021",
+    "url": "http://fixturenet-eth-geth-1:8545/",
+    "basic_auth": {
+      "username": "",
+      "password": ""
+    }
+  }
+]
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# TODO: we should have a mechanism to bundle it inside the container rather than link from here
+# at deploy time.
+
+CHAINID="pocketlocal-1"
+MONIKER="localtestnet"
+SERVICE_URL="http://127.0.0.1:8081"
+PASSWORD="mypassword" # wallet password, required by cli
+
+# check if jq is installed; install if necessary
+# command -v jq > /dev/null 2>&1 || { echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"; exit 1; }
+if ! command -v jq > /dev/null 2>&1; then
+  echo "jq not installed, downloading..."
+  mkdir -p /home/app/bin
+  wget -O /home/app/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
+  chmod +x /home/app/bin/jq
+  export PATH=$PATH:/home/app/bin
+fi
+
+# remove existing daemon and client
+rm -rf ~/.pocket*
+
+# create a wallet with password "mypassword" and save the address for later
+address=$(pocket accounts create --pwd $PASSWORD | awk '/Address:/ {print $2}')
+
+# set this address as the validator address for the node
+pocket accounts set-validator $address --pwd $PASSWORD
+
+# save the public key for later
+pubkey=$(pocket accounts show $address | awk '/Public Key:/ {print $3}')
+
+# set node's moniker
+echo $(pocket util print-configs) | jq '.tendermint_config.Moniker = "'"$MONIKER"'"' | jq . > $HOME/.pocket/config/config.json
+
+# pocket mainnet has block time of 15 minutes, set closer to 1 minute instead
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.TimeoutPropose = 8000000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.TimeoutProposeDelta = 600000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.TimeoutPrevote = 4000000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.TimeoutPrevoteDelta = 600000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.TimeoutPrecommit = 4000000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.TimeoutPrecommitDelta = 6000000006' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.TimeoutCommit = 52000000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.CreateEmptyBlocksInterval = 60000000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.PeerGossipSleepDuration = 2000000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+cat $HOME/.pocket/config/config.json | jq '.tendermint_config.Consensus.PeerQueryMaj23SleepDuration = 1200000000' | jq . > $HOME/.pocket/config/tmp_config.json && mv $HOME/.pocket/config/tmp_config.json $HOME/.pocket/config/config.json
+
+# include genesis.json and chains.json
+cp $HOME/pocket-configs/genesis.json $HOME/.pocket/config/genesis.json
+cp $HOME/pocket-configs/chains.json $HOME/.pocket/config/chains.json
+
+# set chain-id and add node to genesis.json as a validator
+cat $HOME/.pocket/config/genesis.json | jq '.chain_id="'"$CHAINID"'"' > $HOME/.pocket/config/tmp_genesis.json && mv $HOME/.pocket/config/tmp_genesis.json $HOME/.pocket/config/genesis.json
+cat $HOME/.pocket/config/genesis.json | jq '.app_state.auth.accounts[0].value.address="'"$address"'"' > $HOME/.pocket/config/tmp_genesis.json && mv $HOME/.pocket/config/tmp_genesis.json $HOME/.pocket/config/genesis.json
+cat $HOME/.pocket/config/genesis.json | jq '.app_state.auth.accounts[0].value.public_key.value="'"$pubkey"'"' > $HOME/.pocket/config/tmp_genesis.json && mv $HOME/.pocket/config/tmp_genesis.json $HOME/.pocket/config/genesis.json
+cat $HOME/.pocket/config/genesis.json | jq '.app_state.pos.validators[0].address="'"$address"'"' > $HOME/.pocket/config/tmp_genesis.json && mv $HOME/.pocket/config/tmp_genesis.json $HOME/.pocket/config/genesis.json
+cat $HOME/.pocket/config/genesis.json | jq '.app_state.pos.validators[0].public_key="'"$pubkey"'"' > $HOME/.pocket/config/tmp_genesis.json && mv $HOME/.pocket/config/tmp_genesis.json $HOME/.pocket/config/genesis.json
+cat $HOME/.pocket/config/genesis.json | jq '.app_state.pos.validators[0].service_url="'"$SERVICE_URL"'"' > $HOME/.pocket/config/tmp_genesis.json && mv $HOME/.pocket/config/tmp_genesis.json $HOME/.pocket/config/genesis.json
+
+# if [[ $1 == "pending" ]]; then
+#   echo "pending mode is on, please wait for the first block committed."
+# fi
+
+# Start the node
+pocket start --simulateRelay
@@ -0,0 +1,272 @@
+{
+    "genesis_time": "2020-07-28T15:00:00.000000Z",
+    "chain_id": "testnet",
+    "consensus_params": {
+        "block": {
+            "max_bytes": "4000000",
+            "max_gas": "-1",
+            "time_iota_ms": "1"
+        },
+        "evidence": {
+            "max_age": "120000000000"
+        },
+        "validator": {
+            "pub_key_types": [
+                "ed25519"
+            ]
+        }
+    },
+    "app_hash": "",
+    "app_state": {
+        "application": {
+            "params": {
+                "unstaking_time": "1814000000000000",
+                "max_applications": "9223372036854775807",
+                "app_stake_minimum": "1000000",
+                "base_relays_per_pokt": "167",
+                "stability_adjustment": "0",
+                "participation_rate_on": false,
+                "maximum_chains": "15"
+            },
+            "applications": [],
+            "exported": false
+        },
+        "auth": {
+            "params": {
+                "max_memo_characters": "75",
+                "tx_sig_limit": "8",
+                "fee_multipliers": {
+                    "fee_multiplier": [],
+                    "default": "1"
+                }
+            },
+            "accounts": [
+                {
+                    "type": "posmint/Account",
+                    "value": {
+                        "address": "!validator-address",
+                        "coins": [
+                            {
+                                "amount": "0",
+                                "denom": "upokt"
+                            }
+                        ],
+                        "public_key": {
+                            "type": "crypto/ed25519_public_key",
+                            "value": "!validator-pubkey"
+                        }
+                    }
+                } 
+            ],
+            "supply": []
+        },
+        "gov": {
+            "params": {
+                "acl": [
+                    {
+                        "acl_key": "application/ApplicationStakeMinimum",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "application/AppUnstakingTime",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "application/BaseRelaysPerPOKT",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "application/MaxApplications",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "application/MaximumChains",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "application/ParticipationRateOn",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "application/StabilityAdjustment",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "auth/MaxMemoCharacters",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "auth/TxSigLimit",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "gov/acl",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "gov/daoOwner",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "gov/upgrade",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pocketcore/ClaimExpiration",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "auth/FeeMultipliers",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pocketcore/ReplayAttackBurnMultiplier",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/ProposerPercentage",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pocketcore/ClaimSubmissionWindow",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pocketcore/MinimumNumberOfProofs",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pocketcore/SessionNodeCount",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pocketcore/SupportedBlockchains",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/BlocksPerSession",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/DAOAllocation",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/DowntimeJailDuration",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/MaxEvidenceAge",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/MaximumChains",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/MaxJailedBlocks",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/MaxValidators",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/MinSignedPerWindow",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/RelaysToTokensMultiplier",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/SignedBlocksWindow",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/SlashFractionDoubleSign",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/SlashFractionDowntime",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/StakeDenom",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/StakeMinimum",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    },
+                    {
+                        "acl_key": "pos/UnstakingTime",
+                        "address": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+                    }
+                ],
+                "dao_owner": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4",
+                "upgrade": {
+                    "Height": "0",
+                    "Version": "0"
+                }
+            },
+            "DAO_Tokens": "50000000000000"
+        },
+        "pos": {
+            "params": {
+                "relays_to_tokens_multiplier": "10000",
+                "unstaking_time": "1814000000000000",
+                "max_validators": "5000",
+                "stake_denom": "upokt",
+                "stake_minimum": "15000000000",
+                "session_block_frequency": "4",
+                "dao_allocation": "10",
+                "proposer_allocation": "1",
+                "maximum_chains": "15",
+                "max_jailed_blocks": "37960",
+                "max_evidence_age": "120000000000",
+                "signed_blocks_window": "10",
+                "min_signed_per_window": "0.60",
+                "downtime_jail_duration": "3600000000000",
+                "slash_fraction_double_sign": "0.05",
+                "slash_fraction_downtime": "0.000001"
+            },
+            "prevState_total_power": "0",
+            "prevState_validator_powers": null,
+            "validators": [
+                {
+                    "address": "!validator-address",
+                    "public_key": "!validator-pubkey",
+                    "jailed": false,
+                    "status": 2,
+                    "tokens": "5000000000000",
+                    "service_url": "!validator-url",
+                    "chains": [
+                        "0001",
+                        "0021"
+                    ],
+                    "unstaking_time": "2021-05-15T00:00:00Z"
+                }
+            ],
+            "exported": false,
+            "signing_infos": {},
+            "missed_blocks": {},
+            "previous_proposer": ""
+        },
+        "pocketcore": {
+            "params": {
+                "session_node_count": "5",
+                "proof_waiting_period": "3",
+                "supported_blockchains": [
+                    "0001",
+                    "0021"
+                ],
+                "claim_expiration": "120",
+                "replay_attack_burn_multiplier": "3",
+                "minimum_number_of_proofs": "10"
+            },
+            "receipts": null,
+            "claims": null
+        }
+    }
+}
@@ -0,0 +1,34 @@
+[
+  {
+    "endpoint": "http://azimuth-watcher-server:3001/graphql",
+    "prefix": "azimuth"
+  },
+  {
+    "endpoint": "http://censures-watcher-server:3002/graphql",
+    "prefix": "censures"
+  },
+  {
+    "endpoint": "http://claims-watcher-server:3003/graphql",
+    "prefix": "claims"
+  },
+  {
+    "endpoint": "http://conditional-star-release-watcher-server:3004/graphql",
+    "prefix": "conditionalStarRelease"
+  },
+  {
+    "endpoint": "http://delegated-sending-watcher-server:3005/graphql",
+    "prefix": "delegatedSending"
+  },
+  {
+    "endpoint": "http://ecliptic-watcher-server:3006/graphql",
+    "prefix": "ecliptic"
+  },
+  {
+    "endpoint": "http://linear-star-release-watcher-server:3007/graphql",
+    "prefix": "linearStarRelease"
+  },
+  {
+    "endpoint": "http://polls-watcher-server:3008/graphql",
+    "prefix": "polls"
+  }
+]
@@ -0,0 +1,31 @@
+const fs = require('fs');
+const tomlJS = require('toml-js');
+const toml = require('toml');
+const { merge } = require('lodash')
+
+const main = () => {
+  const overrideConfigString = fs.readFileSync('environments/watcher-config.toml', 'utf-8');
+  const configString = fs.readFileSync('environments/local.toml', 'utf-8');
+  const overrideConfig = toml.parse(overrideConfigString)
+  const config = toml.parse(configString)
+
+  // Merge configs
+  const updatedConfig = merge(config, overrideConfig);
+
+  // Form dbConnectionString for jobQueue DB
+  const parts = config.jobQueue.dbConnectionString.split("://");
+  const credsAndDB = parts[1].split("@");
+  const creds = credsAndDB[0].split(":");
+  creds[0] = overrideConfig.database.username;
+  creds[1] = overrideConfig.database.password;
+  credsAndDB[0] = creds.join(":");
+  const dbName = credsAndDB[1].split("/")[1]
+  credsAndDB[1] = [overrideConfig.database.host, dbName].join("/");
+  parts[1] = credsAndDB.join("@");
+
+  updatedConfig.jobQueue.dbConnectionString = parts.join("://");
+
+  fs.writeFileSync('environments/local.toml', tomlJS.dump(updatedConfig), 'utf-8');
+}
+
+main();
@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+CERC_IPLD_ETH_RPC="${CERC_IPLD_ETH_RPC:-${DEFAULT_CERC_IPLD_ETH_RPC}}"
+CERC_IPLD_ETH_GQL="${CERC_IPLD_ETH_GQL:-${DEFAULT_CERC_IPLD_ETH_GQL}}"
+
+echo "Using IPLD ETH RPC endpoint ${CERC_IPLD_ETH_RPC}"
+echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL}"
+
+# Replace env variables in template TOML file
+# Read in the config template TOML file and modify it
+WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
+WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
+  sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}|g; \
+          s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}| ")
+
+# Write the modified content to a new file
+echo "$WATCHER_CONFIG" > environments/watcher-config.toml
+
+# Merge SO watcher config with existing config file
+node merge-toml.js
+
+echo 'yarn server'
+yarn server
@@ -0,0 +1,14 @@
+[server]
+  host = "0.0.0.0"
+  maxSimultaneousRequests = -1
+
+[database]
+  host = "watcher-db"
+  port = 5432
+  username = "vdbm"
+  password = "password"
+
+[upstream]
+  [upstream.ethServer]
+    gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL"
+    rpcProviderEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_RPC"
@@ -0,0 +1,5 @@
+# Defaults
+
+# ipld-eth-server endpoints
+DEFAULT_CERC_IPLD_ETH_RPC=
+DEFAULT_CERC_IPLD_ETH_GQL=
@@ -5,19 +5,32 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi

 CERC_L2_GETH_RPC="${CERC_L2_GETH_RPC:-${DEFAULT_CERC_L2_GETH_RPC}}"
-CERC_PRIVATE_KEY_DEPLOYER="${CERC_PRIVATE_KEY_DEPLOYER:-${DEFAULT_CERC_PRIVATE_KEY_DEPLOYER}}"
+CERC_L1_ACCOUNTS_CSV_URL="${CERC_L1_ACCOUNTS_CSV_URL:-${DEFAULT_CERC_L1_ACCOUNTS_CSV_URL}}"

 CERC_MOBYMASK_APP_BASE_URI="${CERC_MOBYMASK_APP_BASE_URI:-${DEFAULT_CERC_MOBYMASK_APP_BASE_URI}}"
 CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"

+# Check if CERC_DEPLOYED_CONTRACT environment variable set to skip contract deployment
+if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
+  echo "CERC_DEPLOYED_CONTRACT is set to '$CERC_DEPLOYED_CONTRACT'"
+  echo "Skipping contract deployment"
+  exit 0
+fi
+
 echo "Using L2 RPC endpoint ${CERC_L2_GETH_RPC}"

-if [ -f /geth-accounts/accounts.csv ]; then
-  echo "Using L1 private key from the mounted volume"
-  # Read the private key of L1 account to deploy contract
+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 "Using CERC_PRIVATE_KEY_DEPLOYER from env"
+  echo "Couldn't fetch L1 account credentials, using CERC_PRIVATE_KEY_DEPLOYER from env"
 fi

 # Set the private key
@@ -29,14 +42,15 @@ jq --arg rpcUrl "$CERC_L2_GETH_RPC" '.rpcUrl = $rpcUrl' secrets.json > secrets_u
 # Set the MobyMask app base URI
 jq --arg baseURI "$CERC_MOBYMASK_APP_BASE_URI" '.baseURI = $baseURI' secrets.json > secrets_updated.json && mv secrets_updated.json secrets.json

-export RPC_URL="${CERC_L2_GETH_RPC}"
+# Wait for L2 Optimism Geth and Node servers to be up before deploying contract
+CERC_L2_GETH_HOST="${CERC_L2_GETH_HOST:-${DEFAULT_CERC_L2_GETH_HOST}}"
+CERC_L2_GETH_PORT="${CERC_L2_GETH_PORT:-${DEFAULT_CERC_L2_GETH_PORT}}"
+CERC_L2_NODE_HOST="${CERC_L2_NODE_HOST:-${DEFAULT_CERC_L2_NODE_HOST}}"
+CERC_L2_NODE_PORT="${CERC_L2_NODE_PORT:-${DEFAULT_CERC_L2_NODE_PORT}}"
+./wait-for-it.sh -h "${CERC_L2_GETH_HOST}" -p "${CERC_L2_GETH_PORT}" -s -t 0
+./wait-for-it.sh -h "${CERC_L2_NODE_HOST}" -p "${CERC_L2_NODE_PORT}" -s -t 0

-# Check if CERC_DEPLOYED_CONTRACT environment variable set to skip contract deployment
-if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
-  echo "CERC_DEPLOYED_CONTRACT is set to '$CERC_DEPLOYED_CONTRACT'"
-  echo "Exiting without deploying contract"
-  exit 0
-fi
+export RPC_URL="${CERC_L2_GETH_RPC}"

 # Check and exit if a deployment already exists (on restarts)
 if [ -f ./config.json ]; then
@@ -7,6 +7,7 @@ fi
 CERC_CHAIN_ID="${CERC_CHAIN_ID:-${DEFAULT_CERC_CHAIN_ID}}"
 CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"
 CERC_RELAY_NODES="${CERC_RELAY_NODES:-${DEFAULT_CERC_RELAY_NODES}}"
+CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"
 CERC_APP_WATCHER_URL="${CERC_APP_WATCHER_URL:-${DEFAULT_CERC_APP_WATCHER_URL}}"

 # If not set (or []), check the mounted volume for relay peer id
@@ -17,9 +18,13 @@ fi

 echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES"

-# Use config from mounted volume if available (when running web-app along with watcher stack)
-if [ -f /server/config.json ]; then
+if [ -z "$CERC_DEPLOYED_CONTRACT" ]; then
+  # Use config from mounted volume (when running web-app along with watcher stack)
  echo "Taking config for deployed contract from mounted volume"
+  while [ ! -f /server/config.json ]; do
+    echo "Config not found, retrying after 5 seconds"
+    sleep 5
+  done

  # Get deployed contract address and chain id
  CERC_DEPLOYED_CONTRACT=$(jq -r '.address' /server/config.json | tr -d '"')
@@ -33,5 +38,6 @@ yq -n ".address = env(CERC_DEPLOYED_CONTRACT)" > /config/config.yml
 yq ".watcherUrl = env(CERC_APP_WATCHER_URL)" -i /config/config.yml
 yq ".chainId = env(CERC_CHAIN_ID)" -i /config/config.yml
 yq ".relayNodes = strenv(CERC_RELAY_NODES)" -i /config/config.yml
+yq ".denyMultiaddrs = strenv(CERC_DENY_MULTIADDRS)" -i /config/config.yml

 /scripts/start-serving-app.sh
@@ -1,8 +1,6 @@
 # Defaults

 # Watcher endpoint
-DEFAULT_CERC_WATCHER_HOST="mobymask-watcher-server"
-DEFAULT_CERC_WATCHER_PORT=3001
 DEFAULT_CERC_APP_WATCHER_URL="http://localhost:3001"

 # Set of relay peers to connect to from the relay node
@@ -26,3 +24,6 @@ DEFAULT_CERC_CHAIN_ID=42069

 # Set of relay nodes to be used by web-apps
 DEFAULT_CERC_RELAY_NODES=[]
+
+# Set of multiaddrs to be avoided while dialling
+DEFAULT_CERC_DENY_MULTIADDRS=[]
@@ -2,12 +2,13 @@

 # L2 endpoints
 DEFAULT_CERC_L2_GETH_RPC="http://op-geth:8545"
+
+# Endpoints waited on before contract deployment
 DEFAULT_CERC_L2_GETH_HOST="op-geth"
 DEFAULT_CERC_L2_GETH_PORT=8545

 DEFAULT_CERC_L2_NODE_HOST="op-node"
 DEFAULT_CERC_L2_NODE_PORT=8547

-# Credentials for accounts to perform txs on L2
-DEFAULT_CERC_PRIVATE_KEY_DEPLOYER=
-DEFAULT_CERC_PRIVATE_KEY_PEER=
+# URL to get CSV with credentials for accounts on L1 to perform txs on L2
+DEFAULT_CERC_L1_ACCOUNTS_CSV_URL="http://fixturenet-eth-bootnode-geth:9898/accounts.csv"
@@ -5,16 +5,23 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi

 CERC_L2_GETH_RPC="${CERC_L2_GETH_RPC:-${DEFAULT_CERC_L2_GETH_RPC}}"
-CERC_PRIVATE_KEY_PEER="${CERC_PRIVATE_KEY_PEER:-${DEFAULT_CERC_PRIVATE_KEY_PEER}}"
+CERC_L1_ACCOUNTS_CSV_URL="${CERC_L1_ACCOUNTS_CSV_URL:-${DEFAULT_CERC_L1_ACCOUNTS_CSV_URL}}"

 CERC_RELAY_PEERS="${CERC_RELAY_PEERS:-${DEFAULT_CERC_RELAY_PEERS}}"
+CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"
 CERC_RELAY_ANNOUNCE_DOMAIN="${CERC_RELAY_ANNOUNCE_DOMAIN:-${DEFAULT_CERC_RELAY_ANNOUNCE_DOMAIN}}"
 CERC_ENABLE_PEER_L2_TXS="${CERC_ENABLE_PEER_L2_TXS:-${DEFAULT_CERC_ENABLE_PEER_L2_TXS}}"
 CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"

 echo "Using L2 RPC endpoint ${CERC_L2_GETH_RPC}"

-CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/$(jq -r '.id' /app/peers/relay-id.json)"
+# Use public domain for relay multiaddr in peer config if specified
+# Otherwise, use the docker container's host IP
+if [ -n "$CERC_RELAY_ANNOUNCE_DOMAIN" ]; then
+  CERC_RELAY_MULTIADDR="/dns4/${CERC_RELAY_ANNOUNCE_DOMAIN}/tcp/443/wss/p2p/$(jq -r '.id' /app/peers/relay-id.json)"
+else
+  CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/$(jq -r '.id' /app/peers/relay-id.json)"
+fi

 # Use contract address from environment variable or set from config.json in mounted volume
 if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
@@ -24,18 +31,25 @@ else
  CONTRACT_ADDRESS=$(jq -r '.address' /server/config.json | tr -d '"')
 fi

-if [ -f /geth-accounts/accounts.csv ]; then
-  echo "Using L1 private key from the mounted volume"
-  # Read the private key of L1 account for sending txs from peer
+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 for sending txs from peer
  CERC_PRIVATE_KEY_PEER=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
 else
-  echo "Using CERC_PRIVATE_KEY_PEER from env"
+  echo "Couldn't fetch L1 account credentials, using CERC_PRIVATE_KEY_PEER from env"
 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_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; \
@@ -1,6 +1,7 @@
 {
  "relayNodes": [],
  "peer": {
+    "denyMultiaddrs": [],
    "enableDebugInfo": true
  }
 }
@@ -5,6 +5,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi

 CERC_RELAY_NODES="${CERC_RELAY_NODES:-${DEFAULT_CERC_RELAY_NODES}}"
+CERC_DENY_MULTIADDRS="${CERC_DENY_MULTIADDRS:-${DEFAULT_CERC_DENY_MULTIADDRS}}"

 # If not set (or []), check the mounted volume for relay peer id
 if [ -z "$CERC_RELAY_NODES" ] || [ "$CERC_RELAY_NODES" = "[]" ]; then
@@ -16,5 +17,6 @@ echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES"

 # Use yq to create config.yml with environment variables
 yq -n ".relayNodes = strenv(CERC_RELAY_NODES)" > /config/config.yml
+yq ".denyMultiaddrs = strenv(CERC_DENY_MULTIADDRS)" -i /config/config.yml

 /scripts/start-serving-app.sh
@@ -27,6 +27,7 @@
      host = "0.0.0.0"
      port = 9090
      relayPeers = REPLACE_WITH_CERC_RELAY_PEERS
+      denyMultiaddrs = REPLACE_WITH_CERC_DENY_MULTIADDRS
      peerIdFile = './peers/relay-id.json'
      announce = 'REPLACE_WITH_CERC_RELAY_ANNOUNCE_DOMAIN'
      enableDebugInfo = true
@@ -34,6 +35,7 @@
    [server.p2p.peer]
      relayMultiaddr = 'REPLACE_WITH_CERC_RELAY_MULTIADDR'
      pubSubTopic = 'mobymask'
+      denyMultiaddrs = REPLACE_WITH_CERC_DENY_MULTIADDRS
      peerIdFile = './peers/peer-id.json'
      enableDebugInfo = true
      enableL2Txs = REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 # Build a local version of the task executor for act-runner
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/hosting/gitea/Dockerfile.task-executor ${build_command_args} ${CERC_REPO_BASE_DIR}/hosting
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/hosting/gitea/Dockerfile.task-executor ${build_command_args} ${SCRIPT_DIR}
@@ -127,3 +127,9 @@ else
 fi

 wait $geth_pid
+
+if [ "true" == "$CERC_KEEP_RUNNING_AFTER_GETH_EXIT" ]; then
+  while [ 1 -eq 1 ]; do
+    sleep 60
+  done
+fi
@@ -1,4 +1,4 @@
-FROM sigp/lcli:v3.2.1 AS lcli
+FROM sigp/lcli:v4.1.0 AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-eth-geth:local AS fnetgeth

@@ -21,22 +21,14 @@ if [ ! -f "$DATADIR/bootnode/enr.dat" ]; then
    --udp-port $BOOTNODE_PORT \
    --tcp-port $BOOTNODE_PORT \
    --genesis-fork-version $GENESIS_FORK_VERSION \
-    --output-dir $DATADIR/bootnode-temp
+    --output-dir $DATADIR/bootnode

-  # Output ENR to a temp dir and mv as "lcli generate-bootnode-enr" will not overwrite an empty dir (mounted volume)
-  mkdir -p $DATADIR/bootnode
-  mv $DATADIR/bootnode-temp/* $DATADIR/bootnode
-  rm -r $DATADIR/bootnode-temp
+  bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
+  echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml

-  echo "Generated bootnode enr"
-else
-  echo "Found existing bootnode enr"
+  echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
 fi

-bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
-echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
-echo "Written bootnode enr to $TESTNET_DIR/boot_enr.yaml"
-
 exec lighthouse boot_node \
    --testnet-dir $TESTNET_DIR \
    --port $BOOTNODE_PORT \
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Exports the complete fixturenet-eth ethdb data to a tarball (default, ./ethdb.tgz), waiting for a minimum
+# block height (default 1000) to be reached before exporting.
+
+# Usage: export-ethdb.sh [min_block_number=1000] [output_file=./ethdb.tgz]
+
+if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+    set -x
+fi
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+GETH_EXPORT_MIN_BLOCK=${1:-${GETH_EXPORT_MIN_BLOCK:-1000}}
+
+# Wait for block.
+${SCRIPT_DIR}/status.sh $GETH_EXPORT_MIN_BLOCK
+if [[ $? -ne 0 ]]; then
+  echo "Unable to export ethdb." 1>&2
+  exit 1
+fi
+
+# Stop geth.
+echo -n "Exporting ethdb.... "
+GETH_CONTAINER=`docker ps -q -f "name=${CERC_SO_COMPOSE_PROJECT}-fixturenet-eth-geth-2-1"`
+if [[ -z "$GETH_CONTAINER" ]]; then
+  echo "not found"
+  exit 1
+fi
+
+docker exec $GETH_CONTAINER sh -c 'rm -rf /root/tmp && mkdir -p /root/tmp/export'
+docker exec $GETH_CONTAINER sh -c 'ln -s /opt/testnet/build/el/geth.json /root/tmp/export/genesis.json && ln -s /root/ethdata /root/tmp/export/'
+docker exec $GETH_CONTAINER sh -c 'cat /root/tmp/export/genesis.json | jq ".config" > /root/tmp/export/genesis.config.json'
+
+# Stop geth and zip up ethdb.
+docker exec $GETH_CONTAINER sh -c 'curl -s --location "localhost:8545" --header "Content-Type: application/json" --data "{\"jsonrpc\": \"2.0\", \"id\": 1, \"method\": \"eth_getBlockByNumber\", \"params\": [\"0x0\", false]}" > /root/tmp/export/eth_getBlockByNumber_0x0.json'
+docker exec $GETH_CONTAINER sh -c 'curl -s --location "localhost:8545" --header "Content-Type: application/json" --data "{\"jsonrpc\": \"2.0\", \"id\": 1, \"method\": \"eth_blockNumber\", \"params\": []}" > /root/tmp/export/eth_blockNumber.json'
+docker exec $GETH_CONTAINER sh -c "killall geth && sleep 2 && tar chzf /root/tmp/ethdb.tgz -C /root/tmp/export ."
+
+# Copy ethdb to host.
+GETH_EXPORT_FILE=${2:-${GETH_EXPORT_FILE:-./ethdb.tgz}}
+docker cp $GETH_CONTAINER:/root/tmp/ethdb.tgz $GETH_EXPORT_FILE
+echo "$GETH_EXPORT_FILE"
+docker exec $GETH_CONTAINER sh -c "rm -rf /root/tmp"
+
+# Restart the container to get geth back up and running.
+docker restart $GETH_CONTAINER >/dev/null
@@ -2,9 +2,10 @@
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
    set -x
 fi
-STATUSES=("geth to generate DAG" "beacon phase0" "beacon altair" "beacon bellatrix pre-merge" "beacon bellatrix merge")
-STATUS=0

+MIN_BLOCK_NUM=${1:-${MIN_BLOCK_NUM:-3}}
+STATUSES=("geth to generate DAG" "beacon phase0" "beacon altair" "beacon bellatrix pre-merge" "beacon bellatrix merge" "block number $MIN_BLOCK_NUM")
+STATUS=0

 LIGHTHOUSE_BASE_URL=${LIGHTHOUSE_BASE_URL}
 GETH_BASE_URL=${GETH_BASE_URL}
@@ -13,18 +14,29 @@ GETH_BASE_URL=${GETH_BASE_URL}
 # or some execution environment-neutral mechanism.
 if [ -z "$LIGHTHOUSE_BASE_URL" ]; then
  LIGHTHOUSE_CONTAINER=`docker ps -q -f "name=fixturenet-eth-lighthouse-1-1"`
+  if [ -z "$LIGHTHOUSE_CONTAINER" ]; then
+    echo "Lighthouse container not found." 1>&2
+    exit 1
+  fi
  LIGHTHOUSE_PORT=`docker port $LIGHTHOUSE_CONTAINER 8001 | cut -d':' -f2`
  LIGHTHOUSE_BASE_URL="http://localhost:${LIGHTHOUSE_PORT}"
 fi

 if [ -z "$GETH_BASE_URL" ]; then
  GETH_CONTAINER=`docker ps -q -f "name=fixturenet-eth-geth-1-1"`
+  if [ -z "$GETH_CONTAINER" ]; then
+    echo "Lighthouse container not found." 1>&2
+    exit 1
+  fi
  GETH_PORT=`docker port $GETH_CONTAINER 8545 | cut -d':' -f2`
  GETH_BASE_URL="http://localhost:${GETH_PORT}"
 fi

+MARKER="."
+
 function inc_status() {
  echo " done"
+  MARKEr="."
  STATUS=$((STATUS + 1))
  if [ $STATUS -lt ${#STATUSES[@]} ]; then
    echo -n "Waiting for ${STATUSES[$STATUS]}..."
@@ -34,7 +46,7 @@ function inc_status() {
 echo -n "Waiting for ${STATUSES[$STATUS]}..."
 while [ $STATUS -lt ${#STATUSES[@]} ]; do
  sleep 1
-  echo -n "."
+  echo -n "$MARKER"
  case $STATUS in
    0)
      result=`wget --no-check-certificate --quiet -O - --method POST --header 'Content-Type: application/json' \
@@ -67,5 +79,13 @@ while [ $STATUS -lt ${#STATUSES[@]} ]; do
        inc_status
      fi
      ;;
+    5)
+      result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.data.message.body.execution_payload.block_number'`
+      if [ ! -z "$result" ] && [ $result -gt $MIN_BLOCK_NUM ]; then
+        inc_status
+      else
+        MARKER="$result "
+      fi
+      ;;
  esac
 done
@@ -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
@@ -1,4 +1,4 @@
-FROM sigp/lighthouse:v3.2.1-modern
+FROM sigp/lighthouse:v4.1.0-modern

 RUN apt-get update; apt-get install bash netcat curl less jq -y;

@@ -31,7 +31,7 @@ RUN \

 # Install additional OS packages.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends jq bash
+    && apt-get -y install --no-install-recommends jq bash netcat

 # We do this to get a yq binary from the published container, for the correct architecture we're building here
 COPY --from=docker.io/mikefarah/yq:latest /usr/bin/yq /usr/local/bin/yq
@@ -48,8 +48,11 @@ RUN mkdir -p /config
 # Install simple web server for now (use nginx perhaps later)
 RUN yarn global add http-server

-# Globally install the payload web app package
-RUN yarn global add @cerc-io/mobymask-ui
+# Globally install both versions of the payload web app package
+# Install old version of MobyMask web app
+RUN yarn global add @cerc-io/mobymask-ui@0.1.4
+# Install the LXDAO version of MobyMask web app
+RUN yarn global add @cerc-io/mobymask-ui-lxdao@npm:@cerc-io/mobymask-ui@0.1.4-lxdao-0.1.1

 # Expose port for http
 EXPOSE 80
@@ -33,7 +33,7 @@ do
    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"

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

 # TODO: Don't hard wire this:
-webapp_files_dir=/usr/local/share/.config/yarn/global/node_modules/@cerc-io/mobymask-ui/build
+webapp_files_dir="/usr/local/share/.config/yarn/global/node_modules/${CERC_BUILD_DIR}"
 /scripts/apply-webapp-config.sh /config/config.yml ${webapp_files_dir} MOBYMASK_HOSTED_CONFIG
 http-server -p 80 ${webapp_files_dir}
@@ -1,6 +1,6 @@
 FROM node:16.17.1-alpine3.16

-RUN apk --update --no-cache add python3 alpine-sdk jq bash
+RUN apk --update --no-cache add python3 alpine-sdk jq bash curl wget

 WORKDIR /app

@@ -2,7 +2,7 @@ FROM cerc/foundry:local

 # Install node (local foundry is a debian based image)
 RUN apt-get update \
-  && apt-get install -y curl \
+  && apt-get install -y curl wget \
  && curl --silent --location https://deb.nodesource.com/setup_16.x | bash - \
  && apt-get update \
  && apt-get install -y nodejs git busybox jq \
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+
 # Build cerc/optimism-l2geth
+
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
 docker build -t cerc/optimism-l2geth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/op-geth
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
+
 # Build cerc/optimism-op-batcher
 # TODO: use upstream Dockerfile once its buildx-specific content has been removed
+
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 docker build -t cerc/optimism-op-batcher:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/optimism
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
+
 # Build cerc/optimism-op-node
 # TODO: use upstream Dockerfile once its buildx-specific content has been removed
+
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 docker build -t cerc/optimism-op-node:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/optimism
@@ -0,0 +1,31 @@
+FROM golang:1.19.0-alpine3.15 as builder
+
+ARG VERSION=v0.0.0
+
+RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
+
+# build op-proposer with the shared go.mod & go.sum files
+COPY ./op-proposer /app/op-proposer
+COPY ./op-bindings /app/op-bindings
+COPY ./op-node /app/op-node
+COPY ./op-service /app/op-service
+COPY ./op-signer /app/op-signer
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
+COPY ./.git /app/.git
+
+WORKDIR /app/op-proposer
+
+RUN go mod download
+
+ARG TARGETOS TARGETARCH
+
+RUN make op-proposer VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
+
+FROM alpine:3.15
+
+RUN apk add --no-cache jq bash
+
+COPY --from=builder /app/op-proposer/bin/op-proposer /usr/local/bin
+
+CMD ["op-proposer"]
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Build cerc/optimism-op-proposer
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+docker build -t cerc/optimism-op-proposer:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/optimism
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Build cerc/pocket
+docker build -t cerc/pocket:local ${CERC_REPO_BASE_DIR}/pocket-core-deployments/docker
@@ -21,8 +21,7 @@ RUN mkdir -p /config
 RUN yarn global add http-server

 # Globally install the payload web app package
-RUN yarn global add @cerc-io/test-app
-
+RUN yarn global add @cerc-io/test-app@0.2.34

 # Expose port for http
 EXPOSE 80
@@ -33,7 +33,7 @@ do
    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"

    # TODO: Pass keys to be replaced without double quotes
-    if [[ "$template_string_to_replace" == "${config_prefix}_relayNodes" ]]; then
+    if [[ "$template_string_to_replace" =~ ^${config_prefix}_(relayNodes|denyMultiaddrs)$ ]]; then
        find ${webapp_files_dir} -type f -exec sed -i 's#"'"${template_string_to_replace}"'"#'"${template_value_to_substitute}"'#g' {} +
    else
        # Note: we do not escape our strings, on the expectation they do not container the '#' char.
@@ -0,0 +1,13 @@
+FROM node:18.16.0-alpine3.16
+
+RUN apk --update --no-cache add git python3 alpine-sdk
+
+WORKDIR /app
+
+COPY . .
+
+RUN echo "Building azimuth-watcher-ts" && \
+    yarn && yarn build
+
+RUN echo "Install toml-js to update watcher config files" && \
+    yarn add --dev --ignore-workspace-root-check toml-js
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Build cerc/watcher-azimuth
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+# See: https://stackoverflow.com/a/246128/1701505
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/watcher-azimuth:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/azimuth-watcher-ts
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04

 RUN apt-get update \
-  && apt-get install -y curl gnupg build-essential \
+  && 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 \
@@ -14,7 +14,7 @@ WORKDIR /app

 COPY . .

-RUN echo "Building watcher-ts" && \
+RUN echo "Building mobymask-v2-watcher-ts" && \
    yarn && yarn build

 WORKDIR /app
@@ -35,3 +35,6 @@ cerc/act-runner-task-executor
 cerc/optimism-l2geth
 cerc/optimism-op-batcher
 cerc/optimism-op-node
+cerc/optimism-op-proposer
+cerc/pocket
+cerc/watcher-azimuth
@@ -10,7 +10,6 @@ laconicd
 fixturenet-laconicd
 fixturenet-eth
 fixturenet-eth-metrics
-watcher-ts
 watcher-mobymask
 watcher-erc20
 watcher-erc721
@@ -25,3 +24,5 @@ tx-spammer
 kubo
 foundry
 fixturenet-optimism
+fixturenet-pocket
+watcher-azimuth
@@ -13,8 +13,6 @@ cerc-io/laconic-console
 cerc-io/mobymask-watcher
 cerc-io/watcher-ts
 cerc-io/mobymask-v2-watcher-ts
-cerc-io/react-peer
-cerc-io/mobymask-ui
 cerc-io/MobyMask
 vulcanize/uniswap-watcher-ts
 vulcanize/uniswap-v3-info
@@ -29,3 +27,6 @@ lirewine/sdk
 telackey/act_runner
 ethereum-optimism/op-geth
 ethereum-optimism/optimism
+pokt-network/pocket-core
+pokt-network/pocket-core-deployments
+cerc-io/azimuth-watcher-ts
@@ -0,0 +1,72 @@
+# Azimuth Watcher
+
+Instructions to setup and deploy Azimuth Watcher stack
+
+## Setup
+
+Prerequisite: ipld-eth-server RPC and GQL endpoints
+
+Clone required repositories:
+
+```bash
+laconic-so --stack azimuth setup-repositories
+```
+
+NOTE: If the repository already exists and checked out to a different version, `setup-repositories` command will throw an error.
+For getting around this, the `azimuth-watcher-ts` repository can be removed and then run the command.
+
+Checkout to the required versions and branches in repos
+
+```bash
+# azimuth-watcher-ts
+cd ~/cerc/azimuth-watcher-ts
+git checkout v0.1.0
+```
+
+Build the container images:
+
+```bash
+laconic-so --stack azimuth build-containers
+```
+
+This should create the required docker images in the local image registry.
+
+### Configuration
+
+* Create and update an env file to be used in the next step:
+
+  ```bash
+  # External ipld-eth-server endpoints
+  CERC_IPLD_ETH_RPC=
+  CERC_IPLD_ETH_GQL=
+  ```
+
+* NOTE: If ipld-eth-server is running on the host machine, use `host.docker.internal` as the hostname to access host ports
+
+### Deploy the stack
+
+* Deploy the containers:
+
+  ```bash
+  laconic-so --stack azimuth deploy-system --env-file <PATH_TO_ENV_FILE> up
+  ```
+
+* List and check the health status of all the containers using `docker ps` and wait for them to be `healthy`
+
+## Clean up
+
+Stop all the services running in background run:
+
+```bash
+laconic-so --stack azimuth deploy-system down
+```
+
+Clear volumes created by this stack:
+
+```bash
+# List all relevant volumes
+docker volume ls -q --filter "name=.*watcher_db_data"
+
+# Remove all the listed volumes
+docker volume rm $(docker volume ls -q --filter "name=.*watcher_db_data")
+```
@@ -0,0 +1,8 @@
+version: "1.0"
+name: azimuth
+repos:
+  - cerc-io/azimuth-watcher-ts
+containers:
+  - cerc/watcher-azimuth
+pods:
+  - watcher-azimuth
@@ -16,7 +16,7 @@ Leave `CERC_NPM_REGISTRY_URL` un-set to use the local gitea registry.
 Note: the scheme/gerbil container is excluded as it isn't currently required for the package registry.

 ```
-$ laconic-so --stack build-support build-containers --exclude cerc/builder-gerbil
+$ laconic-so --stack build-support build-containers
 ```
 ### 2. Deploy Gitea Package Registry

@@ -1,6 +1,5 @@
-version: "1.1"
+version: "1.2"
 name: build-support
 decription: "Build Support Components"
 containers:
  - cerc/builder-js
-  - cerc/builder-gerbil
@@ -0,0 +1,37 @@
+# fixturenet-eth-tx
+
+A variation of `fixturenet-eth` that automatically generates transactions using `tx-spammer`.
+
+See `stacks/fixturenet-eth/README.md` for more information.
+
+## Containers
+
+* cerc/go-ethereum
+* cerc/lighthouse
+* cerc/fixturenet-eth-geth
+* cerc/fixturenet-eth-lighthouse
+* cerc/tx-spammer
+
+## Deploy the stack
+```
+$ laconic-so --stack fixturenet-eth-tx setup-repositories
+$ laconic-so --stack fixturenet-eth-tx build-containers
+$ laconic-so --stack fixturenet-eth-tx deploy up
+```
+
+## Export the ethdb (optional)
+
+It is easy to export data from the fixturenet for offline processing of the raw ethdb files (eg, by eth-statediff-service) using the `export-ethdb.sh` script.
+
+For example:
+
+```
+$ app/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/export-ethdb.sh 500
+Waiting for geth to generate DAG.... done
+Waiting for beacon phase0.... done
+Waiting for beacon altair.... done
+Waiting for beacon bellatrix pre-merge.... done
+Waiting for beacon bellatrix merge.... done
+Waiting for block number 500.... done
+Exporting ethdb.... ./ethdb.tgz
+```
@@ -0,0 +1,18 @@
+version: "1.2"
+name: fixturenet-eth-tx
+decription: "Ethereum Fixturenet w/ tx-spammer"
+repos:
+  - cerc-io/go-ethereum
+  - cerc-io/tx-spammer
+  - dboreham/foundry
+containers:
+  - cerc/go-ethereum
+  - cerc/lighthouse
+  - cerc/fixturenet-eth-geth
+  - cerc/fixturenet-eth-lighthouse
+  - cerc/tx-spammer
+  - cerc/foundry
+pods:
+  - fixturenet-eth
+  - foundry
+  - tx-spammer
@@ -117,8 +117,8 @@ Clear volumes created by this stack:

 ```bash
 # List all relevant volumes
-$ docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_bootnode_lighthouse_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data|.*fixturenet_geth_accounts"
+$ docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data"

 # Remove all the listed volumes
-$ docker volume rm $(docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_bootnode_lighthouse_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data|.*fixturenet_geth_accounts")
+$ docker volume rm $(docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data")
 ```
@@ -2,7 +2,7 @@

 Instructions to setup and deploy an end-to-end L1+L2 stack with [fixturenet-eth](../fixturenet-eth/) (L1) and [Optimism](https://stack.optimism.io) (L2)

-We support running just the L2 part of stack, given an external L1 endpoint. Follow [l2-only](./l2-only.md) for the same.
+We support running just the L2 part of stack, given an external L1 endpoint. Follow the [L2 only doc](./l2-only.md) for the same.

 ## Setup

@@ -19,7 +19,7 @@ Checkout to the required versions and branches in repos:
 ```bash
 # Optimism
 cd ~/cerc/optimism
-git checkout @eth-optimism/sdk@0.0.0-20230329025055
+git checkout v1.0.4
 ```

 Build the container images:
@@ -28,6 +28,8 @@ Build the container images:
 laconic-so --stack fixturenet-optimism build-containers
 ```

+Note: this will take >10 mins depending on the specs of your machine, and **requires** 16GB of memory or greater.
+
 This should create the required docker images in the local image registry:
 * `cerc/go-ethereum`
 * `cerc/lighthouse`
@@ -36,8 +38,9 @@ This should create the required docker images in the local image registry:
 * `cerc/foundry`
 * `cerc/optimism-contracts`
 * `cerc/optimism-l2geth`
-* `cerc/optimism-op-batcher`
 * `cerc/optimism-op-node`
+* `cerc/optimism-op-batcher`
+* `cerc/optimism-op-proposer`

 ## Deploy

@@ -47,12 +50,14 @@ Deploy the stack:
 laconic-so --stack fixturenet-optimism deploy up
 ```

-The `fixturenet-optimism-contracts` service may take a while (`~15 mins`) to complete running as it:
+If you get the error `service "fixturenet-optimism-contracts" didn't complete successfully: exit 1` with ~25 lines of Traceback, wait 15-20 mins then re-run the command.
+
+The `fixturenet-optimism-contracts` service takes a while to complete running as it:
 1. waits for the 'Merge' to happen on L1
 2. waits for a finalized block to exist on L1 (so that it can be taken as a starting block for roll ups)
 3. deploys the L1 contracts

-To list down and monitor the running containers:
+To list and monitor the running containers:

 ```bash
 laconic-so --stack fixturenet-optimism deploy ps
@@ -69,17 +74,17 @@ docker logs -f <CONTAINER_ID>
 Stop all services running in the background:

 ```bash
-laconic-so --stack fixturenet-optimism deploy down
+laconic-so --stack fixturenet-optimism deploy down 30
 ```

 Clear volumes created by this stack:

 ```bash
 # List all relevant volumes
-docker volume ls -q --filter "name=.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"
+docker volume ls -q --filter "name=.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"

 # Remove all the listed volumes
-docker volume rm $(docker volume ls -q --filter "name=.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data")
+docker volume rm $(docker volume ls -q --filter "name=.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data")
 ```

 ## Troubleshooting
@@ -19,21 +19,22 @@ Checkout to the required versions and branches in repos:
 ```bash
 # Optimism
 cd ~/cerc/optimism
-git checkout @eth-optimism/sdk@0.0.0-20230329025055
+git checkout v1.0.4
 ```

 Build the container images:

 ```bash
-laconic-so --stack fixturenet-optimism build-containers --include cerc/foundry,cerc/optimism-contracts,cerc/optimism-op-node,cerc/optimism-l2geth,cerc/optimism-op-batcher
+laconic-so --stack fixturenet-optimism build-containers --include cerc/foundry,cerc/optimism-contracts,cerc/optimism-op-node,cerc/optimism-l2geth,cerc/optimism-op-batcher,cerc/optimism-op-proposer
 ```

 This should create the required docker images in the local image registry:
 * `cerc/foundry`
 * `cerc/optimism-contracts`
 * `cerc/optimism-l2geth`
-* `cerc/optimism-op-batcher`
 * `cerc/optimism-op-node`
+* `cerc/optimism-op-batcher`
+* `cerc/optimism-op-proposer`

 ## Deploy

@@ -46,8 +47,13 @@ Create and update an env file to be used in the next step ([defaults](../../conf
  CERC_L1_HOST=
  CERC_L1_PORT=

-  # Credentials for accounts on L1 to send balance to Optimism Proxy contract from
+  # URL to get CSV with credentials for accounts on L1
+  # that are used to send balance to Optimism Proxy contract
  # (enables them to do transactions on L2)
+  CERC_L1_ACCOUNTS_CSV_URL=
+
+  # OR
+  # Specify the required account credentials
  CERC_L1_ADDRESS=
  CERC_L1_PRIV_KEY=
  CERC_L1_ADDRESS_2=
@@ -84,17 +90,17 @@ docker logs -f <CONTAINER_ID>
 Stop all services running in the background:

 ```bash
-laconic-so --stack fixturenet-optimism deploy --include fixturenet-optimism down
+laconic-so --stack fixturenet-optimism deploy --include fixturenet-optimism down 30
 ```

 Clear volumes created by this stack:

 ```bash
 # List all relevant volumes
-docker volume ls -q --filter "name=.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"
+docker volume ls -q --filter "name=.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"

 # Remove all the listed volumes
-docker volume rm $(docker volume ls -q --filter "name=.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data")
+docker volume rm $(docker volume ls -q --filter "name=.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data")
 ```

 ## Troubleshooting
@@ -16,6 +16,7 @@ containers:
  - cerc/optimism-op-node
  - cerc/optimism-l2geth
  - cerc/optimism-op-batcher
+  - cerc/optimism-op-proposer
 pods:
  - fixturenet-eth
  - fixturenet-optimism
@@ -0,0 +1,59 @@
+# Pocket Fixturenet
+
+Instructions for deploying a local single-node Pocket chain alongside a geth + lighthouse blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator.
+
+## 1. Build Laconic Stack Orchestrator
+Build this fork of Laconic Stack Orchestrator which includes the fixturenet-pocket stack:
+```
+$ scripts/build_shiv_package.sh
+$ cd package
+$ mv laconic-so-{version} /usr/local/bin/laconic-so  # Or move laconic-so to ~/bin or your favorite on-path directory
+```
+
+## 2. Clone required repositories
+```
+$ laconic-so --stack fixturenet-pocket setup-repositories
+```
+## 3. Build the stack's containers
+```
+$ laconic-so --stack fixturenet-pocket build-containers
+```
+## 4. Deploy the stack
+```
+$ laconic-so --stack fixturenet-pocket deploy up
+```
+It may take up to 10 minutes for the Eth Fixturenet to fully come online and start producing blocks.
+## 5. Check status
+**Eth Fixturenet:**
+```
+$ laconic-so --stack fixturenet-pocket deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh
+Waiting for geth to generate DAG.... done
+Waiting for beacon phase0.... done
+Waiting for beacon altair.... done
+Waiting for beacon bellatrix pre-merge.... done
+Waiting for beacon bellatrix merge.... done
+```
+**Pocket node:**
+```
+$ laconic-so --stack fixturenet-pocket deploy exec pocket "pocket query height"
+2023/04/20 08:07:46 Initializing Pocket Datadir
+2023/04/20 08:07:46 datadir = /home/app/.pocket
+http://localhost:8081/v1/query/height
+{
+    "height": 4
+}
+```
+or
+```
+$ laconic-so --stack fixturenet-pocket deploy logs pocket
+```
+## 6. Send a relay request to Pocket node
+The Pocket node serves relay requests at `http://localhost:8081/v1/client/sim`  
+**Example request:**
+```
+$ curl -X POST --data '{"relay_network_id":"0021","payload":{"data":"{\"jsonrpc\": \"2.0\",\"id\": 1,\"method\": \"eth_blockNumber\",\"params\": []}","method":"POST","path":"","headers":{}}}' http://localhost:8081/v1/client/sim
+```
+**Response:**
+```
+"{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"0x6fe\"}\n"
+```
@@ -0,0 +1,16 @@
+version: "1.0"
+name: fixturenet-pocket
+description: "A single node pocket chain that can serve relays from the geth-1 node in eth-fixturenet"
+repos:
+  - cerc-io/go-ethereum
+  - pokt-network/pocket-core
+  - pokt-network/pocket-core-deployments # contains the dockerfile
+containers:
+  - cerc/go-ethereum
+  - cerc/lighthouse
+  - cerc/fixturenet-eth-geth
+  - cerc/fixturenet-eth-lighthouse
+  - cerc/pocket
+pods:
+  - fixturenet-pocket
+  - fixturenet-eth
@@ -0,0 +1,30 @@
+# Kubo (IPFS)
+
+The Kubo stack currently uses the native IPFS docker image, therefore a single command will do:
+
+```
+laconic-so --stack kubo deploy up
+```
+
+If running locally, visit: http://localhost:5001/webui and explore the functionality of the WebUI.
+
+If running in the cloud, visit `IP:5001/webui` and you'll likely see this error: "Could not connect to the IPFS API". To fix it:
+
+1. Get the container name with `docker ps`:
+
+2. Go into the container (replace with your container name):
+
+```
+docker exec -it laconic-dbbf5498fd7d322930b9484121a6a5f4-ipfs-1 sh
+```
+
+3. Enable CORS as described in point 2 of the error message. Copy/paste/run each line in sequence, then run `exit` to exit the container.
+
+4. Restart the container:
+
+```
+laconic-so --stack kubo deploy down
+laconic-so --stack kubo deploy up
+```
+
+5. Refresh the `IP:5001/webui` URL in your browser, you should now be connected to IPFS.
@@ -0,0 +1,7 @@
+version: "1.0"
+name: kubo 
+description: "Run kubo (IPFS)"
+repos:
+containers:
+pods:
+  - kubo 
@@ -23,7 +23,11 @@ Checkout to the required versions and branches in repos
 ```bash
 # watcher-ts
 cd ~/cerc/watcher-ts
-git checkout v0.2.39
+git checkout v0.2.41
+
+# mobymask-v2-watcher-ts
+cd ~/cerc/mobymask-v2-watcher-ts
+git checkout v0.1.1

 # MobyMask
 cd ~/cerc/MobyMask
@@ -31,7 +35,7 @@ git checkout v0.1.2

 # Optimism
 cd ~/cerc/optimism
-git checkout @eth-optimism/sdk@0.0.0-20230329025055
+git checkout v1.0.4
 ```

 Build the container images:
@@ -107,15 +111,15 @@ Follow the [demo](./demo.md) to try out the MobyMask app with L2 chain
 Stop all the services running in background run:

 ```bash
-laconic-so --stack mobymask-v2 deploy-system down
+laconic-so --stack mobymask-v2 deploy-system down 30
 ```

 Clear volumes created by this stack:

 ```bash
 # List all relevant volumes
-docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"
+docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"

 # Remove all the listed volumes
-docker volume rm $(docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data")
+docker volume rm $(docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data")
 ```
@@ -25,7 +25,7 @@
 * Open the invite link in a new browser with different profile (to simulate remote browser)
  * Check that it is connected to any other peer in the network.

-* In `Report a phishing attempt` section, report multiple phishers using the `submit` button. Click on the `Submit batch to p2p network` button. This broadcasts signed invocations to the connected peers.
+* In `Report a phishing attempt` section, report multiple phishers using the `Submit` button. Click on the `Submit batch to p2p network` button. This broadcasts signed invocations to the connected peers.

 * In the `MESSAGES` tab of other browsers, a message can be seen with the signed invocations.

@@ -9,7 +9,7 @@ Prerequisite: L2 Optimism Geth and Node RPC endpoints
 Clone required repositories:

 ```bash
-laconic-so --stack mobymask-v2 setup-repositories --include cerc-io/MobyMask,cerc-io/watcher-ts
+laconic-so --stack mobymask-v2 setup-repositories --include cerc-io/MobyMask,cerc-io/watcher-ts,cerc-io/mobymask-v2-watcher-ts

 # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command
 ```
@@ -19,7 +19,11 @@ Checkout to the required versions and branches in repos:
 ```bash
 # watcher-ts
 cd ~/cerc/watcher-ts
-git checkout v0.2.35
+git checkout v0.2.41
+
+# mobymask-v2-watcher-ts
+cd ~/cerc/mobymask-v2-watcher-ts
+git checkout v0.1.1

 # MobyMask
 cd ~/cerc/MobyMask
@@ -29,7 +33,7 @@ git checkout v0.1.2
 Build the container images:

 ```bash
-laconic-so --stack mobymask-v2 build-containers --include cerc/watcher-mobymask-v2,cerc/mobymask
+laconic-so --stack mobymask-v2 build-containers --include cerc/watcher-ts,cerc/watcher-mobymask-v2,cerc/mobymask
 ```

 This should create the required docker images in the local image registry
@@ -43,13 +47,19 @@ Create and update an env file to be used in the next step ([defaults](../../conf
  ```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=

-  # Credentials for accounts to perform txs on L2
+  # URL 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=
  CERC_PRIVATE_KEY_PEER=

@@ -57,11 +67,14 @@ Create and update an env file to be used in the next step ([defaults](../../conf
  # (used for generating a root invite link after deploying the contract)
  CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3002/#"

+  # (Optional) Domain to be used in the relay node's announce address
+  CERC_RELAY_ANNOUNCE_DOMAIN=
+
  # (Optional) Set of relay peers to connect to from the relay node
  CERC_RELAY_PEERS=[]

-  # (Optional) Domain to be used in the relay node's announce address
-  CERC_RELAY_ANNOUNCE_DOMAIN=
+  # (Optional) Set of multiaddrs to be avoided while dialling
+  CERC_DENY_MULTIADDRS=[]

  # Set to false for disabling watcher peer to send txs to L2
  CERC_ENABLE_PEER_L2_TXS=true
@@ -118,8 +131,8 @@ Clear volumes created by this stack:

 ```bash
 # List all relevant volumes
-docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*fixturenet_geth_accounts"
+docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment"

 # Remove all the listed volumes
-docker volume rm $(docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*fixturenet_geth_accounts")
+docker volume rm $(docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment")
 ```
@@ -0,0 +1,319 @@
+# MobyMask Watcher P2P Network
+
+Instructions to setup and deploy a watcher that connects to the existing watcher p2p network
+
+## Prerequisites
+
+* Laconic Stack Orchestrator ([installation](/README.md#install))
+* A publicly reachable domain name with SSL setup
+
+This demo has been tested on a `Ubuntu 22.04 LTS` machine with `8GB` of RAM
+
+## Setup
+
+Clone required repositories:
+
+  ```bash
+  laconic-so --stack mobymask-v2 setup-repositories --include cerc-io/MobyMask,cerc-io/watcher-ts,cerc-io/mobymask-v2-watcher-ts
+
+  # This will clone the required repositories at ~/cerc
+  # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned in the next step and re-run the command
+
+  # Expected output:
+
+  # Dev Root is: /home/xyz/cerc
+  # Checking: /home/xyz/cerc/watcher-ts: Needs to be fetched
+  # 100%|#############################################################################################################################################| 9.96k/9.96k [00:05<00:00, 1.70kB/s]
+  # Checking: /home/xyz/cerc/mobymask-v2-watcher-ts: Needs to be fetched
+  # 100%|################################################################################################################################################| 19.0/19.0 [00:01<00:00, 13.6B/s]
+  # Checking: /home/xyz/cerc/MobyMask: Needs to be fetched
+  # 100%|##############################################################################################################################################| 1.41k/1.41k [00:18<00:00, 76.4B/s]
+  ```
+
+Checkout to the required versions and branches in repos:
+
+  ```bash
+  # watcher-ts
+  cd ~/cerc/watcher-ts
+  git checkout v0.2.41
+
+  # mobymask-v2-watcher-ts
+  cd ~/cerc/mobymask-v2-watcher-ts
+  git checkout v0.1.1
+
+  # MobyMask
+  cd ~/cerc/MobyMask
+  git checkout v0.1.2
+  ```
+
+Build the container images:
+
+  ```bash
+  laconic-so --stack mobymask-v2 build-containers --include cerc/watcher-ts,cerc/watcher-mobymask-v2,cerc/mobymask
+  ```
+
+Check that the required images are created in the local image registry:
+
+  ```bash
+  docker image ls
+
+  # Expected output:
+
+  # REPOSITORY                TAG      IMAGE ID       CREATED          SIZE
+  # cerc/watcher-mobymask-v2  local    c4dba5dc8d48   24 seconds ago   1.02GB
+  # cerc/watcher-ts           local    9ef61478c243   9 minutes ago    1.84GB
+  # cerc/mobymask             local    9db3f1a69966   2 weeks ago      3.82GB
+  # .
+  # .
+  ```
+
+## Deploy
+
+### Configuration
+
+Create an env file `mobymask-watcher.env`:
+
+  ```bash
+  touch mobymask-watcher.env
+  ```
+
+Add the following contents to `mobymask-watcher.env`:
+
+  ```bash
+  # Domain to be used in the relay node's announce address
+  CERC_RELAY_ANNOUNCE_DOMAIN="mobymask.example.com"
+
+
+  # DO NOT CHANGE THESE VALUES
+  CERC_L2_GETH_RPC="https://mobymask-l2.dev.vdb.to"
+  CERC_DEPLOYED_CONTRACT="0x2B6AFbd4F479cE4101Df722cF4E05F941523EaD9"
+  CERC_ENABLE_PEER_L2_TXS=false
+  CERC_RELAY_PEERS=["/dns4/relay1.dev.vdb.to/tcp/443/wss/p2p/12D3KooWAx83SM9GWVPc9v9fNzLzftRX6EaAFMjhYiFxRYqctcW1", "/dns4/relay2.dev.vdb.to/tcp/443/wss/p2p/12D3KooWBycy6vHVEfUwwYRbPLBdb5gx9gtFSEMpErYPUjUkDNkm", "/dns4/relay3.dev.vdb.to/tcp/443/wss/p2p/12D3KooWARcUJsiGCgiygiRVVK94U8BNSy8DFBbzAF3B6orrabwn"]
+  ```
+
+Replace `CERC_RELAY_ANNOUNCE_DOMAIN` with your public domain name
+
+### Deploy the stack
+
+```bash
+laconic-so --stack mobymask-v2 deploy --cluster mobymask_v2 --include watcher-mobymask-v2 --env-file mobymask-watcher.env up
+
+# Expected output (ignore the "The X variable is not set. Defaulting to a blank string." warnings):
+
+# [+] Running 9/9
+#  ✔ Network mobymask_v2_default                      Created                            0.1s
+#  ✔ Volume "mobymask_v2_peers_ids"                   Created                            0.0s
+#  ✔ Volume "mobymask_v2_mobymask_watcher_db_data"    Created                            0.0s
+#  ✔ Volume "mobymask_v2_mobymask_deployment"         Created                            0.0s
+#  ✔ Container mobymask_v2-mobymask-watcher-db-1      Healthy                           22.2s
+#  ✔ Container mobymask_v2-mobymask-1                 Exited                             2.2s
+#  ✔ Container mobymask_v2-peer-ids-gen-1             Exited                            23.9s
+#  ✔ Container mobymask_v2-mobymask-watcher-server-1  Healthy                           43.6s
+#  ✔ Container mobymask_v2-peer-tests-1               Started                           44.5s
+```
+
+This will run the `mobymask-v2-watcher` including:
+* A relay node which is in a federated setup with relay nodes set in the env file
+* A peer node which connects to the watcher relay node as an entrypoint to the MobyMask watcher p2p network. This peer listens for messages from other peers on the network and logs them out to the console
+
+The watcher GraphQL endpoint is exposed on host port `3001` and the relay node endpoint is exposed on host port `9090`
+
+To list down and monitor the running containers:
+
+  ```bash
+  laconic-so --stack mobymask-v2 deploy --cluster mobymask_v2 --include watcher-mobymask-v2 ps
+
+  # Expected output:
+
+  # Running containers:
+  # id: 25cc3a1cbda27fcd9c2ad4c772bd753ccef1e178f901a70e6ff4191d4a8684e9, name: mobymask_v2-mobymask-watcher-db-1, ports: 0.0.0.0:15432->5432/tcp
+  # id: c9806f78680d68292ffe942222af2003aa3ed5d5c69d7121b573f5028444391d, name: mobymask_v2-mobymask-watcher-server-1, ports: 0.0.0.0:3001->3001/tcp, 0.0.0.0:9001->9001/tcp, 0.0.0.0:9090->9090/tcp
+  # id: 6b30a1d313a88fb86f8a3b37a1b1a3bc053f238664e4b2d196c3ec74e04faf13, name: mobymask_v2-peer-tests-1, ports:
+
+
+  # With status
+  docker ps
+
+  # Expected output:
+
+  # CONTAINER ID   IMAGE                            COMMAND                  CREATED         STATUS                   PORTS                                                                    NAMES
+  # 6b30a1d313a8   cerc/watcher-ts:local            "docker-entrypoint.s…"   5 minutes ago   Up 4 minutes                                                                                      mobymask_v2-peer-tests-1
+  # c9806f78680d   cerc/watcher-mobymask-v2:local   "sh start-server.sh"     5 minutes ago   Up 5 minutes (healthy)   0.0.0.0:3001->3001/tcp, 0.0.0.0:9001->9001/tcp, 0.0.0.0:9090->9090/tcp   mobymask_v2-mobymask-watcher-server-1
+  # 25cc3a1cbda2   postgres:14-alpine               "docker-entrypoint.s…"   5 minutes ago   Up 5 minutes (healthy)   0.0.0.0:15432->5432/tcp                                                  mobymask_v2-mobymask-watcher-db-1
+
+
+  # Check logs for a container
+  docker logs -f <CONTAINER_ID>
+  ```
+
+Check watcher container logs to get multiaddr advertised by the watcher's relay node and note it down for further usage:
+
+  ```bash
+  laconic-so --stack mobymask-v2 deploy --cluster mobymask_v2 --include watcher-mobymask-v2 logs mobymask-watcher-server | grep -A 2 "Relay node started"
+
+  # The multiaddr will be of form /dns4/<CERC_RELAY_ANNOUNCE_DOMAIN>/tcp/443/wss/p2p/<RELAY_PEER_ID>
+  # Expected output:
+
+  # mobymask_v2-mobymask-watcher-server-1  | 2023-04-20T04:22:57.069Z laconic:relay Relay node started with id 12D3KooWKef84LAcBNb9wZNs6jC5kQFXjddo47hK6AGHD2dSvGai (characteristic-black-pamella)
+  # mobymask_v2-mobymask-watcher-server-1  | 2023-04-20T04:22:57.069Z laconic:relay Listening on:
+  # mobymask_v2-mobymask-watcher-server-1  | 2023-04-20T04:22:57.070Z laconic:relay /dns4/mobymask.example.com/tcp/443/wss/p2p/12D3KooWKef84LAcBNb9wZNs6jC5kQFXjddo47hK6AGHD2dSvGai
+  ```
+
+## Web App
+
+To be able to connect to the relay node from remote peers, it needs to be publicly reachable.
+Configure your website with SSL and the `https` traffic reverse proxied as:
+* `/graphql` to port `3001` (watcher GQL endpoint)
+* `/` to port `9090` (relay node)
+
+For example, a Nginx configuration for domain `mobymask.example.com` would look something like:
+
+  ```bash
+  server {
+    server_name mobymask.example.com;
+
+    location /graphql {
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_pass http://127.0.0.1:3001;
+      proxy_read_timeout 90;
+    }
+
+    # https://nginx.org/en/docs/http/websocket.html
+    location / {
+      proxy_pass http://127.0.0.1:9090;
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+
+      # set a large timeout to avoid websocket disconnects
+      proxy_read_timeout 86400;
+    }
+
+    listen [::]:443 ssl ipv6only=on; # managed by Certbot
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/mobymask.example.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/mobymask.example.com/privkey.pem; # managed by Certbot
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+  }
+
+  server {
+    if ($host = mobymask.example.com) {
+      return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+    listen 80;
+    listen [::]:80;
+
+    server_name mobymask.example.com;
+    return 404; # managed by Certbot
+  }
+  ```
+
+To test the web-app, either visit https://mobymask-lxdao-app.dev.vdb.to/ or follow [web-app.md](./web-app.md) to deploy the app locally that hits your watcher's GQL endpoint
+
+Connect a browser peer to the watcher's relay node:
+* Click on debug panel on bottom right of the homepage
+* Select `<custom>` in `Primary Relay` dropdown on the right and enter the watcher relay node's multiaddr
+* Click on `UPDATE` to refresh the page and connect to the watcher's relay node; you should see the relay node's multiaddr in `Self Node Info` on the debug panel
+* Switch to the `GRAPH (PEERS)` tab to see peers connected to this browser node and the `GRAPH (NETWORK)` tab to see the whole MobyMask p2p network
+
+Perform transactions:
+* An invitation is required to be able to perform transactions; ask an existing user of the app for an invite
+* In a browser, close the app if it's already open and then open the invite link
+* From the debug panel, confirm that the browser peer is connected to at least one other peer
+* Check the status for a phisher to be reported in the `Check Phisher Status` section on homepage
+* Select `Report Phisher` option in the `Pending reports` section, enter multiple phisher records and click on the `Submit batch to p2p network` button; this broadcasts signed invocations to peers on the network, including the watcher peer
+* Check the watcher container logs to see the message received:
+  ```bash
+  docker logs $(docker ps -aq --filter name="mobymask-watcher-server")
+
+  # Expected output:
+
+  # .
+  # .
+  # 2023-04-20T04:42:01.072Z vulcanize:libp2p-utils [4:42:1] Received a message on mobymask P2P network from peer: 12D3KooWDKCke8hrjm4evwc9HzUzPZXeVTEQqmfLCkdNaXQ7efAZ
+  # 2023-04-20T04:42:01.072Z vulcanize:libp2p-utils Signed invocations:
+  # 2023-04-20T04:42:01.073Z vulcanize:libp2p-utils [
+  #   {
+  #     "signature": "0x18dc2f4092473cbcc4636eb922f6abf17675368363675779e67d2c14bb0a135f6029da12671a3367463d41720938c84bb3ceed727721c3bbc50d8739859412801c",
+  #     "invocations": {
+  #       "batch": [
+  #         {
+  #           "transaction": {
+  #             "to": "0x2B6AFbd4F479cE4101Df722cF4E05F941523EaD9",
+  #             "data": "0x6b6dc9de00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c5457543a70686973686572310000000000000000000000000000000000000000",
+  #             "gasLimit": 500000
+  #           },
+  #           "authority": [
+  #             {
+  #               "signature": "0x0f91c765faaf851550ddd4345d1bc11eebbf29fde0306a8051f9d3c679c6d6856f66753cad8fcff25203a3e0528b3d7673371343f66a39424f6281c474eada431c",
+  #               "delegation": {
+  #                 "delegate": "0x1B85a1485582C3389F62EB9F2C88f0C89bb1C1F4",
+  #                 "authority": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  #                 "caveats": [
+  #                   {
+  #                     "enforcer": "0x2B6AFbd4F479cE4101Df722cF4E05F941523EaD9",
+  #                     "terms": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  #                   }
+  #                 ]
+  #               }
+  #             }
+  #           ]
+  #         }
+  #       ],
+  #       "replayProtection": {
+  #         "nonce": 1,
+  #         "queue": 64298938
+  #       }
+  #     }
+  #   }
+  # ]
+  # 2023-04-20T04:42:01.087Z vulcanize:libp2p-utils method: claimIfPhisher, value: TWT:phisher1
+  # 2023-04-20T04:42:01.087Z vulcanize:libp2p-utils ------------------------------------------
+  # .
+  # .
+  ```
+* Now, check the status for reported phishers again and confirm that they have been registered
+
+## Clean up
+
+Stop all services running in the background:
+
+  ```bash
+  laconic-so --stack mobymask-v2 deploy --cluster mobymask_v2 --include watcher-mobymask-v2 down
+
+  # Expected output:
+
+  # [+] Running 6/6
+  #  ✔ Container mobymask_v2-peer-tests-1               Removed                   10.5s
+  #  ✔ Container mobymask_v2-mobymask-watcher-server-1  Removed                   10.8s
+  #  ✔ Container mobymask_v2-peer-ids-gen-1             Removed                    0.0s
+  #  ✔ Container mobymask_v2-mobymask-1                 Removed                    0.0s
+  #  ✔ Container mobymask_v2-mobymask-watcher-db-1      Removed                    0.6s
+  #  ✔ Network mobymask_v2_default                      Removed                    0.5s
+  ```
+
+Clear volumes created by this stack:
+
+  ```bash
+  # List all relevant volumes
+  docker volume ls -q --filter "name=mobymask_v2"
+
+  # Expected output:
+
+  # mobymask_v2_mobymask_deployment
+  # mobymask_v2_mobymask_watcher_db_data
+  # mobymask_v2_peers_ids
+
+
+  # Remove all the listed volumes
+  docker volume rm $(docker volume ls -q --filter "name=mobymask_v2")
+  ```
+
+## Troubleshooting
+
+* If you don't see any peer connections being formed in the debug panel on https://mobymask-lxdao-app.dev.vdb.to/, try clearing out the website's local storage and refreshing the page
@@ -0,0 +1,162 @@
+# MobyMask Watcher P2P Network - Web App
+
+Instructions to setup and deploy the MobyMask app locally, pointed to a watcher on the p2p network
+
+## Prerequisites
+
+* Laconic Stack Orchestrator ([installation](/README.md#install))
+* Watcher GQL endpoint
+
+## Setup
+
+Build the container images:
+
+  ```bash
+  laconic-so --stack mobymask-v2 build-containers --include cerc/react-peer,cerc/mobymask-ui
+  ```
+
+Check that the required images are created in the local image registry:
+
+  ```bash
+  docker image ls
+
+  # Expected output:
+
+  # REPOSITORY                TAG      IMAGE ID       CREATED          SIZE
+  # cerc/react-peer           local    d66b144dbb53   4 days ago       868MB
+  # cerc/mobymask-ui          local    e456bf9937ec   4 days ago       1.67GB
+  # .
+  # .
+  ```
+
+## Deploy
+
+### Configuration
+
+Create an env file `mobymask-app.env`:
+
+  ```bash
+  touch mobymask-app.env
+  ```
+
+Add the following contents to `mobymask-app.env`:
+
+  ```bash
+  # Watcher endpoint used by the app for GQL queries
+  CERC_APP_WATCHER_URL="http://127.0.0.1:3001"
+
+
+  # DO NOT CHANGE THESE VALUES
+  CERC_DEPLOYED_CONTRACT="0x2B6AFbd4F479cE4101Df722cF4E05F941523EaD9"
+  CERC_RELAY_NODES=["/dns4/relay1.dev.vdb.to/tcp/443/wss/p2p/12D3KooWAx83SM9GWVPc9v9fNzLzftRX6EaAFMjhYiFxRYqctcW1","/dns4/relay2.dev.vdb.to/tcp/443/wss/p2p/12D3KooWBycy6vHVEfUwwYRbPLBdb5gx9gtFSEMpErYPUjUkDNkm","/dns4/relay3.dev.vdb.to/tcp/443/wss/p2p/12D3KooWARcUJsiGCgiygiRVVK94U8BNSy8DFBbzAF3B6orrabwn"]
+  ```
+
+Replace `CERC_APP_WATCHER_URL` with the watcher's endpoint (eg. `https://mobymask.example.com`)
+
+### Deploy the stack
+
+```bash
+laconic-so --stack mobymask-v2 deploy --cluster mm_v2 --include mobymask-app --env-file mobymask-app.env up lxdao-mobymask-app
+
+# Expected output (ignore the "The X variable is not set. Defaulting to a blank string." warnings):
+
+# [+] Running 4/4
+#  ✔ Network mm_v2_default                            Created                            0.1s
+#  ✔ Volume "mm_v2_peers_ids"                         Created                            0.0s
+#  ✔ Volume "mm_v2_mobymask_deployment"               Created                            0.0s
+#  ✔ Container mm_v2-lxdao-mobymask-app-1             Started                            1.1s
+```
+
+This will run the `lxdao-mobymask-app` (at `http://localhost:3004`) pointed to `CERC_APP_WATCHER_URL` for GQL queries
+
+To monitor the running container:
+
+  ```bash
+  # With status
+  docker ps
+
+  # Expected output:
+
+  # CONTAINER ID   IMAGE                    COMMAND                  CREATED         STATUS                   PORTS                  NAMES
+  # f1369dbae1c9   cerc/mobymask-ui:local   "docker-entrypoint.s…"   2 minutes ago   Up 2 minutes (healthy)   0.0.0.0:3004->80/tcp   mm_v2-lxdao-mobymask-app-1
+
+  # Check logs for a container
+  docker logs -f mm_v2-lxdao-mobymask-app-1
+
+  # Expected output:
+
+  # .
+  # .
+  # .
+  # Available on:
+  #   http://127.0.0.1:80
+  #   http://192.168.0.2:80
+  # Hit CTRL-C to stop the server
+  ```
+
+Note: For opening an invite link on this deployed app, replace the URL part before `/#` with `http://localhost:3004`
+For example: `http://localhost:3004/#/members?invitation=XYZ`
+
+In order to host the app using a public domain, configure your website with SSL and `https` traffic reverse proxied to port `3004`.
+
+For example, a Nginx configuration for domain `my-mobymask-app.example.com` would look something like:
+
+  ```bash
+  server {
+    server_name my-mobymask-app.example.com;
+
+    location / {
+      proxy_pass http://localhost:3004;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    listen [::]:443 ssl;
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/my-mobymask-app.example.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/my-mobymask-app.example.com/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+  }
+
+  server {
+    if ($host = my-mobymask-app.example.com) {
+      return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+    server_name my-mobymask-app.example.com;
+    listen 80;
+    return 404; # managed by Certbot
+  }
+  ```
+
+## Clean up
+
+Stop all services running in the background:
+
+  ```bash
+  laconic-so --stack mobymask-v2 deploy --cluster mm_v2 --include mobymask-app down
+
+  # Expected output:
+
+  # [+] Running 2/2
+  #  ✔ Container mm_v2-lxdao-mobymask-app-1             Removed                   10.6s
+  #  ✔ Network mm_v2_default                            Removed                    0.5s
+  ```
+
+Clear volumes created by this stack:
+
+  ```bash
+  # List all relevant volumes
+  docker volume ls -q --filter "name=mm_v2"
+
+  # Expected output:
+
+  # mm_v2_mobymask_deployment
+  # mm_v2_peers_ids
+
+  # Remove all the listed volumes
+  docker volume rm $(docker volume ls -q --filter "name=mm_v2")
+  ```
@@ -22,15 +22,14 @@ Create and update an env file to be used in the next step ([defaults](../../conf

  ```bash
  # Set of relay nodes to be used by the web-app
-  # (use double quotes " for strings)
+  # (use double quotes " for strings, avoid space after commas)
  # Eg. CERC_RELAY_NODES=["/dns4/example.com/tcp/443/wss/p2p/12D3KooWGHmDDCc93XUWL16FMcTPCGu2zFaMkf67k8HZ4gdQbRDr"]
  CERC_RELAY_NODES=[]

-  # Also add if running MobyMask app:
+  # Set of multiaddrs to be avoided while dialling
+  CERC_DENY_MULTIADDRS=[]

-  # External watcher endpoint (to check if watcher is up)
-  CERC_WATCHER_HOST=
-  CERC_WATCHER_PORT=
+  # 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"
@@ -50,7 +49,7 @@ For running mobymask-app
 ```bash
 laconic-so --stack mobymask-v2 deploy --include mobymask-app --env-file <PATH_TO_ENV_FILE> up

-# Runs on host port 3002
+# Runs mobymask-app on host port 3002 and lxdao-mobymask-app on host port 3004
 ```

 For running peer-test-app
@@ -74,7 +74,13 @@ def command(ctx, include, exclude, env_file, cluster, command, extra_args):
        elif command == "down":
            if verbose:
                print("Running compose down")
-            docker.compose.down()
+
+            timeout_arg = None
+            if extra_args_list:
+                timeout_arg=extra_args_list[0]
+
+            # Specify shutdown timeout (default 10s) to give services enough time to shutdown gracefully
+            docker.compose.down(timeout=timeout_arg)
        elif command == "exec":
            if extra_args_list is None or len(extra_args_list) < 2:
                print("Usage: exec <service> <cmd>")
@@ -0,0 +1,183 @@
+# Running a laconicd fixturenet with console
+
+The following tutorial explains the steps to run a laconicd fixturenet with CLI and web console that displays records in the registry. It is designed as an introduction to Stack Orchestrator and to showcase one component of the Laconic Stack. Prior to Stack Orchestrator, the following 4 repositories had to be cloned and setup manually:
+
+- https://github.com/cerc-io/laconicd
+- https://github.com/cerc-io/laconic-sdk
+- https://github.com/cerc-io/laconic-registry-cli
+- https://github.com/cerc-io/laconic-console
+
+Now, with Stack Orchestrator, it is a few quick commands. Additionally, the `docker` and `docker compose` integration on the back-end allows the stack to easily persist, facilitating workflows.
+
+## Setup laconic-so
+
+To avoid hiccups on Mac M1/M2 and any local machine nuances that may affect the user experience, this tutorial is focused on using a fresh Digital Ocean (DO) droplet with similar specs: 
+16 GB Memory / 8 Intel vCPUs / 160 GB Disk.
+
+1. Login to the droplet as root (either by SSH key or password set in the DO console)
+
+```
+ssh root@IP
+```
+
+2. Get the install script, give it executable permissions, and run it:
+
+```
+curl -o install.sh https://raw.githubusercontent.com/cerc-io/stack-orchestrator/main/scripts/quick-install-ubuntu.sh
+```
+```
+chmod +x install.sh
+```
+```
+bash install.sh
+```
+
+3. Confirm docker was installed and activate the changes in `~/.profile`:
+
+```
+docker run hello-world
+```
+```
+source ~/.profile
+```
+
+4. Verify installation:
+
+```
+laconic-so version
+```
+
+## Setup the laconic fixturenet stack
+
+1. Get the repositories
+
+```
+laconic-so --stack fixturenet-laconic-loaded setup-repositories --include cerc-io/laconicd,cerc-io/laconic-sdk,cerc-io/laconic-registry-cli,cerc-io/laconic-console
+```
+
+2. Set this environment variable to the Laconic self-hosted Gitea instance:
+
+```
+export CERC_NPM_REGISTRY_URL=https://git.vdb.to/api/packages/cerc-io/npm/
+```
+
+3. Build the containers:
+
+```
+laconic-so --stack fixturenet-laconic-loaded build-containers
+```
+
+It's possible to run into an `ESOCKETTIMEDOUT` error, e.g., `error An unexpected error occurred: "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz: ESOCKETTIMEDOUT"`. This may happen even if you have a great internet connection. In that case, re-run the `build-containers` command.
+
+4. Set this environment variable to your droplet's IP address:
+
+```
+export LACONIC_HOSTED_ENDPOINT=http://<your-IP>
+```
+
+5. Deploy the stack:
+
+```
+laconic-so --stack fixturenet-laconic-loaded deploy up
+```
+
+6. Check the logs:
+
+```
+laconic-so --stack fixturenet-laconic-loaded deploy logs
+```
+
+You'll see output from `laconicd` and the block height should be >1 to confirm it is running:
+
+```
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:29PM INF indexed block exents height=12 module=txindex server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF Timed out dur=4976.960115 height=13 module=consensus round=0 server=node step=1
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received proposal module=consensus proposal={"Type":32,"block_id":{"hash":"D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4","parts":{"hash":"22411A20B7F14CDA33244420FBDDAF24450C0628C7A06034FF22DAC3699DDCC8","total":1}},"height":13,"pol_round":-1,"round":0,"signature":"DEuqnaQmvyYbUwckttJmgKdpRu6eVm9i+9rQ1pIrV2PidkMNdWRZBLdmNghkIrUzGbW8Xd7UVJxtLRmwRASgBg==","timestamp":"2023-04-18T21:30:01.49450663Z"} server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received complete proposal block hash=D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4 height=13 module=consensus server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF finalizing commit of block hash={} height=13 module=consensus num_txs=0 root=1A8CA1AF139CCC80EC007C6321D8A63A46A793386EE2EDF9A5CA0AB2C90728B7 server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF minted coins from module account amount=2059730459416582643aphoton from=mint module=x/bank
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF executed block height=13 module=state num_invalid_txs=0 num_valid_txs=0 server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF commit synced commit=436F6D6D697449447B5B363520313037203630203232372039352038352032303820313334203231392032303520313433203130372031343920313431203139203139322038362031323720362031383520323533203137362031333820313735203135392031383620323334203135382031323120313431203230342037335D3A447D
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF committed state app_hash=416B3CE35F55D086DBCD8F6B958D13C0567F06B9FDB08AAF9FBAEA9E798DCC49 height=13 module=state num_txs=0 server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF indexed block exents height=13 module=txindex server=node
+```
+
+7. Confirm operation of the registry CLI:
+
+```
+laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns status"
+```
+
+## Configure Digital Ocean firewall
+
+Let's open some ports.
+
+1. In the Digital Ocean web console, navigate to your droplet's main page. Select the "Networking" tab and scroll down to "Firewall".
+
+2. Get the port for the running console:
+
+```
+echo http://IP:$(laconic-so --stack fixturenet-laconic-loaded deploy port laconic-console 80 | cut -d ':' -f 2)
+```
+```
+http://IP:32778
+```
+
+3. Go back to the Digital Ocean web console and set an Inbound Rule for Custom TCP of the above port:
+
+- `32778` in this example, but yours will be different.
+- do the same for port `9473`
+
+Additional ports will need to be opened depending on your application. Ensure you add your droplet to this new Firewall and wait a minute or so for the update to propagate.
+
+4. Navigate to http://IP:port and ensure laconic-console is functioning as expected:
+
+- ensure you are connected to `laconicd`; no error message should pop up;
+- the wifi symbol in the bottom right should have a green check mark beside it
+- navigate to the status tab; it should display similar/identical information
+- navigate to the config tab, you'll see something like (with your IP):
+
+```
+wns
+  webui http://68.183.195.210:9473/console
+  server http://68.183.195.210:9473/api
+```
+
+## Publish and query a sample record to the registry
+
+1. The following command will create a bond and publish a record:
+
+```
+laconic-so --stack fixturenet-laconic-loaded deploy exec cli ./scripts/create-demo-records.sh
+```
+
+You'll get an output like:
+
+```
+Balance is: 99998999999999998999600000
+Created bond with id: dd88e8d6f9567b32b28e70552aea4419c5dd3307ebae85a284d1fe38904e301a
+Published demo-record-1.yml with id: bafyreierh3xnfivexlscdwubvczmddsnf46uytyfvrbdhkjzztvsz6ruly
+```
+
+The sample record we deployed looks like:
+
+```
+TODO
+```
+
+2. Return to the laconic-console
+
+- the published record should now be viewable
+- explore it for more information
+- click on the link that opens the GraphQL console
+- the query is pre-loaded, click the button to run it
+- inspect the output
+
+3. Try out additional CLI commands
+
+- these are documented [here](https://github.com/cerc-io/laconic-registry-cli#readme) and updates are forthcoming
+- e.g,:
+
+```
+laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns record list"
+```
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+set -e
+echo "Running stack-orchestrator Ethereum fixturenet test"
+# Bit of a hack, test the most recent package
+TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
+# Set a new unique repo dir
+export CERC_REPO_BASE_DIR=$(mktemp -d stack-orchestrator-fixturenet-eth-test.XXXXXXXXXX)
+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"
+$TEST_TARGET_SO --stack fixturenet-eth setup-repositories 
+$TEST_TARGET_SO  --stack fixturenet-eth build-containers
+$TEST_TARGET_SO --stack fixturenet-eth deploy up
+# Verify that the fixturenet is up and running
+$TEST_TARGET_SO --stack fixturenet-eth deploy ps
+$TEST_TARGET_SO --stack fixturenet-eth deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh
+initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number")
+# Check that the block number increases some time later
+sleep 12
+subsequent_block_number=$($TEST_TARGET_SO  --stack fixturenet-eth deploy exec foundry "cast block-number")
+block_number_difference=$((subsequent_block_number - initial_block_number))
+# Block height difference should be between 1 and some small number
+if [[ $block_number_difference -gt 1 && $block_number_difference -lt 10 ]]; then
+  echo "Test passed"
+  test_result=0
+else
+  echo "Test failed: block numbers were ${initial_block_number} and ${subsequent_block_number}"
+  test_result=1
+fi
+$TEST_TARGET_SO --stack fixturenet-eth deploy down
+echo "Removing cloned repositories"
+rm -rf $CERC_REPO_BASE_DIR
+exit $test_result
@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+# Dump environment variables for debugging
+echo "Environment variables:"
+env
 # Basic simple test of stack-orchestrator functionality
 echo "Running stack-orchestrator smoke test"
 # Bit of a hack, test the most recent package
@@ -19,6 +27,8 @@ $TEST_TARGET_SO --stack test setup-repositories
 $TEST_TARGET_SO --stack test build-containers
 # Build one example containers
 $TEST_TARGET_SO build-containers --include cerc/builder-js
+echo "Images in the local registry:"
+docker image ls -a
 # Deploy the test container
 $TEST_TARGET_SO --stack test deploy-system up
 # TODO: test that we can use the deployed container somehow
Author	SHA1	Message	Date
prathamesh	dc3103ca84	Change delimeter while replacing deny multiaddrs list Former-commit-id: `db27b07d99`	2023-05-05 13:28:57 +05:30
prathamesh	c7cae95114	Use provided domain for relay multiaddr in peer config Former-commit-id: `164a019d69`	2023-05-05 10:27:26 +05:30
prathamesh	cc9a0a5c36	Update package versions Former-commit-id: `ff51e47dfb`	2023-05-04 20:01:38 +05:30
prathamesh	74db89c285	Add watcher config option for blacklisted multiaddrs Former-commit-id: `379332d5ec`	2023-05-04 20:00:58 +05:30
nabarun	46de299032	Add env variable for web apps config denyMultiaddrs Former-commit-id: `859a0f684f`	2023-05-04 18:42:45 +05:30
nabarun	960a24c96b	Add stack for azimuth watchers with gateway-server (#379 ) * Setup gateway-server with watchers * Add js script to merge toml config files * Remove individual watcher configs * Add all azimuth watchers in stack * Fix toml-js install * Use env variables for ipld-eth-server endpoints * Checkout to version tag in azimuth-watcher-ts repo Former-commit-id: `5a94aed7f7`	2023-05-04 15:35:04 +05:30
dboreham iskay Ian	c1e3f5674d	Fixturenet pocket (#350 ) * add fixturenet-gaia stack * add fixturenet-pocket * integrate with eth fixturenet * separate out fixturenet-gaia * use pocket-deployments Dockerfile --------- Co-authored-by: iskay <ian@knowable.vc> Co-authored-by: Ian <ikay@lakeheadu.ca> Former-commit-id: `b23b5ae3bf`	2023-05-02 15:13:48 -06:00
prathamesh0	55e7d22e57	Upgrade to use latest lighthouse release (#378 ) Former-commit-id: `ed4f40118f`	2023-05-02 13:18:29 +05:30
prathamesh0	3634a35479	Avoid persisting lighthouse bootnode ENR between restarts (#377 ) Former-commit-id: `cba2345af3`	2023-05-02 12:14:48 +05:30
Zach	255a71fa4c	Merge pull request #376 from cerc-io/fix-readme Former-commit-id: `2c57fd2122`	2023-04-29 14:57:13 -04:00
Zach	3751db8046	rm gerbil from doc Former-commit-id: `97433a7bb5`	2023-04-29 14:55:10 -04:00
zramsay	6bb1acc04f	better direction to stacks Former-commit-id: `993118deb4`	2023-04-27 13:16:53 -04:00
Zach	9da47a2e45	Merge pull request #344 from cerc-io/console-docs document the laconicd / sdk/ registry CLI / web console Stack Former-commit-id: `c712c181fc`	2023-04-27 13:00:54 -04:00
dboreham	8cdb9cee35	Remove gerbil builder container from build-support stack (#375 ) Former-commit-id: `19e38d2a94`	2023-04-27 10:54:11 -06:00
dboreham	f8306e6685	Add foundry to the fixturenet-eth-tx stack (#374 ) Former-commit-id: `af93743974`	2023-04-27 10:52:37 -06:00
Zach	feb5fe7bff	Merge pull request #371 from cerc-io/zramsay-patch-1 optimism: on error, wait, then re-run 'deploy up' Former-commit-id: `b74e89fd3f`	2023-04-27 12:34:04 -04:00
dboreham	b0770d7379	Remove > Former-commit-id: `73419c341a`	2023-04-27 10:22:21 -06:00
prathamesh0	4aecfcd780	Map op-batcher and op-proposer ports to host (#373 ) Former-commit-id: `f04b266a24`	2023-04-27 18:26:58 +05:30
telackey	03f6d027f9	Minor script cleanup. (#372 ) Former-commit-id: `323ca3b238`	2023-04-26 23:26:50 -05:00
Zach	617228d0dc	optimism: on error, wait, then re-run 'deploy up' Former-commit-id: `a4ff8f3dcb`	2023-04-26 14:43:32 -04:00
telackey	d8522211f4	Add script for exporting ethdb from fixturenet. (#370 ) * Add script for exporting ethdb from fixturenet. * Update README * Script Former-commit-id: `7a607c2994`	2023-04-26 00:13:35 -05:00
prathamesh0	4ca185c753	Fix sample env in MobyMask app instructions (#369 ) Former-commit-id: `6a11046ea5`	2023-04-25 19:38:13 +05:30
prathamesh0	e004d93891	Add instructions to run MobyMask app with a watcher on network (#368 ) * Remove unnecessary check on watcher endpoint * Add instructions to run MobyMask app with a watcher on network * Move watcher on network docs to a separate folder * Add nginx config for watcher endpoint * Add expected output logs * Add sample nginx config for hosting the app * Update instructions Former-commit-id: `018950858b`	2023-04-25 18:32:38 +05:30
prathamesh0	8f6703940a	Upgrade Optimism (#367 ) Former-commit-id: `8a054a979c`	2023-04-25 15:52:38 +05:30
prathamesh0	cf0e0c5d94	Add an arg for shutdown timeout in deploy down command (#366 ) Former-commit-id: `44cf57df9b`	2023-04-25 11:51:49 +05:30
prathamesh0	7f3a33564a	Upgrade Optimism and add op-proposer (#364 ) * Use the latest stable optimism release * Remove unnecessary repos from repo-list * Add op-proposer service to fixturenet-optimism stack * Add jq and bash to op-proposer image * Update instructions * Update op-batcher and op-geth commands Former-commit-id: `988be0ef9a`	2023-04-25 10:41:47 +05:30
nabarun	10337e77f6	Upgrade mobymkas-ui package version for endorse member UI (#365 ) Former-commit-id: `d7ea874268`	2023-04-24 17:55:17 +05:30
prathamesh0	7a1ec3f196	Fix mobymask contract deployment script (#362 ) Former-commit-id: `0bc54b30e0`	2023-04-21 17:27:53 +05:30
dboreham	4beb889e9f	Add DOCKER_HOST inheriting from the caller, to build environment (#360 ) * Add DOCKER_HOST inheriting from the caller, to build environment * Fix for env var not set Former-commit-id: `9feff35f53`	2023-04-20 17:30:54 -06:00
dboreham	2b8eccf167	Add more debugging Former-commit-id: `e8ec090f1d`	2023-04-20 16:58:13 -06:00
dboreham	f5acbd1db0	Dump image list for debugging Former-commit-id: `0a08a7ecba`	2023-04-20 16:47:40 -06:00
dboreham	f87f3d4765	Stop on error Former-commit-id: `7c6b2543af`	2023-04-20 16:26:19 -06:00
dboreham	d2dfcc813f	Enable in-container docker Former-commit-id: `074a3fe20e`	2023-04-20 16:21:26 -06:00
prathamesh0	d6f829ee65	Add instructions to join MobyMask watcher p2p network (#346 ) * Refactor L2 enpoint check to contract deployment script * Add instructions to join to an existing watcher network * Include mobymask-v2-watcher-ts in repositories setup * Add a clean up section and expected outputs * Add a troubleshooting section * Use lxdao frontend * Update instructions for updated UI Former-commit-id: `f78176a27f`	2023-04-20 15:30:19 +05:30
prathamesh0	363a0b733f	Fetch geth accounts using an exposed endpoint (#357 ) * Fetch account creds served by geth service * Use fetched account creds in mobymask-v2 stack Former-commit-id: `eb777b0b47`	2023-04-20 15:12:59 +05:30
nabarun	3d75523d73	Upgrade web-app package versions to set custom relay node (#358 ) Former-commit-id: `01499a3f05`	2023-04-20 14:45:01 +05:30
nabarun	35dd30f877	Add container to mobymask-v2 stack for LXDAO mobymask-app (#347 ) * Add container to stack for lxdao mobymask-app * Remove shm_size * Use cerc-io scoped alias for lxdao app package * Change alias to @cerc-io/mobymask-ui-lxdao Former-commit-id: `46b36c3cb6`	2023-04-20 10:49:19 +05:30
dboreham	b3feab0592	Turn off CI job on push except for to main Former-commit-id: `727fa67d8e`	2023-04-19 21:32:48 -06:00
dboreham	e3e48ccbf3	Delete fixturenet-eth-test.yml Former-commit-id: `5c53e3bedc`	2023-04-19 20:56:19 -06:00
Zach	df13b8f630	Merge pull request #320 from cerc-io/add-kubo-stack Add kubo (IPFS) as a stack Former-commit-id: `45cab0f33d`	2023-04-19 21:48:55 -04:00
Zach	209d49f105	Update laconicd-fixturenet.md Former-commit-id: `32c0830e77`	2023-04-19 21:10:19 -04:00
dboreham	b7094c7e7f	Merge branch 'main' of github.com:cerc-io/stack-orchestrator into main Former-commit-id: `c1ba7f0c1b`	2023-04-19 18:28:39 -06:00
dboreham	fefbcf031c	Put file in the right place Former-commit-id: `aadd1c15f0`	2023-04-19 18:27:56 -06:00
dboreham	d98b02266b	Add fixturenet-eth test (#356 ) * Add fixturenet-eth test Former-commit-id: `d1cada5029`	2023-04-19 18:25:49 -06:00
dboreham	beac97b842	Get branch name right Former-commit-id: `8aed8ab8ae`	2023-04-19 18:22:18 -06:00
dboreham	ea7c5109b8	Add fixturenet-eth test Former-commit-id: `db6da4b75a`	2023-04-19 18:20:00 -06:00
dboreham	6ce01a79ed	Update base containers (#355 ) * Update to Node18 * Update to latest stable lighthouse Former-commit-id: `a335ccde3a`	2023-04-19 16:43:59 -06:00
dboreham	2d5abdce45	Set context dir to the script dir to avoid permission errors (#354 ) Former-commit-id: `bde48b699d`	2023-04-19 16:00:41 -06:00
zramsay	1629129cd5	the fix Former-commit-id: `e5b9b74b4c`	2023-04-18 19:55:51 -04:00
zramsay	feee38140d	second pass Former-commit-id: `07c2a01a58`	2023-04-18 18:48:52 -04:00
zramsay	ddf51e01a3	first pass Former-commit-id: `ca29e9cf0d`	2023-04-18 18:01:54 -04:00
zramsay	a1a4837c89	lil fixes Former-commit-id: `bafdfe6d2a`	2023-04-13 07:05:03 -04:00
zramsay	18f3c2cc4f	update kubo stack README to enable CORS for running in the cloud Former-commit-id: `cfa32a3515`	2023-04-13 06:55:47 -04:00
zramsay	391759e929	expose ports Former-commit-id: `e72ea19c5c`	2023-04-13 05:27:04 -04:00
zramsay	0f7c23951d	run kubo as a stack Former-commit-id: `eae124fdf1`	2023-04-12 17:36:47 -04:00