Chain chunker stack (#389 )

* Fix bug in default container build flow * Add convenience stack for chain-chunker Former-commit-id: 3e78c321b0
match tokens (#388 )
2023-05-09 14:00:58 -06:00 · 2023-05-09 15:23:56 -04:00 · 2023-05-09 14:57:49 -04:00 · 2023-05-05 13:32:19 +05:30 · 2023-05-04 09:47:59 -04:00 · 2023-05-04 09:20:46 -04:00
112 changed files with 2730 additions and 320 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
@@ -5,4 +5,5 @@ laconic-so
 laconic_stack_orchestrator.egg-info
 __pycache__
 *~
-build
+package
+app/data/build_tag.txt
@@ -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:
@@ -112,7 +115,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
            # TODO: make this less of a hack -- should be specified in some metadata somewhere
            # Check if we have a repo for this container. If not, set the context dir to the container-build subdir
            repo_full_path = os.path.join(dev_root_path, repo_dir)
-            repo_dir_or_build_dir = repo_dir if os.path.exists(repo_full_path) else build_dir
+            repo_dir_or_build_dir = repo_full_path if os.path.exists(repo_full_path) else build_dir
            build_command = os.path.join(container_build_dir, "default-build.sh") + f" {container}:local {repo_dir_or_build_dir}"
        if not dry_run:
            if verbose:
@@ -8,6 +8,8 @@ services:
    environment:
      RUN_BOOTNODE: "true"
    image: cerc/fixturenet-eth-geth:local
+    volumes:
+      - fixturenet_eth_bootnode_geth_data:/root/ethdata
    ports:
      - "9898"
      - "30303"
@@ -25,7 +27,7 @@ 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"]
      interval: 30s
@@ -47,11 +49,15 @@ 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
    depends_on:
      - fixturenet-eth-bootnode-geth
+    volumes:
+      - fixturenet_eth_geth_2_data:/root/ethdata

  fixturenet-eth-bootnode-lighthouse:
    hostname: fixturenet-eth-bootnode-lighthouse
@@ -74,6 +80,8 @@ services:
      ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-1:8551"
    image: cerc/fixturenet-eth-lighthouse:local
+    volumes:
+      - fixturenet_eth_lighthouse_1_data:/opt/testnet/build/cl
    depends_on:
      fixturenet-eth-bootnode-lighthouse:
        condition: service_started
@@ -98,6 +106,8 @@ services:
      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-2:8551"
      LIGHTHOUSE_GENESIS_STATE_URL: "http://fixturenet-eth-lighthouse-1:8001/eth/v2/debug/beacon/states/0"
    image: cerc/fixturenet-eth-lighthouse:local
+    volumes:
+      - fixturenet_eth_lighthouse_2_data:/opt/testnet/build/cl
    depends_on:
      fixturenet-eth-bootnode-lighthouse:
        condition: service_started
@@ -105,4 +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_lighthouse_1_data:
+  fixturenet_eth_lighthouse_2_data:
@@ -2,5 +2,7 @@ services:
  laconic-console:
    restart: unless-stopped
    image: cerc/laconic-console-host:local
+    environment:
+      - LACONIC_HOSTED_ENDPOINT=${LACONIC_HOSTED_ENDPOINT:-http://localhost}
    ports:
      - "80"
@@ -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"
@@ -3,6 +3,7 @@ version: '3.2'
 services:
  # Builds and serves the MobyMask react-app
  mobymask-app:
+    restart: unless-stopped
    image: cerc/mobymask-ui:local
    env_file:
      - ../config/watcher-mobymask-v2/mobymask-params.env
@@ -12,27 +13,55 @@ services:
      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
-    # 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
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+      CERC_BUILD_DIR: "@cerc-io/mobymask-ui/build"
+    working_dir: /scripts
+    command: ["sh", "mobymask-app-start.sh"]
    volumes:
-      - ../config/wait-for-it.sh:/app/wait-for-it.sh
-      - ../config/watcher-mobymask-v2/mobymask-app-config.json:/app/src/mobymask-app-config.json
-      - ../config/watcher-mobymask-v2/mobymask-app-start.sh:/app/mobymask-app-start.sh
+      - ../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:3002:3000"
+      - "0.0.0.0:3002:80"
    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3000"]
+      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"

@@ -4,21 +4,22 @@ services:
  peer-test-app:
    # Builds and serves the peer-test react-app
    image: cerc/react-peer:local
-    working_dir: /app/packages/test-app
+    working_dir: /scripts
    env_file:
      - ../config/watcher-mobymask-v2/mobymask-params.env
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
-    command: ["sh", "./test-app-start.sh"]
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+    command: ["sh", "test-app-start.sh"]
    volumes:
-      - ../config/watcher-mobymask-v2/test-app-config.json:/app/packages/test-app/src/test-app-config.json
-      - ../config/watcher-mobymask-v2/test-app-start.sh:/app/packages/test-app/test-app-start.sh
+      - ../config/wait-for-it.sh:/scripts/wait-for-it.sh
+      - ../config/watcher-mobymask-v2/test-app-start.sh:/scripts/test-app-start.sh
      - peers_ids:/peers
    ports:
-      - "0.0.0.0:3003:3000"
+      - "0.0.0.0:3003:80"
    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3000"]
+      test: ["CMD", "nc", "-v", "localhost", "80"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -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,26 +34,35 @@ 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"

+  # Creates peer-id files if they don't exist
+  peer-ids-gen:
+    image: cerc/watcher-ts:local
+    restart: on-failure
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+    working_dir: /app/packages/peer
+    command: ["sh", "generate-peer-ids.sh"]
+    volumes:
+      - ../config/watcher-mobymask-v2/generate-peer-ids.sh:/app/packages/peer/generate-peer-ids.sh
+      - peers_ids:/peer-ids
+
  # Starts the mobymask-v2-watcher server
  mobymask-watcher-server:
    image: cerc/watcher-mobymask-v2:local
@@ -61,6 +70,8 @@ services:
    depends_on:
      mobymask-watcher-db:
        condition: service_healthy
+      peer-ids-gen:
+        condition: service_completed_successfully
      mobymask:
        condition: service_completed_successfully
    env_file:
@@ -69,18 +80,19 @@ 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}
    command: ["sh", "start-server.sh"]
    volumes:
-      - ../config/watcher-mobymask-v2/watcher-config-template.toml:/app/packages/mobymask-v2-watcher/environments/watcher-config-template.toml
-      - ../config/watcher-mobymask-v2/start-server.sh:/app/packages/mobymask-v2-watcher/start-server.sh
-      - peers_ids:/app/packages/mobymask-v2-watcher/peers
+      - ../config/watcher-mobymask-v2/watcher-config-template.toml:/app/environments/watcher-config-template.toml
+      - ../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"
@@ -95,8 +107,29 @@ services:
    extra_hosts:
      - "host.docker.internal:host-gateway"

+  # Container to run peer tests
+  peer-tests:
+    image: cerc/watcher-ts:local
+    restart: on-failure
+    depends_on:
+      mobymask-watcher-server:
+        condition: service_healthy
+      peer-ids-gen:
+        condition: service_completed_successfully
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+    working_dir: /app/packages/peer
+    command:
+      - sh
+      - -c
+      - |
+        ./set-tests-env.sh && \
+        tail -f /dev/null
+    volumes:
+      - ../config/watcher-mobymask-v2/set-tests-env.sh:/app/packages/peer/set-tests-env.sh
+      - peers_ids:/peer-ids
+
 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,9 +6,19 @@ 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() {
+    echo "Signal received, cleaning up..."
+    kill ${batcher_pid}
+
+    wait
+    echo "Done"
+}
+trap 'cleanup' INT TERM
+
+# Run op-batcher
 op-batcher \
  --l2-eth-rpc=http://op-geth:8545 \
  --rollup-rpc=http://op-node:8547 \
@@ -21,6 +31,9 @@ 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
+  --private-key=$BATCHER_KEY \
+  &
+
+batcher_pid=$!
+wait $batcher_pid
@@ -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
@@ -47,6 +47,15 @@ fi
 SEQUENCER_ADDRESS=$(jq -r '.Sequencer.address' /l2-accounts/keys.json | tr -d '"')
 echo "SEQUENCER_ADDRESS: ${SEQUENCER_ADDRESS}"

+cleanup() {
+    echo "Signal received, cleaning up..."
+    kill ${geth_pid}
+
+    wait
+    echo "Done"
+}
+trap 'cleanup' INT TERM
+
 # Run op-geth
 geth \
  --datadir ./datadir \
@@ -61,7 +70,7 @@ geth \
  --ws.origins="*" \
  --ws.api=debug,eth,txpool,net,engine \
  --syncmode=full \
-  --gcmode=full \
+  --gcmode=archive \
  --nodiscover \
  --maxpeers=0 \
  --networkid=42069 \
@@ -74,4 +83,8 @@ geth \
  --allow-insecure-unlock \
  --mine \
  --miner.etherbase=$SEQUENCER_ADDRESS \
-  --unlock=$SEQUENCER_ADDRESS
+  --unlock=$SEQUENCER_ADDRESS \
+  &
+
+geth_pid=$!
+wait $geth_pid
@@ -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
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+# Check for peer ids in ./peers folder, create if not present
+if [ -f /peer-ids/relay-id.json ]; then
+  echo "Using peer id for relay node from the mounted volume"
+else
+  echo "Creating a new peer id for relay node"
+  yarn create-peer -f /peer-ids/relay-id.json
+fi
+
+if [ -f /peer-ids/peer-id.json ]; then
+  echo "Using peer id for peer node from the mounted volume"
+else
+  echo "Creating a new peer id for peer node"
+  yarn create-peer -f /peer-ids/peer-id.json
+fi
@@ -1,7 +0,0 @@
-{
-  "name": "MobyMask",
-  "relayNodes": [],
-  "peer": {
-    "enableDebugInfo": true
-  }
-}
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -e
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
  set -x
@@ -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 '"')
@@ -28,13 +33,11 @@ else
  echo "Taking deployed contract details from env"
 fi

-# Export config values in a json file
-jq --arg address "$CERC_DEPLOYED_CONTRACT" \
-  --argjson chainId "$CERC_CHAIN_ID" \
-  --argjson relayNodes "$CERC_RELAY_NODES" \
-  '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes' \
-  /app/src/mobymask-app-config.json > /app/src/config.json
+# Use yq to create config.yml with environment variables
+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

-REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" npm run build
-
-serve -s build
+/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"
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/$(jq -r '.id' /peer-ids/relay-id.json)"
+
+# Write the relay node's multiaddr to /app/packages/peer/.env for running tests
+echo "RELAY=\"$CERC_RELAY_MULTIADDR\"" > ./.env
@@ -5,36 +5,24 @@ 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}"

-# Check for peer ids in ./peers folder, create if not present
-if [ -f ./peers/relay-id.json ]; then
-  echo "Using peer id for relay node from the mounted volume"
+# 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
-  echo "Creating a new peer id for relay node"
-  cd ../peer
-  yarn create-peer -f ../mobymask-v2-watcher/peers/relay-id.json
-  cd ../mobymask-v2-watcher
+  CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/$(jq -r '.id' /app/peers/relay-id.json)"
 fi

-if [ -f ./peers/peer-id.json ]; then
-  echo "Using peer id for peer node from the mounted volume"
-else
-  echo "Creating a new peer id for peer node"
-  cd ../peer
-  yarn create-peer -f ../mobymask-v2-watcher/peers/peer-id.json
-  cd ../mobymask-v2-watcher
-fi
-
-CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/$(jq -r '.id' ./peers/relay-id.json)"
-
 # Use contract address from environment variable or set from config.json in mounted volume
 if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
  CONTRACT_ADDRESS="${CERC_DEPLOYED_CONTRACT}"
@@ -43,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; \
@@ -65,8 +60,5 @@ WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
 # Write the modified content to a new file
 echo "$WATCHER_CONFIG" > environments/local.toml

-# Write the relay node's multiaddr to /app/packages/peer/.env for running tests
-echo "RELAY=\"$CERC_RELAY_MULTIADDR\"" > /app/packages/peer/.env
-
 echo 'yarn server'
 yarn server
@@ -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
@@ -14,11 +15,8 @@ fi

 echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES"

-# Set relay nodes in config using CERC_RELAY_NODES
-jq --argjson relayNodes "$CERC_RELAY_NODES" \
-  '.relayNodes = $relayNodes' \
-  ./src/test-app-config.json > ./src/config.json
+# 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

-yarn build
-
-serve -s build
+/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}
@@ -22,6 +22,6 @@ COPY run-el.sh /opt/testnet/run.sh
 RUN cd /opt/testnet && make genesis-el

 COPY --from=geth  /usr/local/bin/geth /usr/local/bin/
