Change delimeter while replacing deny multiaddrs list

Former-commit-id: db27b07d99
Use provided domain for relay multiaddr in peer config
2023-05-05 13:28:57 +05:30 · 2023-05-05 10:27:26 +05:30 · 2023-05-04 20:01:38 +05:30 · 2023-05-04 20:00:58 +05:30 · 2023-05-04 18:42:45 +05:30
225 changed files with 699 additions and 9700 deletions
@@ -1,36 +0,0 @@
-name: Fixturenet-Eth-Plugeth-Test
-
-on:
-  push:
-    branches: 'ci-test'
-
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-
-jobs:
-  test:
-    name: "Run an Ethereum plugeth 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: Start dockerd # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-      - name: "Run fixturenet-eth tests"
-        run: ./tests/fixturenet-eth-plugeth/run-test.sh
@@ -4,11 +4,6 @@ on:
  push:
    branches: 'ci-test'

-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-
 jobs:
  test:
    name: "Run an Ethereum fixturenet test"
@@ -17,7 +12,7 @@ jobs:
      - name: "Clone project repository"
        uses: actions/checkout@v3
      - name: "Install Python"
-        uses: actions/setup-python@v4
+        uses: cerc-io/setup-python@v4
        with:
          python-version: '3.8'
      - name: "Print Python version"
@@ -28,10 +23,5 @@ 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 fixturenet-eth tests"
        run: ./tests/fixturenet-eth/run-test.sh
-
@@ -19,7 +19,7 @@ jobs:
          build_tag=$(./scripts/create_build_tag_file.sh)
          echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT
      - name: "Install Python"
-        uses: actions/setup-python@v4
+        uses: cerc-io/setup-python@v4
        with:
          python-version: '3.8'
      - name: "Print Python version"
@@ -37,7 +37,7 @@ jobs:
        run: |
          cp ${{ steps.build.outputs.package-file }} ./laconic-so
      - name: "Create release"
-        uses: https://gitea.com/cerc-io/action-gh-release@gitea-v2
+        uses: cerc-io/action-gh-release@gitea-v1
        with:
          tag_name: ${{ steps.build-info.outputs.build-tag }}
          # On the publish test branch, mark our release as a draft
@@ -1,39 +0,0 @@
-name: Deploy Test
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    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:
-    name: "Run deploy test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: Start dockerd # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-      - name: "Run deploy tests"
-        run: ./tests/deploy/run-deploy-test.sh
@@ -1,4 +1,4 @@
-name: Smoke Test
+name: Integration Test

 on:
  pull_request:
@@ -20,7 +20,7 @@ jobs:
      - name: "Clone project repository"
        uses: actions/checkout@v3
      - name: "Install Python"
-        uses: actions/setup-python@v4
+        uses: cerc-io/setup-python@v4
        with:
          python-version: '3.8'
      - name: "Print Python version"
@@ -37,4 +37,3 @@ jobs:
          sleep 5
      - name: "Run smoke tests"
        run: ./tests/smoke-test/run-smoke-test.sh
-
@@ -1,29 +0,0 @@
-name: Deploy Test
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    branches: '*'
-
-jobs:
-  test:
-    name: "Run deploy test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run deploy tests"
-        run: ./tests/deploy/run-deploy-test.sh
@@ -1,4 +1,4 @@
-name: Smoke Test
+name: Test

 on:
  pull_request:
@@ -7,4 +7,3 @@ __pycache__
 *~
 package
 app/data/build_tag.txt
-build
@@ -6,7 +6,7 @@ Stack Orchestrator allows building and deployment of a Laconic Stack on a single

 ## Install

-**To get started quickly** on a fresh Ubuntu instance (e.g, Digital Ocean); [try this script](./scripts/quick-install-linux.sh). **WARNING:** always review scripts prior to running them so that you know what is happening on your machine.
+**To get started quickly** on a fresh Ubuntu instance (e.g, Digital Ocean); [try this script](./scripts/quick-install-ubuntu.sh). **WARNING:** always review scripts prior to running them so that you know what is happening on your machine.

 For any other installation, follow along below and **adapt these instructions based on the specifics of your system.**

@@ -15,8 +15,7 @@

 import os
 from abc import ABC, abstractmethod
-from app.deploy import get_stack_status
-from decouple import config
+from .deploy_system import get_stack_status


 def get_stack(config, stack):
@@ -70,10 +69,3 @@ class package_registry_stack(base_stack):

    def get_url(self):
        return self.url
-
-
-def get_npm_registry_url():
-    # If an auth token is not defined, we assume the default should be the cerc registry
-    # If an auth token is defined, we assume the local gitea should be used.
-    default_npm_registry_url = "http://gitea.local:3000/api/packages/cerc-io/npm/" if config("CERC_NPM_AUTH_TOKEN", default=None) else "https://git.vdb.to/api/packages/cerc-io/npm/"
-    return config("CERC_NPM_REGISTRY_URL", default=default_npm_registry_url)
@@ -27,8 +27,7 @@ import subprocess
 import click
 import importlib.resources
 from pathlib import Path
-from app.util import include_exclude_check, get_parsed_stack_config
-from app.base import get_npm_registry_url
+from .util import include_exclude_check, get_parsed_stack_config

 # TODO: find a place for this
 #    epilog="Config provided either in .env or settings.ini or env vars: CERC_REPO_BASE_DIR (defaults to ~/cerc)"
@@ -67,7 +66,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
        print('Dev root directory doesn\'t exist, creating')

    # See: https://stackoverflow.com/a/20885799/1701505
-    from app import data
+    from . import data
    with importlib.resources.open_text(data, "container-image-list.txt") as container_list_file:
        all_containers = container_list_file.read().splitlines()

@@ -85,13 +84,13 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):

    # TODO: make this configurable
    container_build_env = {
-        "CERC_NPM_REGISTRY_URL": get_npm_registry_url(),
+        "CERC_NPM_REGISTRY_URL": config("CERC_NPM_REGISTRY_URL", default="http://gitea.local:3000/api/packages/cerc-io/npm/"),
        "CERC_NPM_AUTH_TOKEN": config("CERC_NPM_AUTH_TOKEN", default=""),
        "CERC_REPO_BASE_DIR": dev_root_path,
        "CERC_CONTAINER_BASE_DIR": container_build_dir,
        "CERC_HOST_UID": f"{os.getuid()}",
        "CERC_HOST_GID": f"{os.getgid()}",
-        "DOCKER_BUILDKIT": config("DOCKER_BUILDKIT", default="0")
+        "DOCKER_BUILDKIT": "0"
    }
    container_build_env.update({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
    container_build_env.update({"CERC_FORCE_REBUILD": "true"} if force_rebuild else {})
@@ -116,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_full_path if os.path.exists(repo_full_path) else build_dir
+            repo_dir_or_build_dir = repo_dir 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:
@@ -25,8 +25,8 @@ from decouple import config
 import click
 import importlib.resources
 from python_on_whales import docker, DockerException
-from app.base import get_stack
-from app.util import include_exclude_check, get_parsed_stack_config
+from .base import get_stack
+from .util import include_exclude_check, get_parsed_stack_config

 builder_js_image_name = "cerc/builder-js:local"

@@ -81,7 +81,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
        os.makedirs(build_root_path)

    # See: https://stackoverflow.com/a/20885799/1701505
-    from app import data
+    from . import data
    with importlib.resources.open_text(data, "npm-package-list.txt") as package_list_file:
        all_packages = package_list_file.read().splitlines()

@@ -1,27 +0,0 @@
-# Copyright © 2023 Cerc
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-from dataclasses import dataclass
-
-
-@dataclass
-class CommandOptions:
-    stack: str
-    quiet: bool = False
-    verbose: bool = False
-    dry_run: bool = False
-    local_stack: bool = False
-    debug: bool = False
-    continue_on_error: bool = False
@@ -1,49 +0,0 @@
-version: '3.2'
-
-services:
-  # Deploys the core (UniswapV3Factory) contract
-  sushiswap-v3-core:
-    image: cerc/sushiswap-v3-core:local
-    restart: on-failure
-    env_file:
-      # Defaults
-      - ../config/contract-sushiswap/deployment-params.env
-    environment:
-      # Overrides
-      CERC_ETH_RPC_ENDPOINT: ${ETH_RPC_ENDPOINT}
-      CERC_CHAIN_ID: ${CHAIN_ID}
-      CERC_ACCOUNT_PRIVATE_KEY: ${ACCOUNT_PRIVATE_KEY}
-      CERC_DEPLOY: ${DEPLOY}
-    volumes:
-      - ../config/network/wait-for-it.sh:/app/wait-for-it.sh
-      - ../config/contract-sushiswap/deploy-core-contracts.sh:/app/deploy-core-contracts.sh
-      - sushiswap_core_deployment:/app/deployments/docker
-    command: ["bash", "-c", "/app/deploy-core-contracts.sh && tail -f"]
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Deploys the periphery (NFPM, token, etc.) contracts
-  sushiswap-v3-periphery:
-    image: cerc/sushiswap-v3-periphery:local
-    restart: on-failure
-    env_file:
-      # Defaults
-      - ../config/contract-sushiswap/deployment-params.env
-    environment:
-      # Overrides
-      CERC_ETH_RPC_ENDPOINT: ${ETH_RPC_ENDPOINT}
-      CERC_CHAIN_ID: ${CHAIN_ID}
-      CERC_ACCOUNT_PRIVATE_KEY: ${ACCOUNT_PRIVATE_KEY}
-      CERC_DEPLOY: ${DEPLOY}
-    volumes:
-      - ../config/network/wait-for-it.sh:/app/wait-for-it.sh
-      - ../config/contract-sushiswap/deploy-periphery-contracts.sh:/app/deploy-periphery-contracts.sh
-      - sushiswap_core_deployment:/app/core-deployments/docker
-      - sushiswap_periphery_deployment:/app/deployments/docker
-    command: ["bash", "-c", "/app/deploy-periphery-contracts.sh && tail -f"]
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  sushiswap_core_deployment:
-  sushiswap_periphery_deployment:
@@ -2,7 +2,6 @@ version: '3.7'

 services:
  fixturenet-eth-bootnode-geth:
-    restart: always
    hostname: fixturenet-eth-bootnode-geth
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
@@ -16,13 +15,12 @@ services:
      - "30303"

  fixturenet-eth-geth-1:
-    restart: always
    hostname: fixturenet-eth-geth-1
    cap_add:
      - SYS_PTRACE
    environment:
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-      CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect}
+      CERC_REMOTE_DEBUG: "true"
+      CERC_RUN_STATEDIFF: "detect"
      CERC_STATEDIFF_DB_NODE_ID: 1
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
    env_file:
@@ -44,7 +42,6 @@ services:
      - "6060"

  fixturenet-eth-geth-2:
-    restart: always
    hostname: fixturenet-eth-geth-2
    healthcheck:
      test: ["CMD", "nc", "-v", "localhost", "8545"]
@@ -63,14 +60,12 @@ services:
      - fixturenet_eth_geth_2_data:/root/ethdata

  fixturenet-eth-bootnode-lighthouse:
-    restart: always
    hostname: fixturenet-eth-bootnode-lighthouse
    environment:
      RUN_BOOTNODE: "true"
    image: cerc/fixturenet-eth-lighthouse:local

  fixturenet-eth-lighthouse-1:
-    restart: always
    hostname: fixturenet-eth-lighthouse-1
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
@@ -96,7 +91,6 @@ services:
      - "8001"

  fixturenet-eth-lighthouse-2:
-    restart: always
    hostname: fixturenet-eth-lighthouse-2
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
@@ -1,69 +0,0 @@
-services:
-  graph-node:
-    image: cerc/graph-node:local
-    depends_on:
-      db:
-        condition: service_healthy
-      ipfs:
-        condition: service_healthy
-      lotus-node-1:
-        condition: service_healthy
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    environment:
-      ipfs: ipfs:5001
-      postgres_host: db
-      postgres_port: 5432
-      postgres_user: graph-node
-      postgres_pass: password
-      postgres_db: graph-node
-      # TODO: Get endpoint from env
-      ethereum: 'lotus-fixturenet:http://lotus-node-1:1234/rpc/v1'
-      GRAPH_LOG: info
-    ports:
-      - "8000"
-      - "8001"
-      - "8020"
-      - "8030"
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "8020"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-  ipfs:
-    image: ipfs/kubo:master-2023-02-20-714a968
-    volumes:
-      - ipfs-import:/import
-      - ipfs-data:/data/ipfs
-    ports:
-      - "8080"
-      - "4001"
-      - "5001"
-  db:
-    image: postgres:14-alpine
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: "graph-node"
-      POSTGRES_DB: "graph-node"
-      POSTGRES_PASSWORD: "password"
-      POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C"
-    command:
-      [
-        "postgres",
-        "-cshared_preload_libraries=pg_stat_statements"
-      ]
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    ports:
-      - "5432"
-
-volumes:
-  ipfs-import:
-  ipfs-data:
-  db-data:
@@ -3,7 +3,6 @@ services:
    restart: unless-stopped
    image: cerc/laconic-console-host:local
    environment:
-      - CERC_WEBAPP_FILES_DIR=${CERC_WEBAPP_FILES_DIR:-/usr/local/share/.config/yarn/global/node_modules/@cerc-io/console-app/dist/production}
      - LACONIC_HOSTED_ENDPOINT=${LACONIC_HOSTED_ENDPOINT:-http://localhost}
    ports:
      - "80"
@@ -1,11 +1,10 @@
+version: "3.2"
 services:
  laconicd:
    restart: unless-stopped
    image: cerc/laconicd:local
    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
    volumes:
-      # The cosmos-sdk node's database directory:
-      - laconicd-data:/root/.laconicd/data
      # TODO: look at folding these scripts into the container
      - ../config/fixturenet-laconicd/create-fixturenet.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh
      - ../config/fixturenet-laconicd/export-mykey.sh:/docker-entrypoint-scripts.d/export-mykey.sh
@@ -25,6 +24,3 @@ services:
    image: cerc/laconic-registry-cli:local
    volumes:
      - ../config/fixturenet-laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml
-
-volumes:
-  laconicd-data:
@@ -1,85 +0,0 @@
-version: "3.8"
-services:
-
-  lotus-miner:
-    hostname: lotus-miner
-    env_file:
-      - ../config/fixturenet-lotus/lotus-env.env
-    image: cerc/lotus:local
-    volumes:
-      - ../config/fixturenet-lotus/setup-miner.sh:/docker-entrypoint-scripts.d/setup-miner.sh
-      - ../config/fixturenet-lotus/fund-account.sh:/fund-account.sh
-      - lotus_miner_params:/var/tmp/filecoin-proof-parameters
-      - lotus_shared:/root/.lotus-shared
-      - lotus_miner_data:/root/data
-    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-miner.sh"]
-    ports:
-      - "1234"
-      - "2345"
-      - "3456"
-      - "1777"
-
-  lotus-node-1:
-    hostname: lotus-node-1
-    env_file:
-      - ../config/fixturenet-lotus/lotus-env.env
-    environment:
-      # Use 0.0.0.0 so that calls can be made from outside the container
-      - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http
-    image: cerc/lotus:local
-    volumes:
-      - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
-      - lotus_node_1_params:/var/tmp/filecoin-proof-parameters
-      - lotus_shared:/root/.lotus-shared
-      - lotus_node_1_data:/root/data
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "1234"]
-      interval: 30s
-      timeout: 10s
-      retries: 60
-      start_period: 3s
-    depends_on:
-      - lotus-miner
-    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
-    ports:
-      - "1234"
-      - "2345"
-      - "3456"
-      - "1777"
-
-  lotus-node-2:
-    hostname: lotus-node-2
-    env_file:
-      - ../config/fixturenet-lotus/lotus-env.env
-    environment:
-      # Use 0.0.0.0 so that calls can be made from outside the container
-      - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http
-    image: cerc/lotus:local
-    volumes:
-      - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
-      - lotus_node_2_params:/var/tmp/filecoin-proof-parameters
-      - lotus_shared:/root/.lotus-shared
-      - lotus_node_2_data:/root/data
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "1234"]
-      interval: 30s
-      timeout: 10s
-      retries: 60
-      start_period: 3s
-    depends_on:
-      - lotus-miner
-    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
-    ports:
-      - "1234"
-      - "2345"
-      - "3456"
-      - "1777"
-
-volumes:
-  lotus_miner_params:
-  lotus_node_1_params:
-  lotus_node_2_params:
-  lotus_shared:
-  lotus_miner_data:
-  lotus_node_1_data:
-  lotus_node_2_data:
@@ -5,7 +5,6 @@ services:
  # Creates / updates the configuration for L1 contracts deployment
  # Deploys the L1 smart contracts (outputs to volume l1_deployment)
  fixturenet-optimism-contracts:
-    restart: on-failure
    hostname: fixturenet-optimism-contracts
    image: cerc/optimism-contracts:local
    env_file:
@@ -23,10 +22,10 @@ services:
    command: |
      "./wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- ./run.sh"
    volumes:
-      - ../config/network/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh
-      - ../config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts
-      - ../config/optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts
-      - ../config/optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts
+      - ../config/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh
+      - ../container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts
+      - ../container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts
+      - ../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
      - l2_accounts:/l2-accounts
@@ -36,7 +35,6 @@ services:

  # Generates the config files required for L2 (outputs to volume l2_config)
  op-node-l2-config-gen:
-    restart: on-failure
    image: cerc/optimism-op-node:local
    depends_on:
      fixturenet-optimism-contracts:
@@ -56,7 +54,6 @@ services:

  # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
  op-geth:
-    restart: always
    image: cerc/optimism-l2geth:local
    depends_on:
      op-node-l2-config-gen:
@@ -79,7 +76,6 @@ services:

  # Runs the L2 consensus client (Sequencer node)
  op-node:
-    restart: always
    image: cerc/optimism-op-node:local
    depends_on:
      op-geth:
@@ -107,7 +103,6 @@ services:

  # Runs the batcher (takes transactions from the Sequencer and publishes them to L1)
  op-batcher:
-    restart: always
    image: cerc/optimism-op-batcher:local
    depends_on:
      op-node:
@@ -120,7 +115,7 @@ services:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_L1_RPC: ${CERC_L1_RPC}
    volumes:
-      - ../config/network/wait-for-it.sh:/wait-for-it.sh
+      - ../config/wait-for-it.sh:/wait-for-it.sh
      - ../config/fixturenet-optimism/run-op-batcher.sh:/run-op-batcher.sh
      - l2_accounts:/l2-accounts:ro
    entrypoint: ["sh", "-c"]
@@ -134,7 +129,6 @@ services:

  # Runs the proposer (periodically submits new state roots to L1)
  op-proposer:
-    restart: always
    image: cerc/optimism-op-proposer:local
    depends_on:
      op-node:
@@ -145,7 +139,7 @@ services:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_L1_RPC: ${CERC_L1_RPC}
    volumes:
-      - ../config/network/wait-for-it.sh:/wait-for-it.sh
+      - ../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
@@ -1,126 +0,0 @@
-services:
-  fixturenet-eth-bootnode-geth:
-    restart: always
-    hostname: fixturenet-eth-bootnode-geth
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    environment:
-      RUN_BOOTNODE: "true"
-    image: cerc/fixturenet-plugeth-plugeth:local
-    volumes:
-      - fixturenet_plugeth_bootnode_geth_data:/root/ethdata
-    ports:
-      - "9898"
-      - "30303"
-
-  fixturenet-eth-geth-1:
-    restart: always
-    hostname: fixturenet-eth-geth-1
-    cap_add:
-      - SYS_PTRACE
-    environment:
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-      CERC_RUN_STATEDIFF: "detect"
-      CERC_STATEDIFF_DB_NODE_ID: 1
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    image: cerc/fixturenet-plugeth-plugeth:local
-    volumes:
-      - fixturenet_plugeth_geth_1_data:/root/ethdata
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8545/"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    depends_on:
-      - fixturenet-eth-bootnode-geth
-    ports:
-      - "8545"
-      - "40000"
-      - "6060"
-
-  fixturenet-eth-geth-2:
-    restart: always
-    hostname: fixturenet-eth-geth-2
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8545/"]
-      interval: 30s
-      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-plugeth-plugeth:local
-    depends_on:
-      - fixturenet-eth-bootnode-geth
-    volumes:
-      - fixturenet_plugeth_geth_2_data:/root/ethdata
-
-  fixturenet-eth-bootnode-lighthouse:
-    restart: always
-    hostname: fixturenet-eth-bootnode-lighthouse
-    environment:
-      RUN_BOOTNODE: "true"
-    image: cerc/fixturenet-eth-lighthouse:local
-
-  fixturenet-eth-lighthouse-1:
-    restart: always
-    hostname: fixturenet-eth-lighthouse-1
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    environment:
-      NODE_NUMBER: "1"
-      ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
-      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-1:8551"
-    image: cerc/fixturenet-eth-lighthouse:local
-    volumes:
-      - fixturenet_plugeth_lighthouse_1_data:/opt/testnet/build/cl
-    depends_on:
-      fixturenet-eth-bootnode-lighthouse:
-        condition: service_started
-      fixturenet-eth-geth-1:
-        condition: service_healthy
-    ports:
-      - "8001"
-
-  fixturenet-eth-lighthouse-2:
-    restart: always
-    hostname: fixturenet-eth-lighthouse-2
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    environment:
-      NODE_NUMBER: "2"
-      ETH1_ENDPOINT: "http://fixturenet-eth-geth-2:8545"
-      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_plugeth_lighthouse_2_data:/opt/testnet/build/cl
-    depends_on:
-      fixturenet-eth-bootnode-lighthouse:
-        condition: service_started
-      fixturenet-eth-geth-2:
-        condition: service_healthy
-
-volumes:
-  fixturenet_plugeth_bootnode_geth_data:
-  fixturenet_plugeth_geth_1_data:
-  fixturenet_plugeth_geth_2_data:
-  fixturenet_plugeth_lighthouse_1_data:
-  fixturenet_plugeth_lighthouse_2_data:
@@ -1,7 +1,6 @@
 # Add-on pod to include foundry tooling within a fixturenet
 services:
  foundry:
-    restart: always
    image: cerc/foundry:local
    command: ["while :; do sleep 600; done"]
    volumes:
@@ -7,9 +7,11 @@ services:
        condition: service_healthy
    image: cerc/ipld-eth-server:local
    environment:
-      SERVER_HTTP_PATH: 0.0.0.0:8081
-      SERVER_GRAPHQL: "true"
-      SERVER_GRAPHQLPATH: 0.0.0.0:8082
+      IPLD_SERVER_GRAPHQL: "true"
+      IPLD_POSTGRAPHILEPATH: http://graphql:5000
+      ETH_SERVER_HTTPPATH: 0.0.0.0:8081
+      ETH_SERVER_GRAPHQL: "true"
+      ETH_SERVER_GRAPHQLPATH: 0.0.0.0:8082
      VDB_COMMAND: "serve"
      ETH_CHAIN_CONFIG: "/tmp/chain.json"
      DATABASE_NAME: cerc_testing
@@ -25,8 +27,8 @@ services:
      PROM_HTTP: "true"
      PROM_HTTP_ADDR: "0.0.0.0"
      PROM_HTTP_PORT: "8090"
-      LOG_LEVEL: "debug"
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
+      LOGRUS_LEVEL: "debug"
+      CERC_REMOTE_DEBUG: "true"
    volumes:
      - type: bind
        source: ../config/ipld-eth-server/chain.json
