unused

;
lint
2024-03-04 23:43:21 -06:00 · 2024-03-04 23:42:45 -06:00 · 2024-03-04 23:41:31 -06:00 · 2024-03-05 05:40:15 +00:00 · 2024-03-04 23:05:35 -06:00 · 2024-03-04 22:52:57 -06:00
156 changed files with 1247 additions and 39386 deletions
@@ -9,6 +9,10 @@ on:
  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
    - cron: '2 14 * * *'

+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+

 jobs:
  test:
@@ -39,19 +43,3 @@ jobs:
        run: ./scripts/build_shiv_package.sh
      - name: "Run fixturenet-eth tests"
        run: ./tests/fixturenet-eth-plugeth/run-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -9,6 +9,10 @@ on:
  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
    - cron: '2 14 * * *'

+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+

 jobs:
  test:
@@ -37,21 +41,9 @@ jobs:
        run: ./scripts/create_build_tag_file.sh
      - name: "Build local shiv package"
        run: ./scripts/build_shiv_package.sh
+      - name: Start dockerd # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
      - name: "Run fixturenet-eth tests"
        run: ./tests/fixturenet-eth-plugeth/run-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -7,6 +7,10 @@ on:
      - '!**'
      - '.gitea/workflows/triggers/fixturenet-eth-test'

+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+

 jobs:
  test:
@@ -35,21 +39,10 @@ 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
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+
@@ -11,7 +11,7 @@ on:

 jobs:
  test:
-    name: "Run Laconicd fixturenet and Laconic CLI tests"
+    name: "Run an Laconicd fixturenet test"
    runs-on: ubuntu-latest
    steps:
      - name: 'Update'
@@ -46,21 +46,3 @@ jobs:
        run: ./scripts/build_shiv_package.sh
      - name: "Run fixturenet-laconicd tests"
        run: ./tests/fixturenet-laconicd/run-test.sh
-      - name: "Run laconic CLI tests"
-        run: ./tests/fixturenet-laconicd/run-cli-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -19,19 +19,3 @@ jobs:
          python-version: '3.8'
      - name : "Run flake8"
        uses: py-actions/flake8@v2
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -54,19 +54,3 @@ jobs:
          # Hack using endsWith to workaround Gitea sometimes sending "publish-test" vs "refs/heads/publish-test"
          draft: ${{ endsWith('publish-test', github.ref ) }}
          files: ./laconic-so
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -51,19 +51,4 @@ jobs:
          source /opt/bash-utils/cgroup-helper.sh
          join_cgroup
          ./tests/container-registry/run-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+
@@ -49,19 +49,4 @@ jobs:
          source /opt/bash-utils/cgroup-helper.sh
          join_cgroup
          ./tests/database/run-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+
@@ -10,6 +10,9 @@ on:
    paths-ignore:
      - '.gitea/workflows/triggers/*'

+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock

 jobs:
  test:
@@ -38,21 +41,9 @@ jobs:
        run: ./scripts/create_build_tag_file.sh
      - name: "Build local shiv package"
        run: ./scripts/build_shiv_package.sh
+      - name: Start dockerd # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
      - name: "Run deploy tests"
        run: ./tests/deploy/run-deploy-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -1,58 +0,0 @@
-name: External Stack Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/test-external-stack'
-      - '.gitea/workflows/test-external-stack.yml'
-      - 'tests/external-stack/run-test.sh'
-  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '8 19 * * *'
-
-jobs:
-  test:
-    name: "Run external stack test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        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 external stack tests"
-        run: ./tests/external-stack/run-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -51,19 +51,4 @@ jobs:
          source /opt/bash-utils/cgroup-helper.sh
          join_cgroup
          ./tests/k8s-deploy/run-deploy-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+
@@ -10,6 +10,10 @@ on:
    paths-ignore:
      - '.gitea/workflows/triggers/*'

+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+
 jobs:
  test:
    name: "Run webapp test suite"
@@ -39,21 +43,9 @@ jobs:
        run: ./scripts/build_shiv_package.sh
      - name: "Install wget" # 20240109 - Only needed until the executors are updated.
        run: apt update && apt install -y wget
+      - name: Start dockerd # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
      - name: "Run webapp tests"
        run: ./tests/webapp-test/run-webapp-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
@@ -10,6 +10,9 @@ on:
    paths-ignore:
      - '.gitea/workflows/triggers/*'

+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock

 jobs:
  test:
@@ -38,21 +41,11 @@ jobs:
        run: ./scripts/create_build_tag_file.sh
      - name: "Build local shiv package"
        run: ./scripts/build_shiv_package.sh
+      - name: Start dockerd # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
      - name: "Run smoke tests"
        run: ./tests/smoke-test/run-smoke-test.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+
+
@@ -1,9 +1,3 @@
 Change this file to trigger running the fixturenet-laconicd-test CI job
 Trigger
 Trigger