-RUN geth init /opt/testnet/build/el/geth.json && rm -f ~/.ethereum/geth/nodekey
+RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey

 ENTRYPOINT ["/opt/testnet/run.sh"]
@@ -12,6 +12,6 @@ for line in `cat ../build/el/accounts.csv`; do

  echo ""
  echo "$ADDRESS"
-  geth account import --password .pw.$$ .key.$$
+  geth account import --datadir=~/ethdata --password .pw.$$ .key.$$
  rm -f .pw.$$ .key.$$
 done
@@ -18,17 +18,35 @@ if [ "true" == "$CERC_REMOTE_DEBUG" ] && [ -x "/usr/local/bin/dlv" ]; then
    START_CMD="/usr/local/bin/dlv --listen=:40000 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/geth --continue --"
 fi

+# See https://linuxconfig.org/how-to-propagate-a-signal-to-child-processes-from-a-bash-script
+cleanup() {
+    echo "Signal received, cleaning up..."
+
+    # Kill the child process first (CERC_REMOTE_DEBUG=true uses dlv which starts geth as a child process)
+    pkill -P ${geth_pid}
+    sleep 2
+    kill $(jobs -p)
+
+    wait
+    echo "Done"
+}
+trap 'cleanup' SIGINT SIGTERM
+
 if [ "true" == "$RUN_BOOTNODE" ]; then
    $START_CMD \