@@ -1,8 +0,0 @@
-version: "3.2"
-
-services:
-  lasso:
-    image: cerc/lasso:local
-    restart: always
-    ports:
-      - "0.0.0.0:3000:3000"
@@ -1,51 +0,0 @@
-version: '3.8'
-
-services:
-  keycloak-db:
-    image: postgres:14-alpine
-    env_file:
-      - ../config/mainnet-eth-keycloak/keycloak.env
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    volumes:
-      - mainnet_eth_keycloak_db:/var/lib/postgresql/data
-    ports:
-      - 5432
-
-  keycloak:
-    image: cerc/keycloak:local
-    env_file:
-      - ../config/mainnet-eth-keycloak/keycloak.env
-    environment:
-      JAVA_OPTS_APPEND: "-Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/import -Dkeycloak.migration.strategy=IGNORE_EXISTING"
-    volumes:
-      - ../config/mainnet-eth-keycloak/import:/import
-    ports:
-      - 8080
-    command: ["start"]
-    depends_on:
-      keycloak-db:
-        condition: service_healthy
-
-  keycloak-reg-ui:
-    image: cerc/keycloak-reg-ui:local
-    env_file:
-      - ../config/mainnet-eth-keycloak/keycloak.env
-    volumes:
-      - ../config/mainnet-eth-keycloak/ui:/config
-    ports:
-      - 80
-
-  keycloak-reg-api:
-    image: cerc/keycloak-reg-api:local
-    env_file:
-      - ../config/mainnet-eth-keycloak/keycloak.env
-    ports:
-      - 9292
-
-volumes:
-  mainnet_eth_keycloak_db:
@@ -1,25 +0,0 @@
-version: "3.2"
-services:
-  prometheus:
-    restart: always
-    image: prom/prometheus
-    depends_on:
-      mainnet-eth-geth-1:
-        condition: service_healthy
-    env_file:
-      - ../config/mainnet-eth-metrics/metrics.env
-    volumes:
-      - ../config/mainnet-eth-metrics/prometheus/etc:/etc/prometheus
-    ports:
-      - "9090"
-  grafana:
-    restart: always
-    image: grafana/grafana
-    env_file:
-      - ../config/mainnet-eth-metrics/metrics.env
-    volumes:
-      - ../config/mainnet-eth-metrics/grafana/etc/provisioning/dashboards:/etc/grafana/provisioning/dashboards
-      - ../config/mainnet-eth-metrics/grafana/etc/provisioning/datasources:/etc/grafana/provisioning/datasources
-      - ../config/mainnet-eth-metrics/grafana/etc/dashboards:/etc/grafana/dashboards
-    ports:
-      - "3000"
@@ -1,71 +0,0 @@
-
-services:
-
-  mainnet-eth-geth-1:
-    restart: always
-    hostname: mainnet-eth-geth-1
-    cap_add:
-      - SYS_PTRACE
-    image: cerc/go-ethereum:local
-    entrypoint: /bin/sh
-    command: -c "/opt/run-geth.sh"
-    env_file:
-      - ../config/mainnet-eth/geth.env
-    volumes:
-      - mainnet_eth_geth_1_data:/data
-      - mainnet_eth_config_data:/etc/mainnet-eth
-      - ../config/mainnet-eth/scripts/run-geth.sh:/opt/run-geth.sh
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8545"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    ports:
-      # http api
-      - "8545"
-      # ws api
-      - "8546"
-      # ws el
-      - "8551"
-      # p2p
-      - "30303"
-      - "30303/udp"
-      # debugging
-      - "40000"
-      # metrics
-      - "6060"
-
-  mainnet-eth-lighthouse-1:
-    restart: always
-    hostname: mainnet-eth-lighthouse-1
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:5052/eth/v2/beacon/blocks/head"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
-    environment:
-      LIGHTHOUSE_EXECUTION_ENDPOINT: "http://mainnet-eth-geth-1:8551"
-    env_file:
-      - ../config/mainnet-eth/lighthouse.env
-    image: cerc/lighthouse:local
-    entrypoint: /bin/sh
-    command: -c "/opt/run-lighthouse.sh"
-    volumes:
-      - mainnet_eth_lighthouse_1_data:/data
-      - mainnet_eth_config_data:/etc/mainnet-eth
-      - ../config/mainnet-eth/scripts/run-lighthouse.sh:/opt/run-lighthouse.sh
-    ports:
-      # api
-      - "5052"
-      # metrics
-      - "5054"
-      # p2p
-      - "9000"
-      - "9000/udp"
-
-volumes:
-  mainnet_eth_config_data:
-  mainnet_eth_geth_1_data:
-  mainnet_eth_lighthouse_1_data:
@@ -1,17 +0,0 @@
-version: "3.8"
-
-services:
-  go-opera:
-    restart: unless-stopped
-    image: cerc/go-opera:local
-    entrypoint: ["sh", "/docker-entrypoint-scripts.d/start-node.sh"]
-    volumes:
-      - ../config/mainnet-go-opera/start-node.sh:/docker-entrypoint-scripts.d/start-node.sh
-    # TODO: ports taken from dockerfile, determine which are needed
-    ports:
-      - "5050:5050" # p2p port, needed
-      - "5050:5050/udp"
-      - "18545:18545" # http rpc port
-      - "18546:18546" # websockets rpc port
-      #- "18547" # unknown
-      #- "19090" # unknown
@@ -1,34 +0,0 @@
-services:
-  laconicd:
-    restart: no
-    image: cerc/laconicd:local
-    command: ["/bin/sh", "-c", "/opt/run-laconicd.sh"]
-    volumes:
-      # The cosmos-sdk node's database directory:
-      - laconicd-data:/root/.laconicd/data
-      - laconicd-config:/root/.laconicd/config
-      - laconicd-keyring:/root/.laconicd/keyring-test
-      # TODO: look at folding these scripts into the container
-      - ../config/mainnet-laconicd/scripts/run-laconicd.sh:/opt/run-laconicd.sh
-      - ../config/mainnet-laconicd/scripts/export-mykey.sh:/docker-entrypoint-scripts.d/export-mykey.sh
-      - ../config/mainnet-laconicd/scripts/export-myaddress.sh:/docker-entrypoint-scripts.d/export-myaddress.sh
-    # TODO: determine which of the ports below is really needed
-    ports:
-      - "6060"
-      - "26657"
-      - "26656"
-      - "9473:9473"
-      - "8545"
-      - "8546"
-      - "9090"
-      - "9091"
-      - "1317"
-  cli:
-    image: cerc/laconic-registry-cli:local
-    volumes:
-      - ../config/mainnet-laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml
-
-volumes:
-  laconicd-data:
-  laconicd-config:
-  laconicd-keyring:
@@ -14,18 +14,16 @@ services:
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
-      CERC_RELEASE: "v0.1.5"
-      CERC_USE_NPM: true
-      CERC_CONFIG_FILE: "src/config.json"
+      CERC_BUILD_DIR: "@cerc-io/mobymask-ui/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
-      - ../config/watcher-mobymask-v2/mobymask-app-config.json:/app/src/mobymask-app-config.json
      - peers_ids:/peers
      - mobymask_deployment:/server
    ports:
-      - "127.0.0.1:3002:80"
+      - "0.0.0.0:3002:80"
    healthcheck:
      test: ["CMD", "nc", "-vz", "localhost", "80"]
      interval: 20s
@@ -48,18 +46,16 @@ services:
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
-      CERC_RELEASE: "v0.1.5-lxdao-0.1.1"
-      CERC_USE_NPM: false
-      CERC_CONFIG_FILE: "src/utils/config.json"
+      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
-      - ../config/watcher-mobymask-v2/mobymask-app-config.json:/app/src/mobymask-app-config.json
      - peers_ids:/peers
      - mobymask_deployment:/server
    ports:
-      - "127.0.0.1:3004:80"
+      - "0.0.0.0:3004:80"
    healthcheck:
      test: ["CMD", "nc", "-vz", "localhost", "80"]
      interval: 20s
@@ -1,9 +1,8 @@
 version: '3.2'

 services:
-  # Builds and serves the peer-test react-app
  peer-test-app:
-    restart: unless-stopped
+    # Builds and serves the peer-test react-app
    image: cerc/react-peer:local
    working_dir: /scripts
    env_file:
@@ -14,11 +13,11 @@ services:
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
    command: ["sh", "test-app-start.sh"]
    volumes:
-      - ../config/network/wait-for-it.sh:/scripts/wait-for-it.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:
-      - "127.0.0.1:3003:80"
+      - "0.0.0.0:3003:80"
    healthcheck:
      test: ["CMD", "nc", "-v", "localhost", "80"]
      interval: 20s
@@ -1,35 +0,0 @@
-version: "3.8"
-
-services:
-  reth:
-    restart: unless-stopped
-    hostname: reth
-    image: cerc/reth:local
-    entrypoint: ["sh", "/docker-entrypoint-scripts.d/start-reth.sh"]
-    volumes:
-      - ../config/reth/start-reth.sh:/docker-entrypoint-scripts.d/start-reth.sh
-      - reth_data:/root/.local/share/reth
-      - shared_data:/root/.shared_data
-    ports:
-      - "8545:8545" # http rpc
-      - "8546:8546" # ws rpc
-      - "30303:30303" # network listening port
-      - "30303:30303/udp"
-      - "8551" # consensus auth
-
-  lighthouse:
-    restart: unless-stopped
-    hostname: lighthouse
-    image: cerc/lighthouse:local
-    entrypoint: ["sh", "/docker-entrypoint-scripts.d/start-lighthouse.sh"]
-    volumes:
-      - ../config/reth/start-lighthouse.sh:/docker-entrypoint-scripts.d/start-lighthouse.sh
-      - lighthouse_data:/root/.lighthouse/mainnet
-      - shared_data:/root/.shared_data
-    ports:
-      - "8001"
-
-volumes:
-  reth_data:
-  lighthouse_data:
-  shared_data:
@@ -1,26 +0,0 @@
-version: '3.2'
-
-services:
-  # Deploys the sushiswap v3 subgraph
-  sushiswap-subgraph-v3:
-    image: cerc/sushiswap-subgraphs:local
-    restart: on-failure
-    depends_on:
-      graph-node:
-        condition: service_healthy
-    environment:
-      - APP=v3
-      - NETWORK=lotus-fixturenet
-    command: ["bash", "-c", "./run-v3.sh"]
-    working_dir: /app/subgraphs/v3
-    volumes:
-      - ../config/sushiswap-subgraph-v3/lotus-fixturenet.js.template:/app/config/lotus-fixturenet.js.template
-      - ../config/sushiswap-subgraph-v3/run-v3.sh:/app/subgraphs/v3/run-v3.sh
-      - sushiswap_core_deployment:/app/subgraphs/v3/core-deployments/docker
-      - sushiswap_periphery_deployment:/app/subgraphs/v3/deployments/docker
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  sushiswap_core_deployment:
-  sushiswap_periphery_deployment:
@@ -1,13 +1,7 @@
+version: "3.2"
 services:
  test:
    image: cerc/test-container:local
    restart: always
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-    volumes:
-      - test-data:/data
    ports:
      - "80"
-
-volumes:
-  test-data:
@@ -1,91 +0,0 @@
-version: '3.2'
-
-services:
-  # Starts the PostgreSQL database for watcher
-  gelato-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=gelato-watcher,gelato-watcher-job-queue
-      - POSTGRES_EXTENSION=gelato-watcher-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - gelato_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "0.0.0.0:15432:5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 10s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-
-  # Starts the gelato-watcher job runner
-  gelato-watcher-job-runner:
-    image: cerc/watcher-gelato:local
-    restart: unless-stopped
-    depends_on:
-      gelato-watcher-db:
-        condition: service_healthy
-    env_file:
-      - ../config/watcher-gelato/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}
-    command: ["./start-job-runner.sh"]
-    volumes:
-      - ../config/watcher-gelato/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-gelato/start-job-runner.sh:/app/start-job-runner.sh
-    ports:
-      - "0.0.0.0:9000:9000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "9000"]
-      interval: 10s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Starts the gelato-watcher server
-  gelato-watcher-server:
-    image: cerc/watcher-gelato:local
-    restart: unless-stopped
-    depends_on:
-      gelato-watcher-db:
-        condition: service_healthy
-      gelato-watcher-job-runner:
-        condition: service_healthy
-    env_file:
-      - ../config/watcher-gelato/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}
-      CERC_USE_STATE_SNAPSHOT: ${CERC_USE_STATE_SNAPSHOT}
-      CERC_SNAPSHOT_GQL_ENDPOINT: ${CERC_SNAPSHOT_GQL_ENDPOINT}
-      CERC_SNAPSHOT_BLOCKHASH: ${CERC_SNAPSHOT_BLOCKHASH}
-    command: ["./start-server.sh"]
-    volumes:
-      - ../config/watcher-gelato/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-gelato/start-server.sh:/app/start-server.sh
-      - ../config/watcher-gelato/create-and-import-checkpoint.sh:/app/create-and-import-checkpoint.sh
-      - gelato_watcher_state_gql:/app/state_checkpoint
-    ports:
-      - "0.0.0.0:3008:3008"
-      - "0.0.0.0:9001:9001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3008"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  gelato_watcher_db_data:
-  gelato_watcher_state_gql:
@@ -14,7 +14,7 @@ services:
      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
      - mobymask_watcher_db_data:/var/lib/postgresql/data
    ports:
-      - "127.0.0.1:15432:5432"
+      - "0.0.0.0:15432:5432"
    healthcheck:
      test: ["CMD", "nc", "-v", "localhost", "5432"]
      interval: 20s