-Trigger
-Trigger
-Trigger
-Trigger
-Trigger
-Trigger
@@ -1,2 +0,0 @@
-Change this file to trigger running the external-stack CI job
-trigger
@@ -74,7 +74,7 @@ laconic-so --stack fixturenet-laconicd deploy logs
 ### Test with the registry CLI

 ```bash
-laconic-so --stack fixturenet-laconicd deploy exec cli "laconic registry status"
+laconic-so --stack fixturenet-laconicd deploy exec cli "laconic cns status"
 ```

 Try additional CLI commands, documented [here](https://github.com/cerc-io/laconic-registry-cli#operations).
@@ -100,7 +100,7 @@ To avoid hiccups on Mac M1/M2 and any local machine nuances that may affect the
    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received proposal module=consensus proposal={"Type":32,"block_id":{"hash":"D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4","parts":{"hash":"22411A20B7F14CDA33244420FBDDAF24450C0628C7A06034FF22DAC3699DDCC8","total":1}},"height":13,"pol_round":-1,"round":0,"signature":"DEuqnaQmvyYbUwckttJmgKdpRu6eVm9i+9rQ1pIrV2PidkMNdWRZBLdmNghkIrUzGbW8Xd7UVJxtLRmwRASgBg==","timestamp":"2023-04-18T21:30:01.49450663Z"} server=node
    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received complete proposal block hash=D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4 height=13 module=consensus server=node
    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF finalizing commit of block hash={} height=13 module=consensus num_txs=0 root=1A8CA1AF139CCC80EC007C6321D8A63A46A793386EE2EDF9A5CA0AB2C90728B7 server=node
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF minted coins from module account amount=2059730459416582643photon from=mint module=x/bank
+    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF minted coins from module account amount=2059730459416582643aphoton from=mint module=x/bank
    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF executed block height=13 module=state num_invalid_txs=0 num_valid_txs=0 server=node
    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF commit synced commit=436F6D6D697449447B5B363520313037203630203232372039352038352032303820313334203231392032303520313433203130372031343920313431203139203139322038362031323720362031383520323533203137362031333820313735203135392031383620323334203135382031323120313431203230342037335D3A447D
    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF committed state app_hash=416B3CE35F55D086DBCD8F6B958D13C0567F06B9FDB08AAF9FBAEA9E798DCC49 height=13 module=state num_txs=0 server=node
@@ -110,7 +110,7 @@ To avoid hiccups on Mac M1/M2 and any local machine nuances that may affect the
 4. Confirm operation of the registry CLI:

   ```
-   laconic-so deployment --dir laconic-loaded-deployment exec cli "laconic registry status"
+   laconic-so deployment --dir laconic-loaded-deployment exec cli "laconic cns status"
   ```

   ```
@@ -223,5 +223,5 @@ record:
 - e.g,:

 ```
-laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic registry record list"
+laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns record list"
 ```
@@ -4,11 +4,9 @@ with open("README.md", "r", encoding="utf-8") as fh:
    long_description = fh.read()
 with open("requirements.txt", "r", encoding="utf-8") as fh:
    requirements = fh.read()
-with open("stack_orchestrator/data/version.txt", "r", encoding="utf-8") as fh:
-    version = fh.readlines()[-1].strip(" \n")
 setup(
    name='laconic-stack-orchestrator',
-    version=version,
+    version='1.0.12',
    author='Cerc',
    author_email='info@cerc.io',
    license='GNU Affero General Public License',
@@ -71,7 +71,7 @@ def process_container(build_context: BuildContext) -> bool:

    # Check if this is in an external stack
    if stack_is_external(build_context.stack):
-        container_parent_dir = Path(build_context.stack).parent.parent.joinpath("container-build")
+        container_parent_dir = Path(build_context.stack).joinpath("container-build")
        temp_build_dir = container_parent_dir.joinpath(build_context.container.replace("/", "-"))
        temp_build_script_filename = temp_build_dir.joinpath("build.sh")
        # Now check if the container exists in the external stack.
@@ -21,6 +21,11 @@ from stack_orchestrator.util import get_parsed_stack_config, warn_exit

 def get_containers_in_scope(stack: str):

+    # See: https://stackoverflow.com/a/20885799/1701505
+    from stack_orchestrator import data
+    with importlib.resources.open_text(data, "container-image-list.txt") as container_list_file:
+        all_containers = container_list_file.read().splitlines()
+
    containers_in_scope = []
    if stack:
        stack_config = get_parsed_stack_config(stack)
@@ -28,14 +33,11 @@ def get_containers_in_scope(stack: str):
            warn_exit(f"stack {stack} does not define any containers")
        containers_in_scope = stack_config['containers']
    else:
-        # See: https://stackoverflow.com/a/20885799/1701505
-        from stack_orchestrator import data
-        with importlib.resources.open_text(data, "container-image-list.txt") as container_list_file:
-            containers_in_scope = container_list_file.read().splitlines()
+        containers_in_scope = all_containers

    if opts.o.verbose:
        print(f'Containers: {containers_in_scope}')
        if stack:
            print(f"Stack: {stack}")

-    return containers_in_scope
+    return containers_in_scope
@@ -1,80 +0,0 @@
-
-# From: https://raw.githubusercontent.com/blast-io/deployment/master/docker-compose.yml
-services:
-  # generate jwt.txt if it's absent
-  generate-jwt:
-    image: blastio/openssl
-    volumes:
-      - blast-data:/blast:rw
-    command: >
-      sh -c "[ ! -f /blast/jwt.txt ] && openssl rand -hex 32 | tr -d '\n' > /blast/jwt.txt || exit 0"
-  # initialise geth db
-  geth-init:
-    image: blastio/blast-geth:${NETWORK:-testnet-sepolia}
-    volumes:
-      - blast-data:/blast:rw
-      - ../config/fixturenet-blast/genesis.json:/blast/genesis.json
-    entrypoint: /bin/sh
-    command: >
-      -c "[ ! -d /blast/${GETH_DATA_DIR:-blast-geth-data}/geth ] && /usr/local/bin/geth init --datadir=/blast/${GETH_DATA_DIR:-blast-geth-data} /blast/genesis.json || exit 0"
-    depends_on:
-      generate-jwt:
-        condition: service_completed_successfully
-    env_file: 
-      - ../config/fixturenet-blast/${NETWORK:-fixturenet}.config
-  blast-geth:
-    image: blastio/blast-geth:${NETWORK:-testnet-sepolia}
-    volumes:
-      - blast-data:/blast
-    ports:
-      - "9545"
-      - "9546"
-    command: >
-      --datadir=/blast/${GETH_DATA_DIR:-blast-geth-data}
-      --http
-      --http.corsdomain="*"
-      --http.vhosts="*"
-      --http.addr=0.0.0.0
-      --http.port=9545
-      --http.api=web3,debug,eth,txpool,net,engine
-      --ws
-      --ws.addr=0.0.0.0
-      --ws.port=9546
-      --ws.origins="*"
-      --ws.api=debug,eth,txpool,net,engine
-      --authrpc.addr="0.0.0.0"
-      --authrpc.port="8551"
-      --authrpc.vhosts="*"
-      --authrpc.jwtsecret=/blast/jwt.txt
-      --syncmode=full
-      --gcmode=archive
-      --nodiscover
-      --maxpeers=0
-      --rollup.disabletxpoolgossip=true
-    env_file: 
-      - ../config/fixturenet-blast/${NETWORK:-fixturenet}.config
-    depends_on:
-      geth-init:
-        condition: service_completed_successfully
-  op-node:
-    image: blastio/blast-optimism:${NETWORK:-testnet-sepolia}
-    volumes:
-      - blast-data:/blast
-      - ../config/fixturenet-blast/rollup.json:/blast/rollup.json
-    ports:
-      - "9003"
-    command: >
-      op-node
-      --l1="${CERC_L1_RPC}"
-      --l1.rpckind="any"
-      --l1.trustrpc=true
-      --l2="http://blast-geth:8551"
-      --l2.jwt-secret=/blast/jwt.txt
-      --rollup.config="/blast/rollup.json"
-    depends_on:
-      - blast-geth
-    env_file: 
-      - ../config/fixturenet-blast/${NETWORK:-fixturenet}.config
-
-volumes:
-  blast-data:
@@ -3,9 +3,6 @@ services:
    restart: unless-stopped
    image: cerc/laconicd:local
    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
-    environment:
-      TEST_AUCTION_ENABLED: ${TEST_AUCTION_ENABLED}
-      TEST_REGISTRY_EXPIRY: ${TEST_REGISTRY_EXPIRY}
    volumes:
      # The cosmos-sdk node's database directory:
      - laconicd-data:/root/.laconicd
@@ -28,7 +25,6 @@ services:
    image: cerc/laconic-registry-cli:local
    volumes:
      - ../config/fixturenet-laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml
-      - ${BASE_DIR:-~/cerc}/laconic-registry-cli:/laconic-registry-cli

 volumes:
  laconicd-data:
@@ -6,7 +6,6 @@ services:
      - ../config/fixturenet-eth/fixturenet-eth.env
    environment:
      RUN_BOOTNODE: "true"
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
    image: cerc/fixturenet-plugeth-plugeth:local
    volumes:
      - fixturenet_plugeth_bootnode_geth_data:/root/ethdata
@@ -2,24 +2,16 @@ version: "3.7"

 services:
  grafana:
-    image: grafana/grafana:10.2.3
+    image: grafana/grafana:10.2.2
    restart: always
    environment:
      GF_SERVER_ROOT_URL: ${GF_SERVER_ROOT_URL}
-      CERC_GRAFANA_ALERTS_SUBGRAPH_IDS: ${CERC_GRAFANA_ALERTS_SUBGRAPH_IDS}
    volumes:
      - ../config/monitoring/grafana/provisioning:/etc/grafana/provisioning
      - ../config/monitoring/grafana/dashboards:/etc/grafana/dashboards
-      - ../config/monitoring/update-grafana-alerts-config.sh:/update-grafana-alerts-config.sh
      - grafana_storage:/var/lib/grafana
-    user: root
-    entrypoint: ["bash", "-c"]
-    command: |
-      "/update-grafana-alerts-config.sh && /run.sh"
    ports:
      - "3000"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
    healthcheck:
      test: ["CMD", "nc", "-vz", "localhost", "3000"]
      interval: 30s
@@ -16,13 +16,8 @@ services:
      postgres_pass: password
      postgres_db: graph-node
      ethereum: ${ETH_NETWORKS:-lotus-fixturenet:http://lotus-node-1:1234/rpc/v1}
-      # Env varaibles reference: https://git.vdb.to/cerc-io/graph-node/src/branch/master/docs/environment-variables.md
      GRAPH_LOG: debug
      ETHEREUM_REORG_THRESHOLD: 3
-      GRAPH_ETHEREUM_JSON_RPC_TIMEOUT: ${GRAPH_ETHEREUM_JSON_RPC_TIMEOUT:-180}
-      GRAPH_ETHEREUM_REQUEST_RETRIES: ${GRAPH_ETHEREUM_REQUEST_RETRIES:-10}
-      GRAPH_ETHEREUM_MAX_BLOCK_RANGE_SIZE: ${GRAPH_ETHEREUM_MAX_BLOCK_RANGE_SIZE:-2000}
-      GRAPH_ETHEREUM_BLOCK_INGESTOR_MAX_CONCURRENT_JSON_RPC_CALLS_FOR_TXN_RECEIPTS: ${GRAPH_ETHEREUM_BLOCK_INGESTOR_MAX_CONCURRENT_JSON_RPC_CALLS_FOR_TXN_RECEIPTS:-1000}
    entrypoint: ["bash", "-c"]
    # Wait for ETH RPC endpoint to be up when running with fixturenet-lotus
    command: |
@@ -32,7 +27,6 @@ services:
      - "8001"
      - "8020"
      - "8030"
-      - "8040"
    healthcheck:
      test: ["CMD", "nc", "-vz", "localhost", "8020"]
      interval: 30s
@@ -1,10 +0,0 @@
-services:
-  laconic-explorer:
-    restart: unless-stopped
-    image: cerc/ping-pub:local
-    environment:
-      - LACONIC_LACONICD_API_URL=${LACONIC_LACONICD_API_URL:-http://localhost:1317}
-      - LACONIC_LACONICD_RPC_URL=${LACONIC_LACONICD_RPC_URL:-http://localhost:26657}
-      - LACONIC_LACONICD_CHAIN_ID=${LACONIC_LACONICD_CHAIN_ID:-chain-id-not-set}
-    ports:
-      - "5173"
@@ -1,83 +0,0 @@
-
-# From: https://raw.githubusercontent.com/blast-io/deployment/master/docker-compose.yml
-services:
-  # generate jwt.txt if it's absent
-  generate-jwt:
-    image: blastio/openssl
-    volumes:
-      - blast-data:/blast:rw
-    command: >
-      sh -c "[ ! -f /blast/jwt.txt ] && openssl rand -hex 32 | tr -d '\n' > /blast/jwt.txt || exit 0"
-  # initialise geth db
-  geth-init:
-    image: blastio/blast-geth:${NETWORK:-mainnet}
-    volumes:
-      - blast-data:/blast:rw
-    entrypoint: /bin/sh
-    command: >
-      -c "[ ! -d /blast/${GETH_DATA_DIR:-blast-geth-data}/geth ] && /usr/local/bin/geth init --datadir=/blast/${GETH_DATA_DIR:-blast-geth-data} /blast/genesis.json || exit 0"
-    depends_on:
-      generate-jwt:
-        condition: service_completed_successfully
-    env_file: 
-      - ../config/mainnet-blast/${NETWORK:-mainnet}.config
-  blast-geth:
-    image: blastio/blast-geth:${NETWORK:-mainnet}
-    volumes:
-      - blast-data:/blast
-    ports:
-      - "9545"
-      - "9546"
-      - "6060"
-    command: >
-      --datadir=/blast/${GETH_DATA_DIR:-blast-geth-data}
-      --http
-      --http.corsdomain="*"
-      --http.vhosts="*"
-      --http.addr=0.0.0.0
-      --http.port=9545
-      --http.api=web3,debug,eth,txpool,net,engine
-      --ws
-      --ws.addr=0.0.0.0
-      --ws.port=9546
-      --ws.origins="*"
-      --ws.api=debug,eth,txpool,net,engine
-      --authrpc.addr="0.0.0.0"
-      --authrpc.port="8551"
-      --authrpc.vhosts="*"
-      --authrpc.jwtsecret=/blast/jwt.txt
-      --syncmode=full
-      --metrics
-      --metrics.addr=0.0.0.0
-      --gcmode=archive
-      --nodiscover
-      --maxpeers=0
-      --rollup.disabletxpoolgossip=true
-    env_file: 
-      - ../config/mainnet-blast/${NETWORK:-mainnet}.config
-    depends_on:
-      geth-init:
-        condition: service_completed_successfully
-  op-node:
-    image: blastio/blast-optimism:${NETWORK:-mainnet}
-    volumes:
-      - blast-data:/blast
-    ports:
-      - "9003"
-      - "7300"
-    command: >
-      op-node
-      --l1="https://eth-mainnet-1.vdb.to/"
-      --metrics.enabled
-      --l1.rpckind="any"
-      --l1.trustrpc=true
-      --l2="http://blast-geth:8551"
-      --l2.jwt-secret=/blast/jwt.txt
-      --rollup.config="/blast/rollup.json"
-    depends_on:
-      - blast-geth
-    env_file: 
-      - ../config/mainnet-blast/${NETWORK:-mainnet}.config
-
-volumes:
-  blast-data:
@@ -28,37 +28,15 @@ services:
    extra_hosts:
      - "host.docker.internal:host-gateway"

-  ethereum-chain-head-exporter:
+  chain-head-exporter:
    image: cerc/watcher-ts:local
    restart: always
    working_dir: /app/packages/cli
    environment:
-      ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT:-https://mainnet.infura.io/v3}
+      ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
+      FIL_RPC_ENDPOINT: ${CERC_FIL_RPC_ENDPOINT}
      ETH_RPC_API_KEY: ${CERC_INFURA_KEY}
-    command: ["sh", "-c", "yarn export-metrics:chain-heads"]
-    ports:
-      - '5000'
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  filecoin-chain-head-exporter:
-    image: cerc/watcher-ts:local
-    restart: always
-    working_dir: /app/packages/cli
-    environment:
-      ETH_RPC_ENDPOINT: ${CERC_FIL_RPC_ENDPOINT:-https://api.node.glif.io/rpc/v1}
-    command: ["sh", "-c", "yarn export-metrics:chain-heads"]
-    ports:
-      - '5000'
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  graph-node-upstream-head-exporter:
-    image: cerc/watcher-ts:local
-    restart: always
-    working_dir: /app/packages/cli
-    environment:
-      ETH_RPC_ENDPOINT: ${GRAPH_NODE_RPC_ENDPOINT}
+      PORT: ${CERC_METRICS_PORT}
    command: ["sh", "-c", "yarn export-metrics:chain-heads"]
    ports:
      - '5000'
@@ -0,0 +1,13 @@
+services:
+  snowballtools-base-backend:
+    image: cerc/snowballtools-base-backend:local
+    restart: always
+    volumes:
+      - data:/data
+      - config:/config:ro
+    ports:
+      - 8000
+
+volumes:
+  data:
+  config:
@@ -1,78 +0,0 @@
-version: '3.2'
-
-services:
-  ajna-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=ajna-watcher,ajna-watcher-job-queue
-      - POSTGRES_EXTENSION=ajna-watcher-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - ajna_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-
-  ajna-watcher-job-runner:
-    restart: unless-stopped
-    depends_on:
-      ajna-watcher-db:
-        condition: service_healthy
-    image: cerc/watcher-ajna:local
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-    command: ["bash", "./start-job-runner.sh"]
-    volumes:
-      - ../config/watcher-ajna/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-ajna/start-job-runner.sh:/app/start-job-runner.sh
-    ports:
-      - "9000"
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9000"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  ajna-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      ajna-watcher-db:
-        condition: service_healthy
-      ajna-watcher-job-runner:
-        condition: service_healthy
-    image: cerc/watcher-ajna:local
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-    command: ["bash", "./start-server.sh"]
-    volumes:
-      - ../config/watcher-ajna/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-ajna/start-server.sh:/app/start-server.sh
-      - ajna_watcher_gql_logs_data:/app/gql-logs
-    ports:
-      - "3008"
-      - "9001"
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3008"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  ajna_watcher_db_data:
-  ajna_watcher_gql_logs_data:
@@ -32,8 +32,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CERC_HISTORICAL_BLOCK_RANGE: 500
      CONTRACT_ADDRESS: 0x223c067F8CF28ae173EE5CafEa60cA44C335fecB
      CONTRACT_NAME: Azimuth
@@ -47,7 +47,7 @@ services:
    ports:
      - "9000"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9000"]
+      test: ["CMD", "nc", "-vz", "localhost", "9000"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -66,20 +66,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/azimuth-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/azimuth-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/azimuth-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/azimuth-watcher/start-server.sh
-      - azimuth_watcher_gql_logs_data:/app/packages/azimuth-watcher/gql-logs
    ports:
      - "3001"
-      - "9001"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3001"]
+      test: ["CMD", "nc", "-vz", "localhost", "3001"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -96,8 +94,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CONTRACT_ADDRESS: 0x325f68d32BdEe6Ed86E7235ff2480e2A433D6189
      CONTRACT_NAME: Censures
      STARTING_BLOCK: 6784954
@@ -110,7 +108,7 @@ services:
    ports:
      - "9002"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9002"]
+      test: ["CMD", "nc", "-vz", "localhost", "9002"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -129,20 +127,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/censures-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/censures-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/censures-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/censures-watcher/start-server.sh
-      - censures_watcher_gql_logs_data:/app/packages/censures-watcher/gql-logs
    ports:
      - "3002"
-      - "9003"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3002"]
+      test: ["CMD", "nc", "-vz", "localhost", "3002"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -159,8 +155,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CONTRACT_ADDRESS: 0xe7e7f69b34D7d9Bd8d61Fb22C33b22708947971A
      CONTRACT_NAME: Claims
      STARTING_BLOCK: 6784941
@@ -173,7 +169,7 @@ services:
    ports:
      - "9004"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9004"]
+      test: ["CMD", "nc", "-vz", "localhost", "9004"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -192,20 +188,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/claims-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/claims-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/claims-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/claims-watcher/start-server.sh
-      - claims_watcher_gql_logs_data:/app/packages/claims-watcher/gql-logs
    ports:
      - "3003"
-      - "9005"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3003"]
+      test: ["CMD", "nc", "-vz", "localhost", "3003"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -222,8 +216,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CONTRACT_ADDRESS: 0x8C241098C3D3498Fe1261421633FD57986D74AeA
      CONTRACT_NAME: ConditionalStarRelease
      STARTING_BLOCK: 6828004
@@ -236,7 +230,7 @@ services:
    ports:
      - "9006"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9006"]
+      test: ["CMD", "nc", "-vz", "localhost", "9006"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -255,20 +249,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/conditional-star-release-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/conditional-star-release-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/conditional-star-release-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/conditional-star-release-watcher/start-server.sh
-      - conditional_star_release_watcher_gql_logs_data:/app/packages/conditional-star-release-watcher/gql-logs
    ports:
      - "3004"
-      - "9007"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3004"]
+      test: ["CMD", "nc", "-vz", "localhost", "3004"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -285,8 +277,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CONTRACT_ADDRESS: 0xf6b461fE1aD4bd2ce25B23Fe0aff2ac19B3dFA76
      CONTRACT_NAME: DelegatedSending
      STARTING_BLOCK: 6784956
@@ -299,7 +291,7 @@ services:
    ports:
      - "9008"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9008"]
+      test: ["CMD", "nc", "-vz", "localhost", "9008"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -318,20 +310,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/delegated-sending-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/delegated-sending-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/delegated-sending-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/delegated-sending-watcher/start-server.sh
-      - delegated_sending_watcher_gql_logs_data:/app/packages/delegated-sending-watcher/gql-logs
    ports:
      - "3005"
-      - "9009"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3005"]
+      test: ["CMD", "nc", "-vz", "localhost", "3005"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -348,8 +338,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CONTRACT_ADDRESS: 0x33EeCbf908478C10614626A9D304bfe18B78DD73
      CONTRACT_NAME: Ecliptic
      STARTING_BLOCK: 13692129
@@ -362,7 +352,7 @@ services:
    ports:
      - "9010"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9010"]
+      test: ["CMD", "nc", "-vz", "localhost", "9010"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -381,20 +371,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/ecliptic-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/ecliptic-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/ecliptic-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/ecliptic-watcher/start-server.sh
-      - ecliptic_watcher_gql_logs_data:/app/packages/ecliptic-watcher/gql-logs
    ports:
      - "3006"
-      - "9011"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3006"]
+      test: ["CMD", "nc", "-vz", "localhost", "3006"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -411,8 +399,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CONTRACT_ADDRESS: 0x86cd9cd0992F04231751E3761De45cEceA5d1801
      CONTRACT_NAME: LinearStarRelease
      STARTING_BLOCK: 6784943
@@ -425,7 +413,7 @@ services:
    ports:
      - "9012"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9012"]
+      test: ["CMD", "nc", "-vz", "localhost", "9012"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -444,20 +432,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/linear-star-release-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/linear-star-release-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/linear-star-release-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/linear-star-release-watcher/start-server.sh
-      - linear_star_release_watcher_gql_logs_data:/app/packages/linear-star-release-watcher/gql-logs
    ports:
      - "3007"
-      - "9013"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3007"]
+      test: ["CMD", "nc", "-vz", "localhost", "3007"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -474,8 +460,8 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
      CONTRACT_ADDRESS: 0x7fEcaB617c868Bb5996d99D95200D2Fa708218e4
      CONTRACT_NAME: Polls
      STARTING_BLOCK: 6784912
@@ -488,7 +474,7 @@ services:
    ports:
      - "9014"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9014"]
+      test: ["CMD", "nc", "-vz", "localhost", "9014"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -507,20 +493,18 @@ services:
        condition: service_healthy
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
-      CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT}
+      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
+      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
    working_dir: /app/packages/polls-watcher
    command: "./start-server.sh"
    volumes:
      - ../config/watcher-azimuth/watcher-config-template.toml:/app/packages/polls-watcher/environments/watcher-config-template.toml
      - ../config/watcher-azimuth/merge-toml.js:/app/packages/polls-watcher/merge-toml.js
      - ../config/watcher-azimuth/start-server.sh:/app/packages/polls-watcher/start-server.sh
-      - polls_watcher_gql_logs_data:/app/packages/polls-watcher/gql-logs
    ports:
      - "3008"
-      - "9015"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3008"]
+      test: ["CMD", "nc", "-vz", "localhost", "3008"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -558,7 +542,7 @@ services:
    ports:
      - "0.0.0.0:4000:4000"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "4000"]
+      test: ["CMD", "nc", "-vz", "localhost", "4000"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -568,11 +552,3 @@ services:

 volumes:
  watcher_db_data:
-  azimuth_watcher_gql_logs_data:
-  censures_watcher_gql_logs_data:
-  claims_watcher_gql_logs_data:
-  conditional_star_release_watcher_gql_logs_data:
-  delegated_sending_watcher_gql_logs_data:
-  ecliptic_watcher_gql_logs_data:
-  linear_star_release_watcher_gql_logs_data:
-  polls_watcher_gql_logs_data:
@@ -29,7 +29,7 @@ services:
    image: cerc/watcher-merkl-sushiswap-v3:local
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
+      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
    command: ["bash", "./start-job-runner.sh"]
    volumes:
      - ../config/watcher-merkl-sushiswap-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
@@ -37,7 +37,7 @@ services:
    ports:
      - "9002:9000"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9000"]
+      test: ["CMD", "nc", "-v", "localhost", "9000"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -55,17 +55,16 @@ services:
    image: cerc/watcher-merkl-sushiswap-v3:local
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
+      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
    command: ["bash", "./start-server.sh"]
    volumes:
      - ../config/watcher-merkl-sushiswap-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
      - ../config/watcher-merkl-sushiswap-v3/start-server.sh:/app/start-server.sh
-      - merkl_sushiswap_v3_watcher_gql_logs_data:/app/gql-logs
    ports:
      - "127.0.0.1:3007:3008"
      - "9003:9001"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3008"]
+      test: ["CMD", "nc", "-v", "localhost", "3008"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -75,4 +74,3 @@ services:

 volumes:
  merkl_sushiswap_v3_watcher_db_data:
-  merkl_sushiswap_v3_watcher_gql_logs_data:
@@ -29,7 +29,7 @@ services:
    image: cerc/watcher-sushiswap-v3:local
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
+      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
    command: ["bash", "./start-job-runner.sh"]
    volumes:
      - ../config/watcher-sushiswap-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
@@ -37,7 +37,7 @@ services:
    ports:
      - "9000:9000"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "9000"]
+      test: ["CMD", "nc", "-v", "localhost", "9000"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -55,17 +55,16 @@ services:
    image: cerc/watcher-sushiswap-v3:local
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
+      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
    command: ["bash", "./start-server.sh"]
    volumes:
      - ../config/watcher-sushiswap-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
      - ../config/watcher-sushiswap-v3/start-server.sh:/app/start-server.sh
-      - sushiswap_v3_watcher_gql_logs_data:/app/gql-logs
    ports:
      - "127.0.0.1:3008:3008"
      - "9001:9001"
    healthcheck:
-      test: ["CMD", "nc", "-vz", "127.0.0.1", "3008"]
+      test: ["CMD", "nc", "-v", "localhost", "3008"]
      interval: 20s
      timeout: 5s
      retries: 15
@@ -75,4 +74,3 @@ services:

 volumes:
  sushiswap_v3_watcher_db_data:
-  sushiswap_v3_watcher_gql_logs_data:
@@ -1,2 +0,0 @@
-GETH_ROLLUP_SEQUENCERHTTP=https://sequencer.s2.testblast.io
-OP_NODE_P2P_BOOTNODES=enr:-J-4QM3GLUFfKMSJQuP1UvuKQe8DyovE7Eaiit0l6By4zjTodkR4V8NWXJxNmlg8t8rP-Q-wp3jVmeAOml8cjMj__ROGAYznzb_HgmlkgnY0gmlwhA-cZ_eHb3BzdGFja4X947FQAIlzZWNwMjU2azGhAiuDqvB-AsVSRmnnWr6OHfjgY8YfNclFy9p02flKzXnOg3RjcIJ2YYN1ZHCCdmE,enr:-J-4QDCVpByqQ8nFqCS9aHicqwUfXgzFDslvpEyYz19lvkHLIdtcIGp2d4q5dxHdjRNTO6HXCsnIKxUeuZSPcEbyVQCGAYznzz0RgmlkgnY0gmlwhANiQfuHb3BzdGFja4X947FQAIlzZWNwMjU2azGhAy3AtF2Jh_aPdOohg506Hjmtx-fQ1AKmu71C7PfkWAw9g3RjcIJ2YYN1ZHCCdmE
@@ -1,57 +0,0 @@
-{
-  "config": {
-    "chainId": 608943043,
-    "homesteadBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "petersburgBlock": 0,
-    "istanbulBlock": 0,
-    "muirGlacierBlock": 0,
-    "berlinBlock": 0,
-    "londonBlock": 0,
-    "arrowGlacierBlock": 0,
-    "grayGlacierBlock": 0,
-    "mergeNetsplitBlock": 0,
-    "shanghaiTime": 0,
-    "bedrockBlock": 0,
-    "regolithTime": 0,
-    "canyonTime": 0,
-    "terminalTotalDifficulty": 0,
-    "terminalTotalDifficultyPassed": true,
-    "optimism": {
-      "eip1559Elasticity": 6,
-      "eip1559Denominator": 50,
-      "eip1559DenominatorCanyon": 250
-    }
-  },
-  "alloc": {
-    "0000000000000000000000000000000000000000": {
-      "balance": "0x1"
-    },
-    "4200000000000000000000000000000000000000": {
-      "code": "0x60806040526004361061004e5760003560e01c80633659cfe6146100655780634f1ef286146100855780635c60da1b146100ae5780638f283970146100db578063f851a440146100fb5761005d565b3661005d5761005b610110565b005b61005b610110565b34801561007157600080fd5b5061005b610080366004610521565b6101c8565b61009861009336600461053c565b61020e565b6040516100a591906105bf565b60405180910390f35b3480156100ba57600080fd5b506100c361033e565b6040516001600160a01b0390911681526020016100a5565b3480156100e757600080fd5b5061005b6100f6366004610521565b6103a9565b34801561010757600080fd5b506100c36103e4565b600061013a7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5490565b90506001600160a01b0381166101a55760405162461bcd60e51b815260206004820152602560248201527f50726f78793a20696d706c656d656e746174696f6e206e6f7420696e697469616044820152641b1a5e995960da1b60648201526084015b60405180910390fd5b3660008037600080366000845af43d6000803e806101c2573d6000fd5b503d6000f35b600080516020610625833981519152546001600160a01b0316336001600160a01b031614806101f5575033155b156102065761020381610432565b50565b610203610110565b60606102266000805160206106258339815191525490565b6001600160a01b0316336001600160a01b03161480610243575033155b1561032f5761025184610432565b600080856001600160a01b0316858560405161026e929190610614565b600060405180830381855af49150503d80600081146102a9576040519150601f19603f3d011682016040523d82523d6000602084013e6102ae565b606091505b5091509150816103265760405162461bcd60e51b815260206004820152603960248201527f50726f78793a2064656c656761746563616c6c20746f206e657720696d706c6560448201527f6d656e746174696f6e20636f6e7472616374206661696c656400000000000000606482015260840161019c565b91506103379050565b610337610110565b9392505050565b60006103566000805160206106258339815191525490565b6001600160a01b0316336001600160a01b03161480610373575033155b1561039e57507f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5490565b6103a6610110565b90565b600080516020610625833981519152546001600160a01b0316336001600160a01b031614806103d6575033155b15610206576102038161048e565b60006103fc6000805160206106258339815191525490565b6001600160a01b0316336001600160a01b03161480610419575033155b1561039e57506000805160206106258339815191525490565b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc8181556040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a25050565b60006104a66000805160206106258339815191525490565b600080516020610625833981519152838155604080516001600160a01b0380851682528616602082015292935090917f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f910160405180910390a1505050565b80356001600160a01b038116811461051c57600080fd5b919050565b60006020828403121561053357600080fd5b61033782610505565b60008060006040848603121561055157600080fd5b61055a84610505565b9250602084013567ffffffffffffffff8082111561057757600080fd5b818601915086601f83011261058b57600080fd5b81358181111561059a57600080fd5b8760208285010111156105ac57600080fd5b6020830194508093505050509250925092565b600060208083528351808285015260005b818110156105ec578581018301518582016040015282016105d0565b818111156105fe576000604083870101525b50601f01601f1916929092016040019392505050565b818382376000910190815291905056feb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103a164736f6c634300080f000a",
-      "storage": {
-        "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x000000000000000000000000c0d3c0d3c0d3c0d3c0d3c0d3c0d3c0d3c0d30000",
-        "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x0000000000000000000000004200000000000000000000000000000000000018"
-      },
-      "balance": "0x0",
-      "flags": 1
-    }
-  },
-  "nonce": "0x0",
-  "timestamp": "0x659b7460",
-  "extraData": "0x424544524f434b",
-  "gasLimit": "0x1c9c380",
-  "difficulty": "0x0",
-  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "coinbase": "0x4200000000000000000000000000000000000011",
-  "number": "0x0",
-  "gasUsed": "0x0",
-  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "baseFeePerGas": "0x3b9aca00",
-  "excessBlobGas": null,
-  "blobGasUsed": null
-}
@@ -1,31 +0,0 @@
-{
-  "genesis": {
-    "l1": {
-      "hash": "0x17728cf4d8e0b4f292d2390a869fd7c632d39e72efb00ca3462b4387c6aa2437",
-      "number": 5044255
-    },
-    "l2": {
-      "hash": "0x26a1c0faad7b041f34569a1bb383f00ab74b335883a44bed53e9f41ced5fd906",
-      "number": 0
-    },
-    "l2_time": 1704686688,
-    "system_config": {
-      "batcherAddr": "0xba26fee2fa917443e05e65de8d4350bcd2f59222",
-      "overhead": "0x00000000000000000000000000000000000000000000000000000000000000bc",
-      "scalar": "0x00000000000000000000000000000000000000000000000000000000000a6fe0",
-      "gasLimit": 30000000
-    }
-  },
-  "block_time": 2,
-  "max_sequencer_drift": 600,
-  "seq_window_size": 3600,
-  "channel_timeout": 300,
-  "l1_chain_id": 11155111,
-  "l2_chain_id": 608943043,
-  "regolith_time": 0,
-  "canyon_time": 0,
-  "batch_inbox_address": "0x1c3b85a2108784eab6a4bf56cdd6f722e415b331",
-  "deposit_contract_address": "0x2757e4430e694f27b73ec9c02257cab3a498c8c5",
-  "l1_system_config_address": "0x329faf078c364a316e08bf6a17b7eee6ae75a613",
-  "protocol_versions_address": "0x0000000000000000000000000000000000000000"
-}
@@ -22,7 +22,4 @@ CERC_STATEDIFF_DB_LOG_STATEMENTS="${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false}"
 CERC_STATEDIFF_WORKERS=2

 CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
-CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
-
-# Used by Lighthouse
-SECONDS_PER_ETH1_BLOCK=${SECONDS_PER_ETH1_BLOCK:-3}
+CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
@@ -26,8 +26,8 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data/blockstore.db" ]; then
    make install
  fi

-  laconicd config set client chain-id $CHAINID
-  laconicd config set client keyring-backend $KEYRING
+  laconicd config keyring-backend $KEYRING
+  laconicd config chain-id $CHAINID

  # if $KEY exists it should be deleted
  laconicd keys add $KEY --keyring-backend $KEYRING --algo $KEYALGO
@@ -35,17 +35,17 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data/blockstore.db" ]; then
  # Set moniker and chain-id for Ethermint (Moniker can be anything, chain-id must be an integer)
  laconicd init $MONIKER --chain-id $CHAINID

-  # Change parameter token denominations to photon
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["staking"]["params"]["bond_denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["crisis"]["constant_fee"]["denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  # Change parameter token denominations to aphoton
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["staking"]["params"]["bond_denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["crisis"]["constant_fee"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
  # Custom modules
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["record_rent"]["denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_rent"]["denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_commit_fee"]["denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_reveal_fee"]["denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_minimum_bid"]["denom"]="photon"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["record_rent"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_rent"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_commit_fee"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_reveal_fee"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_minimum_bid"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json

  if [[ "$TEST_REGISTRY_EXPIRY" == "true" ]]; then
    echo "Setting timers for expiry tests."
@@ -102,22 +102,11 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data/blockstore.db" ]; then
    fi
  fi

-  # Enable telemetry (prometheus metrics: http://localhost:1317/metrics?format=prometheus)
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-    sed -i '' 's/enabled = false/enabled = true/g' $HOME/.laconicd/config/app.toml
-    sed -i '' 's/prometheus-retention-time = 0/prometheus-retention-time = 60/g' $HOME/.laconicd/config/app.toml
-    sed -i '' 's/prometheus = false/prometheus = true/g' $HOME/.laconicd/config/config.toml
-  else
-    sed -i 's/enabled = false/enabled = true/g' $HOME/.laconicd/config/app.toml
-    sed -i 's/prometheus-retention-time = 0/prometheus-retention-time = 60/g' $HOME/.laconicd/config/app.toml
-    sed -i 's/prometheus = false/prometheus = true/g' $HOME/.laconicd/config/config.toml
-  fi
-
  # Allocate genesis accounts (cosmos formatted addresses)
-  laconicd add-genesis-account $KEY 100000000000000000000000000photon --keyring-backend $KEYRING
+  laconicd add-genesis-account $KEY 100000000000000000000000000aphoton --keyring-backend $KEYRING

  # Sign genesis transaction
-  laconicd gentx $KEY 1000000000000000000000photon --keyring-backend $KEYRING --chain-id $CHAINID
+  laconicd gentx $KEY 1000000000000000000000aphoton --keyring-backend $KEYRING --chain-id $CHAINID

  # Collect genesis tx
  laconicd collect-gentxs
@@ -133,4 +122,4 @@ else
 fi

 # Start the node (remove the --pruning=nothing flag if historical queries are not needed)
-laconicd start --pruning=nothing --evm.tracer=json $TRACE --log_level $LOGLEVEL --minimum-gas-prices=0.0001photon --json-rpc.api eth,txpool,personal,net,debug,web3,miner --api.enable --gql-server --gql-playground
+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,9 +1,9 @@
 services:
-  registry:
-    rpcEndpoint: 'http://laconicd:26657'
+  cns:
+    restEndpoint: 'http://laconicd:1317'
    gqlEndpoint: 'http://laconicd:9473/api'
    userKey: REPLACE_WITH_MYKEY
    bondId:
    chainId: laconic_9000-1
    gas: 350000
-    fees: 200000photon
+    fees: 200000aphoton
@@ -1,32 +0,0 @@
-POSTGRES_DB=keycloak
-POSTGRES_USER=keycloak
-POSTGRES_PASSWORD=keycloak
-# Don't change this unless you also change the healthcheck in docker-compose-mainnet-eth-keycloak.yml
-PGPORT=35432
-KC_DB=postgres
-KC_DB_URL_HOST=keycloak-db
-KC_DB_URL_PORT=${PGPORT}
-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,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,2 +0,0 @@
-GETH_ROLLUP_SEQUENCERHTTP=https://sequencer.blast.io
-OP_NODE_P2P_BOOTNODES=enr:-J64QGwHl9uYLfC_cnmxSA6wQH811nkOWJDWjzxqkEUlJoZHWvI66u-BXgVcPCeMUmg0dBpFQAPotFchG67FHJMZ9OSGAY3d6wevgmlkgnY0gmlwhANizeSHb3BzdGFja4Sx_AQAiXNlY3AyNTZrMaECg4pk0cskPAyJ7pOmo9E6RqGBwV-Lex4VS9a3MQvu7PWDdGNwgnZhg3VkcIJ2YQ,enr:-J64QDge2jYBQtcNEpRqmKfci5E5BHAhNBjgv4WSdwH1_wPqbueq2bDj38-TSW8asjy5lJj1Xftui6Or8lnaYFCqCI-GAY3d6wf3gmlkgnY0gmlwhCO2D9yHb3BzdGFja4Sx_AQAiXNlY3AyNTZrMaEDo4aCTq7pCEN8om9U5n_VyWdambGnQhwHNwKc8o-OicaDdGNwgnZhg3VkcIJ2YQ
@@ -1,32 +0,0 @@
-{
-    "genesis": {
-      "l1": {
-        "hash": "0xfcfb8d586bdae763f1189988789211c69eb893a895e7ba48be3ca6289f0941b7",
-        "number": 19300102
-      },
-      "l2": {
-        "hash": "0xb689b35ef29d0bec5816938e0e52683c7257d2e325420ea69b739a2be4754b89",
-        "number": 0
-      },
-      "l2_time": 1708809815,
-      "system_config": {
-        "batcherAddr": "0x415c8893d514f9bc5211d36eeda4183226b84aa7",
-        "overhead": "0x00000000000000000000000000000000000000000000000000000000000000bc",
-        "scalar": "0x00000000000000000000000000000000000000000000000000000000000a6fe0",
-        "gasLimit": 30000000
-      }
-    },
-    "block_time": 2,
-    "max_sequencer_drift": 600,
-    "seq_window_size": 3600,
-    "channel_timeout": 300,
-    "l1_chain_id": 1,
-    "l2_chain_id": 81457,
-    "regolith_time": 0,
-    "canyon_time": 0,
-    "batch_inbox_address": "0xff00000000000000000000000000000000081457",
-    "deposit_contract_address": "0x0ec68c5b10f21effb74f2a5c61dfe6b08c0db6cb",
-    "l1_system_config_address": "0x5531dcff39ec1ec727c4c5d2fc49835368f805a9",
-    "protocol_versions_address": "0x0000000000000000000000000000000000000000"
-  }
-  
@@ -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,9 +1,9 @@
 services:
-  registry:
-    rpcEndpoint: 'http://laconicd:26657'
+  cns:
+    restEndpoint: 'http://laconicd:1317'
    gqlEndpoint: 'http://laconicd:9473/api'
    userKey: REPLACE_WITH_MYKEY
    bondId:
    chainId: laconic_9000-1
    gas: 250000
-    fees: 200000photon
+    fees: 200000aphoton
@@ -11,7 +11,7 @@ laconicd start \
    --pruning=nothing \
    --evm.tracer=json $TRACE \
    --log_level $LOGLEVEL \
-    --minimum-gas-prices=0.0001photon \
+    --minimum-gas-prices=0.0001aphoton \
    --json-rpc.api eth,txpool,personal,net,debug,web3,miner \
    --api.enable \
    --gql-server \
@@ -1,20 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - name: Graph Node Postgres
-    type: postgres
-    jsonData:
-      database: graph-node
-      sslmode: 'disable'
-      maxOpenConns: 100
-      maxIdleConns: 100
-      maxIdleConnsAuto: true
-      connMaxLifetime: 14400
-      postgresVersion: 1411 # 903=9.3, 1000=10, 1411=14.11
-      timescaledb: false
-    user: graph-node
-    # # Add URL for graph-node database
-    # url: graph-node-db:5432
-    # # Set password for graph-node database
-    # secureJsonData:
-    #   password: 'password'
@@ -45,18 +45,7 @@ scrape_configs:
    metrics_path: /metrics
    scheme: http
    static_configs:
-      - targets: ['ethereum-chain-head-exporter:5000']
-        labels:
-          instance: 'external'
-          chain: 'ethereum'
-      - targets: ['filecoin-chain-head-exporter:5000']
-        labels:
-          instance: 'external'
-          chain: 'filecoin'
-      - targets: ['graph-node-upstream-head-exporter:5000']
-        labels:
-          instance: 'graph-node'
-          chain: 'filecoin'
+      - targets: ['chain-head-exporter:5000']

  - job_name: 'postgres'
    scrape_interval: 30s
@@ -76,20 +65,3 @@ scrape_configs:
        target_label: instance
      - target_label: __address__
        replacement: postgres-exporter:9187
-
-  - job_name: laconicd
-    metrics_path: /metrics
-    scrape_interval: 30s
-    static_configs:
-      # Add laconicd REST endpoint target with host and port (1317)
-      # - targets: ['example-host:1317']
-    params:
-      format: ['prometheus']
-
-  - job_name: graph-node
-    metrics_path: /metrics
-    scrape_interval: 30s
-    scheme: http
-    static_configs:
-      # Add graph-node targets to be monitored below
-      # - targets: ['graph-node:8040']
@@ -1,64 +0,0 @@
-apiVersion: 1
-groups:
-  - orgId: 1
-    name: subgraph
-    folder: SubgraphAlerts
-    interval: 30s
-    rules:
-      - uid: b2a9144b-6104-46fc-92b5-352f4e643c4c
-        title: subgraph_head_tracking
-        condition: condition
-        data:
-          - refId: diff
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: PBFA97CFB590B2093
-            model:
-              datasource:
-                  type: prometheus
-                  uid: PBFA97CFB590B2093
-              editorMode: code
-              expr: ethereum_chain_head_number - on(network) group_right deployment_head{deployment=~"REPLACE_WITH_SUBGRAPH_IDS"}
-              instant: true
-              intervalMs: 1000
-              legendFormat: __auto
-              maxDataPoints: 43200
-              range: false
-              refId: diff
-          - refId: condition
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: __expr__
-            model:
-              conditions:
-                  - evaluator:
-                      params:
-                          - 15
-                          - 0
-                      type: gt
-                    operator:
-                      type: and
-                    query:
-                      params: []
-                    reducer:
-                      params: []
-                      type: avg
-                    type: query
-              datasource:
-                  name: Expression
-                  type: __expr__
-                  uid: __expr__
-              expression: diff
-              intervalMs: 1000
-              maxDataPoints: 43200
-              refId: condition
-              type: threshold
-        noDataState: OK
-        execErrState: Alerting
-        for: 5m
-        annotations:
-          summary: Subgraph deployment {{ index $labels "deployment" }} is falling behind head by {{ index $values "diff" }}
-        labels: {}
-        isPaused: false
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo Using CERC_GRAFANA_ALERTS_SUBGRAPH_IDS ${CERC_GRAFANA_ALERTS_SUBGRAPH_IDS}
-
-# Replace subgraph ids in subgraph alerting config
-# Note: Requires the grafana container to be run with user root
-if [ -n "$CERC_GRAFANA_ALERTS_SUBGRAPH_IDS" ]; then
-  sed -i "s/REPLACE_WITH_SUBGRAPH_IDS/$CERC_GRAFANA_ALERTS_SUBGRAPH_IDS/g" /etc/grafana/provisioning/alerting/subgraph-alert-rules.yml
-fi
@@ -24,7 +24,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="azimuth", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="azimuth", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -50,6 +50,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="azimuth", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -100,7 +116,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="censures", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="censures", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -126,6 +142,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="censures", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -176,7 +208,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="claims", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="claims", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -202,6 +234,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="claims", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -252,7 +300,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="conditional_star_release", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="conditional_star_release", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -278,6 +326,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="conditional_star_release", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -328,7 +392,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="delegated_sending", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="delegated_sending", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -354,6 +418,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="delegated_sending", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -404,7 +484,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="ecliptic", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="ecliptic", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -430,6 +510,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="ecliptic", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -480,7 +576,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="linear_star_release", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="linear_star_release", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -506,6 +602,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="azimuth", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -556,7 +668,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="azimuth", instance="polls", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="azimuth", instance="polls", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -582,6 +694,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="polls", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -634,7 +762,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="sushi", instance="sushiswap", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="sushi", instance="sushiswap", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -660,6 +788,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="sushi", instance="sushiswap", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -710,163 +854,7 @@ groups:
                uid: PBFA97CFB590B2093
              disableTextWrap: false
              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="sushi", instance="merkl_sushiswap", kind="latest_indexed"}
-              fullMetaSearch: false
-              includeNullMetadata: true
-              instant: true
-              intervalMs: 1000
-              legendFormat: __auto
-              maxDataPoints: 43200
-              range: false
-              refId: diff
-              useBackend: false
-          - refId: latest_external
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: PBFA97CFB590B2093
-            model:
-              datasource:
-                type: prometheus
-                uid: PBFA97CFB590B2093
-              editorMode: code
-              expr: latest_block_number{chain="filecoin"}
-              hide: false
-              instant: true
-              legendFormat: __auto
-              range: false
-              refId: latest_external
-          - refId: condition
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: __expr__
-            model:
-              conditions:
-                - evaluator:
-                    params:
-                      - 0
-                      - 0
-                    type: gt
-                  operator:
-                    type: and
-                  query:
-                    params: []
-                  reducer:
-                    params: []
-                    type: avg
-                  type: query
-              datasource:
-                name: Expression
-                type: __expr__
-                uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
-              refId: condition
-              type: math
-        noDataState: Alerting
-        execErrState: Alerting
-        for: 15m
-        annotations:
-          summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
-        isPaused: false
-
-      # Ajna
-      - uid: ajna_diff_external
-        title: ajna_watcher_head_tracking
-        condition: condition
-        data:
-          - refId: diff
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: PBFA97CFB590B2093
-            model:
-              datasource:
-                type: prometheus
-                uid: PBFA97CFB590B2093
-              disableTextWrap: false
-              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="ajna", instance="ajna", kind="latest_indexed"}
-              fullMetaSearch: false
-              includeNullMetadata: true
-              instant: true
-              intervalMs: 1000
-              legendFormat: __auto
-              maxDataPoints: 43200
-              range: false
-              refId: diff
-              useBackend: false
-          - refId: latest_external
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: PBFA97CFB590B2093
-            model:
-              datasource:
-                type: prometheus
-                uid: PBFA97CFB590B2093
-              editorMode: code
-              expr: latest_block_number{chain="filecoin"}
-              hide: false
-              instant: true
-              legendFormat: __auto
-              range: false
-              refId: latest_external
-          - refId: condition
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: __expr__
-            model:
-              conditions:
-                - evaluator:
-                    params:
-                      - 0
-                      - 0
-                    type: gt
-                  operator:
-                    type: and
-                  query:
-                    params: []
-                  reducer:
-                    params: []
-                    type: avg
-                  type: query
-              datasource:
-                name: Expression
-                type: __expr__
-                uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
-              refId: condition
-              type: math
-        noDataState: Alerting
-        execErrState: Alerting
-        for: 15m
-        annotations:
-          summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
-        isPaused: false
-      
-      # Secured Finance
-      - uid: secured_finance_diff_external
-        title: secured_finance_watcher_head_tracking
-        condition: condition
-        data:
-          - refId: diff
-            relativeTimeRange:
-              from: 600
-              to: 0
-            datasourceUid: PBFA97CFB590B2093
-            model:
-              datasource:
-                type: prometheus
-                uid: PBFA97CFB590B2093
-              disableTextWrap: false
-              editorMode: code
-              expr: latest_block_number{instance="external"} - on(chain) group_right sync_status_block_number{job="secured-finance", instance="secured-finance", kind="latest_indexed"}
+              expr: latest_block_number - on(chain) group_right sync_status_block_number{job="sushi", instance="merkl_sushiswap", kind="latest_indexed"}
              fullMetaSearch: false
              includeNullMetadata: true
              instant: true
@@ -892,6 +880,22 @@ groups:
              legendFormat: __auto
              range: false
              refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="sushi", instance="merkl_sushiswap", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
          - refId: condition
            relativeTimeRange:
              from: 600
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-set -u
-
-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
-
-# Read in the config template TOML file and modify it
-WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-
-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
-WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}| ")
-
-# 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,24 +0,0 @@
-#!/bin/sh
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-set -u
-
-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
-
-# Read in the config template TOML file and modify it
-WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-
-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
-WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-echo "Running server..."
-DEBUG=vulcanize:* exec node --enable-source-maps dist/server.js
@@ -1,110 +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 = false
-
-  subgraphPath = "./subgraph-build"
-
-  # Interval to restart wasm instance periodically
-  wasmRestartBlocksInterval = 20
-
-  # Interval in number of blocks at which to clear entities cache.
-  clearEntitiesCacheInterval = 1000
-
-  # Flag to specify whether RPC endpoint supports block hash as block tag parameter
-  rpcSupportsBlockHashParam = false
-
-  # Server GQL config
-  [server.gql]
-    path = "/"
-
-    # Max block range for which to return events in eventsInRange GQL query.
-    # Use -1 for skipping check on block range.
-    maxEventsBlockRange = 1000
-
-    # Log directory for GQL requests
-    logDir = "./gql-logs"
-
-    # GQL cache settings
-    [server.gql.cache]
-      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 = "ajna-watcher-db"
-  port = 5432
-  database = "ajna-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoints = REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS
-
-    # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
-    rpcClient = true
-
-    # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint
-    isFEVM = true
-
-    # Boolean flag to filter event logs by contracts
-    filterLogsByAddresses = true
-    # Boolean flag to filter event logs by topics
-    filterLogsByTopics = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@ajna-watcher-db/ajna-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50
-  subgraphEventsOrder = true
-  # Filecoin block time: https://docs.filecoin.io/basics/the-blockchain/blocks-and-tipsets#blocktime
-  blockDelayInMilliSecs = 30000
-
-  # Number of blocks by which block processing lags behind head
-  blockProcessingOffset = 0
-
-  # Boolean to switch between modes of processing events when starting the server.
-  # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
-  # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head).
-  useBlockRanges = true
-
-  # Block range in which logs are fetched during historical blocks processing
-  historicalLogsBlockRange = 2000
-
-  # Max block range of historical processing after which it waits for completion of events processing
-  # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
-  historicalMaxFetchAhead = 10000
-
-  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
-  maxNewBlockRetries = 3
@@ -4,19 +4,16 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
  set -x
 fi

-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
-echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL_ENDPOINT}"
+echo "Using IPLD ETH RPC endpoint ${CERC_IPLD_ETH_RPC}"
+echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL}"
 echo "Using historicalLogsBlockRange ${CERC_HISTORICAL_BLOCK_RANGE:-2000}"

-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
 # Replace env variables in template TOML file
 # Read in the config template TOML file and modify it
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}|g; \
-          s|REPLACE_WITH_CERC_IPLD_ETH_GQL_ENDPOINT|${CERC_IPLD_ETH_GQL_ENDPOINT}|g; \
+  sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}|g; \
+          s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}|g; \
          s|REPLACE_WITH_CERC_HISTORICAL_BLOCK_RANGE|${CERC_HISTORICAL_BLOCK_RANGE:-2000}| ")

 # Write the modified content to a new file
@@ -4,19 +4,16 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
  set -x
 fi

-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
-echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL_ENDPOINT}"
+echo "Using IPLD ETH RPC endpoint ${CERC_IPLD_ETH_RPC}"
+echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL}"
 echo "Using historicalLogsBlockRange ${CERC_HISTORICAL_BLOCK_RANGE:-2000}"

-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
 # Replace env variables in template TOML file
 # Read in the config template TOML file and modify it
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}|g; \
-          s|REPLACE_WITH_CERC_IPLD_ETH_GQL_ENDPOINT|${CERC_IPLD_ETH_GQL_ENDPOINT}|g; \
+  sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}|g; \
+          s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}|g; \
          s|REPLACE_WITH_CERC_HISTORICAL_BLOCK_RANGE|${CERC_HISTORICAL_BLOCK_RANGE:-2000}| ")

 # Write the modified content to a new file
@@ -1,7 +1,6 @@
 [server]
  host = "0.0.0.0"
-  [server.gql]
-    maxSimultaneousRequests = -1
+  maxSimultaneousRequests = -1

 [metrics]
  host = "0.0.0.0"
@@ -14,8 +13,8 @@

 [upstream]
  [upstream.ethServer]
-    gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL_ENDPOINT"
-    rpcProviderEndpoints = REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS
+    gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL"
+    rpcProviderEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_RPC"

 [jobQueue]
  historicalLogsBlockRange = REPLACE_WITH_CERC_HISTORICAL_BLOCK_RANGE
@@ -6,16 +6,12 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 set -u

-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
+echo "Using ETH RPC endpoint ${CERC_ETH_RPC_ENDPOINT}"

 # Read in the config template TOML file and modify it
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-
-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}| ")
+  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINT|${CERC_ETH_RPC_ENDPOINT}| ")

 # Write the modified content to a new file
 echo "$WATCHER_CONFIG" > environments/local.toml
@@ -6,16 +6,12 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 set -u

-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
+echo "Using ETH RPC endpoint ${CERC_ETH_RPC_ENDPOINT}"

 # Read in the config template TOML file and modify it
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-
-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}| ")
+  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINT|${CERC_ETH_RPC_ENDPOINT}| ")

 # Write the modified content to a new file
 echo "$WATCHER_CONFIG" > environments/local.toml
@@ -2,6 +2,7 @@
  host = "0.0.0.0"
  port = 3008
  kind = "active"
+  gqlPath = '/'

  # Checkpointing state.
  checkpointing = true
@@ -21,30 +22,23 @@
  # Interval in number of blocks at which to clear entities cache.
  clearEntitiesCacheInterval = 1000

+  # Max block range for which to return events in eventsInRange GQL query.
+  # Use -1 for skipping check on block range.
+  maxEventsBlockRange = 1000
+
  # Flag to specify whether RPC endpoint supports block hash as block tag parameter
  rpcSupportsBlockHashParam = false

-  # Server GQL config
-  [server.gql]
-    path = "/"
+  # GQL cache settings
+  [server.gqlCache]
+    enabled = true

-    # Max block range for which to return events in eventsInRange GQL query.
-    # Use -1 for skipping check on block range.
-    maxEventsBlockRange = 1000
+    # Max in-memory cache size (in bytes) (default 8 MB)
+    # maxCacheSize

-    # Log directory for GQL requests
-    logDir = "./gql-logs"
-
-    # GQL cache settings
-    [server.gql.cache]
-      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
+    # GQL cache-control max-age settings (in seconds)
+    maxAge = 15
+    timeTravelMaxAge = 86400 # 1 day

 [metrics]
  host = "0.0.0.0"
@@ -64,7 +58,7 @@

 [upstream]
  [upstream.ethServer]
-    rpcProviderEndpoints = REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS
+    rpcProviderEndpoint = "REPLACE_WITH_CERC_ETH_RPC_ENDPOINT"

    # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
    rpcClient = true
@@ -75,7 +69,7 @@
    # Boolean flag to filter event logs by contracts
    filterLogsByAddresses = true
    # Boolean flag to filter event logs by topics
-    filterLogsByTopics = true
+    filterLogsByTopics = false

  [upstream.cache]
    name = "requests"
@@ -91,9 +85,6 @@
  # Filecoin block time: https://docs.filecoin.io/basics/the-blockchain/blocks-and-tipsets#blocktime
  blockDelayInMilliSecs = 30000

-  # Number of blocks by which block processing lags behind head
-  blockProcessingOffset = 0
-
  # Boolean to switch between modes of processing events when starting the server.
  # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
  # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head).
@@ -105,6 +96,3 @@
  # Max block range of historical processing after which it waits for completion of events processing
  # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
  historicalMaxFetchAhead = 10000
-
-  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
-  maxNewBlockRetries = 3
@@ -6,16 +6,12 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 set -u

-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
+echo "Using ETH RPC endpoint ${CERC_ETH_RPC_ENDPOINT}"

 # Read in the config template TOML file and modify it
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-
-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}| ")
+  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINT|${CERC_ETH_RPC_ENDPOINT}| ")

 # Write the modified content to a new file
 echo "$WATCHER_CONFIG" > environments/local.toml
@@ -6,16 +6,12 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 set -u

-echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}"
+echo "Using ETH RPC endpoint ${CERC_ETH_RPC_ENDPOINT}"

 # Read in the config template TOML file and modify it
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-
-# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array
-RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/')
-
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}| ")
+  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINT|${CERC_ETH_RPC_ENDPOINT}| ")

 # Write the modified content to a new file
 echo "$WATCHER_CONFIG" > environments/local.toml
@@ -2,6 +2,7 @@
  host = "0.0.0.0"
  port = 3008
  kind = "active"
+  gqlPath = "/"

  # Checkpointing state.
  checkpointing = true
@@ -21,30 +22,23 @@
  # Interval in number of blocks at which to clear entities cache.
  clearEntitiesCacheInterval = 1000

+  # Max block range for which to return events in eventsInRange GQL query.
+  # Use -1 for skipping check on block range.
+  maxEventsBlockRange = 1000
+
  # Flag to specify whether RPC endpoint supports block hash as block tag parameter
  rpcSupportsBlockHashParam = false

-  # Server GQL config
-  [server.gql]
-    path = "/"
+  # GQL cache settings
+  [server.gqlCache]
+    enabled = true

-    # Max block range for which to return events in eventsInRange GQL query.
-    # Use -1 for skipping check on block range.
-    maxEventsBlockRange = 1000
+    # Max in-memory cache size (in bytes) (default 8 MB)
+    # maxCacheSize

-    # Log directory for GQL requests
-    logDir = "./gql-logs"
-
-    # GQL cache settings
-    [server.gql.cache]
-      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
+    # GQL cache-control max-age settings (in seconds)
+    maxAge = 15
+    timeTravelMaxAge = 86400 # 1 day

 [metrics]
  host = "0.0.0.0"
@@ -64,7 +58,7 @@

 [upstream]
  [upstream.ethServer]
-    rpcProviderEndpoints = REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS
+    rpcProviderEndpoint = "REPLACE_WITH_CERC_ETH_RPC_ENDPOINT"

    # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
    rpcClient = true
@@ -91,9 +85,6 @@
  # Filecoin block time: https://docs.filecoin.io/basics/the-blockchain/blocks-and-tipsets#blocktime
  blockDelayInMilliSecs = 30000

-  # Number of blocks by which block processing lags behind head
-  blockProcessingOffset = 0
-
  # Boolean to switch between modes of processing events when starting the server.
  # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
  # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head).
@@ -105,6 +96,3 @@
  # Max block range of historical processing after which it waits for completion of events processing
  # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
  historicalMaxFetchAhead = 10000
-
-  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
-  maxNewBlockRetries = 3
@@ -1,23 +1,26 @@
-FROM ethpandaops/ethereum-genesis-generator:3.0.0 AS ethgen
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen

 FROM golang:1.20-alpine as builder

-RUN apk add --no-cache python3 py3-pip make bash envsubst jq
+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 --break-system-packages -r requirements.txt
-RUN pip3 install --break-system-packages --upgrade "web3==v6.15.1"
+# web3==5.24.0 used by el-gen is broken on python 3.11
+RUN pip3 install --break-system-packages --upgrade "web3==6.5.0"
 RUN pip3 install --break-system-packages --upgrade "typing-extensions"

-# Install tool to generate initial block
-RUN go install github.com/cerc-io/eth-dump-genblock@b29516740fc01cf1d1d623acbfd0e9a2b6440a96
-
 # Build genesis config
-COPY genesis /opt/genesis
+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
@@ -9,8 +9,32 @@ mkdir -p ../build/el
 tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
 envsubst < el-config.yaml > $tmp_dir/genesis-config.yaml

-python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
-  jq 'del(.config.pragueTime)' \
-  > ../build/el/geth.json
+ttd=`cat $tmp_dir/genesis-config.yaml | grep terminal_total_difficulty | awk '{ print $2 }'`
+homestead_block=`cat $tmp_dir/genesis-config.yaml | grep homestead_block | awk '{ print $2 }'`
+eip150_block=`cat $tmp_dir/genesis-config.yaml | grep eip150_block | awk '{ print $2 }'`
+eip155_block=`cat $tmp_dir/genesis-config.yaml | grep eip155_block | awk '{ print $2 }'`
+eip158_block=`cat $tmp_dir/genesis-config.yaml | grep eip158_block | awk '{ print $2 }'`
+byzantium_block=`cat $tmp_dir/genesis-config.yaml | grep byzantium_block | awk '{ print $2 }'`
+constantinople_block=`cat $tmp_dir/genesis-config.yaml | grep constantinople_block | awk '{ print $2 }'`
+petersburg_block=`cat $tmp_dir/genesis-config.yaml | grep petersburg_block | awk '{ print $2 }'`
+istanbul_block=`cat $tmp_dir/genesis-config.yaml | grep istanbul_block | awk '{ print $2 }'`
+berlin_block=`cat $tmp_dir/genesis-config.yaml | grep berlin_block | awk '{ print $2 }'`
+london_block=`cat $tmp_dir/genesis-config.yaml | grep london_block | awk '{ print $2 }'`
+merge_fork_block=`cat $tmp_dir/genesis-config.yaml | grep merge_fork_block | awk '{ print $2 }'`

+python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
+  jq ".config.terminalTotalDifficulty=$ttd" | \
+  jq ".config.homesteadBlock=$homestead_block" | \
+  jq ".config.eip150Block=$eip150_block" | \
+  jq ".config.eip155Block=$eip155_block" | \
+  jq ".config.eip158Block=$eip158_block" | \
+  jq ".config.byzantiumBlock=$byzantium_block" | \
+  jq ".config.constantinopleBlock=$constantinople_block" | \
+  jq ".config.petersburgBlock=$petersburg_block" | \
+  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
 python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
@@ -10,8 +10,22 @@ el_premine_addrs: {}
 chain_id: 1212
 deposit_contract_address: "0x1212121212121212121212121212121212121212"
 genesis_timestamp: 0
-genesis_delay: 0
-deneb_fork_epoch: 0
-# note: only needed as workaround https://github.com/ethpandaops/ethereum-genesis-generator/pull/105
-electra_fork_epoch: 0
-slot_duration_in_seconds: 3
+terminal_total_difficulty: 1000
+homestead_block: 1
+eip150_block: 1
+eip155_block: 1
+eip158_block: 1
+byzantium_block: 1
+constantinople_block: 1
+petersburg_block: 1
+istanbul_block: 1
+berlin_block: 1
+london_block: 1
+merge_fork_block: 1
+
+clique:
+  enabled: false
+  signers:
+    - 36d56343bc308d4ffaac2f793d121aba905fa6cc
+    - 5e762d4a3847cadaf40a4b0c39574b0ff6698c78
+    - 15d7acc1019fdf8ab4f0f7bd31ec1487ecb5a2bd
@@ -6,7 +6,7 @@ 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 -w inet | grep -v '127.0' | 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}"

@@ -102,13 +102,6 @@ else
      fi
    fi

-    OTHER_OPTS=""
-    # miner options were removed in v1.12
-    GETH_VERSION=$(geth --version | grep -io '[0-9][0-9a-z.-]*')
-    if echo -e "$GETH_VERSION\n1.12" | sort -Vc; then
-      OTHER_OPTS="--miner.threads=1"
-    fi
-
    $START_CMD \
      --datadir="${CERC_ETH_DATADIR}" \
      --bootnodes="${ENODE}" \
@@ -133,12 +126,12 @@ else
      --cache.preimages \
      --syncmode=full \
      --mine \
+      --miner.threads=1 \
      --metrics \
      --metrics.addr="0.0.0.0" \
      --verbosity=${CERC_GETH_VERBOSITY:-3} \
      --log.vmodule="${CERC_GETH_VMODULE:-statediff/*=5}" \
      --miner.etherbase="${ETHERBASE}" \
-      ${OTHER_OPTS} \
      ${STATEDIFF_OPTS} \
      &

@@ -1,4 +1,5 @@
 FROM cerc/lighthouse-cli:local AS lcli
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-eth-genesis:local AS fnetgen

 FROM cerc/lighthouse:local
@@ -11,13 +12,16 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y --no-install-reco
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*

-COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli
-COPY --from=fnetgen /opt/genesis/el /opt/testnet/el
-COPY --from=fnetgen /opt/genesis/build/el /opt/testnet/build/el
-
 COPY genesis /opt/testnet
 COPY run-cl.sh /opt/testnet/run.sh

+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
+
 RUN cd /opt/testnet && make genesis-cl

 # Work around some bugs in lcli where the default path is always used.
@@ -10,6 +10,7 @@ set -Eeuo pipefail
 source ./vars.env

 SUBSCRIBE_ALL_SUBNETS=
+DEBUG_LEVEL=${DEBUG_LEVEL:-debug}

 # Get positional arguments
 data_dir=$DATADIR/node_${NODE_NUMBER}
@@ -9,6 +9,8 @@ set -Eeuo pipefail

 source ./vars.env

+DEBUG_LEVEL=${1:-info}
+
 echo "Starting bootnode"

 # Clean up existing ENR dir to avoid node connectivity issues on a restart
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash

-# See https://github.com/sigp/lighthouse/scripts/local_testnet/setup.sh
 #
 # Deploys the deposit contract and makes deposits for $VALIDATOR_COUNT insecure deterministic validators.
 # Produces a testnet specification and a genesis state where the genesis time
@@ -25,26 +24,23 @@ echo "(Note: errors of the form 'WARN: Scrypt parameters are too weak...' below
 lcli \
  new-testnet \
  --spec $SPEC_PRESET \
-  --testnet-dir $TESTNET_DIR \
  --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 $BELLATRIX_FORK_EPOCH \
-  --capella-fork-epoch $CAPELLA_FORK_EPOCH \
-  --deneb-fork-epoch $DENEB_FORK_EPOCH \
+  --bellatrix-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 \
-  --interop-genesis-state \
  --force

-echo Specification and genesis.ssz generated at $TESTNET_DIR.
+echo Specification generated at $TESTNET_DIR.
 echo "Generating $VALIDATOR_COUNT validators concurrently... (this may take a while)"

 lcli \
@@ -54,3 +50,13 @@ lcli \
  --node-count $BN_COUNT

 echo Validators generated with keystore passwords at $DATADIR.
+echo "Building genesis state... (this might take a while)"
+
+lcli \
+  interop-genesis \
+  --spec $SPEC_PRESET \
+  --genesis-time $GENESIS_TIME \
+  --testnet-dir $TESTNET_DIR \
+  $GENESIS_VALIDATOR_COUNT
+
+echo Created genesis state in $TESTNET_DIR
@@ -8,6 +8,8 @@ set -Eeuo pipefail

 source ./vars.env

+DEBUG_LEVEL=info
+
 BUILDER_PROPOSALS=

 # Get options
@@ -25,9 +25,7 @@ BOOTNODE_PORT=${BOOTNODE_PORT:-4242}

 # Hard fork configuration
 ALTAIR_FORK_EPOCH=${ALTAIR_FORK_EPOCH:-0}
-BELLATRIX_FORK_EPOCH=${BELLATRIX_FORK_EPOCH:-0}
-CAPELLA_FORK_EPOCH=${CAPELLA_FORK_EPOCH:-0}
-DENEB_FORK_EPOCH=${DENEB_FORK_EPOCH:-0}
+MERGE_FORK_EPOCH=${MERGE_FORK_EPOCH:-0}

 # Spec version (mainnet or minimal)
 SPEC_PRESET=${SPEC_PRESET:-mainnet}
@@ -53,6 +51,3 @@ ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDiffi
 ETH1_DEPOSIT_CONTRACT_ADDRESS=${ETH1_DEPOSIT_CONTRACT_ADDRESS:-`cat $ETH1_CONFIG_YAML | grep 'deposit_contract_address' | awk '{ print $2 }' | sed 's/"//g'`}
 ETH1_DEPOSIT_CONTRACT_BLOCK=${ETH1_DEPOSIT_CONTRACT_BLOCK:-0x0}
 SUGGESTED_FEE_RECIPIENT=`cat ../build/el/accounts.csv | head -1 | cut -d',' -f2`
-
-# --debug-level
-DEBUG_LEVEL=${LIGHTHOUSE_DEBUG_LEVEL:-debug}
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Build cerc/laconic-console-host
+# Build cerc/laconic-registry-cli

 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh

@@ -50,7 +50,7 @@ RUN npm config set @cerc-io:registry ${CERC_NPM_REGISTRY_URL} \
 # that install different Node-based CLI commands

 # Globally install the cli package
-RUN yarn global add @cerc-io/laconic-registry-cli@0.2.0
+RUN yarn global add @cerc-io/laconic-registry-cli

 # Add scripts
 RUN mkdir /scripts
@@ -5,7 +5,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
  set -x
 fi

-registry_command="laconic registry"
+registry_command="laconic cns"
 demo_records_dir="scripts/demo-records"

 # Check we have funds
@@ -14,7 +14,7 @@ funds_balance=$(echo ${funds_response} | jq -r .[0].balance[0].quantity)
 echo "Balance is: ${funds_balance}"

 # Create a bond
-bond_create_result=$(${registry_command} bond create --type photon --quantity 1000000000)
+bond_create_result=$(${registry_command} bond create --type aphoton --quantity 1000000000)
 bond_id=$(echo ${bond_create_result} | jq -r .bondId)
 echo "Created bond with id: ${bond_id}"

@@ -7,9 +7,9 @@ record:
    env:
      ENV_VAR_A: A
      ENV_VAR_B: B
-  lrn:
-    - lrn://foo.bar
-    - lrn://bar.baz
+  crn:
+    - crn://foo.bar
+    - crn://bar.baz
  meta:
    foo: bar
  tags:
@@ -1,10 +1,9 @@
-FROM sigp/lighthouse:v5.1.2
+ARG TAG_SUFFIX="-modern"
+FROM sigp/lighthouse:v4.3.0${TAG_SUFFIX}

-RUN apt-get update && apt-get -y upgrade \
-    && apt-get -y install bash netcat curl less jq wget \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update; apt-get install bash netcat curl less jq wget -y;

-WORKDIR /root
+WORKDIR /root/
 ADD start-lighthouse.sh .

 ENTRYPOINT [ "./start-lighthouse.sh" ]
@@ -6,4 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

-docker build -t cerc/lighthouse:local ${build_command_args} ${SCRIPT_DIR}
+docker build -t cerc/lighthouse:local ${build_command_args} --build-arg TAG_SUFFIX="" ${SCRIPT_DIR}
@@ -28,8 +28,6 @@ RUN \
    && su ${USERNAME} -c "umask 0002 && npm install -g semver" \
    # Install pnpm
    && su ${USERNAME} -c "umask 0002 && npm install -g pnpm" \
-    # Install bun
-    && su ${USERNAME} -c "umask 0002 && npm install -g bun@1.1.x" \
    && npm cache clean --force > /dev/null 2>&1

 # [Optional] Uncomment this section to install additional OS packages.
@@ -11,14 +11,8 @@ CERC_CONTAINER_BUILD_DOCKERFILE=${CERC_CONTAINER_BUILD_DOCKERFILE:-$SCRIPT_DIR/D
 CERC_CONTAINER_BUILD_TAG=${CERC_CONTAINER_BUILD_TAG:-cerc/nextjs-base:local}

 docker build -t $CERC_CONTAINER_BUILD_TAG ${build_command_args} -f $CERC_CONTAINER_BUILD_DOCKERFILE $CERC_CONTAINER_BUILD_WORK_DIR
-rc=$?

-if [ $rc -ne 0 ]; then
-  echo "BUILD FAILED" 1>&2
-  exit $rc
-fi
-
-if [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/nextjs-base:local" ]; then
+if [ $? -eq 0 ] && [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/nextjs-base:local" ]; then
  cat <<EOF

 #################################################################
@@ -14,8 +14,6 @@ if [ -z "$CERC_BUILD_TOOL" ]; then
    CERC_BUILD_TOOL=pnpm
  elif [ -f "yarn.lock" ]; then
    CERC_BUILD_TOOL=yarn
-  elif [ -f "bun.lockb" ]; then
-    CERC_BUILD_TOOL=bun
  else
    CERC_BUILD_TOOL=npm
  fi
@@ -13,8 +13,6 @@ if [ -z "$CERC_BUILD_TOOL" ]; then
    CERC_BUILD_TOOL=pnpm
  elif [ -f "yarn.lock" ]; then
    CERC_BUILD_TOOL=yarn
-  elif [ -f "bun.lockb" ]; then
-    CERC_BUILD_TOOL=bun
  else
    CERC_BUILD_TOOL=npm
  fi
@@ -5,7 +5,7 @@ fi


 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-CERC_MAX_GENERATE_TIME=${CERC_MAX_GENERATE_TIME:-120}
+CERC_MAX_GENERATE_TIME=${CERC_MAX_GENERATE_TIME:-60}
 tpid=""

 ctrl_c() {
@@ -20,8 +20,6 @@ if [ -z "$CERC_BUILD_TOOL" ]; then
    CERC_BUILD_TOOL=pnpm
  elif [ -f "yarn.lock" ]; then
    CERC_BUILD_TOOL=yarn
-  elif [ -f "bun.lockb" ]; then
-    CERC_BUILD_TOOL=bun
  else
    CERC_BUILD_TOOL=npm
  fi
@@ -1,10 +0,0 @@
-FROM cerc/ping-pub-base:local
-
-COPY ./scripts/update-explorer-config.sh /scripts
-COPY ./scripts/start-serving-explorer.sh /scripts
-COPY ./config/laconic-chaindata-template.json /config/chains/laconic-chaindata-template.json
-
-EXPOSE 5173
-
-WORKDIR /app
-CMD ["/scripts/start-serving-explorer.sh"]
@@ -1,8 +0,0 @@
-FROM cerc/webapp-base:local
-
-WORKDIR /app
-
-COPY . .
-
-RUN yarn
-
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 # Build the ping pub image
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

-# Two-stage build is to allow us to pick up both the upstream repo's files, and local files here for config
-docker build -t cerc/ping-pub-base:local ${build_command_args} -f $SCRIPT_DIR/Dockerfile.base $CERC_REPO_BASE_DIR/explorer
-docker build -t cerc/ping-pub:local ${build_command_args} -f $SCRIPT_DIR/Dockerfile $SCRIPT_DIR
+docker build -t cerc/ping-pub:local ${build_command_args} -f $CERC_REPO_BASE_DIR/explorer/Dockerfile $CERC_REPO_BASE_DIR/explorer
@@ -1,22 +0,0 @@
-{
-    "chain_name": "LACONIC_LACONICD_CHAIN_ID",
-    "registry_name": "LACONIC_LACONICD_CHAIN_ID",
-    "api": [
-        {"provider": "LX-one-tree-one-seven", "address": "LACONIC_LACONICD_API_URL"}
-    ],
-    "rpc": [
-        {"provider": "LX-tendermint-rpc", "address": "LACONIC_LACONICD_RPC_URL"}
-    ],
-    "sdk_version": "0.45.1",
-    "coin_type": "118",
-    "min_tx_fee": "800",
-    "addr_prefix": "ethm",
-    "logo": "/logos/cosmos.svg",
-    "assets": [{
-        "base": "photon",
-        "symbol": "LNT",
-        "exponent": "6",
-        "coingecko_id": "cosmos", 
-        "logo": "/logos/cosmos.svg"
-    }]
-}
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-${SCRIPT_DIR}/update-explorer-config.sh
-
-echo "Starting serving explorer"
-# Force cache re-build because vite is dumb and can't be restarted otherwise
-yarn serve --host --force
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# Verify that we have the config variables we need
-if [[ -z ${LACONIC_LACONICD_API_URL} ]]; then
-    echo "Error: LACONIC_LACONICD_API_URL not defined"
-    exit 1
-fi
-if [[ -z ${LACONIC_LACONICD_RPC_URL} ]]; then
-    echo "Error: LACONIC_LACONICD_RPC_URL not defined"
-    exit 1
-fi
-if [[ -z ${LACONIC_LACONICD_CHAIN_ID} ]]; then
-    echo "Error: LACONIC_LACONICD_CHAIN_ID not defined"
-    exit 1
-fi
-
-# Ping-pub explorer has endlessly confusing behavior where it
-# infers the directory from which to load chain configuration files
-# by the presence or absense of the substring "testnet" in the host name
-# (browser side -- the host name of the host in the address bar of the browser)
-# Accordingly we configure our network in both directories in order to 
-# subvert this lunacy.
-explorer_mainnet_config_dir=/app/chains/mainnet
-explorer_testnet_config_dir=/app/chains/testnet
-config_template_file=/config/chains/laconic-chaindata-template.json
-chain_config_name=laconic.json
-mainnet_config_file=${explorer_mainnet_config_dir}/${chain_config_name}
-testnet_config_file=${explorer_testnet_config_dir}/${chain_config_name}
-
-# Delete the stock config files
-rm -f ${explorer_testnet_config_dir}/*
-rm -f ${explorer_mainnet_config_dir}/*
-
-# Copy in our template file
-cp ${config_template_file} ${mainnet_config_file}
-
-# Update the file with the config variables
-sed -i "s#LACONIC_LACONICD_API_URL#${LACONIC_LACONICD_API_URL}#g" ${mainnet_config_file}
-sed -i "s#LACONIC_LACONICD_RPC_URL#${LACONIC_LACONICD_RPC_URL}#g" ${mainnet_config_file}
-sed -i "s#LACONIC_LACONICD_CHAIN_ID#${LACONIC_LACONICD_CHAIN_ID}#g" ${mainnet_config_file}
-
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  echo "Updated chaindata file:"
-  cat ${mainnet_config_file}
-fi
-
-# Copy over to the testnet directory
-cp ${mainnet_config_file} ${testnet_config_file}
@@ -0,0 +1,6 @@
+FROM cerc/snowballtools-base-backend-base:local
+
+WORKDIR /app/packages/backend
+COPY run.sh .
+
+ENTRYPOINT ["./run.sh"]
@@ -0,0 +1,26 @@
+FROM ubuntu:22.04 as builder
+
+RUN apt update && \
+      apt install -y --no-install-recommends --no-install-suggests \
+      ca-certificates curl gnupg
+
+# Node
+ARG NODE_MAJOR=20
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+      echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
+      apt update && apt install -y nodejs
+
+# npm setup
+RUN npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/ && npm install -g yarn
+
+COPY . /app/
+WORKDIR /app/
+
+RUN find . -name 'node_modules' | xargs -n1 rm -rf
+RUN yarn && yarn build --ignore frontend
+
+FROM cerc/webapp-base:local
+
+COPY --from=builder /app /app
+
+WORKDIR /app/packages/backend
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Build cerc/webapp-deployer-backend
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+# See: https://stackoverflow.com/a/246128/1701505
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/snowballtools-base-backend-base:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile-base ${CERC_REPO_BASE_DIR}/snowballtools-base
+docker build -t cerc/snowballtools-base-backend:local ${build_command_args} ${SCRIPT_DIR} 
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+
+LACONIC_HOSTED_CONFIG_FILE=${LACONIC_HOSTED_CONFIG_FILE}
+if [ -z "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
+  if [ -f "/config/laconic-hosted-config.yml" ]; then
+    LACONIC_HOSTED_CONFIG_FILE="/config/laconic-hosted-config.yml"
+  elif [ -f "/config/config.yml" ]; then
+    LACONIC_HOSTED_CONFIG_FILE="/config/config.yml"
+  fi
+fi
+
+if [ -f "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
+  /scripts/apply-webapp-config.sh $LACONIC_HOSTED_CONFIG_FILE "`pwd`/dist"
+fi
+
+/scripts/apply-runtime-env.sh "`pwd`/dist"
+
+yarn start
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
telackey	82785b6823	unused Lint Checks / Run linter (pull_request) Successful in 59s Details Deploy Test / Run deploy test suite (pull_request) Successful in 4m33s Details Smoke Test / Run basic test suite (pull_request) Successful in 3m8s Details Webapp Test / Run webapp test suite (pull_request) Successful in 4m47s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 8m41s Details	2024-03-04 23:43:21 -06:00
telackey	583774e32a	; Lint Checks / Run linter (pull_request) Failing after 32s Details Deploy Test / Run deploy test suite (pull_request) Successful in 5m41s Details Webapp Test / Run webapp test suite (pull_request) Successful in 3m52s Details Smoke Test / Run basic test suite (pull_request) Successful in 5m7s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 7m47s Details	2024-03-04 23:42:45 -06:00
telackey	f91329eef0	lint Lint Checks / Run linter (pull_request) Failing after 24s Details Deploy Test / Run deploy test suite (pull_request) Successful in 5m1s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Failing after 5m33s Details Smoke Test / Run basic test suite (pull_request) Successful in 3m49s Details Webapp Test / Run webapp test suite (pull_request) Successful in 5m7s Details	2024-03-04 23:41:31 -06:00
telackey	7f0b82b9a9	Update status cmd Lint Checks / Run linter (pull_request) Failing after 28s Details Webapp Test / Run webapp test suite (pull_request) Successful in 2m50s Details Deploy Test / Run deploy test suite (pull_request) Successful in 4m22s Details Smoke Test / Run basic test suite (pull_request) Successful in 6m14s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 10m15s Details	2024-03-05 05:40:15 +00:00
telackey	64b395f15a	more oops Lint Checks / Run linter (pull_request) Successful in 27s Details Webapp Test / Run webapp test suite (pull_request) Successful in 2m58s Details Deploy Test / Run deploy test suite (pull_request) Successful in 5m45s Details Smoke Test / Run basic test suite (pull_request) Successful in 2m36s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 9m16s Details	2024-03-04 23:05:35 -06:00
telackey	240db3ca4c	oops Lint Checks / Run linter (pull_request) Successful in 44s Details Webapp Test / Run webapp test suite (pull_request) Successful in 4m44s Details Deploy Test / Run deploy test suite (pull_request) Successful in 5m53s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 6m20s Details Smoke Test / Run basic test suite (pull_request) Successful in 4m39s Details	2024-03-04 22:52:57 -06:00
telackey	d09fbc3ac4	TLS options Lint Checks / Run linter (pull_request) Successful in 53s Details Webapp Test / Run webapp test suite (pull_request) Successful in 3m19s Details Deploy Test / Run deploy test suite (pull_request) Successful in 4m18s Details Smoke Test / Run basic test suite (pull_request) Successful in 5m12s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 9m16s Details	2024-03-04 22:01:09 -06:00
telackey	3c7ff76a83	fmt Lint Checks / Run linter (pull_request) Successful in 30s Details Deploy Test / Run deploy test suite (pull_request) Successful in 4m17s Details Smoke Test / Run basic test suite (pull_request) Successful in 3m17s Details Webapp Test / Run webapp test suite (pull_request) Successful in 5m3s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 9m30s Details	2024-03-04 17:09:11 -06:00
telackey	53b29ff69b	fmt Lint Checks / Run linter (pull_request) Successful in 52s Details Webapp Test / Run webapp test suite (pull_request) Successful in 3m51s Details Deploy Test / Run deploy test suite (pull_request) Successful in 6m0s Details Smoke Test / Run basic test suite (pull_request) Successful in 5m33s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 7m10s Details	2024-03-04 17:08:08 -06:00
telackey	4ec0e38b77	Fix configmaps constant. Lint Checks / Run linter (pull_request) Successful in 39s Details Webapp Test / Run webapp test suite (pull_request) Successful in 3m17s Details Smoke Test / Run basic test suite (pull_request) Successful in 5m2s Details Deploy Test / Run deploy test suite (pull_request) Successful in 5m42s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 6m37s Details	2024-03-04 22:01:01 +00:00
telackey	14ee4da1fc	comment Lint Checks / Run linter (pull_request) Successful in 37s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Failing after 1m37s Details Deploy Test / Run deploy test suite (pull_request) Successful in 5m20s Details Webapp Test / Run webapp test suite (pull_request) Successful in 2m43s Details Smoke Test / Run basic test suite (pull_request) Successful in 4m24s Details	2024-03-04 15:27:36 -06:00
telackey	e81c95a920	Support wildcard certs. Lint Checks / Run linter (pull_request) Successful in 39s Details Deploy Test / Run deploy test suite (pull_request) Successful in 3m36s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Failing after 3m3s Details Smoke Test / Run basic test suite (pull_request) Successful in 2m37s Details Webapp Test / Run webapp test suite (pull_request) Successful in 5m1s Details	2024-03-04 15:24:14 -06:00