+       --datadir=~/ethdata \
      --nodekeyhex="${BOOTNODE_KEY}" \
      --nodiscover \
      --ipcdisable \
      --networkid=${NETWORK_ID} \
-      --netrestrict="${NETRESTRICT}"
+      --netrestrict="${NETRESTRICT}" \
+      &
+
+    geth_pid=$!
 else
    cd /opt/testnet/accounts
    ./import_keys.sh
-    
+
    echo -n "$JWT" > /opt/testnet/build/el/jwtsecret

    if [ "$CERC_RUN_STATEDIFF" == "detect" ] && [ -n "$CERC_STATEDIFF_DB_HOST" ]; then
@@ -74,6 +92,7 @@ else
    fi

    $START_CMD \
+      --datadir=~/ethdata \
      --bootnodes="${ENODE}" \
      --allow-insecure-unlock \
      --http \
@@ -101,5 +120,16 @@ else
      --metrics.addr="0.0.0.0" \
      --verbosity=${CERC_GETH_VERBOSITY:-3} \
      --vmodule="${CERC_GETH_VMODULE:-statediff/*=5}" \
-      --miner.etherbase="${ETHERBASE}" ${STATEDIFF_OPTS}
+      --miner.etherbase="${ETHERBASE}" ${STATEDIFF_OPTS} \
+      &
+
+    geth_pid=$!
+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

