change imports

rename app module, nest cli in app
2023-10-07 12:22:40 +08:00 · 2023-10-07 12:22:30 +08:00
133 changed files with 462 additions and 2971 deletions
@@ -2,10 +2,7 @@ name: Fixturenet-Eth-Plugeth-Test

 on:
  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
+    branches: 'ci-test'

 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -19,16 +16,8 @@ jobs:
    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
+      - name: "Install Python"
+        uses: cerc-io/setup-python@v4
        with:
          python-version: '3.8'
      - name: "Print Python version"
@@ -2,10 +2,7 @@ name: Fixturenet-Eth-Test

 on:
  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-eth-test'
+    branches: 'ci-test'

 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -19,15 +16,7 @@ jobs:
    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') }}
+      - name: "Install Python"
        uses: actions/setup-python@v4
        with:
          python-version: '3.8'
@@ -1,55 +0,0 @@
-name: Fixturenet-Laconicd-Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-laconicd-test'
-
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-
-jobs:
-  test:
-    name: "Run an Laconicd fixturenet test"
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Update'
-        run: apt-get update
-      - name: 'Setup jq'
-        run: apt-get install jq -y
-      - name: 'Check jq'
-        run: |
-          which jq
-          jq --version
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # 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: Start dockerd # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-      - name: "Run fixturenet-laconicd tests"
-        run: ./tests/fixturenet-laconicd/run-test.sh
@@ -5,8 +5,6 @@ on:
    branches:
      - main
      - publish-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'

 jobs:
  publish:
@@ -20,15 +18,7 @@ jobs:
        run: |
          build_tag=$(./scripts/create_build_tag_file.sh)
          echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT
-      # 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') }}
+      - name: "Install Python"
        uses: actions/setup-python@v4
        with:
          python-version: '3.8'
@@ -7,8 +7,6 @@ on:
    branches:
      - main
      - ci-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'

 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -21,15 +19,7 @@ jobs:
    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') }}
+      - name: "Install Python"
        uses: actions/setup-python@v4
        with:
          python-version: '3.8'
@@ -7,8 +7,6 @@ on:
    branches:
      - main
      - ci-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'

 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -21,15 +19,7 @@ jobs:
    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') }}
+      - name: "Install Python"
        uses: actions/setup-python@v4
        with:
          python-version: '3.8'
@@ -48,4 +38,3 @@ jobs:
      - name: "Run smoke tests"
        run: ./tests/smoke-test/run-smoke-test.sh

-
@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-eth-plugeth-test CI job
-trigger
@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-eth-test CI job
-
@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-laconicd-test CI job
-
@@ -1,30 +0,0 @@
-name: Fixturenet-Eth Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.github/workflows/triggers/fixturenet-eth-test'
-
-jobs:
-  test:
-    name: "Run fixturenet-eth test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run fixturenet-eth tests"
-        run: ./tests/fixturenet-eth/run-test.sh
@@ -1,30 +0,0 @@
-name: Fixturenet-Laconicd Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.github/workflows/triggers/fixturenet-laconicd-test'
-
-jobs:
-  test:
-    name: "Run fixturenet-laconicd test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run fixturenet-laconicd tests"
-        run: ./tests/fixturenet-laconicd/run-test.sh
@@ -1,30 +0,0 @@
-name: Fixturenet-Plugeth Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.github/workflows/triggers/fixturenet-plugeth-test'
-
-jobs:
-  test:
-    name: "Run fixturenet-plugeth test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run fixturenet-plugeth tests"
-        run: ./tests/fixturenet-plugeth/run-test.sh
@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-eth-test CI job
-
@@ -1,3 +0,0 @@
-Change this file to trigger running the fixturenet-laconicd-test CI job
-
-trigger
@@ -1,3 +0,0 @@
-Change this file to trigger running the fixturenet-plugeth-test CI job
-
-trigger
@@ -7,4 +7,4 @@ __pycache__
 *~
 package
 app/data/build_tag.txt
-/build
+build
@@ -52,7 +52,7 @@ Version: 1.1.0-7a607c2-202304260513
 Save the distribution url to `~/.laconic-so/config.yml`:
 ```bash
 mkdir ~/.laconic-so
-echo "distribution-url: https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so" >  ~/.laconic-so/config.yml
+echo "distribution-url: https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so" >  ~/.laconic-so/config.yml"
 ```

 ### Update
@@ -15,8 +15,8 @@

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


 def get_stack(config, stack):
@@ -27,8 +27,8 @@ import subprocess
 import click
 import importlib.resources
 from pathlib import Path
-from app.util import include_exclude_check, get_parsed_stack_config
-from app.base import get_npm_registry_url
+from .util import include_exclude_check, get_parsed_stack_config
+from .base import get_npm_registry_url

 # TODO: find a place for this
 #    epilog="Config provided either in .env or settings.ini or env vars: CERC_REPO_BASE_DIR (defaults to ~/cerc)"
@@ -52,7 +52,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
    continue_on_error = ctx.obj.continue_on_error

    # See: https://stackoverflow.com/questions/25389095/python-get-path-of-root-project-structure
-    container_build_dir = Path(__file__).absolute().parent.parent.joinpath("data", "container-build")
+    container_build_dir = Path(__file__).absolute().parent.joinpath("data", "container-build")

    if local_stack:
        dev_root_path = os.getcwd()[0:os.getcwd().rindex("stack-orchestrator")]
@@ -67,7 +67,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
        print('Dev root directory doesn\'t exist, creating')

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

@@ -25,8 +25,8 @@ from decouple import config
 import click
 import importlib.resources
 from python_on_whales import docker, DockerException
-from app.base import get_stack
-from app.util import include_exclude_check, get_parsed_stack_config
+from .base import get_stack
+from .util import include_exclude_check, get_parsed_stack_config

 builder_js_image_name = "cerc/builder-js:local"

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

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

@@ -15,15 +15,14 @@

 import click

-from app.command_types import CommandOptions
-from app.repos import setup_repositories
-from app.build import build_containers
-from app.build import build_npms
-from app.deploy import deploy
-from app import version
-from app.deploy import deployment
-from app import opts
-from app import update
+from .command_types import CommandOptions
+from . import setup_repositories
+from . import build_containers
+from . import build_npms
+from . import deploy
+from . import version
+from . import deployment
+from . import update

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

@@ -40,9 +39,7 @@ CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
@click.pass_context
 def cli(ctx, stack, quiet, verbose, dry_run, local_stack, debug, continue_on_error):
    """Laconic Stack Orchestrator"""
-    command_options = CommandOptions(stack, quiet, verbose, dry_run, local_stack, debug, continue_on_error)
-    opts.opts.o = command_options
-    ctx.obj = command_options
+    ctx.obj = CommandOptions(stack, quiet, verbose, dry_run, local_stack, debug, continue_on_error)


 cli.add_command(setup_repositories.command, "setup-repositories")
@@ -70,7 +70,6 @@ services:
    command: "/run-op-geth.sh"
    ports:
      - "0.0.0.0:8545:8545"
-      - "0.0.0.0:8546:8546"
    healthcheck:
      test: ["CMD", "nc", "-vz", "localhost:8545"]
      interval: 30s
@@ -11,13 +11,10 @@ services:
        condition: service_completed_successfully
    environment:
      CERC_NITRO_CHAIN_URL: ${CERC_NITRO_CHAIN_URL:-ws://fixturenet-eth-geth-1:8546}
-      CERC_NITRO_PK: ${CERC_NITRO_PK:-f36f6dd450892224ee113899195ef922a4795d41c32cafb386d9aab6e0b7b0c6}
-      CERC_NITRO_CHAIN_PK: ${CERC_NITRO_CHAIN_PK:-888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218}
+      CERC_NITRO_PK: ${CERC_NITRO_PK:-2d999770f7b5d49b694080f987b82bbc9fc9ac2b4dcc10b0f8aba7d700f69c6d}
+      CERC_NITRO_CHAIN_PK: ${CERC_NITRO_CHAIN_PK:-570b909da9669b2f35a0b1ac70b8358516d55ae1b5b3710e95e9a94395090597}
      CERC_NITRO_USE_DURABLE_STORE: ${CERC_NITRO_USE_DURABLE_STORE:-true}
      CERC_NITRO_DURABLE_STORE_FOLDER: ${CERC_NITRO_DURABLE_STORE_FOLDER:-/app/data/nitro-store}
-      CERC_NITRO_MSG_PORT: ${CERC_NITRO_MSG_PORT:-3006}
-      CERC_NITRO_WS_MSG_PORT: ${CERC_NITRO_WS_MSG_PORT:-5006}
-      CERC_NITRO_RPC_PORT: ${CERC_NITRO_RPC_PORT:-4006}
      CERC_NA_ADDRESS: ${CERC_NA_ADDRESS}
      CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
      CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
@@ -27,15 +24,25 @@ services:
      - nitro_deployment:/app/deployment
      - ../config/go-nitro/run-nitro-node.sh:/app/run-nitro-node.sh
    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "4006"]
-      interval: 30s
+      test: ["CMD", "nc", "-vz", "localhost", "4005"]
+      interval: 10s
      timeout: 5s
      retries: 10
      start_period: 10s
    ports:
-      - "3006:3006"
-      - "4006:4006"
-      - "5006:5006"
+      - "3005"
+      - "4005:4005"
+      - "5005:5005"
+
+  nitro-rpc-client:
+      image: cerc/nitro-rpc-client:local
+      hostname: nitro-rpc-client
+      restart: on-failure
+      depends_on:
+        # Wait for the go-nitro node to start
+        go-nitro:
+          condition: service_healthy
+      command: ["bash", "-c", "tail -f /dev/null"]

 volumes:
  go_nitro_data:
@@ -1,111 +0,0 @@
-version: "3.2"
-services:
-  ipld-eth-server-1:
-    restart: unless-stopped
-    depends_on:
-      ipld-eth-db:
-        condition: service_healthy
-    image: cerc/ipld-eth-server:local
-    environment:
-      SERVER_HTTP_PATH: 0.0.0.0:8081
-      SERVER_GRAPHQL: "true"
-      SERVER_GRAPHQLPATH: 0.0.0.0:8082
-      VDB_COMMAND: "serve"
-      ETH_CHAIN_CONFIG: "/tmp/chain.json"
-      DATABASE_NAME: cerc_testing
-      DATABASE_HOSTNAME: ipld-eth-db
-      DATABASE_PORT: 5432
-      DATABASE_USER: "vdbm"
-      DATABASE_PASSWORD: "password"
-      ETH_CHAIN_ID: 99
-      ETH_FORWARD_ETH_CALLS: "false"
-      ETH_FORWARD_GET_STORAGE_AT: "false"
-      ETH_PROXY_ON_ERROR: "false"
-      METRICS: "true"
-      PROM_HTTP: "true"
-      PROM_HTTP_ADDR: "0.0.0.0"
-      PROM_HTTP_PORT: "8090"
-      LOG_LEVEL: "debug"
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-      NITRO_RUN_NODE_IN_PROCESS: ${CERC_NITRO_RUN_NODE_IN_PROCESS:-true}
-      NITRO_PK: ${CERC_NITRO_PK:-2d999770f7b5d49b694080f987b82bbc9fc9ac2b4dcc10b0f8aba7d700f69c6d}
-      NITRO_CHAIN_PK: ${CERC_NITRO_CHAIN_PK:-570b909da9669b2f35a0b1ac70b8358516d55ae1b5b3710e95e9a94395090597}
-      NITRO_CHAIN_URL: ${CERC_NITRO_CHAIN_URL:-ws://fixturenet-eth-geth-1:8546}
-      NITRO_USE_DURABLE_STORE: ${CERC_NITRO_USE_DURABLE_STORE:-true}
-      NITRO_DURABLE_STORE_FOLDER: ${CERC_NITRO_DURABLE_STORE_FOLDER:-/app/nitro-data/nitro-store}
-      CERC_NA_ADDRESS: ${CERC_NA_ADDRESS}
-      CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
-      CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
-    entrypoint: ["bash", "-c", "/app/entrypoint.sh"]
-    volumes:
-      - type: bind
-        source: ../config/ipld-eth-server/chain.json
-        target: /tmp/chain.json
-      - eth_server_nitro_data:/app/nitro-data
-      - nitro_deployment:/app/deployment
-      - ../config/ipld-eth-server/entrypoint.sh:/app/entrypoint.sh
-    ports:
-      - "8081"
-      - "8082"
-      - "8090"
-      - "40000"
-      - "3005:3005"
-      - "4005:4005"
-      - "5005:5005"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8081"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-
-  ipld-eth-server-2:
-    restart: unless-stopped
-    depends_on:
-      ipld-eth-db:
-        condition: service_healthy
-    image: cerc/ipld-eth-server:local
-    environment:
-      SERVER_HTTP_PATH: 0.0.0.0:8081
-      SERVER_GRAPHQL: "true"
-      SERVER_GRAPHQLPATH: 0.0.0.0:8082
-      VDB_COMMAND: "serve"
-      ETH_CHAIN_CONFIG: "/tmp/chain.json"
-      DATABASE_NAME: cerc_testing
-      DATABASE_HOSTNAME: ipld-eth-db
-      DATABASE_PORT: 5432
-      DATABASE_USER: "vdbm"
-      DATABASE_PASSWORD: "password"
-      ETH_CHAIN_ID: 99
-      ETH_FORWARD_ETH_CALLS: "false"
-      ETH_FORWARD_GET_STORAGE_AT: "false"
-      ETH_PROXY_ON_ERROR: "false"
-      METRICS: "true"
-      PROM_HTTP: "true"
-      PROM_HTTP_ADDR: "0.0.0.0"
-      PROM_HTTP_PORT: "8090"
-      LOG_LEVEL: "debug"
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-      NITRO_RUN_NODE_IN_PROCESS: ${CERC_NITRO_RUN_NODE_IN_PROCESS:-false}
-      NITRO_ENDPOINT: ${CERC_NITRO_ENDPOINT:-go-nitro:4006/api/v1}
-    entrypoint: ["bash", "-c", "/app/entrypoint.sh"]
-    volumes:
-      - type: bind
-        source: ../config/ipld-eth-server/chain.json
-        target: /tmp/chain.json
-      - ../config/ipld-eth-server/entrypoint.sh:/app/entrypoint.sh
-    ports:
-      - "8081"
-      - "8082"
-      - "8090"
-      - "40000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8081"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-
-volumes:
-  eth_server_nitro_data:
-  nitro_deployment:
@@ -1,8 +0,0 @@
-version: "3.2"
-
-services:
-  laconic-dot-com:
-    image: cerc/laconic-dot-com:local
-    restart: always
-    ports:
-      - "3000"
@@ -1,29 +0,0 @@
-version: "3.2"
-
-services:
-  migrations:
-    restart: on-failure
-    depends_on:
-      ipld-eth-db:
-        condition: service_healthy
-    image: cerc/ipld-eth-db:local
-    env_file:
-      - ../config/mainnet-eth-ipld-eth-db/db.env
-
-  ipld-eth-db:
-    image: timescale/timescaledb:2.8.1-pg14
-    restart: always
-    env_file:
-      - ../config/mainnet-eth-ipld-eth-db/db.env
-    volumes:
-      - mainnet_eth_ipld_eth_db:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    ports:
-      - "5432"
-volumes:
-  mainnet_eth_ipld_eth_db:
@@ -1,24 +0,0 @@
-version: "3.7"
-services:
-  ipld-eth-server:
-    restart: always
-    depends_on:
-      ipld-eth-db:
-        condition: service_healthy
-    image: cerc/ipld-eth-server:local
-    env_file:
-      - ../config/mainnet-eth-ipld-eth-db/db.env
-      - ../config/mainnet-eth-ipld-eth-server/srv.env
-    volumes:
-      - ../config/mainnet-eth-ipld-eth-server/config.toml:/app/config.toml:ro
-    ports:
-      - "8081"
-      - "8082"
-      - "8090"
-      - "40001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8081"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
@@ -6,7 +6,7 @@ services:
    env_file:
      - ../config/mainnet-eth-keycloak/keycloak.env
    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "35432"]
+      test: ["CMD", "nc", "-v", "localhost", "5432"]
      interval: 30s
      timeout: 10s
      retries: 10
@@ -14,7 +14,7 @@ services:
    volumes:
      - mainnet_eth_keycloak_db:/var/lib/postgresql/data
    ports:
-      - 35432
+      - 5432

  keycloak:
    image: cerc/keycloak:local
@@ -1,72 +0,0 @@
-
-services:
-
-  mainnet-eth-geth-1:
-    restart: always
-    hostname: mainnet-eth-geth-1
-    cap_add:
-      - SYS_PTRACE
-    image: cerc/plugeth-with-plugins:local
-    entrypoint: /bin/sh
-    command: -c "/opt/run-geth.sh"
-    env_file:
-      - ../config/mainnet-eth-ipld-eth-db/db.env
-      - ../config/mainnet-eth-plugeth/geth.env
-    volumes:
-      - mainnet_eth_plugeth_geth_1_data:/data
-      - mainnet_eth_plugeth_config_data:/etc/mainnet-eth
-      - ../config/mainnet-eth-plugeth/scripts/run-geth.sh:/opt/run-geth.sh
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8545"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    ports:
-      # http api
-      - "8545"
-      # ws api
-      - "8546"
-      # ws el
-      - "8551"
-      # p2p
-      - "30303"
-      - "30303/udp"
-      # debugging
-      - "40000"
-      # metrics
-      - "6060"
-
-  mainnet-eth-lighthouse-1:
-    restart: always
-    hostname: mainnet-eth-lighthouse-1
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:5052/eth/v2/beacon/blocks/head"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
-    environment:
-      LIGHTHOUSE_EXECUTION_ENDPOINT: "http://mainnet-eth-geth-1:8551"
-    env_file:
-      - ../config/mainnet-eth-plugeth/lighthouse.env
-    image: cerc/lighthouse:local
-    entrypoint: /bin/sh
-    command: -c "/opt/run-lighthouse.sh"
-    volumes:
-      - mainnet_eth_plugeth_lighthouse_1_data:/data
-      - mainnet_eth_plugeth_config_data:/etc/mainnet-eth
-      - ../config/mainnet-eth-plugeth/scripts/run-lighthouse.sh:/opt/run-lighthouse.sh
-    ports:
-      # api
-      - "5052"
-      # metrics
-      - "5054"
-      # p2p
-      - "9000"
-      - "9000/udp"
-
-volumes:
-  mainnet_eth_plugeth_config_data:
-  mainnet_eth_plugeth_geth_1_data:
-  mainnet_eth_plugeth_lighthouse_1_data:
@@ -0,0 +1,27 @@
+version: '3.7'
+
+services:
+  nitro-reverse-payment-proxy:
+    image: cerc/go-nitro:local
+    hostname: nitro-reverse-payment-proxy
+    restart: on-failure
+    depends_on:
+      # Wait for the go-nitro node to start
+      go-nitro:
+        condition: service_healthy
+    environment:
+      CERC_PROXY_ADDRESS: 0.0.0.0:8081
+      CERC_PROXY_NITRO_ENDPOINT: ${CERC_PROXY_NITRO_ENDPOINT:-go-nitro:4005/api/v1}
+      CERC_PROXY_DESTINATION_URL: ${CERC_PROXY_DESTINATION_URL:-http://ipld-eth-server:8081}
+      CERC_PROXY_COST_PER_BYTE: ${CERC_PROXY_COST_PER_BYTE:-1}
+    entrypoint: ["bash", "-c", "/app/run-reverse-payment-proxy.sh"]
+    volumes:
+      - ../config/go-nitro/run-reverse-payment-proxy.sh:/app/run-reverse-payment-proxy.sh
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "8081"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 10s
+    ports:
+      - "8081:8081"
@@ -1,7 +0,0 @@
-version: '3.7'
-services:
-    nitro-rpc-client:
-      image: cerc/nitro-rpc-client:local
-      hostname: nitro-rpc-client
-      restart: on-failure
-      command: ["bash", "-c", "tail -f /dev/null"]
@@ -1,80 +0,0 @@
-version: '3.7'
-
-services:
-  ponder-er20-contracts:
-    image: cerc/watcher-erc20:local
-    restart: on-failure
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT:-http://fixturenet-eth-geth-1:8545}
-      CERC_PRIVATE_KEY_DEPLOYER: ${CERC_PRIVATE_KEY_DEPLOYER:-0x888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218}
-    volumes:
-      - ../config/ponder/deploy-erc20-contract.sh:/app/deploy-erc20-contract.sh
-      - erc20_deployment:/app/deployment
-    command: ["bash", "-c", "/app/deploy-erc20-contract.sh"]
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  ponder-app-indexer-1:
-    hostname: ponder-app-indexer-1
-    restart: unless-stopped
-    image: cerc/ponder:local
-    working_dir: /app/examples/token-erc20
-    environment:
-      CERC_PONDER_CHAIN_ID: ${PONDER_CHAIN_ID:-99}
-      CERC_PONDER_RPC_URL_1: ${PONDER_RPC_URL_1:-http://ipld-eth-server-2:8081}
-      CERC_PONDER_NITRO_PK: ${CERC_PONDER_INDEXER_NITRO_PK_1:-58368d20ff12f17669c06158c21d885897aa56f9be430edc789614bf9851d53f}
-      CERC_PONDER_NITRO_CHAIN_PK: ${CERC_PONDER_INDEXER_NITRO_CHAIN_PK_1:-fb1e9af328c283ca3e2486e7c24d13582b7912057d8b9542ff41503c85bc05c0}
-      CERC_PONDER_NITRO_CHAIN_URL: ${CERC_PONDER_NITRO_CHAIN_URL:-http://fixturenet-eth-geth-1:8546}
-      CERC_RELAY_MULTIADDR: ${CERC_RELAY_MULTIADDR}
-      CERC_UPSTREAM_NITRO_ADDRESS: ${CERC_UPSTREAM_NITRO_ADDRESS:-0x660a4bEF3fbC863Fcd8D3CDB39242aE513d7D92e}
-      CERC_UPSTREAM_NITRO_MULTIADDR: ${CERC_UPSTREAM_NITRO_MULTIADDR:-/dns4/go-nitro/tcp/5006/ws/p2p/16Uiu2HAmNUiX7bpCpbo5JdqEebp85ptGU2Vk2AT9E3BykvbwQ3F9}
-      CERC_UPSTREAM_NITRO_PAY_AMOUNT: ${CERC_UPSTREAM_NITRO_PAY_AMOUNT:-100}
-    command: ["bash", "./ponder-start.sh"]
-    volumes:
-      - ../config/ponder/ponder-start.sh:/app/examples/token-erc20/ponder-start.sh
-      - ../config/ponder/ponder.indexer-1.config.ts:/app/examples/token-erc20/ponder.config.ts
-      - ../config/ponder/base-rates-config.json:/app/examples/token-erc20/base-rates-config.json
-      - peers_ids:/peers
-      - nitro_deployment:/nitro
-      - erc20_deployment:/erc20
-      - ponder_indexer_1_nitro_data:/app/examples/token-erc20/.ponder/nitro-db
-    ports:
-      - "127.0.0.1:42070:42070"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  ponder-app-indexer-2:
-    hostname: ponder-app-indexer-2
-    restart: unless-stopped
-    image: cerc/ponder:local
-    working_dir: /app/examples/token-erc20
-    environment:
-      CERC_PONDER_CHAIN_ID: ${PONDER_CHAIN_ID:-99}
-      CERC_INDEXER_GQL_ENDPOINT: ${CERC_INDEXER_GQL_ENDPOINT:-http://ponder-app-indexer-1:42070/graphql}
-      CERC_PONDER_NITRO_PK: ${CERC_PONDER_INDEXER_NITRO_PK_2:-0aca28ba64679f63d71e671ab4dbb32aaa212d4789988e6ca47da47601c18fe2}
-      CERC_PONDER_NITRO_CHAIN_PK: ${CERC_PONDER_INDEXER_NITRO_CHAIN_PK_2:-6177345b77c4069ac4d553f8b43cf68a799ca4bb63eac93d6cf796d63694ebf0}
-      CERC_PONDER_NITRO_CHAIN_URL: ${CERC_PONDER_NITRO_CHAIN_URL:-http://fixturenet-eth-geth-1:8546}
-      CERC_RELAY_MULTIADDR: ${CERC_RELAY_MULTIADDR}
-      CERC_INDEXER_NITRO_ADDRESS: ${CERC_INDEXER_NITRO_ADDRESS:-0x67D5b55604d1aF90074FcB69b8C51838FFF84f8d}
-      CERC_UPSTREAM_NITRO_PAY_AMOUNT: ${CERC_UPSTREAM_NITRO_PAY_AMOUNT:-100}
-    command: ["bash", "./ponder-start.sh"]
-    volumes:
-      - ../config/ponder/ponder-start.sh:/app/examples/token-erc20/ponder-start.sh
-      - ../config/ponder/ponder.indexer-2.config.ts:/app/examples/token-erc20/ponder.config.ts
-      - ../config/ponder/base-rates-config.json:/app/examples/token-erc20/base-rates-config.json
-      - peers_ids:/peers
-      - nitro_deployment:/nitro
-      - erc20_deployment:/erc20
-      - ponder_indexer_2_nitro_data:/app/examples/token-erc20/.ponder/nitro-db
-    ports:
-      - "127.0.0.1:42071:42070"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  peers_ids:
-  nitro_deployment:
-  erc20_deployment:
-  ponder_indexer_1_nitro_data:
-  ponder_indexer_2_nitro_data:
@@ -1,39 +0,0 @@
-
-version: '3.7'
-
-services:
-  ponder-app-watcher:
-      hostname: ponder-app-watcher
-      depends_on:
-        - ponder-app-indexer-1
-      restart: unless-stopped
-      image: cerc/ponder:local
-      working_dir: /app/examples/token-erc20
-      environment:
-        CERC_PONDER_CHAIN_ID: ${PONDER_CHAIN_ID:-99}
-        CERC_PONDER_NITRO_PK: ${CERC_PONDER_WATCHER_NITRO_PK:-febb3b74b0b52d0976f6571d555f4ac8b91c308dfa25c7b58d1e6a7c3f50c781}
-        CERC_PONDER_NITRO_CHAIN_PK: ${CERC_PONDER_WATCHER_NITRO_CHAIN_PK:-be4aa664815ea3bc3d63118649a733f6c96b243744310806ecb6d96359ab62cf}
-        CERC_PONDER_NITRO_CHAIN_URL: ${CERC_PONDER_NITRO_CHAIN_URL:-http://fixturenet-eth-geth-1:8546}
-        CERC_RELAY_MULTIADDR: ${CERC_RELAY_MULTIADDR}
-        CERC_INDEXER_GQL_ENDPOINT: ${CERC_INDEXER_GQL_ENDPOINT:-http://ponder-app-indexer-2:42070/graphql}
-        CERC_INDEXER_NITRO_ADDRESS: ${CERC_INDEXER_NITRO_ADDRESS:-0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01}
-        CERC_INDEXER_NITRO_PAY_AMOUNT: ${CERC_INDEXER_NITRO_PAY_AMOUNT:-50}
-      command: ["bash", "./ponder-start.sh"]
-      volumes:
-        - ../config/ponder/ponder-start.sh:/app/examples/token-erc20/ponder-start.sh
-        - ../config/ponder/ponder.watcher.config.ts:/app/examples/token-erc20/ponder.config.ts
-        - ../config/ponder/base-rates-config.json:/app/examples/token-erc20/base-rates-config.json
-        - peers_ids:/peers
-        - nitro_deployment:/nitro
-        - erc20_deployment:/erc20
-        - ponder_watcher_nitro_data:/app/examples/token-erc20/.ponder/nitro-db
-      ports:
-        - "127.0.0.1:42069:42069"
-      extra_hosts:
-        - "host.docker.internal:host-gateway"
-
-volumes:
-  peers_ids:
-  nitro_deployment:
-  erc20_deployment:
-  ponder_watcher_nitro_data:
@@ -0,0 +1,31 @@
+version: '3.7'
+
+services:
+  ponder-app:
+    restart: unless-stopped
+    image: cerc/ponder:local
+    working_dir: /app/examples/token-erc20
+    environment:
+      CERC_PONDER_CHAIN_ID: ${PONDER_CHAIN_ID:-99}
+      CERC_PONDER_RPC_URL_1: ${PONDER_RPC_URL_1:-http://nitro-reverse-payment-proxy:8081}
+      CERC_PONDER_NITRO_PK: ${CERC_PONDER_NITRO_PK:-58368d20ff12f17669c06158c21d885897aa56f9be430edc789614bf9851d53f}
+      CERC_PONDER_NITRO_CHAIN_PK: ${CERC_PONDER_NITRO_CHAIN_PK:-fb1e9af328c283ca3e2486e7c24d13582b7912057d8b9542ff41503c85bc05c0}
+      CERC_PONDER_NITRO_CHAIN_URL: ${CERC_PONDER_NITRO_CHAIN_URL:-http://fixturenet-eth-geth-1:8546}
+      CERC_RELAY_MULTIADDR: ${CERC_RELAY_MULTIADDR}
+      CERC_UPSTREAM_NITRO_ADDRESS: ${CERC_UPSTREAM_NITRO_ADDRESS:-0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE}
+      CERC_UPSTREAM_NITRO_MULTIADDR: ${CERC_UPSTREAM_NITRO_MULTIADDR:-/dns4/go-nitro/tcp/5005/ws/p2p/16Uiu2HAmSjXJqsyBJgcBUU2HQmykxGseafSatbpq5471XmuaUqyv}
+      CERC_UPSTREAM_NITRO_PAY_AMOUNT: ${CERC_UPSTREAM_NITRO_PAY_AMOUNT:-5000}
+    command: ["bash", "./ponder-start.sh"]
+    volumes:
+      - ../config/ponder/ponder-start.sh:/app/examples/token-erc20/ponder-start.sh
+      - ../config/ponder/ponder.config.ts:/app/examples/token-erc20/ponder.config.ts
+      - peers_ids:/peers
+      - nitro_deployment:/nitro
+      - ponder_nitro_data:/app/examples/token-erc20/.ponder/nitro-db
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+volumes:
+  peers_ids:
+  nitro_deployment:
+  ponder_nitro_data:
@@ -34,7 +34,7 @@ services:
      - ETH_RPC_URL=http://go-ethereum:8545
    command: ["sh", "-c", "yarn server"]
    volumes:
-      - ../config/watcher-erc20/erc20-watcher.toml:/app/environments/local.toml
+      - ../config/watcher-erc20/erc20-watcher.toml:/app/packages/erc20-watcher/environments/local.toml
    ports:
      - "0.0.0.0:3002:3001"
      - "0.0.0.0:9002:9001"
@@ -89,8 +89,8 @@ services:
      CERC_PEER_ID: ${CERC_PEER_ID}
      CERC_ENABLE_UPSTREAM_PAYMENTS: ${CERC_ENABLE_UPSTREAM_PAYMENTS}
      CERC_UPSTREAM_NITRO_ADDRESS: ${CERC_UPSTREAM_NITRO_ADDRESS:-0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE}
-      CERC_UPSTREAM_NITRO_MULTIADDR: ${CERC_UPSTREAM_NITRO_MULTIADDR:-/dns4/ipld-eth-server-1/tcp/5005/ws/p2p/16Uiu2HAmSjXJqsyBJgcBUU2HQmykxGseafSatbpq5471XmuaUqyv}
-      CERC_UPSTREAM_NITRO_PAY_AMOUNT: ${CERC_UPSTREAM_NITRO_PAY_AMOUNT:-100}
+      CERC_UPSTREAM_NITRO_MULTIADDR: ${CERC_UPSTREAM_NITRO_MULTIADDR:-/dns4/go-nitro/tcp/5005/ws/p2p/16Uiu2HAmSjXJqsyBJgcBUU2HQmykxGseafSatbpq5471XmuaUqyv}
+      CERC_UPSTREAM_NITRO_PAY_AMOUNT: ${CERC_UPSTREAM_NITRO_PAY_AMOUNT:-5000}
    command: ["bash", "./start-server.sh"]
    volumes:
      - ../config/watcher-mobymask-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
@@ -5,5 +5,5 @@ services:
    userKey: REPLACE_WITH_MYKEY
    bondId:
    chainId: laconic_9000-1
-    gas: 350000
+    gas: 250000
    fees: 200000aphoton
@@ -29,13 +29,12 @@ fi

 echo "Running Nitro node"

-# Assuming CERC_NITRO_CHAIN_URL is of format <ws|http>://host:port
-ws_host=$(echo "$CERC_NITRO_CHAIN_URL" | awk -F '://' '{print $2}' | cut -d ':' -f 1)
-ws_port=$(echo "$CERC_NITRO_CHAIN_URL" | awk -F '://' '{print $2}' | cut -d ':' -f 2)
-
 # Wait till chain endpoint is available
 retry_interval=5
 while true; do
+  # Assuming CERC_NITRO_CHAIN_URL is of format <ws|http>://host:port
+  ws_host=$(echo "$CERC_NITRO_CHAIN_URL" | awk -F '://' '{print $2}' | cut -d ':' -f 1)
+  ws_port=$(echo "$CERC_NITRO_CHAIN_URL" | awk -F '://' '{print $2}' | cut -d ':' -f 2)
  nc -z -w 1 "$ws_host" "$ws_port"

  if [ $? -eq 0 ]; then
@@ -47,4 +46,4 @@ while true; do
  sleep $retry_interval
 done

-./nitro -chainurl ${CERC_NITRO_CHAIN_URL} -msgport ${CERC_NITRO_MSG_PORT} -rpcport ${CERC_NITRO_RPC_PORT} -wsmsgport ${CERC_NITRO_WS_MSG_PORT} -publicip "0.0.0.0" -pk ${CERC_NITRO_PK} -chainpk ${CERC_NITRO_CHAIN_PK} -naaddress ${NA_ADDRESS} -vpaaddress ${VPA_ADDRESS} -caaddress ${CA_ADDRESS} -usedurablestore ${CERC_NITRO_USE_DURABLE_STORE} -durablestorefolder ${CERC_NITRO_DURABLE_STORE_FOLDER} -tlscertfilepath "" -tlsKeyFilepath ""
+./nitro -chainurl ${CERC_NITRO_CHAIN_URL} -msgport 3005 -rpcport 4005 -wsmsgport 5005 -pk ${CERC_NITRO_PK} -chainpk ${CERC_NITRO_CHAIN_PK} -naaddress ${NA_ADDRESS} -vpaaddress ${VPA_ADDRESS} -caaddress ${CA_ADDRESS} -usedurablestore ${CERC_NITRO_USE_DURABLE_STORE} -durablestorefolder ${CERC_NITRO_DURABLE_STORE_FOLDER}
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+echo "Running Nitro reverse payment proxy"
+echo "Using CERC_PROXY_ADDRESS ${CERC_PROXY_ADDRESS}"
+echo "Using CERC_PROXY_NITRO_ENDPOINT ${CERC_PROXY_NITRO_ENDPOINT}"
+echo "Using CERC_PROXY_DESTINATION_URL ${CERC_PROXY_DESTINATION_URL}"
+echo "Using CERC_PROXY_COST_PER_BYTE ${CERC_PROXY_COST_PER_BYTE}"
+
+./proxy -proxyaddress ${CERC_PROXY_ADDRESS} -nitroendpoint=${CERC_PROXY_NITRO_ENDPOINT} -destinationurl=${CERC_PROXY_DESTINATION_URL} -costperbyte ${CERC_PROXY_COST_PER_BYTE} -enablepaidrpcmethods
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-read_nitro_addresses() {
-  nitro_addresses_file="/app/deployment/nitro-addresses.json"
-
-  # Check if CERC_NA_ADDRESS environment variable is set
-  if [ -n "$CERC_NA_ADDRESS" ]; then
-    echo "CERC_NA_ADDRESS is set to '$CERC_NA_ADDRESS'"
-    echo "CERC_VPA_ADDRESS is set to '$CERC_VPA_ADDRESS'"
-    echo "CERC_CA_ADDRESS is set to '$CERC_CA_ADDRESS'"
-    echo "Using the above Nitro addresses"
-
-    export NITRO_NA_ADDRESS=${CERC_NA_ADDRESS}
-    export NITRO_VPA_ADDRESS=${CERC_VPA_ADDRESS}
-    export NITRO_CA_ADDRESS=${CERC_CA_ADDRESS}
-  else
-    # Read addresses from a file
-    # Keep retrying until found
-    echo "Reading Nitro addresses from ${nitro_addresses_file}"
-    retry_interval=5
-    while true; do
-      if [[ -e "$nitro_addresses_file" ]]; then
-        export NITRO_NA_ADDRESS=$(jq -r '.nitroAdjudicatorAddress' ${nitro_addresses_file})
-        export NITRO_VPA_ADDRESS=$(jq -r '.virtualPaymentAppAddress' ${nitro_addresses_file})
-        export NITRO_CA_ADDRESS=$(jq -r '.consensusAppAddress' ${nitro_addresses_file})
-
-        break
-      else
-        echo "File not yet available, retrying in $retry_interval seconds..."
-        sleep $retry_interval
-      fi
-    done
-  fi
-}
-
-wait_for_nitro_endpoint() {
-  retry_interval=5
-  while true; do
-    curl -I -s -o /dev/null $NITRO_ENDPOINT/health
-
-    if [ $? -eq 0 ]; then
-      echo "Nitro endpoint is up"
-      break
-    else
-      echo "Nitro endpoint not available yet, retrying in $retry_interval seconds..."
-      sleep $retry_interval
-    fi
-  done
-}
-
-if [ "$NITRO_RUN_NODE_IN_PROCESS" = "true" ]; then
-  read_nitro_addresses
-else
-  wait_for_nitro_endpoint
-fi
-
-echo "Beginning the ipld-eth-server process"
-
-START_CMD="./ipld-eth-server"
-if [ "true" == "$CERC_REMOTE_DEBUG" ] && [ -x "/usr/local/bin/dlv" ]; then
-    START_CMD="/usr/local/bin/dlv --listen=:40000 --headless=true --api-version=2 --accept-multiclient exec `pwd`/ipld-eth-server --continue --"
-fi
-
-echo running: $START_CMD ${VDB_COMMAND} --config=`pwd`/config.toml
-$START_CMD ${VDB_COMMAND} --config=`pwd`/config.toml
-rv=$?
-
-if [ $rv != 0 ]; then
-  echo "ipld-eth-server startup failed"
-  exit 1
-fi
@@ -1,15 +0,0 @@
-DATABASE_HOSTNAME="ipld-eth-db"
-DATABASE_NAME="cerc"
-DATABASE_PASSWORD="CHANGEME"
-DATABASE_PORT=5432
-DATABASE_USER="vdbm"
-
-POSTGRES_DB="${DATABASE_NAME}"
-POSTGRES_PASSWORD="${DATABASE_PASSWORD}"
-POSTGRES_USER="${DATABASE_USER}"
-
-CERC_STATEDIFF_DB_HOST="${DATABASE_HOSTNAME}"
-CERC_STATEDIFF_DB_NAME="${DATABASE_NAME}"
-CERC_STATEDIFF_DB_PASSWORD="${DATABASE_PASSWORD}"
-CERC_STATEDIFF_DB_PORT=${DATABASE_PORT}
-CERC_STATEDIFF_DB_USER="${DATABASE_USER}"
@@ -1,33 +0,0 @@
-[database]
-    name     = "" # $DATABASE_NAME
-    hostname = "" # $DATABASE_HOSTNAME
-    port     = 5432 # $DATABASE_PORT
-    user     = "" # $DATABASE_USER
-    password = "" # $DATABASE_PASSWORD
-
-[log]
-    level = "info" # $LOG_LEVEL
-
-[server]
-    ipc = false
-    ipcPath = "" # $SERVER_IPC_PATH
-    ws = false
-    wsPath = "0.0.0.0:8080" # $SERVER_WS_PATH
-    http = true
-    httpPath = "0.0.0.0:8081" # $SERVER_HTTP_PATH
-    graphql = false # $SERVER_GRAPHQL
-    graphqlPath = "0.0.0.0:8082" # $SERVER_GRAPHQL_PATH
-
-[ethereum]
-    chainConfig = "" # ETH_CHAIN_CONFIG
-    chainID = "1" # $ETH_CHAIN_ID
-    rpcGasCap = "1000000000000" # $ETH_RPC_GAS_CAP
-    httpPath = "mainnet-eth-geth-1:8545" # $ETH_HTTP_PATH
-    supportsStateDiff = true # $ETH_SUPPORTS_STATEDIFF
-    stateDiffTimeout = "4m" # $ETH_STATEDIFF_TIMEOUT
-    forwardEthCalls = false # $ETH_FORWARD_ETH_CALLS
-    proxyOnError = true # $ETH_PROXY_ON_ERROR
-    nodeID = "" # $ETH_NODE_ID
-    clientName = "" # $ETH_CLIENT_NAME
-    genesisBlock = "" # $ETH_GENESIS_BLOCK
-    networkID = "1" # $ETH_NETWORK_ID
@@ -1,27 +0,0 @@
-CERC_REMOTE_DEBUG="false"
-
-LOG_LEVEL="debug"
-
-ETH_CHAIN_ID=1
-ETH_CLIENT_NAME="Geth"
-ETH_FORWARD_ETH_CALLS="false"
-ETH_FORWARD_GET_STORAGE_AT="false"
-ETH_GENESIS_BLOCK="0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3"
-ETH_HTTP_PATH="mainnet-eth-geth-1:8545"
-ETH_NETWORK_ID=1
-ETH_NODE_ID=1112
-ETH_PROXY_ON_ERROR="true"
-ETH_RPC_GAS_CAP=1000000000000
-ETH_SUPPORTS_STATEDIFF="true"
-ETH_STATEDIFF_TIMEOUT=4m
-
-SERVER_HTTP_PATH=0.0.0.0:8081
-SERVER_GRAPHQL="false"
-SERVER_GRAPHQLPATH=0.0.0.0:8082
-
-METRICS="true"
-PROM_HTTP="true"
-PROM_HTTP_ADDR="0.0.0.0"
-PROM_HTTP_PORT="8090"
-
-VDB_COMMAND="serve"
@@ -1,11 +1,8 @@
 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}
@@ -15,49 +15,42 @@ server {
 }

 upstream geth-pool {
-  server server-a:8545 max_fails=10 fail_timeout=2s;
-  server server-c:8545 max_fails=10 fail_timeout=2s backup;
-  server server-b:8545 max_fails=10 fail_timeout=2s backup;
-  keepalive 200;
+  keepalive 100;
+  hash $user_id consistent;
+  server server-a:8545;
+  server server-b:8545;
+  server server-c:8545;
 }

+# self-reg happens on one server for clarity
 upstream reg-ui-pool {
-  keepalive 2;
+  keepalive 100;
  server server-a:8085;
 }

 upstream reg-api-pool {
-  keepalive 2;
+  keepalive 100;
  server server-a:8086;
 }

-# auth uses the reg server when available
+# auth uses server-a if available
 upstream auth-pool {
-  keepalive 10;
+  keepalive 100;
  server server-a:8080;
  server server-b:8080 backup;
  server server-c:8080 backup;
 }

-
-log_format upstreamlog '[$time_local] $msec $remote_addr $user_id - $server_name($host) to $upstream_addr: $request $status upstream_response_time $upstream_response_time request_time $request_time';
-proxy_cache_path /var/cache/nginx/auth_cache levels=1 keys_zone=auth_cache:1m max_size=5m inactive=60m;
-
+log_format upstreamlog '[$time_local] $remote_addr $user_id - $server_name $host to: $upstream_addr: $request $status upstream_response_time $upstream_response_time msec $msec request_time $request_time';
+proxy_cache_path                /var/cache/nginx/auth_cache levels=1 keys_zone=auth_cache:1m max_size=5m inactive=60m;
 server {
    listen 443 ssl http2;
    server_name my.example.com;
-    keepalive_requests 500000;
-    keepalive_timeout 90s;
-    http2_max_requests 5000000;
-    http2_max_concurrent_streams 1024;
-    http2_idle_timeout 3m;
-    http2_recv_timeout 30s;
    access_log /var/log/nginx/my.example.com-access.log upstreamlog;
    error_log /var/log/nginx/my.example.com-error.log;

    ssl_certificate /etc/nginx/ssl/my.example.com/cert.pem;
    ssl_certificate_key /etc/nginx/ssl/my.example.com/key.pem;
-    ssl_session_cache shared:SSL:10m;

    error_page 500 502 503 504 /50x.html;
    location = /50x.html {
@@ -67,6 +60,7 @@ server {
    #rewrite ^/?$ /newuser/;
    rewrite ^/?$ https://www.example.com/;

+
    # geth-pool ETH API
    location ~ ^/v1/eth/?([^/]*)$ {
        set $apiKey $1;
@@ -77,8 +71,8 @@ server {
        auth_request_set $user_id $sent_http_x_user_id;
        rewrite /.*$ / break;

-        client_max_body_size       3m;
-        client_body_buffer_size    3m;
+        client_max_body_size 3m;
+        client_body_buffer_size 3m;
        proxy_buffer_size          32k;
        proxy_buffers              16 32k;
        proxy_busy_buffers_size    96k;
@@ -86,10 +80,8 @@ server {
        proxy_pass  http://geth-pool;
        proxy_set_header X-Original-Remote-Addr $remote_addr;
        proxy_set_header X-User-Id $user_id;
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
    }
-
+    
    # keycloak
    location = /auth {
        internal;
@@ -103,8 +95,6 @@ server {
        proxy_set_header X-Original-URI $request_uri;
        proxy_set_header X-Original-Remote-Addr $remote_addr;
        proxy_set_header X-Original-Host $host;
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
    }

    location /newuser/ {
@@ -1,75 +0,0 @@
-# Enable remote debugging using dlv
-CERC_REMOTE_DEBUG=false
-
-# Enable startup script debug output.
-CERC_SCRIPT_DEBUG=false
-
-# Simple toggle to choose either a 'full' node or an 'archive' node
-# (controls the values of --syncmode --gcmode --snapshot)
-CERC_GETH_MODE_QUICK_SET=archive
-
-# Path to plugeth plugins.
-CERC_PLUGINS_DIR="/usr/local/lib/plugeth"
-
-# Will turn on statediffing automatically if CERC_STATEDIFF_DB_HOST exists (see ../mainnet-eth-ipld-eth-db/db.env).
-CERC_RUN_STATEDIFF="detect"
-
-# The minimum necessary verion of the DB to enable statediffing.
-CERC_STATEDIFF_DB_GOOSE_MIN_VER=18
-
-# Whether all statediff-related DB statements should be logged (useful for debugging).
-CERC_STATEDIFF_DB_LOG_STATEMENTS=false
-
-# The number of concurrent workers to process state diff objects
-CERC_STATEDIFF_WORKERS=16
-
-# Each statediffing node should have a unique node ID.
-CERC_STATEDIFF_DB_NODE_ID=1111
-
-# Optional custom node name.
-# GETH_NODE_NAME=""
-
-# Specify any other geth CLI options.
-GETH_OPTS=""
-
-# --cache
-GETH_CACHE=1024
-
-# --cache.database
-GETH_CACHE_DB=50
-
-# --cache.gc
-GETH_CACHE_GC=25
-
-# --cache.trie
-GETH_CACHE_TRIE=15
-
-# --datadir
-GETH_DATADIR="/data"
-
-# --http.api
-GETH_HTTP_API="eth,web3,net"
-
-# --authrpc.jwtsecret
-GETH_JWTSECRET="/etc/mainnet-eth/jwtsecret"
-
-# --maxpeers
-GETH_MAX_PEERS=100
-
-# --rpc.evmtimeout
-GETH_RPC_EVMTIMEOUT=0
-
-# --rpc.gascap
-GETH_RPC_GASCAP=0
-
-# --txlookuplimit
-GETH_TXLOOKUPLIMIT=0
-
-# --verbosity
-GETH_VERBOSITY=3
-
-# --log.vmodule
-GETH_VMODULE="rpc/*=4"
-
-# --ws.api
-GETH_WS_API="eth,web3,net"
@@ -1,33 +0,0 @@
-# Enable startup script debug output.
-CERC_SCRIPT_DEBUG=false
-
-# Specify any other lighthouse CLI options.
-LIGHTHOUSE_OPTS=""
-
-# Override the advertised public IP (optional)
-# --enr-address
-#LIGHTHOUSE_ENR_ADDRESS=""
-
-# --checkpoint-sync-url
-LIGHTHOUSE_CHECKPOINT_SYNC_URL="https://beaconstate.ethstaker.cc"
-
-# --checkpoint-sync-url-timeout
-LIGHTHOUSE_CHECKPOINT_SYNC_URL_TIMEOUT=300
-
-# --datadir
-LIGHTHOUSE_DATADIR=/data
-
-# --debug-level
-LIGHTHOUSE_DEBUG_LEVEL=info
-
-# --http-port
-LIGHTHOUSE_HTTP_PORT=5052
-
-# --execution-jwt
-LIGHTHOUSE_JWTSECRET=/etc/mainnet-eth/jwtsecret
-
-# --metrics-port
-LIGHTHOUSE_METRICS_PORT=5054
-
-# --port --enr-udp-port --enr-tcp-port
-LIGHTHOUSE_NETWORK_PORT=9000
@@ -1,121 +0,0 @@
-#!/bin/sh
-if [[ "true" == "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
-
-START_CMD="geth"
-if [[ "true" == "$CERC_REMOTE_DEBUG" ]] && [[ -x "/usr/local/bin/dlv" ]]; then
-    START_CMD="/usr/local/bin/dlv --listen=:40000 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/geth --continue --"
-fi
-
-# See https://linuxconfig.org/how-to-propagate-a-signal-to-child-processes-from-a-bash-script
-cleanup() {
-    echo "Signal received, cleaning up..."
-
-    # Kill the child process first (CERC_REMOTE_DEBUG=true uses dlv which starts geth as a child process)
-    pkill -P ${geth_pid}
-    sleep 2
-    kill $(jobs -p)
-
-    wait
-    echo "Done"
-}
-trap 'cleanup' SIGINT SIGTERM
-
-MODE_FLAGS=""
-if [[ "$CERC_GETH_MODE_QUICK_SET" = "archive" ]]; then
-  MODE_FLAGS="--syncmode=${GETH_SYNC_MODE:-full} --gcmode=${GETH_GC_MODE:-archive} --snapshot=${GETH_SNAPSHOT:-false}"
-else
-  MODE_FLAGS="--syncmode=${GETH_SYNC_MODE:-snap} --gcmode=${GETH_GC_MODE:-full} --snapshot=${GETH_SNAPSHOT:-true}"
-fi
-
-if [[ "${CERC_RUN_STATEDIFF}" == "detect" ]] && [[ -n "$CERC_STATEDIFF_DB_HOST" ]]; then
-  dig_result=$(dig $CERC_STATEDIFF_DB_HOST +short)
-  dig_status_code=$?
-  if [[ $dig_status_code = 0 && -n $dig_result ]]; then
-    echo "Statediff DB at $CERC_STATEDIFF_DB_HOST"
-    CERC_RUN_STATEDIFF="true"
-  else
-    echo "No statediff DB available."
-    CERC_RUN_STATEDIFF="false"
-  fi
-fi
-
-STATEDIFF_OPTS=""
-if [[ "${CERC_RUN_STATEDIFF}" == "true" ]]; then
-  ready=0
-  echo "Waiting for statediff DB..."
-  while [ $ready -eq 0 ]; do
-    sleep 1
-    export PGPASSWORD="$CERC_STATEDIFF_DB_PASSWORD"
-    result=$(psql -h "$CERC_STATEDIFF_DB_HOST" \
-      -p "$CERC_STATEDIFF_DB_PORT" \
-      -U "$CERC_STATEDIFF_DB_USER" \
-      -d "$CERC_STATEDIFF_DB_NAME" \
-      -t -c 'select max(version_id) from goose_db_version;' 2>/dev/null | awk '{ print $1 }')
-    if [ -n "$result" ]; then
-      echo "DB ready..."
-      if [[ $result -ge $CERC_STATEDIFF_DB_GOOSE_MIN_VER ]]; then
-        ready=1
-      else
-        echo "DB not at required version (want $CERC_STATEDIFF_DB_GOOSE_MIN_VER, have $result)"
-      fi
-    fi
-  done
-
-  STATEDIFF_OPTS="--statediff \
-  --statediff.db.host=$CERC_STATEDIFF_DB_HOST \
-  --statediff.db.name=$CERC_STATEDIFF_DB_NAME \
-  --statediff.db.nodeid=$CERC_STATEDIFF_DB_NODE_ID \
-  --statediff.db.password=$CERC_STATEDIFF_DB_PASSWORD \
-  --statediff.db.port=$CERC_STATEDIFF_DB_PORT \
-  --statediff.db.user=$CERC_STATEDIFF_DB_USER \
-  --statediff.db.logstatements=${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false} \
-  --statediff.db.copyfrom=${CERC_STATEDIFF_DB_COPY_FROM:-true} \
-  --statediff.waitforsync=${CERC_STATEDIFF_WAIT_FO_SYNC:-true} \
-  --statediff.workers=${CERC_STATEDIFF_WORKERS:-1} \
-  --statediff.writing=${CERC_STATEDIFF_WRITING:-true}"
-
-  if [[ -d "${CERC_PLUGINS_DIR}" ]]; then
-    # With plugeth, we separate the statediff options by prefixing with ' -- '
-    STATEDIFF_OPTS="--pluginsdir "${CERC_PLUGINS_DIR}" -- ${STATEDIFF_OPTS}"
-  fi
-fi
-
-$START_CMD \
-  $MODE_FLAGS \
-  --datadir="${GETH_DATADIR}"\
-  --identity="${GETH_NODE_NAME}" \
-  --maxpeers=${GETH_MAX_PEERS} \
-  --cache=${GETH_CACHE} \
-  --cache.gc=${GETH_CACHE_GC} \
-  --cache.database=${GETH_CACHE_DB} \
-  --cache.trie=${GETH_CACHE_TRIE} \
-  --authrpc.addr='0.0.0.0' \
-  --authrpc.vhosts='*'  \
-  --authrpc.jwtsecret="${GETH_JWTSECRET}" \
-  --http \
-  --http.addr='0.0.0.0' \
-  --http.api="${GETH_HTTP_API}" \
-  --http.vhosts='*' \
-  --metrics \
-  --metrics.addr='0.0.0.0' \
-  --ws \
-  --ws.addr='0.0.0.0' \
-  --ws.api="${GETH_WS_API}" \
-  --rpc.gascap=${GETH_RPC_GASCAP} \
-  --rpc.evmtimeout=${GETH_RPC_EVMTIMEOUT} \
-  --txlookuplimit=${GETH_TXLOOKUPLIMIT} \
-  --verbosity=${GETH_VERBOSITY} \
-  --log.vmodule="${GETH_VMODULE}" \
-  ${STATEDIFF_OPTS} \
-  ${GETH_OPTS} &
-
-geth_pid=$!
-wait $geth_pid
-
-if [[ "true" == "$CERC_KEEP_RUNNING_AFTER_GETH_EXIT" ]]; then
-  while [[ 1 -eq 1 ]]; do
-    sleep 60
-  done
-fi
@@ -1,30 +0,0 @@
-#!/bin/bash
-if [[ "true" == "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
-
-ENR_OPTS=""
-if [[ -n "$LIGHTHOUSE_ENR_ADDRESS" ]]; then
-  ENR_OPTS="--enr-address $LIGHTHOUSE_ENR_ADDRESS"
-fi
-
-exec lighthouse bn \
-  --checkpoint-sync-url "$LIGHTHOUSE_CHECKPOINT_SYNC_URL" \
-  --checkpoint-sync-url-timeout ${LIGHTHOUSE_CHECKPOINT_SYNC_URL_TIMEOUT} \
-  --datadir "$LIGHTHOUSE_DATADIR" \
-  --debug-level $LIGHTHOUSE_DEBUG_LEVEL \
-  --disable-deposit-contract-sync \
-  --disable-upnp \
-  --enr-tcp-port $LIGHTHOUSE_NETWORK_PORT \
-  --enr-udp-port $LIGHTHOUSE_NETWORK_PORT \
-  --execution-endpoint "$LIGHTHOUSE_EXECUTION_ENDPOINT" \
-  --execution-jwt /etc/mainnet-eth/jwtsecret \
-  --http \
-  --http-address 0.0.0.0 \
-  --http-port $LIGHTHOUSE_HTTP_PORT \
-  --metrics \
-  --metrics-address=0.0.0.0 \
-  --metrics-port $LIGHTHOUSE_METRICS_PORT \
-  --network mainnet \
-  --port $LIGHTHOUSE_NETWORK_PORT \
-  $ENR_OPTS $LIGHTHOUSE_OPTS
@@ -25,7 +25,7 @@ GETH_CACHE_GC=25

 # --cache.trie
 GETH_CACHE_TRIE=15
-
+j
 # --datadir
 GETH_DATADIR="/data"

@@ -1,10 +0,0 @@
-{
-    "freeQueriesLimit": 10,
-    "freeQueriesList": [],
-    "queries": {
-      "getLogEvents": "50",
-      "getEthLogs": "50",
-      "getEthBlock": "50"
-    },
-    "mutations": {}
-}
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-erc20_address_file="/app/deployment/erc20-address.json"
-
-echo ETH_RPC_URL=${CERC_ETH_RPC_ENDPOINT} > .env
-echo ACCOUNT_PRIVATE_KEY=${CERC_PRIVATE_KEY_DEPLOYER} >> .env
-
-# Check and keep container running if a deployment already exists (on restarts)
-if [ -f ${erc20_address_file} ]; then
-  echo "${erc20_address_file} already exists, skipping ERC20 contract deployment"
-  cat ${erc20_address_file}
-  
-  # Keep the container running
-  tail -f
-fi
-
-wait_for_chain_endpoint() {
-  # Wait till ETH RPC endpoint is available with block number > 1
-  retry_interval=5
-  while true; do
-    block_number_hex=$(curl -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' ${CERC_ETH_RPC_ENDPOINT} | jq -r '.result')
-
-    # Check if the request call was successful
-    if [ $? -ne 0 ]; then
-      echo "RPC endpoint ${CERC_ETH_RPC_ENDPOINT} not yet available, retrying in $retry_interval seconds..."
-      sleep $retry_interval
-      continue
-    fi
-
-    # Convert hex to decimal
-    block_number_dec=$(printf %u ${block_number_hex})
-
-    # Check if block number is > 1 to avoid failures in the deployment
-    if [ "$block_number_dec" -ge 1 ]; then
-      echo "RPC endpoint ${CERC_ETH_RPC_ENDPOINT} is up"
-      break
-    else
-      echo "RPC endpoint ${CERC_ETH_RPC_ENDPOINT} not yet available, retrying in $retry_interval seconds..."
-      sleep $retry_interval
-      continue
-    fi
-  done
-}
-
-wait_for_chain_endpoint
-
-echo "Using CERC_PRIVATE_KEY_DEPLOYER from env"
-
-yarn token:deploy:docker --file ${erc20_address_file}
-
-# Keep the container running
-tail -f
@@ -31,21 +31,6 @@ else
  exit 1
 fi

-# Read ERC20 address from a file
-# Keep retrying until found
-erc20_address_file="/erc20/erc20-address.json"
-echo "Reading ERC20 address from ${erc20_address_file}"
-retry_interval=5
-while true; do
-  if [[ -e "$erc20_address_file" ]]; then
-    ERC20_CONTRACT=$(jq -r '.address' ${erc20_address_file})
-    break
-  else
-    echo "File not yet available, retrying in $retry_interval seconds..."
-    sleep $retry_interval
-  fi
-done
-
 echo "Using CERC_PONDER_NITRO_PK from env for Nitro account"
 echo "Using CERC_PONDER_NITRO_CHAIN_PK (account with funds) from env for sending Nitro txs"
 echo "Using ${CERC_PONDER_NITRO_CHAIN_URL} as the RPC endpoint for Nitro txs"
@@ -68,10 +53,6 @@ echo "RELAY_MULTIADDR=\"$CERC_RELAY_MULTIADDR\"" >> "$env_file"
 echo "UPSTREAM_NITRO_ADDRESS=\"$CERC_UPSTREAM_NITRO_ADDRESS\"" >> "$env_file"
 echo "UPSTREAM_NITRO_MULTIADDR=\"$CERC_UPSTREAM_NITRO_MULTIADDR\"" >> "$env_file"
 echo "UPSTREAM_NITRO_PAY_AMOUNT=\"$CERC_UPSTREAM_NITRO_PAY_AMOUNT\"" >> "$env_file"
-echo "INDEXER_GQL_ENDPOINT=\"$CERC_INDEXER_GQL_ENDPOINT\"" >> "$env_file"
-echo "INDEXER_NITRO_ADDRESS=\"$CERC_INDEXER_NITRO_ADDRESS\"" >> "$env_file"
-echo "INDEXER_NITRO_PAY_AMOUNT=\"$CERC_INDEXER_NITRO_PAY_AMOUNT\"" >> "$env_file"
-echo "ERC20_CONTRACT=\"$ERC20_CONTRACT\"" >> "$env_file"

 cat "$env_file"

@@ -1,6 +1,6 @@
-import { type Config, AppMode } from "@ponder/core";
+import type { Config } from "@ponder/core";

-import contractAddresses from "./nitro-addresses.json" assert { type: "json" };
+import contractAddresses from "./nitro-addresses.json";

 export const config: Config = {
  networks: [
@@ -34,14 +34,11 @@ export const config: Config = {
      name: "AdventureGold",
      network: "fixturenet",
      abi: "./abis/AdventureGold.json",
-      address: process.env.ERC20_CONTRACT,
-      startBlock: 1,
+      address: "0x32353A6C91143bfd6C7d363B546e62a9A2489A20",
+      startBlock: 5,
      maxBlockRange: 100,
    },
  ],
-  options: {
-    mode: AppMode.Indexer,
-  },
  nitro: {
    privateKey: process.env.PONDER_NITRO_PK!,
    chainPrivateKey: process.env.PONDER_NITRO_CHAIN_PK!,
@@ -49,17 +46,5 @@ export const config: Config = {
    contractAddresses,
    relayMultiAddr: process.env.RELAY_MULTIADDR!,
    store: "./.ponder/nitro-db",
-    payments: {
-      cache: {
-        maxAccounts: 1000,
-        accountTTLInSecs: 1800,
-        maxVouchersPerAccount: 1000,
-        voucherTTLInSecs: 300,
-        maxPaymentChannels: 10000,
-        paymentChannelTTLInSecs: 1800,
-      },
-      ratesFile: "./base-rates-config.json",
-      requestTimeoutInSecs: 10,
-    },
  },
 };
@@ -1,64 +0,0 @@
-import { type Config, AppMode } from "@ponder/core";
-
-import contractAddresses from "./nitro-addresses.json" assert { type: "json" };
-
-export const config: Config = {
-  networks: [
-    {
-      name: "fixturenet",
-      chainId: Number(process.env.PONDER_CHAIN_ID),
-      indexerUrl: process.env.INDEXER_GQL_ENDPOINT,
-      maxRpcRequestConcurrency: 1,
-      pollingInterval: 5000,
-      payments: {
-        nitro: {
-          address: process.env.INDEXER_NITRO_ADDRESS!,
-          fundingAmounts: {
-            // TODO: Pass amounts from env
-            directFund: "1000000000000",
-            virtualFund: "1000000000",
-          },
-        },
-        paidRPCMethods: [
-          "eth_getLogs",
-          "eth_getBlockByNumber",
-          "eth_getBlockByHash",
-        ],
-        amount: process.env.UPSTREAM_NITRO_PAY_AMOUNT!,
-      },
-    },
-  ],
-  contracts: [
-    {
-      name: "AdventureGold",
-      network: "fixturenet",
-      abi: "./abis/AdventureGold.json",
-      address: process.env.ERC20_CONTRACT,
-      startBlock: 1,
-      maxBlockRange: 100,
-    },
-  ],
-  options: {
-    mode: AppMode.Indexer,
-  },
-  nitro: {
-    privateKey: process.env.PONDER_NITRO_PK!,
-    chainPrivateKey: process.env.PONDER_NITRO_CHAIN_PK!,
-    chainUrl: process.env.PONDER_NITRO_CHAIN_URL!,
-    contractAddresses,
-    relayMultiAddr: process.env.RELAY_MULTIADDR!,
-    store: "./.ponder/nitro-db",
-    payments: {
-      cache: {
-        maxAccounts: 1000,
-        accountTTLInSecs: 1800,
-        maxVouchersPerAccount: 1000,
-        voucherTTLInSecs: 300,
-        maxPaymentChannels: 10000,
-        paymentChannelTTLInSecs: 1800,
-      },
-      ratesFile: "./base-rates-config.json",
-      requestTimeoutInSecs: 10,
-    },
-  },
-};
@@ -1,58 +0,0 @@
-import { type Config, AppMode } from "@ponder/core";
-
-import contractAddresses from "./nitro-addresses.json" assert { type: "json" };
-
-export const config: Config = {
-  networks: [
-    {
-      name: "fixturenet",
-      chainId: Number(process.env.PONDER_CHAIN_ID),
-    },
-  ],
-  contracts: [
-    {
-      name: "AdventureGold",
-      network: "fixturenet",
-      abi: "./abis/AdventureGold.json",
-      address: process.env.ERC20_CONTRACT,
-      startBlock: 1,
-      maxBlockRange: 100,
-    },
-  ],
-  options: {
-    mode: AppMode.Watcher,
-  },
-  indexer: {
-    gqlEndpoint: process.env.INDEXER_GQL_ENDPOINT,
-    payments: {
-      nitro: {
-        address: process.env.INDEXER_NITRO_ADDRESS,
-        fundingAmounts: {
-          directFund: "1000000000000",
-          virtualFund: "1000000000",
-        },
-      },
-      amount: process.env.INDEXER_NITRO_PAY_AMOUNT,
-    },
-  },
-  nitro: {
-    privateKey: process.env.PONDER_NITRO_PK!,
-    chainPrivateKey: process.env.PONDER_NITRO_CHAIN_PK!,
-    chainUrl: process.env.PONDER_NITRO_CHAIN_URL!,
-    contractAddresses,
-    relayMultiAddr: process.env.RELAY_MULTIADDR!,
-    store: "./.ponder/nitro-db",
-    payments: {
-      cache: {
-        maxAccounts: 1000,
-        accountTTLInSecs: 1800,
-        maxVouchersPerAccount: 1000,
-        voucherTTLInSecs: 300,
-        maxPaymentChannels: 10000,
-        paymentChannelTTLInSecs: 1800,
-      },
-      ratesFile: "./base-rates-config.json",
-      requestTimeoutInSecs: 10,
-    },
-  }
-};
@@ -4,7 +4,7 @@
 DEFAULT_CERC_ETH_RPC_ENDPOINT="http://fixturenet-eth-geth-1:8545"

 # ETH RPC endpoint used for queries in the watcher
-DEFAULT_CERC_ETH_RPC_QUERY_ENDPOINT="http://ipld-eth-server-1:8081"
+DEFAULT_CERC_ETH_RPC_QUERY_ENDPOINT="http://nitro-reverse-payment-proxy:8081"

 # ETH RPC endpoint used for mutations in the watcher
 DEFAULT_CERC_ETH_RPC_MUTATION_ENDPOINT="http://fixturenet-eth-geth-1:8545"
@@ -2,4 +2,4 @@
 # Build a local version of the task executor for act-runner
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/hosting/act-runner/Dockerfile.task-executor ${build_command_args} ${SCRIPT_DIR}
+docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/hosting/gitea/Dockerfile.task-executor ${build_command_args} ${SCRIPT_DIR}
@@ -20,24 +20,21 @@ if [[ $? -ne 0 ]]; then
  exit 1
 fi

+# Stop geth.
+echo -n "Exporting ethdb.... "
 GETH_CONTAINER=`docker ps -q -f "name=${CERC_SO_COMPOSE_PROJECT}-fixturenet-eth-geth-2-1"`
 if [[ -z "$GETH_CONTAINER" ]]; then
  echo "not found"
  exit 1
 fi

-# Make sure we have the necessary tools
-docker exec $GETH_CONTAINER sh -c 'apk add --no-cache jq curl'
-
-# Gather metadata.
 docker exec $GETH_CONTAINER sh -c 'rm -rf /root/tmp && mkdir -p /root/tmp/export'
 docker exec $GETH_CONTAINER sh -c 'ln -s /opt/testnet/build/el/geth.json /root/tmp/export/genesis.json && ln -s /root/ethdata /root/tmp/export/'
 docker exec $GETH_CONTAINER sh -c 'cat /root/tmp/export/genesis.json | jq ".config" > /root/tmp/export/genesis.config.json'
-docker exec $GETH_CONTAINER sh -c 'curl -s --location "localhost:8545" --header "Content-Type: application/json" --data "{\"jsonrpc\": \"2.0\", \"id\": 1, \"method\": \"eth_getBlockByNumber\", \"params\": [\"0x0\", false]}" > /root/tmp/export/eth_getBlockByNumber_0x0.json'
-docker exec $GETH_CONTAINER sh -c 'curl -s --location "localhost:8545" --header "Content-Type: application/json" --data "{\"jsonrpc\": \"2.0\", \"id\": 1, \"method\": \"eth_blockNumber\", \"params\": []}" > /root/tmp/export/eth_blockNumber.json'

 # Stop geth and zip up ethdb.
-echo -n "Exporting ethdb.... "
+docker exec $GETH_CONTAINER sh -c 'curl -s --location "localhost:8545" --header "Content-Type: application/json" --data "{\"jsonrpc\": \"2.0\", \"id\": 1, \"method\": \"eth_getBlockByNumber\", \"params\": [\"0x0\", false]}" > /root/tmp/export/eth_getBlockByNumber_0x0.json'
+docker exec $GETH_CONTAINER sh -c 'curl -s --location "localhost:8545" --header "Content-Type: application/json" --data "{\"jsonrpc\": \"2.0\", \"id\": 1, \"method\": \"eth_blockNumber\", \"params\": []}" > /root/tmp/export/eth_blockNumber.json'
 docker exec $GETH_CONTAINER sh -c "killall geth && sleep 2 && tar chzf /root/tmp/ethdb.tgz -C /root/tmp/export ."

 # Copy ethdb to host.
@@ -1,16 +0,0 @@
-FROM golang:1.21-bullseye AS builder
-
-# Copy files into image
-WORKDIR /app
-COPY . .
-
-# Build the binary
-RUN go build -v -o nitro .
-
-# Reduce image size
-FROM debian:bullseye-slim
-RUN apt-get update
-RUN apt-get install -y ca-certificates jq netcat
-RUN rm -rf /var/lib/apt/lists/*
-WORKDIR /app
-COPY --from=builder /app/nitro .
@@ -3,6 +3,4 @@

 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh

-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/go-nitro:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/go-nitro
+docker build -t cerc/go-nitro:local -f ${CERC_REPO_BASE_DIR}/go-nitro/docker/local/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/go-nitro
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build the laconic.com image
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/laconic-dot-com:local -f ${CERC_REPO_BASE_DIR}/laconic.com/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/laconic.com
@@ -54,10 +54,8 @@ RUN yarn global add @cerc-io/laconic-registry-cli

 # Add scripts
 RUN mkdir /scripts
-RUN mkdir /scripts/demo-records
 ENV PATH="${PATH}:/scripts"
 COPY ./create-demo-records.sh /scripts
-COPY ./demo-records /scripts/demo-records
 COPY ./import-key.sh /scripts
 COPY ./import-address.sh /scripts

@@ -4,26 +4,26 @@ set -e
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
  set -x
 fi
-
 registry_command="laconic cns"
-demo_records_dir="scripts/demo-records"
-
+record_1_filename=demo-record-1.yml
+cat <<EOF > ${record_1_filename}
+record:
+  type: WebsiteRegistrationRecord
+  url: 'https://cerc.io'
+  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
+  build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
+  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
+  version: 1.0.23
+EOF
 # Check we have funds
 funds_response=$(${registry_command} account get --address $(cat my-address.txt))
 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 aphoton --quantity 1000000000)
 bond_id=$(echo ${bond_create_result} | jq -r .bondId)
 echo "Created bond with id: ${bond_id}"
-
-## Publish the demo records
-if [ -d $demo_records_dir ]; then
-  for demo_record in "${demo_records_dir}"/*; do
-    publish_response=$(${registry_command} record publish --filename ${demo_record} --bond-id ${bond_id})
-    published_record_id=$(echo ${publish_response} | jq -r .id)
-    echo "Published ${demo_record} with id: ${published_record_id}"
-    cat ${demo_record}
-  done
-fi
+# Publish a demo record
+publish_response=$(${registry_command} record publish --filename ${record_1_filename} --bond-id ${bond_id})
+published_record_id=$(echo ${publish_response} | jq -r .id)
+echo "Published ${record_1_filename} with id: ${published_record_id}"
@@ -1,7 +0,0 @@
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://hello-urbit.laconic.com'
-  repo_registration_record_cid: QmTZQ8ZJS6mALjEM2wY71msFno6zzxFftVCiZELj9xREPx
-  build_artifact_cid: '~lostex-rabdur-labtul-moltev/hello-urbit'
-  tls_cert_cid: QmR1acEmQt7Tjmhp9cFtymie2eFcrHURQKt9kGto1TQTW1
-  version: 0.2.4
@@ -1,7 +0,0 @@
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://dev-hello-urbit.laconic.com'
-  repo_registration_record_cid: QmPbKkK7gKojnGAgKAE6bK5qBY8BcYp2YDB1e4b28NxvVv
-  build_artifact_cid: '~lostex-rabdur-labtul-moltev/hello-urbit-dev'
-  tls_cert_cid: QmWbCv4k9Q9P6XptHNJN6EupDyKVLSLRV6W6T2sAYkfBxr
-  version: 0.2.5
@@ -1,7 +0,0 @@
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://app.osmosis.zone'
-  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
-  build_artifact_cid: '~larryx-woldyr/osmosis:latest'
-  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
-  version: 1.3.5
@@ -1,7 +0,0 @@
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://dev.osmosis.zone'
-  repo_registration_record_cid: QmPbKkK7gKojnGAgKAE6bK5qBY8BcYp2YDB1e4b28NxvVv
-  build_artifact_cid: '~larryx-woldyr/osmosis:dev'
-  tls_cert_cid: QmWbCv4k9Q9P6XptHNJN6EupDyKVLSLRV6W6T2sAYkfBxr
-  version: 1.3.6
@@ -1,7 +0,0 @@
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://pwa-1-1-3.iglootools.xyz'
-  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
-  build_artifact_cid: https://ipfs.io/ipfs/QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
-  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
-  version: 1.1.3
@@ -1,7 +0,0 @@
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://pwa-1-2-3.iglootools.xyz'
-  repo_registration_record_cid: QmVjYQ59z3fuKfYUV1aXhDR82JAKxdqB5JMPfUsHkJUkJq
-  build_artifact_cid: https://ipfs.io/ipfs/QmN2yevgjC92gzGi2BY6Q2yBWmR6JNWQ9yscoPPyy1V2Hv
-  tls_cert_cid: QmTAnmDMSnzqAN3yyXtFD4KpyATkeze62ZkbmXHjJ8xQW8
-  version: 1.2.3
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 # Build cerc/plugeth-statediff
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-# Pass Go auth token if present
-if [[ -n "${CERC_GO_AUTH_TOKEN}" ]]; then
-    build_command_args="${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN}"
+# This container build currently requires access to private dependencies in gitea
+# so we check that the necessary access token has been supplied here, then pass it o the build
+if [[ -z "${CERC_GO_AUTH_TOKEN}" ]]; then
+    echo "ERROR: CERC_GO_AUTH_TOKEN is not set" >&2
+    exit 1
 fi
-docker build -t cerc/plugeth-statediff:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth-statediff
+docker build -t cerc/plugeth-statediff:local ${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN} ${CERC_REPO_BASE_DIR}/plugeth-statediff
@@ -1,22 +0,0 @@
-# Using the same golang image as used to build plugeth: https://git.vdb.to/cerc-io/plugeth/src/branch/statediff/Dockerfile
-FROM golang:1.20-alpine3.18 as delve
-
-# Add delve so that we can do remote debugging.
-RUN go install github.com/go-delve/delve/cmd/dlv@latest
-
-FROM cerc/plugeth-statediff:local as statediff
-FROM cerc/plugeth:local as plugeth
-
-FROM alpine:3.18
-
-# Install tools often used in scripting, like bash, wget, and jq.
-RUN apk add --no-cache ca-certificates bash wget curl python3 bind-tools postgresql-client jq
-
-COPY --from=delve /go/bin/dlv /usr/local/bin/
-COPY --from=plugeth /usr/local/bin/geth /usr/local/bin/
-
-# Place all plugeth plugins in /usr/local/lib/plugeth
-COPY --from=statediff  /usr/local/lib/statediff.so /usr/local/lib/plugeth/
-
-EXPOSE 8545 8546 8551 6060 30303 30303/udp 40000
-ENTRYPOINT ["geth"]
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/cerc-plugeth-with-plugins
-set -x
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/plugeth-with-plugins:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 # Build cerc/plugeth
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-# Pass Go auth token if present
-if [[ -n "${CERC_GO_AUTH_TOKEN}" ]]; then
-    build_command_args="${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN}"
+# This container build currently requires access to private dependencies in gitea
+# so we check that the necessary access token has been supplied here, then pass it o the build
+if [[ -z "${CERC_GO_AUTH_TOKEN}" ]]; then
+    echo "ERROR: CERC_GO_AUTH_TOKEN is not set" >&2
+    exit 1
 fi
-docker build -t cerc/plugeth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth
+docker build -t cerc/plugeth:local ${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN} ${CERC_REPO_BASE_DIR}/plugeth
@@ -1,10 +1,13 @@
 FROM node:16.17.1-alpine3.16

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

 WORKDIR /app

 COPY . .

-RUN echo "Building erc20-watcher-ts" && \
+RUN echo "Building watcher-ts" && \
+    git checkout v0.2.19 && \
    yarn && yarn build
+
+WORKDIR /app/packages/erc20-watcher
@@ -6,4 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

-docker build -t cerc/watcher-erc20:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/erc20-watcher-ts
+docker build -t cerc/watcher-erc20:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/watcher-ts
@@ -1,4 +1,4 @@
-FROM node:18.17.1-alpine3.17
+FROM node:18.17.1-alpine3.18

 RUN apk --update --no-cache add git python3 alpine-sdk jq

@@ -14,7 +14,6 @@ cerc/laconic-registry-cli
 cerc/laconic-console-host
 cerc/fixturenet-eth-geth
 cerc/fixturenet-eth-lighthouse
-cerc/fixturenet-eth-genesis
 cerc/watcher-ts
 cerc/watcher-mobymask
 cerc/watcher-erc20
@@ -38,8 +38,7 @@ fixturenet-sushiswap-subgraph-v3
 watcher-mobymask-v3
 mobymask-app-v3
 go-nitro
-nitro-rpc-client
 nitro-contracts
+nitro-reverse-payment-proxy
 mobymask-snap
 ponder
-ipld-eth-server-payments
@@ -1,13 +0,0 @@
-# act-runner stack
-
-## Example
-
-```
-$ laconic-so --stack act-runner deploy init --output act-runner-1.yml --config CERC_GITEA_RUNNER_REGISTRATION_TOKEN=FOO
-$ laconic-so --stack act-runner deploy create --spec-file act-runner-1.yml --deployment-dir ~/opt/deployments/act-runner-1
-$ laconic-so deployment --dir ~/opt/deployments/act-runner-1 up
-
-$ laconic-so --stack act-runner deploy init --output act-runner-2.yml --config CERC_GITEA_RUNNER_REGISTRATION_TOKEN=BAR
-$ laconic-so --stack act-runner deploy create --spec-file act-runner-2.yml --deployment-dir ~/opt/deployments/act-runner-2
-$ laconic-so deployment --dir ~/opt/deployments/act-runner-2 up
-```
@@ -1,15 +0,0 @@
-version: "1.1"
-name: act-runner
-description: "Local act-runner"
-repos:
-  - git.vdb.to/cerc-io/hosting
-  - gitea.com/gitea/act_runner
-containers:
-  - cerc/act-runner
-  - cerc/act-runner-task-executor
-pods:
-  - name: act-runner
-    repository: cerc-io/hosting
-    path: act-runner
-    pre_start_command: "pre_start.sh"
-    post_start_command: "post_start.sh"
@@ -6,10 +6,8 @@ repos:
  - git.vdb.to/cerc-io/eth-statediff-service@v5
  - git.vdb.to/cerc-io/ipld-eth-db@v5
  - git.vdb.to/cerc-io/ipld-eth-server@v5
-  - git.vdb.to/cerc-io/plugeth@statediff
 containers:
  - cerc/ipld-eth-state-snapshot
  - cerc/eth-statediff-service
  - cerc/ipld-eth-db
  - cerc/ipld-eth-server
-  - cerc/plugeth
@@ -4,8 +4,8 @@ repos:
  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
  - git.vdb.to/cerc-io/ipld-eth-db@v5
  - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5
+  - github.com/cerc-io/watcher-ts
  - github.com/dboreham/foundry
-  - github.com/cerc-io/erc20-watcher-ts
 containers:
  - cerc/foundry
  - cerc/go-ethereum
@@ -2,14 +2,14 @@ version: "1.1"
 name: fixturenet-laconic-loaded
 description: "A full featured laconic fixturenet"
 repos:
-  - git.vdb.to/cerc-io/laconicd
+  - github.com/cerc-io/laconicd
  - github.com/lirewine/debug
  - github.com/lirewine/crypto
  - github.com/lirewine/gem
  - github.com/lirewine/sdk
-  - git.vdb.to/cerc-io/laconic-sdk
-  - git.vdb.to/cerc-io/laconic-registry-cli
-  - git.vdb.to/cerc-io/laconic-console
+  - github.com/cerc-io/laconic-sdk
+  - github.com/cerc-io/laconic-registry-cli
+  - github.com/cerc-io/laconic-console
 npms:
  - laconic-sdk
  - laconic-registry-cli
@@ -2,9 +2,9 @@ version: "1.0"
 name: fixturenet-laconicd
 description: "A laconicd fixturenet"
 repos:
-  - git.vdb.to/cerc-io/laconicd
-  - git.vdb.to/cerc-io/laconic-sdk
-  - git.vdb.to/cerc-io/laconic-registry-cli
+  - github.com/cerc-io/laconicd
+  - github.com/cerc-io/laconic-sdk
+  - github.com/cerc-io/laconic-registry-cli
 npms:
  - laconic-sdk
  - laconic-registry-cli
@@ -1,6 +1,6 @@
 # fixturenet-payments

-Instructions to setup and deploy an end-to-end fixturenet-payments stack, on a local machine. Some tips are included for running on a remote cloud machine.
+Instructions to setup and deploy an end-to-end fixturenet-payments stack

 ## Setup

@@ -22,48 +22,21 @@ Deploy the stack:

 ```bash
 laconic-so --stack fixturenet-payments deploy --cluster payments up
-```

-```bash
 # Exposed on host ports:
-# 32***: geth in statediffing mode and ipld-eth-server(s)
-# 4005: in-process go-nitro node's RPC endpoint
-# 3005: in-process go-nitro node's p2p TCP endpoint
-# 5005: in-process go-nitro node's p2p WS endpoint
-# 4006: out-of-process go-nitro node's RPC endpoint
-# 3006: out-of-process go-nitro node's p2p TCP endpoint
-# 5006: out-of-process go-nitro node's p2p WS endpoint
+# 4005: go-nitro node's RPC endpoint
+# 5005: go-nitro node's p2p endpoint
+# 8081: reverse payment proxy's RPC endpoint
 # 15432: MobyMask v3 watcher's db endpoint
 # 3001: MobyMask v3 watcher endpoint
 # 9090: MobyMask v3 watcher relay node endpoint
 # 8080: MobyMask snap
 # 3004: MobyMask v3 app
-# 42070: Ponder indexer-1
-# 42071: Ponder indexer-2
-# 42069: Ponder watcher
 ```

-If running in the cloud, ensure all the of the above ports are open. The geth port can be retrieved with:
-
-```bash
-docker port payments-fixturenet-eth-geth-1-1 8545
-```
-
-Then for every port above, run each line in a new terminal window (or use `screen`):
-
-```bash
-ssh -L 4005:localhost:4005 user@<your-ip>
-ssh -L 5005:localhost:5005 user@<your-ip>
-ssh -L 8081:localhost:8081 user@<your-ip>
-# ... and so on for every port
-```
-
-This will allow you to access the entirety of the app as if it were running locally.
-
 ## Demo

- Follow the [mobymask-demo](./mobymask-demo.md) to try out MobyMask end-to-end payments.
- Follow the [ponder-demo](./ponder-demo.md) to try out Ponder end-to-end payments.
+Follow the [demo](./demo.md) to try out end-to-end payments

 ## Clean up

@@ -77,8 +50,8 @@ Clear volumes created by this stack:

 ```bash
 # List all relevant volumes
-docker volume ls -q --filter "name=payments"
+docker volume ls -q --filter "name=[payments"

 # Remove all the listed volumes
-docker volume rm $(docker volume ls -q --filter "name=payments")
+docker volume rm $(docker volume ls -q --filter "name=[payments")
 ```
@@ -3,14 +3,16 @@
 Stack components:
 * `ipld-eth-db` database for statediffed data
 * Local geth + lighthouse blockchain "fixturenet" running in statediffing mode
-* `ipld-eth-server-1` which runs an ETH RPC API and a GQL server; they both serve data from `ipld-eth-db`
-  * It runs an in-process go-nitro node for payments required for configured RPC requests
-* A MobyMask v3 watcher that pays the `ipld-eth-server-1` for ETH RPC requests
+* `ipld-eth-server` which runs an ETH RPC API and a GQL server; serves data from `ipld-eth-db`
+* A go-nitro deployment acting as the Nitro node for `ipld-eth-server`
+* A modified reverse payment proxy server (based on the one from go-nitro) that proxies requests to `ipld-eth-server`'s RPC endpoint; it talks to `ipld-eth-server`'s Nitro node to accept and validate payments required for configured RPC requests
+* A MobyMask v3 watcher that pays the `ipld-eth-server` for ETH RPC requests
 * A MobyMask v3 app that pays the watcher for reads (GQL queries) and writes
+* An example ERC20 Ponder app that pays the `ipld-eth-server` for ETH RPC requests

 ## Setup

-* On starting the stack, MobyMask watcher creates a payment channel with the `ipld-eth-server-1`'s (in-process) Nitro node. Check watcher logs and wait for the same:
+* On starting the stack, MobyMask watcher creates a payment channel with the `ipld-eth-server`'s Nitro node. Check watcher logs and wait for the same:

  ```bash
  docker logs -f $(docker ps -aq --filter name="mobymask-watcher-server")
@@ -36,7 +38,7 @@ Stack components:
 * Check the payment channel status:

  ```bash
-  docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $WATCHER_UPSTREAM_PAYMENT_CHANNEL -s false -h ipld-eth-server-1 -p 4005"
+  docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $WATCHER_UPSTREAM_PAYMENT_CHANNEL -h go-nitro -p 4005"

  # Expected output:
  # {
@@ -52,10 +54,10 @@ Stack components:
  # }
  ```

-* In another terminal, check `ipld-eth-server-1`'s logs to keep track of incoming payments and RPC requests from the MobyMask watcher:
+* In another terminal, check the reverse payment proxy server's logs to keep track of incoming payments and RPC requests:

  ```bash
-  docker logs -f $(docker ps -aq --filter name="ipld-eth-server-1")
+  docker logs -f $(docker ps -aq --filter name="nitro-reverse-payment-proxy")
  ```

 * MetaMask flask wallet setup for running the MobyMask app:
@@ -133,35 +135,31 @@ Stack components:
    ```bash
    # Expected output:
    # ...
-    # laconic:payments Received a payment voucher of 50 from 0x86804299822212c070178B5135Ba6DdAcFC357D3
    # laconic:payments Serving a paid query for 0x86804299822212c070178B5135Ba6DdAcFC357D3
    # vulcanize:resolver isPhisher 0x98ae4f9e9d01cc892adfe6871e1db0287039e0c183d3b5bb31d724228c114744 0x2B6AFbd4F479cE4101Df722cF4E05F941523EaD9 TWT:ash1
    # vulcanize:indexer isPhisher: db miss, fetching from upstream server
    # laconic:payments Making RPC call: eth_chainId
    # laconic:payments Making RPC call: eth_getBlockByHash
-    # 2023-10-13T06:33:58.443Z ts-nitro:engine{"msg":"Sent message","_msg":{"to":"0xAAA662","from":"0xBBB676", "payloadSummaries":[],"proposalSummaries":[],"payments":[{"amount":200,"channelId":"0x9a4bdfe03c8e72f368aab07e6bd18f1cd6821170e1a93e59864aad6ee6a853a2"}],"rejectedObjectives":[]}}
    # laconic:payments Making RPC call: eth_chainId
    # laconic:payments Making RPC call: eth_getStorageAt
-    # 2023-10-13T06:34:00.483Z ts-nitro:engine {"msg":"Sent message","_msg":{"to":"0xAAA662","from":"0xBBB676",# "payloadSummaries":[],"proposalSummaries":[],"payments":[{"amount":300,"channelId":"0x9a4bdfe03c8e72f368aab07e6bd18f1cd6821170e1a93e59864aad6ee6a853a2"}],"rejectedObjectives":[]}}
    ```

-  * The watcher makes several ETH RPC requests to `ipld-eth-server-1` to fetch data required for satisfying the GQL request(s); check `ipld-eth-server-1` logs for charged RPC requests (`eth_getBlockByHash`, `eth_getBlockByNumber`, `eth_getStorageAt`):
+  * The watcher makes several ETH RPC requests to `ipld-eth-server` to fetch data required for satisfying the GQL request(s); check the payment proxy server logs for charged RPC requests (`eth_getBlockByHash`, `eth_getBlockByNumber`, `eth_getStorageAt`):

    ```bash
    # Expected output:
    # ...
-    # 2023/10/13 06:34:57 INFO Received a voucher payer=0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94 amount=100
-    #  2023/10/13 06:34:59 INFO Serving a paid RPC request method=eth_getBlockByHash cost=50 sender=0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94
-    #  time="2023-10-13T06:34:59Z" level=debug msg=START api_method=eth_getBlockByHash api_params="[0x46411a554f30e607bdd79cd157a60a7c8b314c0709557be3357ed2fef53d6c3d false]" api_reqid=52 conn="192.168.64.4:59644" user_id= uuid=a1893211-6992-11ee-a67a-0242c0a8400c
-    #  WARN [10-13|06:34:59.133] Attempting GerRPCCalls, but default PluginLoader has not been initialized
-    #  time="2023-10-13T06:34:59Z" level=debug msg=END api_method=eth_getBlockByHash api_params="[0x46411a554f30e607bdd79cd157a60a7c8b314c0709557be3357ed2fef53d6c3d false]" api_reqid=52 conn="192.168.64.4:59644" duration=5 user_id= uuid=a1893211-6992-11ee-a67a-0242c0a8400c
-    #  2023/10/13 06:34:59 INFO Serving a free RPC request method=eth_chainId
-    #  time="2023-10-13T06:34:59Z" level=debug msg=START api_method=eth_chainId api_params="[]" api_reqid=53 conn="192.168.64.4:59658" user_id= uuid=a18a96d9-6992-11ee-a67a-0242c0a8400c
-    #  time="2023-10-13T06:34:59Z" level=debug msg=END api_method=eth_chainId api_params="[]" api_reqid=53 conn="192.168.64.4:59658" duration=0 user_id= uuid=a18a96d9-6992-11ee-a67a-0242c0a8400c
-    #  2023/10/13 06:34:59 INFO Received a voucher payer=0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94 amount=100
-    #  2023/10/13 06:35:01 INFO Serving a paid RPC request method=eth_getStorageAt cost=50 sender=0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94
-    #  time="2023-10-13T06:35:01Z" level=debug msg=START api_method=eth_getStorageAt api_params="[0x2b6afbd4f479ce4101df722cf4e05f941523ead9 0xf76621c2cc1c1705fabbc22d30ffc5ded7f26e4995feb8d1c9812a2697ba1278 0x46411a554f30e607bdd79cd157a60a7c8b314c0709557be3357ed2fef53d6c3d]" api_reqid=54 conn="192.168.64.4:59660" user_id= uuid=a2bd75d2-6992-11ee-a67a-0242c0a8400c
-    #  time="2023-10-13T06:35:01Z" level=debug msg=END api_method=eth_getStorageAt api_params="[0x2b6afbd4f479ce4101df722cf4e05f941523ead9 0xf76621c2cc1c1705fabbc22d30ffc5ded7f26e4995feb8d1c9812a2697ba1278 0x46411a554f30e607bdd79cd157a60a7c8b314c0709557be3357ed2fef53d6c3d]" api_reqid=54 conn="192.168.64.4:59660" duration=7 user_id= uuid=a2bd75d2-6992-11ee-a67a-0242c0a8400c
+    # {"time":"2023-10-06T06:46:52.769009314Z","level":"DEBUG","msg":"Serving RPC request","method":"eth_chainId"}
+    # {"time":"2023-10-06T06:46:52.773006426Z","level":"DEBUG","msg":"Serving RPC request","method":"eth_getBlockByNumber"}
+    # {"time":"2023-10-06T06:46:52.811142054Z","level":"DEBUG","msg":"Request cost","cost-per-byte":1,"response-length":1480,"cost":1480,"method":"eth_getBlockByNumber"}
+    # {"time":"2023-10-06T06:46:52.811418494Z","level":"DEBUG","msg":"sent message","address":"0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE","method":"receive_voucher"}
+    # {"time":"2023-10-06T06:46:52.812557482Z","level":"DEBUG","msg":"Received voucher","delta":5000}
+    # ...
+    # {"time":"2023-10-06T06:46:52.87525215Z","level":"DEBUG","msg":"Serving RPC request","method":"eth_getStorageAt"}
+    # {"time":"2023-10-06T06:46:52.882859654Z","level":"DEBUG","msg":"Request cost","cost-per-byte":1,"response-length":104,"cost":104,"method":"eth_getStorageAt"}
+    # {"time":"2023-10-06T06:46:52.882946485Z","level":"DEBUG","msg":"sent message","address":"0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE","method":"receive_voucher"}
+    # {"time":"2023-10-06T06:46:52.884012641Z","level":"DEBUG","msg":"Received voucher","delta":5000}
+    # {"time":"2023-10-06T06:46:52.884032961Z","level":"DEBUG","msg":"Destination request","url":"http://ipld-eth-server:8081/"}
    ```

 * Change the amount besides `PAY` button in debug panel to `>=100` for phisher reports next
@@ -185,10 +183,10 @@ Stack components:
  # }
  ```

-* Check the watcher - ipld-eth-server-1 payment channel status after a few requests:
+* Check the watcher - ipld-eth-server payment channel status after a few requests:

  ```bash
-  docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $WATCHER_UPSTREAM_PAYMENT_CHANNEL -s false -h ipld-eth-server-1 -p 4005"
+  docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $WATCHER_UPSTREAM_PAYMENT_CHANNEL -h go-nitro -p 4005"

  # Expected output ('PaidSoFar' should be non zero):
  # {
@@ -204,6 +202,65 @@ Stack components:
  # }
  ```

+### ERC20 Ponder App
+
+* Run the ponder app in it's container:
+
+  ```bash
+  docker exec -it payments-ponder-app-1 bash -c "pnpm start"
+
+  # Expected output:
+  # 09:58:54.288 INFO  payment    Creating ledger channel with nitro node 0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE
+  # ...
+  # 09:59:14.230 INFO  payment    Creating payment channel with nitro node 0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE
+  # ...
+  # 09:59:14.329 INFO  payment    Using payment channel 0x10f049519bc3f862e2b26e974be8666886228f30ea54aab06e2f23718afffab0
+  ```
+
+* On starting the Ponder app, it creates a payment channel with the `ipld-eth-server`'s Nitro node and then starts the historical sync service
+
+* The sync service makes several ETH RPC requests to the `ipld-eth-server` to fetch required data; check the payment proxy server logs for charged RPC requests (`eth_getBlockByNumber`, `eth_getLogs`)
+
+  ```bash
+  # Expected output:
+  # ...
+  # {"time":"2023-10-06T06:51:45.214478402Z","level":"DEBUG","msg":"Serving RPC request","method":"eth_getBlockByNumber"}
+  # {"time":"2023-10-06T06:51:45.22251171Z","level":"DEBUG","msg":"Request cost","cost-per-byte":1,"response-length":576,"cost":576,"method":"eth_getBlockByNumber"}
+  # {"time":"2023-10-06T06:51:45.222641963Z","level":"DEBUG","msg":"sent message","address":"0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE","method":"receive_voucher"}
+  # {"time":"2023-10-06T06:51:45.224042391Z","level":"DEBUG","msg":"Received voucher","delta":5000}
+  # {"time":"2023-10-06T06:51:45.224061411Z","level":"DEBUG","msg":"Destination request","url":"http://ipld-eth-server:8081/"}
+  # {"time":"2023-10-06T06:51:45.242064953Z","level":"DEBUG","msg":"Serving RPC request","method":"eth_getLogs"}
+  # {"time":"2023-10-06T06:51:45.249118517Z","level":"DEBUG","msg":"Request cost","cost-per-byte":1,"response-length":61,"cost":61,"method":"eth_getLogs"}
+  # {"time":"2023-10-06T06:51:45.249189892Z","level":"DEBUG","msg":"sent message","address":"0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE","method":"receive_voucher"}
+  # {"time":"2023-10-06T06:51:45.249743149Z","level":"DEBUG","msg":"Received voucher","delta":5000}
+  # {"time":"2023-10-06T06:51:45.249760631Z","level":"DEBUG","msg":"Destination request","url":"http://ipld-eth-server:8081/"}
+  # ...
+  ```
+
+* Export the payment channel id to a variable:
+
+  ```bash
+  export PONDER_UPSTREAM_PAYMENT_CHANNEL=<PAYMENT_CHANNEL_ID>
+  ```
+
+* Check the ponder - ipld-eth-server payment channel status:
+
+  ```bash
+  docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $PONDER_UPSTREAM_PAYMENT_CHANNEL -h go-nitro -p 4005"
+
+  # Expected output ('PaidSoFar' is non zero):
+  # {
+  #   ID: '0x1178ac0f2a43e54a122216fa6afdd30333b590e49e50317a1f9274a591da0f96',
+  #   Status: 'Open',
+  #   Balance: {
+  #     AssetAddress: '0x0000000000000000000000000000000000000000',
+  #     Payee: '0xaaa6628ec44a8a742987ef3a114ddfe2d4f7adce',
+  #     Payer: '0x67d5b55604d1af90074fcb69b8c51838fff84f8d',
+  #     PaidSoFar: 215000n,
+  #     RemainingFunds: 999785000n
+  #   }
+  # }
+  ```

 ## Clean Up

@@ -215,9 +272,4 @@ Stack components:
  await clearNodeStorage()
  ```

-* Run the following in the browser console to clear data in local storage:
-  ```bash
-  localStorage.clear()
-  ```
-
 * On a fresh restart, clear activity tab data in MetaMask for concerned accounts
@@ -1,267 +0,0 @@
-# Demo
-
-Stack components:
-* `ipld-eth-db` database for statediffed data
-* Local geth + lighthouse blockchain "fixturenet" running in statediffing mode
-* `ipld-eth-server-2` which runs an ETH RPC API and a GQL server; they both serve data from `ipld-eth-db`
-* A go-nitro deployment acting as the remote Nitro node for `ipld-eth-server-2`
-* Example ERC20 Ponder apps
-  * `ponder-app-indexer-1` that pays the `ipld-eth-server-2` for ETH RPC requests
-  * `ponder-app-indexer-2` that pays `ponder-app-indexer-1` for GQL queries
-  * `ponder-app-watcher` that pays `ponder-app-indexer-2` for GQL queries
-
-## Setup
-
-* In a terminal, check `ipld-eth-server-2`'s logs to keep track of incoming RPC requests from the `ponder-app-indexer-1`:
-
-  ```bash
-  docker logs -f $(docker ps -aq --filter name="ipld-eth-server-2")
-  ```
-
-## Run
-
-### ERC20 Ponder App
-
-* Run the first indexer Ponder app:
-
-  ```bash
-  docker exec -it payments-ponder-app-indexer-1-1 bash -c "DEBUG=laconic:payments pnpm start"
-
-  # Expected output:
-  # 12:57:03.751 INFO  payment    Nitro node setup with address 0x67D5b55604d1aF90074FcB69b8C51838FFF84f8d
-  #   laconic:payments Starting voucher subscription... +0ms
-  # ...
-  # 09:58:54.288 INFO  payment    Creating ledger channel with nitro node 0x660a4bEF3fbC863Fcd8D3CDB39242aE513d7D92e ...
-  # 09:59:14.230 INFO  payment    Creating payment channel with nitro node 0x660a4bEF3fbC863Fcd8D3CDB39242aE513d7D92e ...
-  # 09:59:14.329 INFO  payment    Using payment channel 0x1ff59db391b7a55bed723b930ab53c80e7ce857487c1e58771aa5a0737d71625
-  ```
-
-* Export the payment channel id to a variable:
-
-  ```bash
-  export PONDER_UPSTREAM_PAYMENT_CHANNEL=<PAYMENT_CHANNEL_ID>
-  ```
-
-* On starting the Ponder app in indexer mode, it creates a payment channel with the `ipld-eth-server-2`'s (external) Nitro node and then starts the historical sync service
-
-* The sync service makes several ETH RPC requests to the `ipld-eth-server-2` to fetch required data; check the `ipld-eth-server-2` logs for charged RPC requests (`eth_getBlockByNumber`, `eth_getLogs`):
-
-  ```bash
-  # Expected output:
-  # ...
-  # 2023/10/18 05:29:38 INFO Serving a paid RPC request method=eth_getBlockByNumber cost=50 sender=0x67D5b55604d1aF90074FcB69b8C51838FFF84f8d
-  # time="2023-10-18T05:29:38Z" level=debug msg=START api_method=eth_getBlockByNumber api_params="[latest true]" api_reqid=0 conn="172.26.0.19:42306" user_id= uuid=54992dc3-6d77-11ee-9ede-0242ac1a000f
-  # WARN [10-18|05:29:38.292] Attempting GerRPCCalls, but default PluginLoader has not been initialized
-  # time="2023-10-18T05:29:38Z" level=debug msg=END api_method=eth_getBlockByNumber api_params="[latest true]" api_reqid=0 conn="172.26.0.19:42306" duration=22 user_id= uuid=54992dc3-6d77-11ee-9ede-0242ac1a000f
-  # ...
-  # 2023/10/18 05:29:40 INFO Serving a paid RPC request method=eth_getLogs cost=50 sender=0x67D5b55604d1aF90074FcB69b8C51838FFF84f8d
-  # WARN [10-18|05:29:40.340] Attempting GerRPCCalls, but default PluginLoader has not been initialized
-  # time="2023-10-18T05:29:40Z" level=debug msg="retrieving log cids for receipt ids"
-  # ...
-  ```
-
-* Check the Ponder - ipld-eth-server-2 payment channel status:
-
-  ```bash
-  docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $PONDER_UPSTREAM_PAYMENT_CHANNEL -s false -h go-nitro -p 4006"
-
-  # Expected output ('PaidSoFar' is non zero):
-  # {
-  #   ID: '0x1ff59db391b7a55bed723b930ab53c80e7ce857487c1e58771aa5a0737d71625',
-  #   Status: 'Open',
-  #   Balance: {
-  #     AssetAddress: '0x0000000000000000000000000000000000000000',
-  #     Payee: '0x660a4bef3fbc863fcd8d3cdb39242ae513d7d92e',
-  #     Payer: '0x67d5b55604d1af90074fcb69b8c51838fff84f8d',
-  #     PaidSoFar: 7200n,
-  #     RemainingFunds: 999992800n
-  #   }
-  # }
-  ```
-
-* In another terminal run the second indexer Ponder app:
-
-  ```bash
-  docker exec -it payments-ponder-app-indexer-2-1 bash -c "DEBUG=laconic:payments pnpm start"
-
-  # Expected output:
-  # 08:00:28.701 INFO  payment    Nitro node setup with address 0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01
-  #   laconic:payments Starting voucher subscription... +0ms
-  # ...
-  # 09:58:54.288 INFO  payment    Creating ledger channel with nitro node 0x67D5b55604d1aF90074FcB69b8C51838FFF84f8d ...
-  # 09:59:14.230 INFO  payment    Creating payment channel with nitro node 0x67D5b55604d1aF90074FcB69b8C51838FFF84f8d ...
-  # 09:59:14.329 INFO  payment    Using payment channel 0xfbf9d7eb7c18446883c7f57f4c94db5607f414a224b3e921c787db07371d2a70
-  ```
-
-* On starting indexer Ponder app, it creates a payment channel with first indexer and then starts the sync services
-
-* Check logs in `ponder-indexer-1` to see payments made from `ponder-indexer-2` from GQL queries to fetch network data
-
-  ```bash
-  # ...
-  #   laconic:payments Received a payment voucher of 100 from 0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01 +23ms
-  #   laconic:payments Serving a paid query for 0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01 +0ms
-  # 13:01:05.671 DEBUG payment    Verified payment for GQL queries getEthLogs
-  #   laconic:payments Received a payment voucher of 100 from 0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01 +20ms
-  #   laconic:payments Serving a paid query for 0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01 +0ms
-  # 13:01:05.691 DEBUG payment    Verified payment for GQL queries getEthBlock
-  # 13:01:07.598 INFO  realtime   Fetched missing blocks [686, 687] (network=fixturenet)
-  # 13:01:07.598 DEBUG realtime   Started processing new head block 686 (network=fixturenet)
-  # ...
-  ```
-
-* Following are the example GQL queries (with payment headers) `ponder-indexer-2` makes to `ponder-indexer-1` for fetching data
-
-  ```graphql
-  {
-    getEthLogs(
-      chainId: 1212,
-      address: "0x6325439389e0797ab35752b4f43a14c004f22a9c",
-      fromBlock: 100,
-      toBlock: 200,
-    ) {
-      address
-      blockHash
-      blockNumber
-      data
-      logIndex
-      removed
-      topics
-      transactionHash
-      transactionIndex 
-    }
-
-    getEthBlock(
-      chainId: 1212,
-      blockNumber: 150,
-      fullTransactions: false
-    ) {
-      baseFeePerGas
-      difficulty
-      extraData
-      gasLimit
-      gasUsed
-      hash
-      logsBloom
-      miner
-      mixHash
-      nonce
-      number
-      parentHash
-      receiptsRoot
-      sha3Uncles
-      size
-      stateRoot
-      timestamp
-      totalDifficulty
-      transactionsRoot
-      txHashes
-    }
-  }
-  ```
-
-* In another terminal run the Ponder app in watcher mode:
-
-  ```bash
-  docker exec -it payments-ponder-app-watcher-1 bash -c "DEBUG=laconic:payments pnpm start"
-
-  # Expected output:
-  # 11:23:22.057 DEBUG app        Started using config file: ponder.config.ts
-  # 08:02:12.548 INFO  payment    Nitro node setup with address 0x111A00868581f73AB42FEEF67D235Ca09ca1E8db
-  #   laconic:payments Starting voucher subscription... +0ms
-  # 08:02:17.417 INFO  payment    Creating ledger channel with nitro node 0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01 ...
-  # 08:02:37.135 INFO  payment    Creating payment channel with nitro node 0xB2B22ec3889d11f2ddb1A1Db11e80D20EF367c01 ...
-  # 08:02:37.313 INFO  payment    Using payment channel 0xc48622577dfa389283beb19ed946274eb034587d72e61445dc997304be671f1a
-  # ...
-  # 11:23:22.436 INFO  server     Started responding as healthy
-  ```
-
-* Check the terminal of the second indexer Ponder app. Logs of payment for `getLogEvents` queries can be seen:
-
-  ```bash
-  # ...
-  # 08:02:37.763 DEBUG realtime   Finished processing new head block 89 (network=fixturenet)
-  #   laconic:payments Received a payment voucher of 50 from 0x111A00868581f73AB42FEEF67D235Ca09ca1E8db +444ms
-  #   laconic:payments Serving a paid query for 0x111A00868581f73AB42FEEF67D235Ca09ca1E8db +1ms
-  # 08:02:37.804 DEBUG payment    Verified payment for GQL queries getLogEvents
-  #   laconic:payments Received a payment voucher of 50 from 0x111A00868581f73AB42FEEF67D235Ca09ca1E8db +45ms
-  #   laconic:payments Serving a paid query for 0x111A00868581f73AB42FEEF67D235Ca09ca1E8db +0ms
-  # 08:02:37.849 DEBUG payment    Verified payment for GQL queries getLogEvents
-  ```
-
-* Following are the example GQL queries (with payment headers) `ponder-watcher` makes to `ponder-indexer-2` for fetching data
-
-  ```graphql
-  getLogEvents(
-    fromTimestamp: 1695303079,
-    toTimestamp: 1695304156,
-    filters: [
-      {
-        name: "AdventureGold"
-        chainId: 1212,
-        address: ["0x6325439389e0797ab35752b4f43a14c004f22a9c"],
-        fromBlock: 100,
-        toBlock: 200,
-        includeEventSelectors: ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"]
-      }
-    ]
-  ) {
-    events {
-      transaction {
-        hash
-      }
-      log {
-        id 
-      }
-      block {
-        number
-      }
-    }
-    metadata {
-      pageEndsAtTimestamp	
-      isLastPage
-    }
-  }
-  ```
-
-* Open watcher Ponder app endpoint http://localhost:42069
-
-  * Try GQL query to see transfer events
-    
-    ```graphql
-    {
-      transferEvents (orderBy: "timestamp", orderDirection: "desc") {
-        id
-        amount
-        from {
-          id
-        }
-        to {
-          id
-        }
-        timestamp
-      }
-    }
-    ```
-
-* Transfer an ERC20 token on chain
-
-  * Get the deployed ERC20 token address
-
-    ```bash
-    export TOKEN_ADDRESS=$(docker exec payments-ponder-er20-contracts-1 jq -r '.address' ./deployment/erc20-address.json)
-    ```
-  
-  * Transfer token
-  
-    ```bash
-    docker exec -it payments-ponder-er20-contracts-1 bash -c "yarn token:transfer:docker --token ${TOKEN_ADDRESS} --to 0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a --amount 5000"
-    ```
-
-* Wait for a log in watcher Ponder app
-
-  ```bash
-  06:40:47.567 INFO  handlers   Processed 1 event (up to Oct 19, 2023)
-  ```
-
-* Check the GQL query again in http://localhost:42069 to see a new `TransferEvent` entity
@@ -6,22 +6,19 @@ repos:
  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
  - git.vdb.to/cerc-io/lighthouse
  - git.vdb.to/cerc-io/ipld-eth-db@v5
-  # ipld-eth-server with payments -- to be used by ipld-eth-server-payments pod
-  - git.vdb.to/cerc-io/ipld-eth-server@payments
-  # nitro repo
-  - github.com/cerc-io/ts-nitro@v0.1.15
-  - github.com/cerc-io/go-nitro@v0.1.2-ts-port-0.1.9
+  - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5
+  # nitro repos
+  - github.com/cerc-io/ts-nitro@v0.1.13
+  - github.com/cerc-io/go-nitro@v0.1.1-ts-port-0.1.5
  # mobymask watcher repos
-  - github.com/cerc-io/watcher-ts@v0.2.66
-    # this is mobymask-v3
-  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.2.4
+  - github.com/cerc-io/watcher-ts@v0.2.63
+  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.2.2
  - github.com/cerc-io/MobyMask@v0.1.3
  # mobymask app repos
  - github.com/cerc-io/mobymask-snap
-  - github.com/cerc-io/mobymask-ui@v0.2.2
+  - github.com/cerc-io/mobymask-ui@v0.2.1
  # ponder repo
-  - github.com/cerc-io/ponder@laconic-esm
-  - github.com/cerc-io/erc20-watcher-ts
+  - github.com/cerc-io/ponder@laconic
 containers:
  # fixturenet images
  - cerc/go-ethereum
@@ -44,16 +41,14 @@ containers:
  - cerc/mobymask-ui
  # ponder image
  - cerc/ponder
-  - cerc/watcher-erc20
 pods:
  - fixturenet-eth
-  - ipld-eth-server-payments
+  - ipld-eth-server
  - ipld-eth-db
  - nitro-contracts
  - go-nitro
-  - nitro-rpc-client
+  - nitro-reverse-payment-proxy
  - watcher-mobymask-v3
  - mobymask-snap
  - mobymask-app-v3
-  - ponder-indexer
-  - ponder-watcher
+  - ponder
@@ -12,7 +12,7 @@ See `stacks/fixturenet-eth/README.md` for more information.
 * cerc/tx-spammer

 ## Deploy the stack
-Note: if there are any private Go dependencies, `CERC_GO_AUTH_TOKEN` must be set to a valid Gitea access token before running the `build-containers` command.
+Note: since some Go dependencies are currently private, `CERC_GO_AUTH_TOKEN` must be set to a valid Gitea access token before running the `build-containers` command.
 ```
 $ laconic-so --stack fixturenet-plugeth-tx setup-repositories
 $ laconic-so --stack fixturenet-plugeth-tx build-containers
@@ -1,9 +0,0 @@
-# laconic-dot-com
-
-```
-laconic-so --stack laconic-dot-com setup-repositories
-laconic-so --stack laconic-dot-com build-containers 
-laconic-so --stack laconic-dot-com deploy init --output laconic-website-spec.yml --map-ports-to-host localhost-same
-laconic-so --stack laconic-dot-com deploy create --spec-file laconic-website-spec.yml --deployment-dir lx-website
-laconic-so deployment --dir lx-website start
-```
@@ -1,8 +0,0 @@
-version: "0.1"
-name: laconic-dot-com
-repos:
-  - github.com/LaconicNetwork/laconic.com@v0.0.1
-containers:
-  - cerc/laconic-dot-com
-pods:
-  - laconic-dot-com
@@ -1,141 +0,0 @@
-# mainnet-eth-plugeth
-
-Deploys a "head-tracking" mainnet Ethereum stack comprising a [plugeth](https://git.vdb.to/cerc-io/plugeth) execution layer node and a [lighthouse](https://github.com/sigp/lighthouse) consensus layer node, with [plugeth-statediff](https://git.vdb.to/cerc-io/plugeth-statediff) for statediffing, [ipld-eth-db](https://git.vdb.to/cerc-io/ipld-eth-db) for storage, and [ipld-eth-server](https://git.vdb.to/cerc-io/ipld-eth-server) for indexed ETH IPLD objects.
-
-## Clone required repositories
-
-```
-$ laconic-so --stack mainnet-eth-plugeth setup-repositories
-```
-
-## Build containers
-
-```
-$ laconic-so --stack mainnet-eth-plugeth build-containers
-```
-
-## Create a deployment
-
-```
-$ laconic-so --stack mainnet-eth-plugeth deploy init --map-ports-to-host any-same --output mainnet-eth-plugeth-spec.yml
-$ laconic-so --stack mainnet-eth-plugeth deploy create --spec-file mainnet-eth-plugeth-spec.yml --deployment-dir mainnet-eth-plugeth-deployment
-```
-## Start the stack
-```
-$ laconic-so deployment --dir mainnet-eth-plugeth-deployment start
-```
-Display stack status:
-```
-$ laconic-so deployment --dir mainnet-eth-plugeth-deployment ps
-Running containers:
-id: f39608eca04d72d6b0f1f3acefc5ebb52908da06e221d20c7138f7e3dff5e423, name: laconic-ef641b4d13eb61ed561b19be67063241-foundry-1, ports:
-id: 4052b1eddd886ae0d6b41f9ff22e68a70f267b2bfde10f4b7b79b5bd1eeddcac, name: laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-geth-1-1, ports: 30303/tcp, 30303/udp, 0.0.0.0:49184->40000/tcp, 0.0.0.0:49185->6060/tcp, 0.0.0.0:49186->8545/tcp, 8546/tcp
-id: ac331232e597944b621b3b8942ace5dafb14524302cab338ff946c7f6e5a1d52, name: laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-lighthouse-1-1, ports: 0.0.0.0:49187->8001/tcp
-```
-See stack logs:
-```
-$ laconic-so deployment --dir mainnet-eth-plugeth-deployment logs
-time="2023-07-25T09:46:29-06:00" level=warning msg="The \"CERC_SCRIPT_DEBUG\" variable is not set. Defaulting to a blank string."
-laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-lighthouse-1-1  | Jul 25 15:45:13.362 INFO Logging to file                         path: "/var/lighthouse-data-dir/beacon/logs/beacon.log"
-laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-lighthouse-1-1  | Jul 25 15:45:13.365 INFO Lighthouse started                      version: Lighthouse/v4.1.0-693886b
-laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-lighthouse-1-1  | Jul 25 15:45:13.365 INFO Configured for network                  name: mainnet
-laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-lighthouse-1-1  | Jul 25 15:45:13.366 INFO Data directory initialised              datadir: /var/lighthouse-data-dir
-laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-lighthouse-1-1  | Jul 25 15:45:13.366 INFO Deposit contract                        address: 0x00000000219ab540356cbb839cbe05303d7705fa, deploy_block: 11184524
-laconic-ef641b4d13eb61ed561b19be67063241-mainnet-eth-plugeth-lighthouse-1-1  | Jul 25 15:45:13.424 INFO Starting checkpoint sync                remote_url: https://beaconstate.ethstaker.cc/, service: beacon
-```
-## Monitoring stack sync progress
-Both go-ethereum and lighthouse will engage in an initial chain sync phase that will last up to several hours depending on hardware performance and network capacity.
-Syncing can be monitored by looking for these log messages:
-```
-Jul 24 12:34:17.001 INFO Downloading historical blocks           est_time: 5 days 11 hrs, speed: 14.67 slots/sec, distance: 6932481 slots (137 weeks 3 days), service: slot_notifier
-INFO [07-24|12:14:52.493] Syncing beacon headers                   downloaded=145,920 left=17,617,968 eta=1h23m32.815s
-INFO [07-24|12:33:15.238] Syncing: chain download in progress      synced=1.86% chain=148.94MiB headers=368,640@95.03MiB bodies=330,081@40.56MiB receipts=330,081@13.35MiB eta=37m54.505s
-INFO [07-24|12:35:13.028] Syncing: state download in progress      synced=1.32% state=4.64GiB   accounts=2,850,314@677.57MiB slots=18,663,070@3.87GiB  codes=26662@111.14MiB eta=3h18m0.699s
-```
-Once synced up these log messages will be observed:
-```
-INFO Synced                                  slot: 6952515, block: 0x5bcb…f6d9, epoch: 217266, finalized_epoch: 217264, finalized_root: 0x6342…2c5c, exec_hash: 0x8d8c…2443 (verified), peers: 31, service: slot_notifier
-INFO [07-25|03:04:48.941] Imported new potential chain segment     number=17,767,316 hash=84f6e7..bc2cb0 blocks=1  txs=137  mgas=16.123  elapsed=57.087ms     mgasps=282.434 dirty=461.46MiB
-INFO [07-25|03:04:49.042] Chain head was updated                   number=17,767,316 hash=84f6e7..bc2cb0 root=ca58b2..8258c1 elapsed=2.480111ms
-```
-## Clean up
-
-Stop the stack:
-```
-$ laconic-so deployment --dir mainnet-eth-plugeth-deployment stop
-```
-This leaves data volumes in place, allowing the stack to be subsequently re-started.
-To permanently *delete* the stack's data volumes run:
-```
-$ laconic-so deployment --dir mainnet-eth-plugeth-deployment stop --delete-data-volumes
-```
-After deleting the volumes, any subsequent re-start will begin chain sync from cold.
-
-## Ports
-It is usually necessary to expose certain container ports on one or more the host's addresses to allow incoming connections.
-Any ports defined in the Docker compose file are exposed by default with random port assignments, bound to "any" interface (IP address 0.0.0.0), but the port mappings can be
-customized by editing the "spec" file generated by `laconic-so deploy init`.
-
-In this example, ports `8545` and `5052` have been assigned to a specific addresses/port combination on the host, while
-port `40000` has been left with random assignment:
-```
-$ cat mainnet-eth-plugeth-spec.yml
-stack: mainnet-eth-plugeth
-ports:
-  mainnet-eth-plugeth-geth-1:
-   - '10.10.10.10:8545:8545'
-   - '40000'
-  mainnet-eth-plugeth-lighthouse-1:
-   - '10.10.10.10:5052:5052'
-volumes:
-  mainnet_eth_plugeth_config_data: ./data/mainnet_eth_plugeth_config_data
-  mainnet_eth_plugeth_geth_1_data: ./data/mainnet_eth_plugeth_geth_1_data
-  mainnet_eth_plugeth_lighthouse_1_data: ./data/mainnet_eth_plugeth_lighthouse_1_data
-```
-In addition, a stack-wide port mapping "recipe" can be applied at the time the 
-`laconic-so deploy init` command is run, by supplying the  desired recipe with the `--map-ports-to-host` option. The following recipes are supported:
-| Recipe | Host Port Mapping |
-|--------|-------------------|
-| any-variable-random | Bind to 0.0.0.0 using a random port assigned at start time (default) |
-| localhost-same | Bind to 127.0.0.1 using the same port number as exposed by the containers |
-| any-same | Bind to 0.0.0.0 using the same port number as exposed by the containers |
-| localhost-fixed-random | Bind to 127.0.0.1 using a random port number selected at the time the command is run (not checked for already in use)|
-| any-fixed-random | Bind to 0.0.0.0 using a random port number selected at the time the command is run (not checked for already in use) |
-## Data volumes
-Container data volumes are bind-mounted to specified paths in the host filesystem.
-The default setup (generated by `laconic-so deploy init`) places the volumes in the `./data` subdirectory of the deployment directory:
-```
-$ cat mainnet-eth-plugeth-spec.yml
-stack: mainnet-eth-plugeth
-ports:
-  mainnet-eth-plugeth-geth-1:
-   - '10.10.10.10:8545:8545'
-   - '40000'
-  mainnet-eth-plugeth-lighthouse-1:
-   - '10.10.10.10:5052:5052'
-volumes:
-  mainnet_eth_plugeth_config_data: ./data/mainnet_eth_plugeth_config_data
-  mainnet_eth_plugeth_geth_1_data: ./data/mainnet_eth_plugeth_geth_1_data
-  mainnet_eth_plugeth_lighthouse_1_data: ./data/mainnet_eth_plugeth_lighthouse_1_data
-```
-A synced-up stack will consume around 900GB of data volume space:
-```
-$ sudo du -h mainnet-eth-plugeth-deployment/data/
-150M    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_lighthouse_1_data/beacon/freezer_db
-25G     mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_lighthouse_1_data/beacon/chain_db
-16K     mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_lighthouse_1_data/beacon/network
-368M    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_lighthouse_1_data/beacon/logs
-26G     mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_lighthouse_1_data/beacon
-26G     mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_lighthouse_1_data
-8.0K    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_config_data
-4.0K    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/keystore
-527G    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/geth/chaindata/ancient/chain
-527G    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/geth/chaindata/ancient
-859G    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/geth/chaindata
-4.8M    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/geth/nodes
-242M    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/geth/ethash
-669M    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/geth/triecache
-860G    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data/geth
-860G    mainnet-eth-plugeth-deployment/data/mainnet_eth_plugeth_geth_1_data
-885G    mainnet-eth-plugeth-deployment/data/
-```
@@ -1,32 +0,0 @@
-# Copyright © 2023 Vulcanize
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-from secrets import token_hex
-
-
-def init(ctx):
-    return None
-
-
-def setup(ctx):
-    return None
-
-
-def create(ctx, extra_args):
-    # Generate the JWT secret and save to its config file
-    secret = token_hex(32)
-    jwt_file_path = ctx.deployment_dir.joinpath("data", "mainnet_eth_plugeth_config_data", "jwtsecret")
-    with open(jwt_file_path, 'w+') as jwt_file:
-        jwt_file.write(secret)
@@ -1,29 +0,0 @@
-version: "1.2"
-name: mainnet-eth
-description: "Ethereum Mainnet"
-repos:
-  - git.vdb.to/cerc-io/plugeth@statediff
-  - git.vdb.to/cerc-io/plugeth-statediff
-  - git.vdb.to/cerc-io/lighthouse
-  - git.vdb.to/cerc-io/ipld-eth-db@v5
-  - git.vdb.to/cerc-io/ipld-eth-server@v5
-  - git.vdb.to/cerc-io/keycloak-reg-api
-  - git.vdb.to/cerc-io/keycloak-reg-ui
-containers:
-  - cerc/plugeth-statediff
-  - cerc/plugeth
-  - cerc/plugeth-with-plugins
-  - cerc/lighthouse
-  - cerc/lighthouse-cli
-  - cerc/ipld-eth-db
-  - cerc/ipld-eth-server
-  - cerc/keycloak
-  - cerc/webapp-base
-  - cerc/keycloak-reg-api
-  - cerc/keycloak-reg-ui
-pods:
-  - mainnet-eth-plugeth
-  - mainnet-eth-ipld-eth-db
-  - mainnet-eth-ipld-eth-server
-  - mainnet-eth-keycloak
-  - mainnet-eth-metrics
@@ -13,11 +13,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.

-from app.util import get_yaml
-from app.deploy.deploy_types import DeployCommandContext, LaconicStackSetupCommand, DeploymentContext
-from app.deploy.stack_state import State
-from app.deploy.deploy_util import VolumeMapping, run_container_command
-from app.command_types import CommandOptions
+from laconic_stack_orchestrator.util import get_yaml
+from laconic_stack_orchestrator.deploy_types import DeployCommandContext, LaconicStackSetupCommand, DeploymentContext
+from laconic_stack_orchestrator.stack_state import State
+from laconic_stack_orchestrator.deploy_util import VolumeMapping, run_container_command
+from laconic_stack_orchestrator.command_types import CommandOptions
 from enum import Enum
 from pathlib import Path
 from shutil import copyfile, copytree
@@ -2,11 +2,11 @@ version: "1.0"
 description: "MobyMask v3 stack"
 name: mobymask-v3
 repos:
-  - github.com/cerc-io/ts-nitro@v0.1.13
-  - github.com/cerc-io/watcher-ts@v0.2.63
-  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.2.2
+  - github.com/cerc-io/ts-nitrov0.1.12
+  - github.com/cerc-io/watcher-ts@v0.2.57
+  - github.com/cerc-io/mobymask-v2-watcher-ts@v3 # TODO: Update after fixes
  - github.com/cerc-io/MobyMask@v0.1.3
-  - github.com/cerc-io/mobymask-ui@v0.2.1
+  - github.com/cerc-io/mobymask-ui@v0.2.0
 containers:
  - cerc/nitro-contracts
  - cerc/watcher-ts
@@ -23,7 +23,7 @@ laconic-so --stack mobymask-v3 build-containers --exclude cerc/mobymask-ui
 Create and update an env file to be used in the next step ([defaults](../../config/watcher-mobymask-v3/mobymask-params.env)):

  ```bash
-  # External ETH RPC endpoint for contract(s) deployment
+  # External ETH RPC endpoint (L2 Optimism geth)
  CERC_ETH_RPC_ENDPOINT=

  # External ETH RPC endpoint used for queries in the watcher
@@ -32,9 +32,6 @@ Create and update an env file to be used in the next step ([defaults](../../conf
  # External ETH RPC endpoint used for mutations in the watcher
  CERC_ETH_RPC_MUTATION_ENDPOINT=

-  # External ETH endpoint used by watcher's Nitro node
-  CERC_NITRO_CHAIN_URL=
-
  # Specify the an account PK for contract deployment
  CERC_PRIVATE_KEY_DEPLOYER=

@@ -2,7 +2,7 @@ version: "1.1"
 name: package-registry
 description: "Local Package Registry"
 repos:
-  - git.vdb.to/cerc-io/hosting
+  - github.com/cerc-io/hosting
  - gitea.com/gitea/act_runner
 containers:
  - cerc/act-runner
@@ -13,8 +13,3 @@ pods:
    path: gitea
    pre_start_command: "run-this-first.sh"
    post_start_command: "initialize-gitea.sh"
-  - name: act-runner
-    repository: cerc-io/hosting
-    path: act-runner
-    pre_start_command: "pre_start.sh"
-    post_start_command: "post_start.sh"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
roysc	f8f5030976	change imports	2023-10-07 12:22:40 +08:00
roysc	b686540512	rename app module, nest cli in app	2023-10-07 12:22:30 +08:00
				`@@ -1,2 +0,0 @@`
				`Change this file to trigger running the fixturenet-eth-test CI job`