@@ -44,7 +44,7 @@ services:
      CERC_L2_NODE_PORT: ${CERC_L2_NODE_PORT}
    command: ["sh", "deploy-and-generate-invite.sh"]
    volumes:
-      - ../config/network/wait-for-it.sh:/app/packages/server/wait-for-it.sh
+      - ../config/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
@@ -95,9 +95,9 @@ services:
      - mobymask_deployment:/server
    # Expose GQL, metrics and relay node ports
    ports:
-      - "127.0.0.1:3001:3001"
-      - "127.0.0.1:9001:9001"
-      - "127.0.0.1:9090:9090"
+      - "0.0.0.0:3001:3001"
+      - "0.0.0.0:9001:9001"
+      - "0.0.0.0:9090:9090"
    healthcheck:
      test: ["CMD", "busybox", "nc", "localhost", "9090"]
      interval: 20s
@@ -1,187 +0,0 @@
-version: '3.2'
-
-services:
-  sushiswap-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=erc20-watcher,sushi-watcher,sushi-info-watcher,erc20-watcher-job-queue,sushi-watcher-job-queue,sushi-info-watcher-job-queue
-      - POSTGRES_EXTENSION=erc20-watcher-job-queue:pgcrypto,sushi-watcher-job-queue:pgcrypto,sushi-info-watcher-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    command: ["postgres", "-c", "shared_preload_libraries=pg_stat_statements", "-c", "pg_stat_statements.track=all", "-c", "work_mem=2GB"]
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - ../config/postgresql/create-pg-stat-statements.sql:/docker-entrypoint-initdb.d/create-pg-stat-statements.sql
-      - sushiswap_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "0.0.0.0:15435:5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-    shm_size: '8GB'
-
-  erc20-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    working_dir: /app/packages/erc20-watcher
-    environment:
-      - DEBUG=vulcanize:*
-    command: ["node", "--enable-source-maps", "dist/server.js"]
-    volumes:
-      - ../config/watcher-sushiswap/erc20-watcher.toml:/app/packages/erc20-watcher/environments/local.toml
-    ports:
-      - "0.0.0.0:3005:3001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3001"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-watcher-job-runner:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      lotus-node-1:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    working_dir: /app/packages/uni-watcher
-    environment:
-      - DEBUG=vulcanize:*
-    command: ["node", "--enable-source-maps", "dist/job-runner.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-watcher.toml:/app/packages/uni-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-watcher-test.toml:/app/packages/uni-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:9004:9000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "9000"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      sushi-watcher-job-runner:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-    environment:
-      - DEBUG=vulcanize:*
-    working_dir: /app/packages/uni-watcher
-    command: ["node", "--enable-source-maps", "dist/server.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-watcher.toml:/app/packages/uni-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-watcher-test.toml:/app/packages/uni-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:3003:3003"
-      - "0.0.0.0:9005:9001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3003"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-info-watcher-job-runner:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      erc20-watcher-server:
-        condition: service_healthy
-      lotus-node-1:
-        condition: service_healthy
-      sushi-watcher-server:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    working_dir: /app/packages/uni-info-watcher
-    environment:
-      - DEBUG=vulcanize:*
-    command: ["node", "--enable-source-maps", "dist/job-runner.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-info-watcher.toml:/app/packages/uni-info-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-info-watcher-test.toml:/app/packages/uni-info-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:9006:9002"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "9002"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-info-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      erc20-watcher-server:
-        condition: service_healthy
-      sushi-watcher-server:
-        condition: service_healthy
-      sushi-info-watcher-job-runner:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-    working_dir: /app/packages/uni-info-watcher
-    command: ["node", "--enable-source-maps", "dist/server.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-info-watcher.toml:/app/packages/uni-info-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-info-watcher-test.toml:/app/packages/uni-info-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:3004:3004"
-      - "0.0.0.0:9007:9003"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3004"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushiswap-v3-info:
-    depends_on:
-      sushi-info-watcher-server:
-        condition: service_healthy
-    image: cerc/uniswap-v3-info:local
-    ports:
-      - "0.0.0.0:3006:3000"
-
-  # Deploys the core (UniswapV3Factory) contract
-  sushiswap-v3-core:
-    image: cerc/sushiswap-v3-core:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-
-  # Deploys the periphery (NFPM, token, etc.) contracts
-  sushiswap-v3-periphery:
-    image: cerc/sushiswap-v3-periphery:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-
-volumes:
-  sushiswap_watcher_db_data:
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Chain config
-export ETH_RPC_ENDPOINT="${CERC_ETH_RPC_ENDPOINT:-${CERC_DEFAULT_ETH_RPC_ENDPOINT}}"
-export CHAIN_ID="${CERC_CHAIN_ID:-${CERC_DEFAULT_CHAIN_ID}}"
-export ACCOUNT_PRIVATE_KEY="${CERC_ACCOUNT_PRIVATE_KEY:-${CERC_DEFAULT_ACCOUNT_PRIVATE_KEY}}"
-
-# Option
-DEPLOY="${CERC_DEPLOY:-${CERC_DEFAULT_DEPLOY}}"
-
-# Create a .env file
-echo "ETH_RPC_ENDPOINT=$ETH_RPC_ENDPOINT" > .env
-echo "CHAIN_ID=$CHAIN_ID" >> .env
-echo "ACCOUNT_PRIVATE_KEY=$ACCOUNT_PRIVATE_KEY" >> .env
-
-echo "Using RPC endpoint ${ETH_RPC_ENDPOINT}"
-
-# Wait for the RPC endpoint to be up
-endpoint=${ETH_RPC_ENDPOINT#http://}
-endpoint=${endpoint#https://}
-RPC_HOST=$(echo "$endpoint" | awk -F'[:/]' '{print $1}')
-RPC_PORT=$(echo "$endpoint" | awk -F'[:/]' '{print $2}')
-./wait-for-it.sh -h "${RPC_HOST}" -p "${RPC_PORT}" -s -t 0
-
-if [ "$DEPLOY" = true ] && [ ! -e "/app/deployments/docker/UniswapV3Factory.json" ]; then
-  echo "Performing core contract deployments..."
-  pnpm hardhat --network docker deploy --tags UniswapV3Factory
-else
-  echo "Skipping contract deployments"
-fi
-
-echo "Done"
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Chain config
-ETH_RPC_ENDPOINT="${CERC_ETH_RPC_ENDPOINT:-${CERC_DEFAULT_ETH_RPC_ENDPOINT}}"
-CHAIN_ID="${CERC_CHAIN_ID:-${CERC_DEFAULT_CHAIN_ID}}"
-ACCOUNT_PRIVATE_KEY="${CERC_ACCOUNT_PRIVATE_KEY:-${CERC_DEFAULT_ACCOUNT_PRIVATE_KEY}}"
-
-# Option
-DEPLOY="${CERC_DEPLOY:-${CERC_DEFAULT_DEPLOY}}"
-
-# Create a .env file
-echo "ETH_RPC_ENDPOINT=$ETH_RPC_ENDPOINT" > .env
-echo "CHAIN_ID=$CHAIN_ID" >> .env
-echo "ACCOUNT_PRIVATE_KEY=$ACCOUNT_PRIVATE_KEY" >> .env
-
-echo "Using RPC endpoint $ETH_RPC_ENDPOINT"
-
-# Wait for the RPC endpoint to be up
-endpoint=${ETH_RPC_ENDPOINT#http://}
-endpoint=${endpoint#https://}
-RPC_HOST=$(echo "$endpoint" | awk -F'[:/]' '{print $1}')
-RPC_PORT=$(echo "$endpoint" | awk -F'[:/]' '{print $2}')
-./wait-for-it.sh -h "${RPC_HOST}" -p "${RPC_PORT}" -s -t 0
-
-if [ "$DEPLOY" = true ] && [ ! -e "/app/deployments/docker/NonfungiblePositionManager.json" ]; then
-  # Loop until the factory deployment is detected
-  echo "Waiting for core deployments to occur"
-  while [ ! -f /app/core-deployments/docker/UniswapV3Factory.json ]; do
-    sleep 5
-  done
-
-  echo "Reading factory address from core deployments"
-  FACTORY_ADDRESS=$(jq -r '.address' /app/core-deployments/docker/UniswapV3Factory.json)
-
-  echo "Using UniswapV3Factory at $FACTORY_ADDRESS"
-  echo "FACTORY_ADDRESS=$FACTORY_ADDRESS" >> .env
-
-  echo "Performing periphery contract deployments..."
-  yarn hardhat --network docker deploy --tags NonfungiblePositionManager
-else
-  echo "Skipping contract deployments"
-fi
-
-echo "Done"
@@ -1,11 +0,0 @@
-# Chain config
-
-CERC_DEFAULT_ETH_RPC_ENDPOINT="http://lotus-node-1:1234/rpc/v1"
-CERC_DEFAULT_CHAIN_ID=31415926
-
-# From app/data/config/fixturenet-lotus/fund-account.sh
-CERC_DEFAULT_ACCOUNT_PRIVATE_KEY="0xc05fd3613bcd62a4f25e5eba1f464d0b76d74c3f771a7c2f13e26ad6439444b3"
-
-# Options
-
-CERC_DEFAULT_DEPLOY=true
@@ -17,9 +17,7 @@ CERC_STATEDIFF_DB_PORT=5432
 CERC_STATEDIFF_DB_NAME="cerc_testing"
 CERC_STATEDIFF_DB_USER="vdbm"
 CERC_STATEDIFF_DB_PASSWORD="password"
-CERC_STATEDIFF_DB_GOOSE_MIN_VER=${CERC_STATEDIFF_DB_GOOSE_MIN_VER:-18}
-CERC_STATEDIFF_DB_LOG_STATEMENTS="${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false}"
-CERC_STATEDIFF_WORKERS=2
+CERC_STATEDIFF_DB_GOOSE_MIN_VER=23
+CERC_STATEDIFF_DB_LOG_STATEMENTS="false"

 CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
-CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# ETH account with pk c05fd3613bcd62a4f25e5eba1f464d0b76d74c3f771a7c2f13e26ad6439444b3
-ETH_ADDRESS=0xD375B03bd3A2434A9f675bEC4Ccd68aC5e67C743
-AMOUNT=1000
-
-# Pre-fund stat
-PREFUND_STAT_OUTPUT=$(lotus evm stat $ETH_ADDRESS)
-
-FILECOIN_ADDRESS=$(echo "$PREFUND_STAT_OUTPUT" | grep -oP 'Filecoin address:\s+\K\S+')
-echo Filecoin address: "$FILECOIN_ADDRESS"
-
-echo Sending balance to "$FILECOIN_ADDRESS"
-lotus send --from $(lotus wallet default) "$FILECOIN_ADDRESS" $AMOUNT
-
-# Post-fund stat
-echo lotus evm stat $ETH_ADDRESS
-lotus evm stat $ETH_ADDRESS
-
-echo "Account with ETH address $ETH_ADDRESS funded"
@@ -1,6 +0,0 @@
-LOTUS_PATH=/root/data/.lotus-local-net
-LOTUS_MINER_PATH=/root/data/.lotus-miner-local-net
-LOTUS_SKIP_GENESIS_CHECK=_yes_
-LOTUS_FEVM_ENABLEETHRPC=true
-CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__"
-CGO_CFLAGS="-D__BLST_PORTABLE__"
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-lotus --version
-
-# remove old bootnode peer info if present
-if [ -f /root/.lotus-shared/miner.addr ]; then
-  rm /root/.lotus-shared/miner.addr
-fi
-
-# Check if filecoin-proof-parameters exist; avoid fetching if they do
-if [ -z "$(find "/var/tmp/filecoin-proof-parameters" -maxdepth 1 -type f)" ]; then
-  echo "Proof params not found, fetching..."
-  lotus fetch-params 2048
-else
-  echo "Existing proof params found"
-fi
-
-# if genesis is not already setup
-if [ ! -f /root/data/localnet.json ]; then
-  lotus-seed --sector-dir /root/data/.genesis-sectors pre-seal --sector-size 2KiB --num-sectors 2
-  lotus-seed --sector-dir /root/data/.genesis-sectors genesis new /root/data/localnet.json
-  lotus-seed --sector-dir /root/data/.genesis-sectors genesis add-miner /root/data/localnet.json /root/data/.genesis-sectors/pre-seal-t01000.json
-fi
-
-# start daemon
-# /root/.lotus-shared/devgen.car path
-nohup lotus daemon --lotus-make-genesis=/root/.lotus-shared/devgen.car --profile=bootstrapper --genesis-template=/root/data/localnet.json --bootstrap=false > /var/log/lotus.log 2>&1 &
-
-# Loop until the daemon is started
-echo "Waiting for daemon to start..."
-while ! grep -q "started ChainNotify channel" /var/log/lotus.log ; do
-  sleep 5
-done
-echo "Daemon started."
-
-# copy genesis file to shared volume
-cp /devgen.car /root/.lotus-shared
-
-# if miner not already initialized
-if [ ! -d $LOTUS_MINER_PATH ]; then
-  # initialize miner
-  lotus wallet import --as-default /root/data/.genesis-sectors/pre-seal-t01000.key
-
-  # fund a known account for usage
-  /fund-account.sh
-
-  lotus-miner init --genesis-miner --actor=t01000 --sector-size=2KiB --pre-sealed-sectors=/root/data/.genesis-sectors --pre-sealed-metadata=/root/data/.genesis-sectors/pre-seal-t01000.json --nosync
-fi
-
-# publish bootnode peer info to shared volume
-lotus net listen | grep "$(ip addr | grep inet | grep -v '127.0.0.1' | sort | head -1 | awk '{print $2}' | cut -d '/' -f1)" | head -1 > /root/.lotus-shared/miner.addr
-
-# start miner
-nohup lotus-miner run --nosync &
-
-tail -f /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-lotus --version
-
-# Loop until the daemon is started
-echo "Waiting for miner to share peering info..."
-while [ ! -f /root/.lotus-shared/miner.addr ]; do
-  sleep 5
-done
-echo "Resuming..."
-
-# init node config
-mkdir -p $LOTUS_PATH
-lotus config default > $LOTUS_PATH/config.toml
-
-# add bootstrap peer info if available
-if [ -f /root/.lotus-shared/miner.addr ]; then
-  MINER_ADDR=\"$(cat /root/.lotus-shared/miner.addr)\"
-  # add bootstrap peer id to config file
-  sed -i "/^\[Libp2p\]/a \ \ BootstrapPeers = [$MINER_ADDR]" $LOTUS_PATH/config.toml
-else
-  echo "Bootstrap peer info not found, unable to configure. Manual peering will be required."
-fi
-
-# start node
-lotus daemon --genesis=/root/.lotus-shared/devgen.car
@@ -1,29 +0,0 @@
-POSTGRES_DB=keycloak
-POSTGRES_USER=keycloak
-POSTGRES_PASSWORD=keycloak
-KC_DB=postgres
-KC_DB_URL_HOST=keycloak-db
-KC_DB_URL_DATABASE=${POSTGRES_DB}
-KC_DB_USERNAME=${POSTGRES_USER}
-KC_DB_PASSWORD=${POSTGRES_PASSWORD}
-KC_DB_SCHEMA=public
-KC_HOSTNAME=localhost
-KC_HTTP_ENABLED="true"
-KC_HTTP_RELATIVE_PATH="/auth"
-KC_HOSTNAME_STRICT_HTTPS="false"
-KEYCLOAK_ADMIN=admin
-KEYCLOAK_ADMIN_PASSWORD=admin
-X_API_CHECK_REALM=cerc
-X_API_CHECK_CLIENT_ID="%user_id%"
-
-
-# keycloak-reg-api
-CERC_KCUSERREG_LISTEN_PORT=9292
-CERC_KCUSERREG_LISTEN_ADDR='0.0.0.0'
-CERC_KCUSERREG_API_URL='http://keycloak:8080/auth'
-CERC_KCUSERREG_REG_USER="${KEYCLOAK_ADMIN}"
-CERC_KCUSERREG_REG_PW="${KEYCLOAK_ADMIN_PASSWORD}"
-CERC_KCUSERREG_REG_CLIENT_ID='admin-cli'
-CERC_KCUSERREG_TARGET_REALM=cerc
-CERC_KCUSERREG_TARGET_GROUPS=eth
-CERC_KCUSERREG_CREATE_ENABLED=true
@@ -1,107 +0,0 @@
-server {
-    listen 80;
-    server_name my.example.com;
-
-    # See: https://github.com/acmesh-official/acme.sh/wiki/Stateless-Mode
-    # and  https://datatracker.ietf.org/doc/html/rfc8555
-    location ~ ^/\.well-known/acme-challenge/([-_a-zA-Z0-9]+)$ {
-      default_type text/plain;
-      return 200 "$1.MY_ACCOUNT_THUMBPRINT_GOES_HERE";
-    }
-
-    location / {
-      return 301 https://$host$request_uri;
-    }
-}
-
-upstream geth-pool {
-  keepalive 100;
-  hash $user_id consistent;
-  server server-a:8545;
-  server server-b:8545;
-  server server-c:8545;
-}
-
-# self-reg happens on one server for clarity
-upstream reg-ui-pool {
-  keepalive 100;
-  server server-a:8085;
-}
-
-upstream reg-api-pool {
-  keepalive 100;
-  server server-a:8086;
-}
-
-# auth uses server-a if available
-upstream auth-pool {
-  keepalive 100;
-  server server-a:8080;
-  server server-b:8080 backup;
-  server server-c:8080 backup;
-}
-
-log_format upstreamlog '[$time_local] $remote_addr $user_id - $server_name $host to: $upstream_addr: $request $status upstream_response_time $upstream_response_time msec $msec request_time $request_time';
-proxy_cache_path                /var/cache/nginx/auth_cache levels=1 keys_zone=auth_cache:1m max_size=5m inactive=60m;
-server {
-    listen 443 ssl http2;
-    server_name my.example.com;
-    access_log /var/log/nginx/my.example.com-access.log upstreamlog;
-    error_log /var/log/nginx/my.example.com-error.log;
-
-    ssl_certificate /etc/nginx/ssl/my.example.com/cert.pem;
-    ssl_certificate_key /etc/nginx/ssl/my.example.com/key.pem;
-
-    error_page 500 502 503 504 /50x.html;
-    location = /50x.html {
-        root /usr/share/nginx/html;
-    }
-
-    #rewrite ^/?$ /newuser/;
-    rewrite ^/?$ https://www.example.com/;
-
-
-    # geth-pool ETH API
-    location ~ ^/v1/eth/?([^/]*)$ {
-        set $apiKey $1;
-        if ($apiKey = '') {
-          set $apiKey $http_X_API_KEY;
-        }
-        auth_request /auth;
-        auth_request_set $user_id $sent_http_x_user_id;
-        rewrite /.*$ / break;
-
-        client_max_body_size 3m;
-        client_body_buffer_size 3m;
-        proxy_buffer_size          32k;
-        proxy_buffers              16 32k;
-        proxy_busy_buffers_size    96k;
-
-        proxy_pass  http://geth-pool;
-        proxy_set_header X-Original-Remote-Addr $remote_addr;
-        proxy_set_header X-User-Id $user_id;
-    }
-    
-    # keycloak
-    location = /auth {
-        internal;
-        proxy_cache auth_cache;
-        proxy_cache_key "$apiKey";
-        proxy_cache_valid 200 300s;
-        proxy_cache_valid 401 30s;
-        proxy_pass http://auth-pool/auth/realms/cerc/check?memberOf=eth&apiKey=$apiKey;
-        proxy_pass_request_body off;
-        proxy_set_header Content-Length "";
-        proxy_set_header X-Original-URI $request_uri;
-        proxy_set_header X-Original-Remote-Addr $remote_addr;
-        proxy_set_header X-Original-Host $host;
-    }
-
-    location /newuser/ {
-        proxy_pass  http://reg-ui-pool/;
-    }
-
-    location /user-api/ {
-        proxy_pass  http://reg-api-pool/;
-    }
-}
@@ -1,138 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import sys
-
-import psycopg
-import random
-
-from subprocess import Popen
-from fabric import Connection
-
-
-def dump_src_db_to_file(db_host, db_port, db_user, db_password, db_name, file_name):
-    command = f"pg_dump -h {db_host} -p {db_port} -U {db_user} -d {db_name} -c --inserts -f {file_name}"
-    my_env = os.environ.copy()
-    my_env["PGPASSWORD"] = db_password
-    print(f"Exporting from {db_host}:{db_port}/{db_name} to {file_name}... ", end="")
-    ret = Popen(command, shell=True, env=my_env).wait()
-    print("DONE")
-    return ret
-
-
-def establish_ssh_tunnel(ssh_host, ssh_port, ssh_user, db_host, db_port):
-    local_port = random.randint(11000, 12000)
-    conn = Connection(host=ssh_host, port=ssh_port, user=ssh_user)
-    fw = conn.forward_local(
-        local_port=local_port, remote_port=db_port, remote_host=db_host
-    )
-    return conn, fw, local_port
-
-
-def load_db_from_file(db_host, db_port, db_user, db_password, db_name, file_name):
-    connstr = "host=%s port=%s user=%s password=%s sslmode=disable dbname=%s" % (
-        db_host,
-        db_port,
-        db_user,
-        db_password,
-        db_name,
-    )
-    with psycopg.connect(connstr) as conn:
-        with conn.cursor() as cur:
-            print(
-                f"Importing from {file_name} to {db_host}:{db_port}/{db_name}... ",
-                end="",
-            )
-            cur.execute(open(file_name, "rt").read())
-            print("DONE")
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument("--src-dbhost", help="DB hostname", default="localhost")
-    parser.add_argument("--src-dbport", help="DB port", default=5432, type=int)
-    parser.add_argument("--src-dbuser", help="DB username", default="keycloak")
-    parser.add_argument("--src-dbpw", help="DB password", required=True)
-    parser.add_argument("--src-dbname", help="dbname", default="keycloak")
-
-    parser.add_argument(
-        "--dst-file", help="Destination filename", default="keycloak-mirror.sql"
-    )
-
-    parser.add_argument("--live-import", help="run the import", action="store_true")
-
-    parser.add_argument("--dst-dbhost", help="DB hostname", default="localhost")
-    parser.add_argument("--dst-dbport", help="DB port", default=5432, type=int)
-    parser.add_argument("--dst-dbuser", help="DB username", default="keycloak")
-    parser.add_argument("--dst-dbpw", help="DB password")
-    parser.add_argument("--dst-dbname", help="dbname", default="keycloak")
-
-    parser.add_argument("--ssh-host", help="SSH hostname")
-    parser.add_argument("--ssh-port", help="SSH port", default=22, type=int)
-    parser.add_argument("--ssh-user", help="SSH user")
-
-    args = parser.parse_args()
-
-    if args.live_import and not args.dst_dbpw:
-        print("--dst-dbpw is required if importing", file=sys.stderr)
-        sys.exit(2)
-
-    remove_sql_file = False
-    if args.dst_dbhost and not args.dst_file:
-        remove_sql_file = True
-
-    dst_file = args.dst_file
-    if not dst_file:
-        dst_file = "keycloak-mirror.sql"
-
-    dump_src_db_to_file(
-        args.src_dbhost,
-        args.src_dbport,
-        args.src_dbuser,
-        args.src_dbpw,
-        args.src_dbname,
-        dst_file,
-    )
-
-    if args.live_import:
-        try:
-            if args.ssh_host:
-                dst_dbport = random.randint(11000, 12000)
-                print(
-                    f"Establishing SSH tunnel from 127.0.0.1:{dst_dbport} to {args.ssh_host}->{args.dst_dbhost}:{args.dst_dbport}... ",
-                    end="",
-                )
-                with Connection(
-                    host=args.ssh_host, port=args.ssh_port, user=args.ssh_user
-                ).forward_local(
-                    local_port=dst_dbport,
-                    remote_port=args.dst_dbport,
-                    remote_host=args.dst_dbhost,
-                ):
-                    print("DONE")
-
-                    load_db_from_file(
-                        args.dst_dbhost,
-                        args.dst_dbport,
-                        args.dst_dbuser,
-                        args.dst_dbpw,
-                        args.dst_dbname,
-                        dst_file,
-                    )
-            else:
-                load_db_from_file(
-                    args.dst_dbhost,
-                    args.dst_dbport,
-                    args.dst_dbuser,
-                    args.dst_dbpw,
-                    args.dst_dbname,
-                    dst_file,
-                )
-
-        finally:
-            if args.live_import:
-                print(f"Removing {dst_file}... ", end="")
-                os.remove(dst_file)
-                print("DONE")
@@ -1,3 +0,0 @@
-fabric
-psycopg~=3.1.8
-psycopg_binary
@@ -1,4 +0,0 @@
-web:
-  path: ''
-api:
-  url: 'http://keycloak-reg-api:9292'
@@ -1,9 +0,0 @@
-apiVersion: 1
-
-providers:
-  - name: dashboards
-    type: file
-    updateIntervalSeconds: 10
-    options:
-      path: /etc/grafana/dashboards
-      foldersFromFilesStructure: true
@@ -1,19 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - id: 1
-    uid: jZUuGao4k
-    orgId: 1
-    name: Prometheus
-    type: prometheus
-    typeName: Prometheus
-    typeLogoUrl: public/app/plugins/datasource/prometheus/img/prometheus_logo.svg
-    access: proxy
-    url: http://prometheus:9090
-    user: ""
-    database: ""
-    basicAuth: false
-    isDefault: true
-    jsonData:
-      httpMethod: POST
-    readOnly: false
@@ -1,2 +0,0 @@
-# grafana
-GF_SECURITY_ADMIN_PASSWORD=changeme6325
@@ -1,19 +0,0 @@
-global:
-  scrape_interval: 5s
-  evaluation_interval: 15s
-
-scrape_configs:
-  # geth
-  - job_name: 'geth'
-    metrics_path: /debug/metrics/prometheus
-    scheme: http
-    static_configs:
-    - targets: ['mainnet-eth-geth-1:6060']
-
-  # keycloak
-  - job_name: 'keycloak'
-    scrape_interval: 5s
-    metrics_path: /auth/realms/cerc/metrics
-    scheme: http
-    static_configs:
-      - targets: ['keycloak:8080']
@@ -1,57 +0,0 @@
-# Enable remote debugging using dlv
-CERC_REMOTE_DEBUG=false
-
-# Enable startup script debug output.
-CERC_SCRIPT_DEBUG=false
-
-# Simple toggle to choose either a 'full' node or an 'archive' node
-# (controls the values of --syncmode --gcmode --snapshot)
-CERC_GETH_MODE_QUICK_SET=full
-
-# Optional custom node name.
-# GETH_NODE_NAME=""
-
-# Specify any other geth CLI options.
-GETH_OPTS=""
-
-# --cache
-GETH_CACHE=1024
-
-# --cache.database
-GETH_CACHE_DB=50
-
-# --cache.gc
-GETH_CACHE_GC=25
-
-# --cache.trie
-GETH_CACHE_TRIE=15
-j
-# --datadir
-GETH_DATADIR="/data"
-
-# --http.api
-GETH_HTTP_API="eth,web3,net"
-
-# --authrpc.jwtsecret
-GETH_JWTSECRET="/etc/mainnet-eth/jwtsecret"
-
-# --maxpeers
-GETH_MAX_PEERS=100
-
-# --rpc.evmtimeout
-GETH_RPC_EVMTIMEOUT=0
-
-# --rpc.gascap
-GETH_RPC_GASCAP=0
-
-# --txlookuplimit
-GETH_TXLOOKUPLIMIT=0
-
-# --verbosity
-GETH_VERBOSITY=3
-
-# --log.vmodule
-GETH_VMODULE="rpc/*=4"
-
-# --ws.api
-GETH_WS_API="eth,web3,net"
@@ -1,33 +0,0 @@
-# Enable startup script debug output.
-CERC_SCRIPT_DEBUG=false
-
-# Specify any other lighthouse CLI options.
-LIGHTHOUSE_OPTS=""
-
-# Override the advertised public IP (optional)
-# --enr-address
-#LIGHTHOUSE_ENR_ADDRESS=""
-
-# --checkpoint-sync-url
-LIGHTHOUSE_CHECKPOINT_SYNC_URL="https://beaconstate.ethstaker.cc"
-
-# --checkpoint-sync-url-timeout
-LIGHTHOUSE_CHECKPOINT_SYNC_URL_TIMEOUT=300
-
-# --datadir
-LIGHTHOUSE_DATADIR=/data
-
-# --debug-level
-LIGHTHOUSE_DEBUG_LEVEL=info
-
-# --http-port
-LIGHTHOUSE_HTTP_PORT=5052
-
-# --execution-jwt
-LIGHTHOUSE_JWTSECRET=/etc/mainnet-eth/jwtsecret
-
-# --metrics-port
-LIGHTHOUSE_METRICS_PORT=5054
-
-# --port --enr-udp-port --enr-tcp-port
-LIGHTHOUSE_NETWORK_PORT=9000
@@ -1,67 +0,0 @@
-#!/bin/sh
-if [[ "true" == "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
-
-START_CMD="geth"
-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
-
-MODE_FLAGS=""
-if [[ "$CERC_GETH_MODE_QUICK_SET" = "archive" ]]; then
-  MODE_FLAGS="--syncmode=${GETH_SYNC_MODE:-full} --gcmode=${GETH_GC_MODE:-archive} --snapshot=${GETH_SNAPSHOT:-false}"
-else
-  MODE_FLAGS="--syncmode=${GETH_SYNC_MODE:-snap} --gcmode=${GETH_GC_MODE:-full} --snapshot=${GETH_SNAPSHOT:-true}"
-fi
-
-$START_CMD \
-  $MODE_FLAGS \
-  --datadir="${GETH_DATADIR}"\
-  --identity="${GETH_NODE_NAME}" \
-  --maxpeers=${GETH_MAX_PEERS} \
-  --cache=${GETH_CACHE} \
-  --cache.gc=${GETH_CACHE_GC} \
-  --cache.database=${GETH_CACHE_DB} \
-  --cache.trie=${GETH_CACHE_TRIE} \
-  --authrpc.addr='0.0.0.0' \
-  --authrpc.vhosts='*'  \
-  --authrpc.jwtsecret="${GETH_JWTSECRET}" \
-  --http \
-  --http.addr='0.0.0.0' \
-  --http.api="${GETH_HTTP_API}" \
-  --http.vhosts='*' \
-  --metrics \
-  --metrics.addr='0.0.0.0' \
-  --ws \
-  --ws.addr='0.0.0.0' \
-  --ws.api="${GETH_WS_API}" \
-  --rpc.gascap=${GETH_RPC_GASCAP} \
-  --rpc.evmtimeout=${GETH_RPC_EVMTIMEOUT} \
-  --txlookuplimit=${GETH_TXLOOKUPLIMIT} \
-  --verbosity=${GETH_VERBOSITY} \
-  --log.vmodule="${GETH_VMODULE}" \
-  ${GETH_OPTS} &
-
-geth_pid=$!
-wait $geth_pid
-
-if [ "true" == "$CERC_KEEP_RUNNING_AFTER_GETH_EXIT" ]; then
-  while [ 1 -eq 1 ]; do
-    sleep 60
-  done
-fi
@@ -1,30 +0,0 @@
-#!/bin/bash
-if [[ "true" == "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
-
-ENR_OPTS=""
-if [[ -n "$LIGHTHOUSE_ENR_ADDRESS" ]]; then
-  ENR_OPTS="--enr-address $LIGHTHOUSE_ENR_ADDRESS"
-fi
-
-exec lighthouse bn \
-  --checkpoint-sync-url "$LIGHTHOUSE_CHECKPOINT_SYNC_URL" \
-  --checkpoint-sync-url-timeout ${LIGHTHOUSE_CHECKPOINT_SYNC_URL_TIMEOUT} \
-  --datadir "$LIGHTHOUSE_DATADIR" \
-  --debug-level $LIGHTHOUSE_DEBUG_LEVEL \
-  --disable-deposit-contract-sync \
-  --disable-upnp \
-  --enr-tcp-port $LIGHTHOUSE_NETWORK_PORT \
-  --enr-udp-port $LIGHTHOUSE_NETWORK_PORT \
-  --execution-endpoint "$LIGHTHOUSE_EXECUTION_ENDPOINT" \
-  --execution-jwt /etc/mainnet-eth/jwtsecret \
-  --http \
-  --http-address 0.0.0.0 \
-  --http-port $LIGHTHOUSE_HTTP_PORT \
-  --metrics \
-  --metrics-address=0.0.0.0 \
-  --metrics-port $LIGHTHOUSE_METRICS_PORT \
-  --network mainnet \
-  --port $LIGHTHOUSE_NETWORK_PORT \
-  $ENR_OPTS $LIGHTHOUSE_OPTS
@@ -1 +0,0 @@
-
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# download genesis file
-wget https://download.fantom.network/mainnet-109331-no-history.g
-
-./opera --genesis=mainnet-109331-no-history.g --db.preset ldb-1 --syncmode snap --http --http.addr="0.0.0.0" --http.corsdomain="*" --http.api=eth,web3,net,txpool,ftm --ws --ws.addr="0.0.0.0" --ws.origins="*" --ws.api=eth,web3,net,txpool,ftm --cache 8192
-#tail -f /dev/null
@@ -1,9 +0,0 @@
-services:
-  cns:
-    restEndpoint: 'http://laconicd:1317'
-    gqlEndpoint: 'http://laconicd:9473/api'
-    userKey: REPLACE_WITH_MYKEY
-    bondId:
-    chainId: laconic_9000-1
-    gas: 250000
-    fees: 200000aphoton
@@ -1,2 +0,0 @@
-#!/bin/sh
-laconicd keys show mykey | grep address | cut -d ' ' -f 3
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo y | laconicd keys export mykey --unarmored-hex --unsafe
@@ -1,18 +0,0 @@
-#!/bin/sh
-if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
-
-#TODO: pass these in from the caller
-TRACE="--trace"
-LOGLEVEL="info"
-
-laconicd start \
-    --pruning=nothing \
-    --evm.tracer=json $TRACE \
-    --log_level $LOGLEVEL \
-    --minimum-gas-prices=0.0001aphoton \
-    --json-rpc.api eth,txpool,personal,net,debug,web3,miner \
-    --api.enable \
-    --gql-server \
-    --gql-playground
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Wait for reth container to create jwt auth token
-while [ ! -f /root/.shared_data/jwt.hex ]; do
-  echo "Jwt auth token not found, sleeping for 5s..."
-  sleep 5
-done
-
-echo "Jwt token found. Starting Lighthouse..."
-export RUST_LOG=info
-lighthouse bn \
-  --network mainnet \
-  --execution-endpoint http://reth:8551 \
-  --execution-jwt /root/.shared_data/jwt.hex \
-  --checkpoint-sync-url https://mainnet.checkpoint.sigp.io \
-  --disable-deposit-contract-sync
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# generate jwt token for reth/lighthouse authentication
-echo "Installing OpenSSL..."
-apt update
-apt install openssl
-echo "Generating jwt token for lighthouse auth..."
-openssl rand -hex 32 | tr -d "\n" | tee /root/.shared_data/jwt.hex
-
-# start reth
-echo "Starting Reth..."
-export RUST_LOG=info
-reth node \
-  --authrpc.jwtsecret /root/.shared_data/jwt.hex \
-  --authrpc.addr 0.0.0.0 \
-  --authrpc.port 8551 \
-  --http \
-  --http.addr 0.0.0.0 \
-  --http.corsdomain * \
-  --http.api eth,web3,net,rpc \
-  --ws \
-  --ws.addr 0.0.0.0 \
-  --ws.origins * \
-  --ws.api eth,web3,net,rpc
@@ -1,20 +0,0 @@
-module.exports = {
-  network: 'lotus-fixturenet',
-  v3: {
-    factory: {
-      address: 'FACTORY_ADDRESS',
-      startBlock: FACTORY_BLOCK
-    },
-    positionManager: {
-      address: 'NFPM_ADDRESS',
-      startBlock: NFPM_BLOCK
-    },
-    native: { address: 'NATIVE_ADDRESS' },
-    whitelistedTokenAddresses: [
-      'NATIVE_ADDRESS',
-    ],
-    stableTokenAddresses: [
-    ],
-    minimumEthLocked: 1.5
-  }
-}
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Loop until the NFPM deployment is detected
-echo "Waiting for sushiswap-periphery deployments to occur"
-while [ ! -f ./deployments/docker/NonfungiblePositionManager.json ]; do
-  sleep 5
-done
-
-echo "Reading contract addresses and block numbers from deployments"
-FACTORY_ADDRESS=$(jq -r '.address' ./core-deployments/docker/UniswapV3Factory.json)
-FACTORY_BLOCK=$(jq -r '.receipt.blockNumber' ./core-deployments/docker/UniswapV3Factory.json)
-NATIVE_ADDRESS=$(jq -r '.address' ./deployments/docker/WFIL.json)
-NFPM_ADDRESS=$(jq -r '.address' ./deployments/docker/NonfungiblePositionManager.json)
-NFPM_BLOCK=$(jq -r '.receipt.blockNumber' ./deployments/docker/NonfungiblePositionManager.json)
-
-# Read the JavaScript file content
-file_content=$(</app/config/lotus-fixturenet.js.template)
-
-# Replace uppercase words with environment variables
-echo "Reading values in lotus-fixturenet config"
-replaced_content=$(echo "$file_content" | sed -e "s/FACTORY_ADDRESS/$FACTORY_ADDRESS/g" \
-                                              -e "s/FACTORY_BLOCK/$FACTORY_BLOCK/g" \
-                                              -e "s/NFPM_ADDRESS/$NFPM_ADDRESS/g" \
-                                              -e "s/NFPM_BLOCK/$NFPM_BLOCK/g" \
-                                              -e "s/NATIVE_ADDRESS/$NATIVE_ADDRESS/g")
-
-# Write the replaced content back to the JavaScript file
-echo "$replaced_content" > /app/config/lotus-fixturenet.js
-
-
-echo "Building subgraph and deploying to graph-node..."
-pnpm run generate
-pnpm run build
-pnpm exec graph create --node http://graph-node:8020/ sushiswap/v3-lotus
-pnpm exec graph deploy --node http://graph-node:8020/ --ipfs http://ipfs:5001 --version-label 0.1.0 sushiswap/v3-lotus
-
-echo "Done"
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-CERC_SNAPSHOT_GQL_ENDPOINT="${CERC_SNAPSHOT_GQL_ENDPOINT:-${DEFAULT_CERC_SNAPSHOT_GQL_ENDPOINT}}"
-CERC_SNAPSHOT_BLOCKHASH="${CERC_SNAPSHOT_BLOCKHASH:-${DEFAULT_CERC_SNAPSHOT_BLOCKHASH}}"
-
-CHECKPOINT_FILE_PATH="./state_checkpoint/state-gql-${CERC_SNAPSHOT_BLOCKHASH}"
-
-if [ -f "${CHECKPOINT_FILE_PATH}" ]; then
-  # Skip checkpoint creation if the file already exists
-  echo "File at ${CHECKPOINT_FILE_PATH} already exists, skipping checkpoint creation..."
-else
-  # Create a checkpoint using GQL endpoint
-  echo "Creating a state checkpoint using GQL endpoint..."
-  yarn create-state-gql \
-    --snapshot-block-hash "${CERC_SNAPSHOT_BLOCKHASH}" \
-    --gql-endpoint "${CERC_SNAPSHOT_GQL_ENDPOINT}" \
-    --output "${CHECKPOINT_FILE_PATH}"
-fi
-
-echo "Initializing watcher using a state snapshot..."
-
-# Import the state checkpoint
-# (skips if snapshot block is already indexed)
-yarn import-state --import-file "${CHECKPOINT_FILE_PATH}"
@@ -1,23 +0,0 @@
-#!/bin/bash
-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 ETH server RPC endpoint ${CERC_IPLD_ETH_RPC}"
-echo "Using ETH server GQL endpoint ${CERC_IPLD_ETH_GQL}"
-
-# 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_GQL|${CERC_IPLD_ETH_GQL}|g; \
-          s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-echo "Running job-runner"
-DEBUG=vulcanize:* exec node --enable-source-maps dist/job-runner.js
@@ -1,32 +0,0 @@
-#!/bin/bash
-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}}"
-
-CERC_USE_STATE_SNAPSHOT="${CERC_USE_STATE_SNAPSHOT:-${DEFAULT_CERC_USE_STATE_SNAPSHOT}}"
-
-echo "Using ETH server RPC endpoint ${CERC_IPLD_ETH_RPC}"
-echo "Using ETH server GQL endpoint ${CERC_IPLD_ETH_GQL}"
-
-# 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_GQL|${CERC_IPLD_ETH_GQL}|g; \
-          s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-if [ "$CERC_USE_STATE_SNAPSHOT" = true ] ; then
-  ./create-and-import-checkpoint.sh
-else
-  echo "Initializing watcher using fill..."
-  yarn fill --start-block $DEFAULT_CERC_GELATO_START_BLOCK --end-block $DEFAULT_CERC_GELATO_START_BLOCK
-fi
-
-echo "Running active server"
-DEBUG=vulcanize:* exec node --enable-source-maps dist/server.js
@@ -1,75 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3008
-  kind = "active"
-
-  # Checkpointing state.
-  checkpointing = true
-
-  # Checkpoint interval in number of blocks.
-  checkpointInterval = 2000
-
-  # Enable state creation
-  # CAUTION: Disable only if state creation is not desired or can be filled subsequently
-  enableState = true
-
-  subgraphPath = "./subgraph"
-
-  # Interval to restart wasm instance periodically
-  wasmRestartBlocksInterval = 20
-
-  # Interval in number of blocks at which to clear entities cache.
-  clearEntitiesCacheInterval = 1000
-
-  # Boolean to filter logs by contract.
-  filterLogs = true
-
-  # Max block range for which to return events in eventsInRange GQL query.
-  # Use -1 for skipping check on block range.
-  maxEventsBlockRange = 1000
-
-  # GQL cache settings
-  [server.gqlCache]
-    enabled = true
-
-    # Max in-memory cache size (in bytes) (default 8 MB)
-    # maxCacheSize
-
-    # GQL cache-control max-age settings (in seconds)
-    maxAge = 15
-    timeTravelMaxAge = 86400 # 1 day
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9000
-  [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "gelato-watcher-db"
-  port = 5432
-  database = "gelato-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-
-[upstream]
-  [upstream.ethServer]
-    gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL"
-    rpcProviderEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_RPC"
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@gelato-watcher-db/gelato-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = true
-  prefetchBlockCount = 10
@@ -1,13 +0,0 @@
-# ipld-eth-server endpoints
-DEFAULT_CERC_IPLD_ETH_RPC="http://ipld-eth-server:8082"
-DEFAULT_CERC_IPLD_ETH_GQL="http://ipld-eth-server:8083/graphql"
-
-# Gelato start block
-DEFAULT_CERC_GELATO_START_BLOCK=11361987
-
-# Whether to use a state snapshot to initialize the watcher
-DEFAULT_CERC_USE_STATE_SNAPSHOT=false
-
-# State snapshot params
-DEFAULT_CERC_SNAPSHOT_GQL_ENDPOINT=
-DEFAULT_CERC_SNAPSHOT_BLOCKHASH=
@@ -1,7 +0,0 @@
-{
-  "name": "MobyMask",
-  "relayNodes": [],
-  "peer": {
-    "enableDebugInfo": true
-  }
-}
@@ -33,23 +33,11 @@ else
  echo "Taking deployed contract details from env"
 fi

-cd /app
-git checkout $CERC_RELEASE
+# 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

-# Export config values in a json file
-jq --arg address "$CERC_DEPLOYED_CONTRACT" \
-  --argjson chainId "$CERC_CHAIN_ID" \
-  --argjson relayNodes "$CERC_RELAY_NODES" \
-  --argjson denyMultiaddrs "$CERC_DENY_MULTIADDRS" \
-  '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes | .peer.denyMultiaddrs = $denyMultiaddrs' \
-  /app/src/mobymask-app-config.json > /app/${CERC_CONFIG_FILE}
-
-if [ "${CERC_USE_NPM}" = "true" ]; then
-  npm install
-  REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" npm run build
-else
-  yarn install
-  REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" yarn build
-fi
-
-http-server -p 80 /app/build
+/scripts/start-serving-app.sh
@@ -10,7 +10,7 @@ DEFAULT_CERC_RELAY_PEERS=[]
 DEFAULT_CERC_RELAY_ANNOUNCE_DOMAIN=

 # Base URI for mobymask-app (used for generating invite)
-DEFAULT_CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3004/#"
+DEFAULT_CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3002/#"

 # Set to false for disabling watcher peer to send txs to L2
 DEFAULT_CERC_ENABLE_PEER_L2_TXS=true
@@ -1,39 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3001
-  mode = "eth_call"
-  kind = "lazy"
-
-[metrics]
-  host = "127.0.0.1"
-  port = 9000
-    [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "erc20-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/erc20-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50
-  blockDelayInMilliSecs = 2000
@@ -1,6 +0,0 @@
-# Lotus node config
-ETH_RPC_ENDPOINT="http://lotus-node-1:1234/rpc/v1"
-CHAIN_ID=31415926
-
-# From app/data/config/fixturenet-lotus/fund-account.sh
-ACCOUNT_PRIVATE_KEY="0xc05fd3613bcd62a4f25e5eba1f464d0b76d74c3f771a7c2f13e26ad6439444b3"
@@ -1,45 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3004
-  # Use mode demo when running watcher locally.
-  # Mode demo whitelists all tokens so that entity values get updated.
-  mode = "demo"
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-info-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-  [upstream.uniWatcher]
-    gqlEndpoint = "http://sushi-watcher-server:3003/graphql"
-    gqlSubscriptionEndpoint = "ws://sushi-watcher-server:3003/graphql"
-
-  [upstream.tokenWatcher]
-    gqlEndpoint = "http://erc20-watcher-server:3001/graphql"
-    gqlSubscriptionEndpoint = "ws://erc20-watcher-server:3001/graphql"
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-info-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 1000
-  eventsInBatch = 50
-  subgraphEventsOrder = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -1,90 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3004
-  mode = "demo"
-  kind = "active"
-
-  # Checkpointing state.
-  checkpointing = true
-
-  # Checkpoint interval in number of blocks.
-  checkpointInterval = 50000
-
-  # Enable state creation
-  enableState = false
-
-  # Max block range for which to return events in eventsInRange GQL query.
-  # Use -1 for skipping check on block range.
-  maxEventsBlockRange = 1000
-
-  # Interval in number of blocks at which to clear entities cache.
-  clearEntitiesCacheInterval = 1000
-
-  # Boolean to skip updating entity fields required in state creation and not required in the frontend.
-  skipStateFieldsUpdate = false
-
-  # Boolean to load GQL query nested entity relations sequentially.
-  loadRelationsSequential = false
-
-  # Max GQL API requests to process simultaneously (defaults to 1).
-  maxSimultaneousRequests = 1
-
-  # GQL cache settings
-  [server.gqlCache]
-    enabled = true
-
-    # Max in-memory cache size (in bytes) (default 8 MB)
-    # maxCacheSize
-
-    # GQL cache-control max-age settings (in seconds)
-    maxAge = 15
-    timeTravelMaxAge = 86400 # 1 day
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9002
-  [metrics.gql]
-    port = 9003
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-info-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-  [database.extra]
-    # maximum number of clients the pool should contain
-    max = 20
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-  [upstream.uniWatcher]
-    gqlEndpoint = "http://sushi-watcher-server:3003/graphql"
-    gqlSubscriptionEndpoint = "ws://sushi-watcher-server:3003/graphql"
-
-  [upstream.tokenWatcher]
-    gqlEndpoint = "http://erc20-watcher-server:3001/graphql"
-    gqlSubscriptionEndpoint = "ws://erc20-watcher-server:3001/graphql"
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-info-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 1000
-  eventsInBatch = 50
-  subgraphEventsOrder = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -1,34 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3003
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 0
-  eventsInBatch = 50
-  lazyUpdateBlockProgress = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -1,41 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3003
-  kind = "active"
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9000
-  [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 0
-  eventsInBatch = 50
-  lazyUpdateBlockProgress = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -27,8 +27,8 @@ yarn_info_output=$(yarn info --json $versioned_target_package 2>/dev/null)
 # If it doesn't exist there will be no .data.dist.tarball element,
 # and jq will output the string "null"
 package_tarball=$(echo $yarn_info_output | jq -r .data.dist.tarball)
-if [[ "$yarn_info_output" == "" ||  $package_tarball == "null" ]]; then
-    echo "FATAL: Target package version ($versioned_target_package) not found (or bad npm auth token)" >&2
+if [[ $package_tarball == "null" ]]; then
+    echo "FATAL: Target package version ($versioned_target_package) not found" >&2
    exit 1
 fi
 # Code below parses out the values we need
@@ -1,27 +0,0 @@
-FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
-
-FROM golang:1.20-alpine as builder
-
-RUN apk add --no-cache python3 py3-pip
-
-COPY genesis /opt/genesis
-
-# Install ethereum-genesis-generator tools
-COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
-COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
-COPY --from=ethgen /apps /apps
-RUN cd /apps/el-gen && pip3 install -r requirements.txt
-# web3==5.24.0 used by el-gen is broken on python 3.11
-RUN pip3 install --upgrade "web3==6.5.0"
-
-# Build genesis config
-RUN apk add --no-cache make bash envsubst jq
-RUN cd /opt/genesis && make genesis-el
-
-# Snag the genesis block info.
-RUN go install github.com/cerc-io/eth-dump-genblock@latest
-RUN eth-dump-genblock /opt/genesis/build/el/geth.json > /opt/genesis/build/el/genesis_block.json
-
-FROM alpine:latest
-
-COPY --from=builder /opt/genesis /opt/genesis
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/fixturenet-eth-genesis
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/fixturenet-eth-genesis:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -1,21 +1,27 @@
-FROM cerc/fixturenet-eth-genesis:local as fnetgen
-FROM cerc/go-ethereum:local as geth
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen

 # Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
-FROM golang:1.20-alpine as delve
+FROM golang:1.18-alpine as delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest

-FROM alpine:3.17
+FROM cerc/go-ethereum:local as geth

-RUN apk add --no-cache bash wget python3 bind-tools postgresql-client
+FROM alpine:latest
+RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client

+COPY --from=delve  /go/bin/dlv /usr/local/bin/
+COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
+COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
+COPY --from=ethgen /apps /apps
+
+RUN cd /apps/el-gen && pip3 install -r requirements.txt
+
+COPY genesis /opt/testnet
 COPY run-el.sh /opt/testnet/run.sh

-COPY --from=delve /go/bin/dlv /usr/local/bin/
-COPY --from=geth /usr/local/bin/geth /usr/local/bin/
-COPY --from=fnetgen /opt/genesis /opt/testnet
+RUN cd /opt/testnet && make genesis-el

-# Initialize the geth db with our config
+COPY --from=geth  /usr/local/bin/geth /usr/local/bin/
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey

 ENTRYPOINT ["/opt/testnet/run.sh"]
@@ -34,7 +34,5 @@ python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
  jq ".config.istanbulBlock=$istanbul_block" | \
  jq ".config.berlinBlock=$berlin_block" | \
  jq ".config.londonBlock=$london_block" | \
-  jq ".config.mergeForkBlock=$merge_fork_block" | \
-  jq ".config.mergeNetsplitBlock=$merge_fork_block" \
-  > ../build/el/geth.json
+  jq ".config.mergeForkBlock=$merge_fork_block" > ../build/el/geth.json
 python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
@@ -7,12 +7,11 @@ fi
 ETHERBASE=`cat /opt/testnet/build/el/accounts.csv | head -1 | cut -d',' -f2`
 NETWORK_ID=`cat /opt/testnet/el/el-config.yaml | grep 'chain_id' | awk '{ print $2 }'`
 NETRESTRICT=`ip addr | grep inet | grep -v '127.0' | awk '{print $2}'`
-CERC_ETH_DATADIR="${CERC_ETH_DATADIR:-$HOME/ethdata}"
-CERC_PLUGINS_DIR="${CERC_PLUGINS_DIR:-/usr/local/lib/plugeth}"

+HOME_DIR=`pwd`
 cd /opt/testnet/build/el
 python3 -m http.server 9898 &
-cd $HOME
+cd $HOME_DIR

 START_CMD="geth"
 if [ "true" == "$CERC_REMOTE_DEBUG" ] && [ -x "/usr/local/bin/dlv" ]; then
@@ -35,7 +34,7 @@ trap 'cleanup' SIGINT SIGTERM

 if [ "true" == "$RUN_BOOTNODE" ]; then
    $START_CMD \
-      --datadir="${CERC_ETH_DATADIR}" \
+       --datadir=~/ethdata \
      --nodekeyhex="${BOOTNODE_KEY}" \
      --nodiscover \
      --ipcdisable \
@@ -65,8 +64,8 @@ else
    STATEDIFF_OPTS=""
    if [ "$CERC_RUN_STATEDIFF" == "true" ]; then
      ready=0
-      echo "Waiting for statediff DB..."
      while [ $ready -eq 0 ]; do
+        echo "Waiting for statediff DB..."
        sleep 1
        export PGPASSWORD="$CERC_STATEDIFF_DB_PASSWORD"
        result=$(psql -h "$CERC_STATEDIFF_DB_HOST" \
@@ -74,16 +73,12 @@ else
          -U "$CERC_STATEDIFF_DB_USER" \
          -d "$CERC_STATEDIFF_DB_NAME" \
          -t -c 'select max(version_id) from goose_db_version;' 2>/dev/null | awk '{ print $1 }')
-        if [ -n "$result" ]; then
+        if [ -n "$result" ] && [ $result -ge $CERC_STATEDIFF_DB_GOOSE_MIN_VER ]; then
          echo "DB ready..."
-          if [ $result -ge $CERC_STATEDIFF_DB_GOOSE_MIN_VER ]; then
-            ready=1
-          else
-            echo "DB not at required version (want $CERC_STATEDIFF_DB_GOOSE_MIN_VER, have $result)"
-          fi
+          ready=1
        fi
      done
-      STATEDIFF_OPTS="--statediff \
+      STATEDIFF_OPTS="--statediff=true \
      --statediff.db.host=$CERC_STATEDIFF_DB_HOST \
      --statediff.db.name=$CERC_STATEDIFF_DB_NAME \
      --statediff.db.nodeid=$CERC_STATEDIFF_DB_NODE_ID \
@@ -93,17 +88,11 @@ else
      --statediff.db.logstatements=${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false} \
      --statediff.db.copyfrom=${CERC_STATEDIFF_DB_COPY_FROM:-true} \
      --statediff.waitforsync=true \
-      --statediff.workers=${CERC_STATEDIFF_WORKERS:-1} \
      --statediff.writing=true"
-
-      if [ -d "${CERC_PLUGINS_DIR}" ]; then
-        # With plugeth, we separate the statediff options by prefixing with ' -- '
-        STATEDIFF_OPTS="--pluginsdir "${CERC_PLUGINS_DIR}" -- ${STATEDIFF_OPTS}"
-      fi
    fi

    $START_CMD \
-      --datadir="${CERC_ETH_DATADIR}" \
+      --datadir=~/ethdata \
      --bootnodes="${ENODE}" \
      --allow-insecure-unlock \
      --http \
@@ -130,9 +119,8 @@ else
      --metrics \
      --metrics.addr="0.0.0.0" \
      --verbosity=${CERC_GETH_VERBOSITY:-3} \
-      --log.vmodule="${CERC_GETH_VMODULE:-statediff/*=5}" \
-      --miner.etherbase="${ETHERBASE}" \
-      ${STATEDIFF_OPTS} \
+      --vmodule="${CERC_GETH_VMODULE:-statediff/*=5}" \
+      --miner.etherbase="${ETHERBASE}" ${STATEDIFF_OPTS} \
      &

    geth_pid=$!
@@ -1,6 +1,6 @@
-FROM cerc/lighthouse-cli:local AS lcli
+FROM sigp/lcli:v4.1.0 AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
-FROM cerc/fixturenet-eth-genesis:local AS fnetgen
+FROM cerc/fixturenet-eth-geth:local AS fnetgeth

 FROM cerc/lighthouse:local

@@ -19,8 +19,8 @@ COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli
 COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis
 COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
 COPY --from=ethgen /apps /apps
-COPY --from=fnetgen /opt/genesis/el /opt/testnet/el
-COPY --from=fnetgen /opt/genesis/build/el /opt/testnet/build/el
+COPY --from=fnetgeth /opt/testnet/el /opt/testnet/el
+COPY --from=fnetgeth /opt/testnet/build/el /opt/testnet/build/el

 RUN cd /opt/testnet && make genesis-cl

@@ -13,26 +13,22 @@ DEBUG_LEVEL=${1:-info}

 echo "Starting bootnode"

-# Clean up existing ENR dir to avoid node connectivity issues on a restart
-if [ -d "$DATADIR/bootnode" ]; then
-  echo "Removing existing bootnode enr directory"
-  rm -r "$DATADIR/bootnode"
+if [ ! -f "$DATADIR/bootnode/enr.dat" ]; then
+  echo "Generating bootnode enr"
+  lcli \
+    generate-bootnode-enr \
+    --ip $ENR_IP \
+    --udp-port $BOOTNODE_PORT \
+    --tcp-port $BOOTNODE_PORT \
+    --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"
 fi

-echo "Generating bootnode enr"
-lcli \
-  generate-bootnode-enr \
-  --ip $ENR_IP \
-  --udp-port $BOOTNODE_PORT \
-  --tcp-port $BOOTNODE_PORT \
-  --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"
-
 exec lighthouse boot_node \
    --testnet-dir $TESTNET_DIR \
    --port $BOOTNODE_PORT \
@@ -27,14 +27,12 @@ lcli \
  --deposit-contract-address $ETH1_DEPOSIT_CONTRACT_ADDRESS \
  --testnet-dir $TESTNET_DIR \
  --min-genesis-active-validator-count $GENESIS_VALIDATOR_COUNT \
-  --validator-count $VALIDATOR_COUNT \
  --min-genesis-time $GENESIS_TIME \
  --genesis-delay $GENESIS_DELAY \
  --genesis-fork-version $GENESIS_FORK_VERSION \
  --altair-fork-epoch $ALTAIR_FORK_EPOCH \
-  --bellatrix-fork-epoch $MERGE_FORK_EPOCH \
+  --merge-fork-epoch $MERGE_FORK_EPOCH \
  --eth1-id $ETH1_CHAIN_ID \
-  --eth1-block-hash $ETH1_BLOCK_HASH \
  --eth1-follow-distance 1 \
  --seconds-per-slot $SECONDS_PER_SLOT \
  --seconds-per-eth1-block $SECONDS_PER_ETH1_BLOCK \
@@ -15,6 +15,9 @@ GENESIS_VALIDATOR_COUNT=${GENESIS_VALIDATOR_COUNT:-80}
 # Number of beacon_node instances that you intend to run
 BN_COUNT=${BN_COUNT:-2}

+# Number of validator clients
+VC_COUNT=${VC_COUNT:-$BN_COUNT}
+
 # Number of seconds to delay to start genesis block.
 # If started by a script this can be 0, if starting by hand
 # use something like 180.
@@ -42,9 +45,7 @@ VC_ARGS=${VC_ARGS:-""}
 EXECUTION_ENDPOINT=${EXECUTION_ENDPOINT:-http://localhost:8551}

 ETH1_GENESIS_JSON=${ETH1_GENESIS_JSON:-"../build/el/geth.json"}
-ETH1_GENESIS_BLOCK_JSON=${ETH1_GENESIS_BLOCK_JSON:-"../build/el/genesis_block.json"}
 ETH1_CONFIG_YAML=${ETH1_CONFIG_YAML:-"../el/el-config.yaml"}
-ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.hash' | cut -d'x' -f2`}

 ETH1_CHAIN_ID=${ETH1_CHAIN_ID:-`cat $ETH1_GENESIS_JSON | jq -r '.config.chainId'`}
 ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDifficulty'`}
@@ -4,14 +4,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi

 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"
-)
+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}
@@ -43,6 +36,7 @@ MARKER="."

 function inc_status() {
  echo " done"
+  MARKEr="."
  STATUS=$((STATUS + 1))
  if [ $STATUS -lt ${#STATUSES[@]} ]; then
    echo -n "Waiting for ${STATUSES[$STATUS]}..."
@@ -61,7 +55,7 @@ while [ $STATUS -lt ${#STATUSES[@]} ]; do
        inc_status
      fi
      ;;
-    1)
+    1) 
      result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.data.message.slot'`
      if [ ! -z "$result" ] && [ $result -gt 0 ]; then
        inc_status
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
prathamesh	dc3103ca84	Change delimeter while replacing deny multiaddrs list Former-commit-id: `db27b07d99`	2023-05-05 13:28:57 +05:30
prathamesh	c7cae95114	Use provided domain for relay multiaddr in peer config Former-commit-id: `164a019d69`	2023-05-05 10:27:26 +05:30
prathamesh	cc9a0a5c36	Update package versions Former-commit-id: `ff51e47dfb`	2023-05-04 20:01:38 +05:30
prathamesh	74db89c285	Add watcher config option for blacklisted multiaddrs Former-commit-id: `379332d5ec`	2023-05-04 20:00:58 +05:30
nabarun	46de299032	Add env variable for web apps config denyMultiaddrs Former-commit-id: `859a0f684f`	2023-05-04 18:42:45 +05:30