@@ -19,9 +19,9 @@ http_port=8001
 authrpc_port=8551

 exec lighthouse \
-  --debug-level $DEBUG_LEVEL \
  bn \
  $SUBSCRIBE_ALL_SUBNETS \
+  --debug-level $DEBUG_LEVEL \
  --boot-nodes "$ENR" \
  --datadir $data_dir \
  --testnet-dir $TESTNET_DIR \
@@ -38,4 +38,5 @@ exec lighthouse \
  --execution-jwt $JWTSECRET \
  --terminal-total-difficulty-override $ETH1_TTD \
  --suggested-fee-recipient $SUGGESTED_FEE_RECIPIENT \
-  --target-peers $((BN_COUNT - 1))
+  --target-peers $((BN_COUNT - 1)) \
+  --http-allow-sync-stalled \
@@ -23,10 +23,10 @@ if [ ! -f "$DATADIR/bootnode/enr.dat" ]; then
    --genesis-fork-version $GENESIS_FORK_VERSION \
    --output-dir $DATADIR/bootnode

-    bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
-    echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
-    
-    echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
+  bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
+  echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
+
+  echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
 fi

 exec lighthouse boot_node \
@@ -16,4 +16,4 @@ lcli \
  $TESTNET_DIR/genesis.ssz \
  $NOW

-echo "Reset genesis time to now ($NOW)"
+echo "Reset genesis time to ($NOW)"
@@ -21,9 +21,9 @@ while getopts "pd:" flag; do
 done

 exec lighthouse \
-  --debug-level $DEBUG_LEVEL \
  vc \
  $BUILDER_PROPOSALS \
+  --debug-level $DEBUG_LEVEL \
  --validators-dir $DATADIR/node_$NODE_NUMBER/validators \
  --secrets-dir $DATADIR/node_$NODE_NUMBER/secrets \
  --testnet-dir $TESTNET_DIR \
@@ -1,12 +1,25 @@
 #!/bin/bash

-if [ "true" == "$RUN_BOOTNODE" ]; then 
+# See https://linuxconfig.org/how-to-propagate-a-signal-to-child-processes-from-a-bash-script
+cleanup() {
+    echo "Signal received, cleaning up..."
+    kill $(jobs -p)
+
+    wait
+    echo "Done"
+}
+trap 'cleanup' SIGINT SIGTERM
+
+if [ "true" == "$RUN_BOOTNODE" ]; then
    cd /opt/testnet/build/cl
    python3 -m http.server 3000 &


    cd /opt/testnet/cl
-    ./bootnode.sh 2>&1 | tee /var/log/lighthouse_bootnode.log
+    ./bootnode.sh 2>&1 | tee /var/log/lighthouse_bootnode.log &
+    bootnode_pid=$!
+
+    wait $bootnode_pid
 else
    while [ 1 -eq 1 ]; do
      echo "Waiting on geth ..."
@@ -25,7 +38,12 @@ else
    cd /opt/testnet/cl

    if [ -z "$LIGHTHOUSE_GENESIS_STATE_URL" ]; then
-        ./reset_genesis_time.sh
+        # Check if beacon node data exists to avoid resetting genesis time on a restart
+        if [ -d /opt/testnet/build/cl/node_"$NODE_NUMBER"/beacon ]; then
+            echo "Skipping genesis time reset"
+        else
+            ./reset_genesis_time.sh
+        fi
    else
        while [ 1 -eq 1 ]; do
            echo "Waiting on Genesis time ..."
@@ -54,10 +72,9 @@ else
    echo -n "$JWT" > $JWTSECRET

    ./beacon_node.sh 2>&1 | tee /var/log/lighthouse_bn.log &
-    lpid=$!
+    beacon_pid=$!
    ./validator_client.sh 2>&1 | tee /var/log/lighthouse_vc.log &
-    vpid=$!
+    validator_pid=$!

-    wait $lpid $vpid
+    wait $beacon_pid $validator_pid
 fi
-
@@ -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
@@ -26,9 +26,10 @@ do
    kv_pair=(${kv_pair_string//=/ })
    template_string_to_replace=${kv_pair[0]}
    template_value_to_substitute=${kv_pair[1]}
+    template_value_to_substitute_expanded=${template_value_to_substitute//LACONIC_HOSTED_ENDPOINT/${LACONIC_HOSTED_ENDPOINT}}
    # Run find and sed to do the substitution of one variable over all files
    # See: https://stackoverflow.com/a/21479607/1701505
-    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"
+    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute_expanded}"
    # Note: we do not escape our strings, on the expectation they do not container the '#' char.
-    find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute}'#g' {} +
+    find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute_expanded}'#g' {} +
 done
@@ -2,5 +2,5 @@

 services:
  wns:
-    server: 'http://localhost:9473/api'
-    webui: 'http://localhost:9473/console'
+    server: 'LACONIC_HOSTED_ENDPOINT:9473/api'
+    webui: 'LACONIC_HOSTED_ENDPOINT:9473/console'
@@ -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;

@@ -1,14 +1,60 @@
-FROM node:18.15.0-alpine3.16
+# 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
+FROM node:${VARIANT}

-RUN apk --update --no-cache add make git jq bash
+ARG USERNAME=node
+ARG NPM_GLOBAL=/usr/local/share/npm-global

-WORKDIR /app
+# This container pulls npm package from a registry configured via env var
+ARG CERC_NPM_REGISTRY_URL

-COPY . .
+# Add NPM global to PATH.
+ENV PATH=${NPM_GLOBAL}/bin:${PATH}
+# Prevents npm from printing version warnings
+ENV NPM_CONFIG_UPDATE_NOTIFIER=false

-RUN npm install -g serve
+RUN \
+  # Configure global npm install location, use group to adapt to UID/GID changes
+  if ! cat /etc/group | grep -e "^npm:" > /dev/null 2>&1; then groupadd -r npm; fi \
+  && usermod -a -G npm ${USERNAME} \
+  && umask 0002 \
+  && mkdir -p ${NPM_GLOBAL} \
+  && touch /usr/local/etc/npmrc \
+  && chown ${USERNAME}:npm ${NPM_GLOBAL} /usr/local/etc/npmrc \
+  && chmod g+s ${NPM_GLOBAL} \
+  && npm config -g set prefix ${NPM_GLOBAL} \
+  && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \
+  # Install eslint
+  && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \
+  && npm cache clean --force > /dev/null 2>&1

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

-WORKDIR /app
+# 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
+
+RUN mkdir -p /scripts
+COPY ./apply-webapp-config.sh /scripts
+COPY ./start-serving-app.sh /scripts
+
+# Configure the local npm registry
+RUN npm config set @cerc-io:registry ${CERC_NPM_REGISTRY_URL}
+
+RUN mkdir -p /config
+
+# Install simple web server for now (use nginx perhaps later)
+RUN yarn global add http-server
+
+# Globally install both versions of the payload web app package
+# Install old version of MobyMask web app
+RUN yarn global add @cerc-io/mobymask-ui@0.1.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
+
+CMD ["/scripts/start-serving-app.sh"]
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+    set -x
+fi
+if [[ $# -ne 3 ]]; then
+    echo "Illegal number of parameters" >&2
+    exit 1
+fi
+config_file_name=$1
+webapp_files_dir=$2
+config_prefix=$3
+if ! [[ -f ${config_file_name} ]]; then
+    echo "Config file ${config_file_name} does not exist" >&2
+    exit 1
+fi
+if ! [[ -d ${webapp_files_dir} ]]; then
+    echo "Webapp directory ${webapp_files_dir} does not exist" >&2
+    exit 1
+fi
+# First some magic using sed to translate our yaml config file into an array of key value pairs like:
+# ${config_prefix}<path-through-objects>=<value>
+# sed "s/'//g" is used to remove single quote for relayNodes value
+readarray -t config_kv_pair_array < <( sed -E 's/([^:]+):\s*(.*)/\1=\2/g' ${config_file_name} | sed "s/'//g" |  sed "s/^/${config_prefix}_/" )
+declare -p config_kv_pair_array
+# Then iterate over that kv array making the template substitution in our web app files
+for kv_pair_string in "${config_kv_pair_array[@]}"
+do
+    kv_pair=(${kv_pair_string//=/ })
+    template_string_to_replace=${kv_pair[0]}
+    template_value_to_substitute=${kv_pair[1]}
+    # Run find and sed to do the substitution of one variable over all files
+    # See: https://stackoverflow.com/a/21479607/1701505
+    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|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.
+        find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute}'#g' {} +
+    fi
+done
@@ -6,4 +6,7 @@ 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/mobymask-ui:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/mobymask-ui
+CERC_NPM_REGISTRY_URL="https://git.vdb.to/api/packages/cerc-io/npm/"
+
+docker build -t cerc/mobymask-ui:local  ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile \
+  --build-arg CERC_NPM_REGISTRY_URL ${SCRIPT_DIR}
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+    set -x
+fi
+
+# TODO: Don't hard wire this:
+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
@@ -1,14 +1,29 @@
 FROM node:18.15.0-alpine3.16

-RUN apk --update --no-cache add make git python3 jq
+# This container pulls npm package from a registry configured via env var
+ARG CERC_NPM_REGISTRY_URL

-WORKDIR /app
+RUN apk --update --no-cache add make git python3 jq bash

-COPY . .
+# 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

-RUN yarn global add serve
+RUN mkdir -p /scripts
+COPY ./apply-webapp-config.sh /scripts
+COPY ./start-serving-app.sh /scripts

-RUN echo "Building react-peer" && \
-    yarn install --ignore-scripts && yarn build --ignore @cerc-io/test-app
+# Configure the local npm registry
+RUN npm config set @cerc-io:registry ${CERC_NPM_REGISTRY_URL}

-WORKDIR /app
+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/test-app@0.2.34
+
+# Expose port for http
+EXPOSE 80
+
+CMD ["/scripts/start-serving-app.sh"]
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+    set -x
+fi
+if [[ $# -ne 3 ]]; then
+    echo "Illegal number of parameters" >&2
+    exit 1
+fi
+config_file_name=$1
+webapp_files_dir=$2
+config_prefix=$3
+if ! [[ -f ${config_file_name} ]]; then
+    echo "Config file ${config_file_name} does not exist" >&2
+    exit 1
+fi
+if ! [[ -d ${webapp_files_dir} ]]; then
+    echo "Webapp directory ${webapp_files_dir} does not exist" >&2
+    exit 1
+fi
+# First some magic using sed to translate our yaml config file into an array of key value pairs like:
+# ${config_prefix}<path-through-objects>=<value>
+# sed "s/'//g" is used to remove single quote for relayNodes value
+readarray -t config_kv_pair_array < <( sed -E 's/([^:]+):\s*(.*)/\1=\2/g' ${config_file_name} | sed "s/'//g" |  sed "s/^/${config_prefix}_/" )
+declare -p config_kv_pair_array
+# Then iterate over that kv array making the template substitution in our web app files
+for kv_pair_string in "${config_kv_pair_array[@]}"
+do
+    kv_pair=(${kv_pair_string//=/ })
+    template_string_to_replace=${kv_pair[0]}
+    template_value_to_substitute=${kv_pair[1]}
+    # Run find and sed to do the substitution of one variable over all files
+    # See: https://stackoverflow.com/a/21479607/1701505
+    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|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.
+        find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute}'#g' {} +
+    fi
+done
@@ -6,4 +6,7 @@ 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/react-peer:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/react-peer
+CERC_NPM_REGISTRY_URL="https://git.vdb.to/api/packages/cerc-io/npm/"
+
+docker build -t cerc/react-peer:local  ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile \
+  --build-arg CERC_NPM_REGISTRY_URL ${SCRIPT_DIR}
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+    set -x
+fi
+
+# TODO: Don't hard wire this:
+webapp_files_dir=/usr/local/share/.config/yarn/global/node_modules/@cerc-io/test-app/build
+/scripts/apply-webapp-config.sh /config/config.yml ${webapp_files_dir} MOBYMASK_HOSTED_CONFIG
+http-server -p 80 ${webapp_files_dir}
@@ -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/packages/mobymask-v2-watcher
+WORKDIR /app
@@ -6,4 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

-docker build -t cerc/watcher-mobymask-v2:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/watcher-ts
+docker build -t cerc/watcher-mobymask-v2:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/mobymask-v2-watcher-ts
@@ -0,0 +1,10 @@
+FROM node:16.17.1-alpine3.16
+
+RUN apk --update --no-cache add git python3 alpine-sdk jq
+
+WORKDIR /app
+
+COPY . .
+
+RUN echo "Building watcher-ts" && \
+    yarn && yarn build
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Build cerc/watcher-erc20
+
+# See: https://stackoverflow.com/a/246128/1701505
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/watcher-ts:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/watcher-ts
@@ -14,6 +14,7 @@ cerc/laconic-registry-cli
 cerc/laconic-console-host
 cerc/fixturenet-eth-geth
 cerc/fixturenet-eth-lighthouse
+cerc/watcher-ts
 cerc/watcher-mobymask
 cerc/watcher-erc20
 cerc/watcher-erc721
@@ -34,3 +35,7 @@ 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
+cerc/ipld-eth-state-snapshot
@@ -24,3 +24,5 @@ tx-spammer
 kubo
 foundry
 fixturenet-optimism
+fixturenet-pocket
+watcher-azimuth
@@ -12,8 +12,7 @@ cerc-io/laconic-registry-cli
 cerc-io/laconic-console
 cerc-io/mobymask-watcher
 cerc-io/watcher-ts
-cerc-io/react-peer
-cerc-io/mobymask-ui
+cerc-io/mobymask-v2-watcher-ts
 cerc-io/MobyMask
 vulcanize/uniswap-watcher-ts
 vulcanize/uniswap-v3-info
@@ -28,3 +27,7 @@ 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
+cerc-io/ipld-eth-state-snapshot
@@ -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

@@ -30,7 +30,7 @@ $ laconic-so --stack package-registry deploy up
 ⠿ Container laconic-aecc4a21d3a502b14522db97d427e850-server-1  Started                                                                                    1.9s
 New user 'gitea_admin' has been successfully created!
 This is your gitea access token: 84fe66a73698bf11edbdccd0a338236b7d1d5c45. Keep it safe and secure, it can not be fetched again from gitea.
-To use with laconic-so set this environment variable: export CERC_NPM_AUTH_TOKEN=3e493e77b3e83fe9e882f7e3a79dd4d5441c308b
+To use with laconic-so set this environment variable: export CERC_NPM_AUTH_TOKEN=84fe66a73698bf11edbdccd0a338236b7d1d5c45
 Created the organization cerc-io
 Gitea was configured to use host name: gitea.local, ensure that this resolves to localhost, e.g. with sudo vi /etc/hosts
 Success, gitea is properly initialized
@@ -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,13 @@
+version: "1.0"
+name: chain-chunker
+decription: "Stack to build containers for chain-chunker"
+repos:
+  - cerc-io/ipld-eth-state-snapshot
+  - cerc-io/eth-statediff-service
+  - cerc-io/ipld-eth-db
+  - cerc-io/ipld-eth-server
+containers:
+  - cerc/ipld-eth-state-snapshot
+  - cerc/eth-statediff-service
+  - cerc/ipld-eth-db
+  - cerc/ipld-eth-server
@@ -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
@@ -3,15 +3,18 @@
 Instructions for deploying a local a geth + lighthouse blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator (the installation of which is covered [here](https://github.com/cerc-io/stack-orchestrator#user-mode)):

 ## Clone required repositories
+
 ```
 $ laconic-so --stack fixturenet-eth setup-repositories
 ```

 ## Build the fixturenet-eth containers
+
 ```
 $ laconic-so --stack fixturenet-eth build-containers
 ```
-This should create several container images in the local image registry: 
+
+This should create several container images in the local image registry:

 * cerc/go-ethereum
 * cerc/lighthouse
@@ -19,6 +22,7 @@ This should create several container images in the local image registry:
 * cerc/fixturenet-eth-lighthouse

 ## Deploy the stack
+
 ```
 $ laconic-so --stack fixturenet-eth deploy up
 ```
@@ -57,7 +61,7 @@ Several other containers can used with the basic `fixturenet-eth`:
 * `eth-probe` (captures eth1 tx gossip)
 * `keycloak` (nginx proxy with keycloak auth for API authentication)
 * `tx-spammer` (generates and sends automated transactions to the fixturenet)
-	
+
 It is not necessary to use them all at once, but a complete example follows:

 ```
@@ -99,4 +103,22 @@ keycloak-db-1                          0.0.0.0:55850->5432/tcp
 keycloak-nginx-1                       0.0.0.0:55859->80/tcp
 migrations-1
 tx-spammer-1
-```
+```
+
+## Clean up
+
+Stop all services running in the background:
+
+```bash
+$ laconic-so --stack fixturenet-eth deploy down
+```
+
+Clear volumes created by this stack:
+
+```bash
+# List all relevant volumes
+$ 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_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data")
+```
@@ -14,7 +14,7 @@ $ chmod +x ./laconic-so
 $ export PATH=$PATH:$(pwd)  # Or move laconic-so to ~/bin or your favorite on-path directory
 ```
 ## 2. Prepare the local build environment
-Note that this step needs only to be done once on a new machine. 
+Note that this step needs only to be done once on a new machine.
 Detailed instructions can be found [here](../build-support/README.md). For the impatient run these commands:
 ```
 $ laconic-so --stack build-support build-containers --exclude cerc/builder-gerbil
@@ -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
@@ -91,6 +96,9 @@ docker volume rm $(docker volume ls -q --filter "name=.*fixturenet_geth_accounts
  ```

 * This means that the data directory that `op-geth` is using is corrupted and needs to be reinitialized; the containers `op-geth`, `op-node` and `op-batcher` need to be started afresh:
+
+  WARNING: This will reset the L2 chain; consequently, all the data on it will be lost
+
  * Stop and remove the concerned containers:

    ```bash
@@ -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,15 +23,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

-# react-peer
-cd ~/cerc/react-peer
-git checkout v0.2.31
-
-# mobymask-ui
-cd ~/cerc/mobymask-ui
-git checkout laconic
+# mobymask-v2-watcher-ts
+cd ~/cerc/mobymask-v2-watcher-ts
+git checkout v0.1.1

 # MobyMask
 cd ~/cerc/MobyMask
@@ -39,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:
@@ -73,13 +69,13 @@ Deploy the stack:
 Find the watcher container's id and export it for later use:

 ```bash
-export CONTAINER_ID=$(docker ps -q --filter "name=mobymask-watcher-server")
+export CONTAINER_ID=$(docker ps -q --filter "name=peer-tests")
 ```

 Run the peer tests:

 ```bash
-docker exec -w /app/packages/peer $CONTAINER_ID yarn test
+docker exec $CONTAINER_ID yarn test
 ```

 ## Web Apps
@@ -115,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.

@@ -66,7 +66,7 @@
  * Get the deployed contract address:

    ```bash
-    docker exec -it $(docker ps -aq --filter name="mobymask-app") cat src/config.json
+    docker exec -it $(docker ps -aq --filter name="mobymask-app") cat /config/config.yml
    ```

    The value of `address` field is the deployed contract address
@@ -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")
 ```
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dboreham	1852d7d4c1	Chain chunker stack (#389 ) * Fix bug in default container build flow * Add convenience stack for chain-chunker Former-commit-id: `3e78c321b0`	2023-05-09 14:00:58 -06:00
Zach	fce41994a3	match tokens (#388 ) Former-commit-id: `e5faeb9d3b`	2023-05-09 15:23:56 -04:00
Zach	a5d3d6bae7	Update laconicd-fixturenet.md (#386 ) Former-commit-id: `b6a0af4e95`	2023-05-09 14:57:49 -04:00
nabarunandprathamesh	8add4671c0	Add environment variables for multiaddrs blacklist (#381 ) * Add env variable for web apps config denyMultiaddrs * Add watcher config option for blacklisted multiaddrs * Update package versions * Use provided domain for relay multiaddr in peer config * Change delimeter while replacing deny multiaddrs list --------- Co-authored-by: prathamesh0 <prathamesh.musale0@gmail.com> Former-commit-id: `b678a3ecb4`	2023-05-05 13:32:19 +05:30
Marten O'Grady	b1b1464205	Update CONTRIBUTING.md (#383 ) Wrong output for Step 3 in Build A ZipApp. Fixed it to what I just experienced while smoke testing. Former-commit-id: `bce604e4bb`	2023-05-04 09:47:59 -04:00
Zach	fbe901a0fb	Merge pull request #382 from Escape613/patch-2 Update CONTRIBUTING.md Former-commit-id: `ff0a67f45f`	2023-05-04 09:20:46 -04:00
Marten O'Grady	a9558aa874	Update CONTRIBUTING.md Missing ")" in Step #1 of INSTALL Former-commit-id: `f1bc8aa4e1`	2023-05-04 09:16:14 -04:00
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
dboreham	db1edd85e6	Catch and report git errors (#353 ) Former-commit-id: `7c867171e4`	2023-04-19 15:29:41 -06:00
dboreham	55b2d3bd25	Update setuptools in case the version on the machine is old (#352 ) Former-commit-id: `5ef37894ce`	2023-04-19 15:16:34 -06:00
dboreham	a3b3ac18b1	Fix build script (#351 ) Former-commit-id: `c07113320b`	2023-04-19 14:55:36 -06:00
nabarun	53fbc60f55	Use standalone mobymask-v2-watcher-ts for running watcher server (#327 ) * Use standalone mobymask-v2-watcher-ts to run peer test * Add watcher-ts image for running peer tests * Run separate containers for peer ids generation and tests * Wait for watcher to be up before starting peer-test-app * Resolve peer-test-app compose file and remove setup-repositories for web-apps Former-commit-id: `c4002dcc5c`	2023-04-19 13:48:51 +05:30
prathamesh0	4caae1d850	Gracefully shutdown optimism batcher and op-geth containers (#345 ) * Gracefully shutdown optimism batcher and op-geth containers * Remove unnecessary env export Former-commit-id: `c6e6122516`	2023-04-19 12:48:38 +05:30
prathamesh0	3f79c2b811	[WIP] Handle restarts in fixturenet-eth stack (#324 ) * Use mounted volumes for data in geth nodes * Use mounted volumes for data in lighthouse nodes * Avoid resetting genesis time in a lighthouse node on restart * Mount parent datadir for lighthouse nodes * Trap signals on shutdown and clean up in lighthouse nodes * Allow stalled sync in lighthouse beacon nodes * Gracefully shutdown geth nodes * Add clean up instructions * Gracefully shutdown lighthouse boot node Former-commit-id: `3130af1615`	2023-04-19 12:22:13 +05:30
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
nabarun	b0aeff50bb	Package mobymask-v2 stack web-apps similar to laconic-console app (#310 ) * Build MobyMask web-app at container build step * Fix web-app start script to use env variables in config * Replace variables in built web-app files * Use published mobymask-ui package from gitea * Use published react-peer/test-app from gitea * Remove local gitea publish TODO Former-commit-id: `cf79f0de0a`	2023-04-18 18:25:58 +05:30
dboreham	cb72e5c03f	Simple implementation of LACONIC_HOSTED_ENDPOINT (#342 ) Former-commit-id: `172300d7bd`	2023-04-17 20:46:05 -06: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