Add comments.

Former-commit-id: 46f00e1d485661b6328b8ca6911a81455a346f6a

.gitea/workflows/publish.yml

@@ -1,46 +0,0 @@
-name: Publish
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    branches: '*'
-
-# Enable debug logging
-env:
-  ACTIONS_STEP_DEBUG: true
-  RUNNER_DEBUG: true
-  ACTIONS_RUNNER_DEBUG: true
-
-jobs:
-  test:
-    name: "Build"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: cerc-io/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Create release"
-        uses: cerc-io/action-gh-release@v1
-        # We haven't decided how to trigger this release job.
-        # It might be done on creation of a git tag
-        # Or it might be done on merge to a release branch
-        # Somehow by this point however we need to know the release version
-        with:
-          tag_name: "v1.2.4"
-      - name: "Build local shiv package"
-        # Build has to be done after deciding on the version because
-        # we bundle the version into the build
-        run: ./scripts/build_shiv_package.sh
-      - name: "Upload release artifact"
-        uses: cerc-io/action-gh-release@v1
-        with:
-          tag_name: "v1.2.4"
-          files: requirements.txt

.gitea/workflows/test.yml

@@ -1,27 +0,0 @@
-name: Test
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    branches: '*'
-
-jobs:
-  test:
-    name: "Run basic test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: cerc-io/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run smoke tests"
-        run: ./tests/smoke-test/run-smoke-test.sh

README.md

@@ -6,18 +6,13 @@ Stack Orchestrator allows building and deployment of a Laconic Stack on a single
 
 ## Install
 
-**To get started quickly** on a fresh Ubuntu instance (e.g, Digital Ocean); [try this script](./scripts/quick-install-ubuntu.sh). **WARNING:** always review scripts prior to running them so that you know what is happening on your machine.
-
-For any other installation, follow along below and **adapt these instructions based on the specifics of your system.**
-
-
 Ensure that the following are already installed:
 
-- [Python3](https://wiki.python.org/moin/BeginnersGuide/Download): `python3 --version` >= `3.8.10` (the Python3 shipped in Ubuntu 20+ is good to go)
+- [Python3](https://wiki.python.org/moin/BeginnersGuide/Download): `python3 --version` >= `3.10.8`
 - [Docker](https://docs.docker.com/get-docker/): `docker --version` >= `20.10.21`
-- [jq](https://stedolan.github.io/jq/download/): `jq --version` >= `1.5`
+- [Docker Compose](https://docs.docker.com/compose/install/): `docker-compose --version` >= `2.13.0`
 
-Note: if installing docker-compose via package manager on Linux (as opposed to Docker Desktop), you must [install the plugin](https://docs.docker.com/compose/install/linux/#install-the-plugin-manually), e.g. :
+Note: if installing docker-compose via package manager (as opposed to Docker Desktop), you must [install the plugin](https://docs.docker.com/compose/install/linux/#install-the-plugin-manually), e.g., on Linux:
 
 ```bash
 mkdir -p ~/.docker/cli-plugins
@@ -25,27 +20,39 @@ curl -SL https://github.com/docker/compose/releases/download/v2.11.2/docker-comp
 chmod +x ~/.docker/cli-plugins/docker-compose
 ```
 
-Next decide on a directory where you would like to put the stack-orchestrator program. Typically this would be 
+Next, download the latest release from [this page](https://github.com/cerc-io/stack-orchestrator/tags), into a suitable directory (e.g. `~/bin`):
-a "user" binary directory such as `~/bin` or perhaps `/usr/local/laconic` or possibly just the current working directory.
-
-Now, having selected that directory, download the latest release from [this page](https://github.com/cerc-io/stack-orchestrator/tags) into it (we're using `~/bin` below for concreteness but edit to suit if you selected a different directory). Also be sure that the destination directory exists and is writable:
 
 ```bash
 curl -L -o ~/bin/laconic-so https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
 ```
 
-Give it execute permissions:
+Give it permissions:
 ```bash
 chmod +x ~/bin/laconic-so
 ```
 
 Ensure `laconic-so` is on the [`PATH`](https://unix.stackexchange.com/a/26059)
 
-Verify operation (your version will probably be different, just check here that you see some version outut and not an error):
+Verify operation:
 
 ```
-laconic-so version
+laconic-so --help
-Version: v1.0.27-7831078
+Usage: python -m laconic-so [OPTIONS] COMMAND [ARGS]...
+
+  Laconic Stack Orchestrator
+
+Options:
+  --quiet
+  --verbose
+  --dry-run
+  --local-stack
+  -h, --help     Show this message and exit.
+
+Commands:
+  build-containers    build the set of containers required for a complete...
+  build-npms          build the set of npm packages required for a...  
+  deploy-system       deploy a stack
+  setup-repositories  git clone the set of repositories required to build...
 ```
 
 ## Usage
@@ -57,25 +64,25 @@ Three sub-commands: `setup-repositories`, `build-containers` and `deploy-system`
 Clone the set of git repositories necessary to build a system:
 
 ```bash
-laconic-so --stack erc20 setup-repositories
+laconic-so --verbose setup-repositories --include cerc-io/go-ethereum,cerc-io/ipld-eth-db,cerc-io/ipld-eth-server,cerc-io/watcher-ts
 ```
 
-This will default to cloning git reposiories into: `~/cerc` or - if set - the environment variable `CERC_REPO_BASE_DIR`
+This will default to `~/cerc` or - if set - the environment variable `CERC_REPO_BASE_DIR`
 
 ### Build Containers
 
 Build the set of docker container images required to run a system. It takes around 10 minutes to build all the containers from scratch.
 
 ```bash
-laconic-so --stack erc20 build-containers
+laconic-so --verbose build-containers --include cerc/go-ethereum,cerc/go-ethereum-foundry,cerc/ipld-eth-db,cerc/ipld-eth-server,cerc/watcher-erc20
 ```
 
 ### Deploy System
 
-Uses `docker compose` to deploy a system (with most recently built container images).
+Uses `docker-compose` to deploy a system (with most recently built container images).
 
 ```bash
-laconic-so --stack erc20 deploy-system up
+laconic-so --verbose deploy-system --include ipld-eth-db,go-ethereum-foundry,ipld-eth-server,watcher-erc20 up
 ```
 
 Check out he GraphQL playground here: [http://localhost:3002/graphql](http://localhost:3002/graphql)
@@ -85,7 +92,7 @@ See the [erc20 watcher demo](/app/data/stacks/erc20) to continue further.
 ### Cleanup
 
 ```bash
-laconic-so --stack erc20 deploy-system down
+laconic-so --verbose deploy-system --include ipld-eth-db,go-ethereum-foundry,ipld-eth-server,watcher-erc20 down
 ```
 
 ## Contributing

app/base.py

@@ -1,71 +0,0 @@
-# Copyright © 2022, 2023 Cerc
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-import os
-from abc import ABC, abstractmethod
-from .deploy_system import get_stack_status
-
-
-def get_stack(config, stack):
-    if stack == "package-registry":
-        return package_registry_stack(config, stack)
-    else:
-        return base_stack(config, stack)
-
-
-class base_stack(ABC):
-
-    def __init__(self, config, stack):
-        self.config = config
-        self.stack = stack
-
-    @abstractmethod
-    def ensure_available(self):
-        pass
-
-    @abstractmethod
-    def get_url(self):
-        pass
-
-
-class package_registry_stack(base_stack):
-
-    def ensure_available(self):
-        self.url = "<no registry url set>"
-        # Check if we were given an external registry URL
-        url_from_environment = os.environ.get("CERC_NPM_REGISTRY_URL")
-        if url_from_environment:
-            if self.config.verbose:
-                print(f"Using package registry url from CERC_NPM_REGISTRY_URL: {url_from_environment}")
-            self.url = url_from_environment
-        else:
-            # Otherwise we expect to use the local package-registry stack
-            # First check if the stack is up
-            registry_running = get_stack_status(self.config, "package-registry")
-            if registry_running:
-                # If it is available, get its mapped port and construct its URL
-                if self.config.debug:
-                    print("Found local package registry stack is up")
-                # TODO: get url from deploy-stack
-                self.url = "http://gitea.local:3000/api/packages/cerc-io/npm/"
-            else:
-                # If not, print a message about how to start it and return fail to the caller
-                print("ERROR: The package-registry stack is not running, and no external registry specified with CERC_NPM_REGISTRY_URL")
-                print("ERROR: Start the local package registry with: laconic-so --stack package-registry deploy-system up")
-                return False
-        return True
-
-    def get_url(self):
-        return self.url

app/build_containers.py

@@ -83,10 +83,7 @@ def command(ctx, include, exclude):
     container_build_env = {
         "CERC_NPM_URL": "http://gitea.local:3000/api/packages/cerc-io/npm/",
         "CERC_NPM_AUTH_TOKEN": config("CERC_NPM_AUTH_TOKEN", default="<token-not-supplied>"),
-        "CERC_REPO_BASE_DIR": dev_root_path,
+        "CERC_REPO_BASE_DIR": dev_root_path
-        "CERC_HOST_UID": f"{os.getuid()}",
-        "CERC_HOST_GID": f"{os.getgid()}",
-        "DOCKER_BUILDKIT": "0"
     }
 
     def process_container(container):
@@ -106,10 +103,10 @@ def command(ctx, include, exclude):
             # Check if we have a repo for this container. If not, set the context dir to the container-build subdir
             repo_full_path = os.path.join(dev_root_path, repo_dir)
             repo_dir_or_build_dir = repo_dir if os.path.exists(repo_full_path) else build_dir
-            build_command = os.path.join(container_build_dir, "default-build.sh") + f" {container}:local {repo_dir_or_build_dir}"
+            build_command = os.path.join(container_build_dir, "default-build.sh") + f" {container} {repo_dir_or_build_dir}"
         if not dry_run:
             if verbose:
-                print(f"Executing: {build_command} with environment: {container_build_env}")
+                print(f"Executing: {build_command}")
             build_result = subprocess.run(build_command, shell=True, env=container_build_env)
             if verbose:
                 print(f"Return code is: {build_result.returncode}")

app/build_npms.py

@@ -20,16 +20,12 @@
 
 import os
 import sys
-from shutil import rmtree, copytree
 from decouple import config
 import click
 import importlib.resources
 from python_on_whales import docker, DockerException
-from .base import get_stack
 from .util import include_exclude_check, get_parsed_stack_config
 
-builder_js_image_name = "cerc/builder-js:local"
-
 @click.command()
 @click.option('--include', help="only build these packages")
 @click.option('--exclude', help="don\'t build these packages")
@@ -45,38 +41,17 @@ def command(ctx, include, exclude):
     stack = ctx.obj.stack
     continue_on_error = ctx.obj.continue_on_error
 
-    _ensure_prerequisites()
-
-    # build-npms depends on having access to a writable package registry
-    # so we check here that it is available
-    package_registry_stack = get_stack(ctx.obj, "package-registry")
-    registry_available = package_registry_stack.ensure_available()
-    if not registry_available:
-        print("FATAL: no npm registry available for build-npms command")
-        sys.exit(1)
-    npm_registry_url = package_registry_stack.get_url()
-    npm_registry_url_token = config("CERC_NPM_AUTH_TOKEN", default=None)
-    if not npm_registry_url_token:
-        print("FATAL: CERC_NPM_AUTH_TOKEN is not defined")
-        sys.exit(1)
-
     if local_stack:
         dev_root_path = os.getcwd()[0:os.getcwd().rindex("stack-orchestrator")]
         print(f'Local stack dev_root_path (CERC_REPO_BASE_DIR) overridden to: {dev_root_path}')
     else:
         dev_root_path = os.path.expanduser(config("CERC_REPO_BASE_DIR", default="~/cerc"))
 
-    build_root_path = os.path.join(dev_root_path, "build-trees")
+    if not quiet:
-
-    if verbose:
         print(f'Dev Root is: {dev_root_path}')
 
     if not os.path.isdir(dev_root_path):
         print('Dev root directory doesn\'t exist, creating')
-        os.makedirs(dev_root_path)
-    if not os.path.isdir(dev_root_path):
-        print('Build root directory doesn\'t exist, creating')
-        os.makedirs(build_root_path)
 
     # See: https://stackoverflow.com/a/20885799/1701505
     from . import data
@@ -99,38 +74,21 @@ def command(ctx, include, exclude):
             print(f"Building npm package: {package}")
         repo_dir = package
         repo_full_path = os.path.join(dev_root_path, repo_dir)
-        # Copy the repo and build that to avoid propagating JS tooling file changes back into the cloned repo
+        # TODO: make the npm registry url configurable.
-        repo_copy_path = os.path.join(build_root_path, repo_dir)
+        build_command = ["sh", "-c", "cd /workspace && build-npm-package-local-dependencies.sh http://gitea.local:3000/api/packages/cerc-io/npm/"]
-        # First delete any old build tree
-        if os.path.isdir(repo_copy_path):
-            if verbose:
-                print(f"Deleting old build tree: {repo_copy_path}")
-            if not dry_run:
-                rmtree(repo_copy_path)
-        # Now copy the repo into the build tree location
-        if verbose:
-            print(f"Copying build tree from: {repo_full_path} to: {repo_copy_path}")
-        if not dry_run:
-            copytree(repo_full_path, repo_copy_path)
-        build_command = ["sh", "-c", f"cd /workspace && build-npm-package-local-dependencies.sh {npm_registry_url}"]
         if not dry_run:
             if verbose:
                 print(f"Executing: {build_command}")
-            # Originally we used the PEP 584 merge operator:
+            envs = {"CERC_NPM_AUTH_TOKEN": os.environ["CERC_NPM_AUTH_TOKEN"]} | ({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
-            # envs = {"CERC_NPM_AUTH_TOKEN": npm_registry_url_token} | ({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
-            # but that isn't available in Python 3.8 (default in Ubuntu 20) so for now we use dict.update:
-            envs = {"CERC_NPM_AUTH_TOKEN": npm_registry_url_token}
-            envs.update({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
             try:
-                docker.run(builder_js_image_name,
+                docker.run("cerc/builder-js",
                            remove=True,
                            interactive=True,
                            tty=True,
                            user=f"{os.getuid()}:{os.getgid()}",
                            envs=envs,
-                           # TODO: detect this host name in npm_registry_url rather than hard-wiring it
                            add_hosts=[("gitea.local", "host-gateway")],
-                           volumes=[(repo_copy_path, "/workspace")],
+                           volumes=[(repo_full_path, "/workspace")],
                            command=build_command
                            )
                 # Note that although the docs say that build_result should contain
@@ -153,13 +111,3 @@ def command(ctx, include, exclude):
         else:
             if verbose:
                 print(f"Excluding: {package}")
-
-
-def _ensure_prerequisites():
-    # Check that the builder-js container is available and
-    # Tell the user how to build it if not
-    images = docker.image.list(builder_js_image_name)
-    if len(images) == 0:
-        print(f"FATAL: builder image: {builder_js_image_name} is required but was not found")
-        print("Please run this command to create it: laconic-so --stack build-support build-containers")
-        sys.exit(1)

app/data/compose/docker-compose-datanet-eth.yml

@@ -0,0 +1,67 @@
+version: '3.7'
+
+services:
+  datanet-eth-bootnode-geth:
+    hostname: datanet-eth-bootnode-geth
+    env_file:
+      - ../config/datanet-eth/datanet-eth.env
+    environment:
+      RUN_BOOTNODE: "true"
+    image: cerc/datanet-eth-geth:local
+    ports:
+      - "9898"
+      - "30303"
+
+  datanet-eth-geth-1:
+    hostname: datanet-eth-geth-1
+    cap_add:
+      - SYS_PTRACE
+    environment:
+      CERC_REMOTE_DEBUG: "false"
+      CERC_RUN_STATEDIFF: "false"
+      CERC_STATEDIFF_DB_NODE_ID: 1
+    env_file:
+      - ../config/datanet-eth/datanet-eth.env
+    image: cerc/datanet-eth-geth:local
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "8545"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 3s
+    depends_on:
+      - datanet-eth-bootnode-geth
+    ports:
+      - "8545"
+      - "40000"
+      - "6060"
+
+  datanet-eth-geth-2:
+    hostname: datanet-eth-geth-2
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "8545"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 3s
+    env_file:
+      - ../config/datanet-eth/datanet-eth.env
+    image: cerc/datanet-eth-geth:local
+    depends_on:
+      - datanet-eth-bootnode-geth
+
+  datanet-tx-spammer:
+    restart: always
+    image: cerc/tx-spammer:local
+    environment:
+      ACCOUNTS_CSV_URL: http://datanet-eth-bootnode-geth:9898/accounts.csv
+      ETH_HTTP_PATH: http://datanet-eth-geth-1:8545
+      LOG_LEVEL: info
+      SPAMMER_COMMAND: autoSend
+      ETH_CALL_FREQ: 0
+      ETH_SEND_FREQ: 0
+    depends_on:
+      datanet-eth-bootnode-geth:
+        condition: service_started
+      datanet-eth-geth-1:
+        condition: service_healthy

app/data/compose/docker-compose-fixturenet-eth-metrics.yml

@@ -13,8 +13,6 @@ services:
   grafana:
     restart: always
     image: grafana/grafana
-    environment:
-      - GF_SECURITY_ADMIN_PASSWORD=changeme6325
     volumes:
       - ../config/fixturenet-eth-metrics/grafana/etc/provisioning/dashboards:/etc/grafana/provisioning/dashboards
       - ../config/fixturenet-eth-metrics/grafana/etc/provisioning/datasources:/etc/grafana/provisioning/datasources

app/data/compose/docker-compose-fixturenet-eth.yml

@@ -24,8 +24,6 @@ services:
     env_file:
       - ../config/fixturenet-eth/fixturenet-eth.env
     image: cerc/fixturenet-eth-geth:local
-    volumes:
-      - fixturenet_geth_accounts:/opt/testnet/build/el
     healthcheck:
       test: ["CMD", "nc", "-v", "localhost", "8545"]
       interval: 30s
@@ -103,6 +101,3 @@ services:
         condition: service_started
       fixturenet-eth-geth-2:
         condition: service_healthy
-
-volumes:
-  fixturenet_geth_accounts:

app/data/compose/docker-compose-fixturenet-laconic-console.yml

@@ -1,6 +0,0 @@
-services:
-  laconic-console:
-    restart: unless-stopped
-    image: cerc/laconic-console-host:local
-    ports:
-      - "80"

app/data/compose/docker-compose-fixturenet-laconicd.yml

@@ -5,21 +5,17 @@ services:
     image: cerc/laconicd:local
     command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
     volumes:
-      # TODO: look at folding these scripts into the container
+      # TODO: look at folding this script into the container
       - ../config/fixturenet-laconicd/create-fixturenet.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh
-      - ../config/fixturenet-laconicd/export-mykey.sh:/docker-entrypoint-scripts.d/export-mykey.sh
     # TODO: determine which of the ports below is really needed
     ports:
       - "6060"
       - "26657"
       - "26656"
-      - "9473:9473"
+      - "9473"
       - "8545"
       - "8546"
       - "9090"
       - "9091"
       - "1317"
-  cli:
+
-    image: cerc/laconic-registry-cli:local
-    volumes:
-      - ../config/fixturenet-laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml

app/data/compose/docker-compose-fixturenet-optimism.yml

@@ -1,116 +0,0 @@
-version: '3.7'
-
-services:
-  # Generates and funds the accounts required when setting up the L2 chain (outputs to volume l2_accounts)
-  # Creates / updates the configuration for L1 contracts deployment
-  # Deploys the L1 smart contracts (outputs to volume l1_deployment)
-  fixturenet-optimism-contracts:
-    hostname: fixturenet-optimism-contracts
-    image: cerc/optimism-contracts:local
-    env_file:
-      - ../config/fixturenet-optimism/l1-params.env
-    # Waits for L1 endpoint to be up before running the script
-    command: |
-      "./wait-for-it.sh -h $${L1_HOST} -p $${L1_PORT} -s -t 60 -- ./run.sh"
-    volumes:
-      - ../config/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh
-      - ../container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts
-      - ../container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts
-      - ../container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts
-      - ../config/fixturenet-optimism/optimism-contracts/update-config.js:/app/packages/contracts-bedrock/update-config.js
-      - ../config/fixturenet-optimism/optimism-contracts/run.sh:/app/packages/contracts-bedrock/run.sh
-      - fixturenet_geth_accounts:/geth-accounts:ro
-      - l2_accounts:/l2-accounts
-      - l1_deployment:/app/packages/contracts-bedrock
-    extra_hosts:
-    - "host.docker.internal:host-gateway"
-
-  # Generates the config files required for L2 (outputs to volume l2_config)
-  op-node-l2-config-gen:
-    image: cerc/optimism-op-node:local
-    depends_on:
-      fixturenet-optimism-contracts:
-        condition: service_completed_successfully
-    env_file:
-      - ../config/fixturenet-optimism/l1-params.env
-    volumes:
-      - ../config/fixturenet-optimism/generate-l2-config.sh:/app/generate-l2-config.sh
-      - l1_deployment:/contracts-bedrock:ro
-      - l2_config:/app
-    command: ["sh", "/app/generate-l2-config.sh"]
-    extra_hosts:
-    - "host.docker.internal:host-gateway"
-
-  # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
-  op-geth:
-    image: cerc/optimism-l2geth:local
-    depends_on:
-      op-node-l2-config-gen:
-        condition: service_started
-    volumes:
-      - ../config/fixturenet-optimism/run-op-geth.sh:/run-op-geth.sh
-      - l2_config:/op-node:ro
-      - l2_accounts:/l2-accounts:ro
-      - l2_geth_data:/datadir
-    entrypoint: "sh"
-    command: "/run-op-geth.sh"
-    ports:
-      - "0.0.0.0:8545:8545"
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost:8545"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 10s
-
-  # Runs the L2 consensus client (Sequencer node)
-  op-node:
-    env_file:
-      - ../config/fixturenet-optimism/l1-params.env
-    depends_on:
-      op-geth:
-        condition: service_healthy
-    image: cerc/optimism-op-node:local
-    volumes:
-      - ../config/fixturenet-optimism/run-op-node.sh:/app/run-op-node.sh
-      - l2_config:/op-node-data:ro
-      - l2_accounts:/l2-accounts:ro
-    command: ["sh", "/app/run-op-node.sh"]
-    ports:
-      - "0.0.0.0:8547:8547"
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost:8547"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 10s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Runs the batcher (takes transactions from the Sequencer and publishes them to L1)
-  op-batcher:
-    env_file:
-      - ../config/fixturenet-optimism/l1-params.env
-    depends_on:
-      op-node:
-        condition: service_healthy
-      op-geth:
-        condition: service_healthy
-    image: cerc/optimism-op-batcher:local
-    volumes:
-      - ../config/wait-for-it.sh:/wait-for-it.sh
-      - ../config/fixturenet-optimism/run-op-batcher.sh:/run-op-batcher.sh
-      - l2_accounts:/l2-accounts:ro
-    entrypoint: ["sh", "-c"]
-    # Waits for L1 endpoint to be up before running the batcher
-    command: |
-      "/wait-for-it.sh -h $${L1_HOST} -p $${L1_PORT} -s -t 60 -- /run-op-batcher.sh"
-    extra_hosts:
-    - "host.docker.internal:host-gateway"
-
-volumes:
-  fixturenet_geth_accounts:
-  l1_deployment:
-  l2_accounts:
-  l2_config:
-  l2_geth_data:

app/data/compose/docker-compose-foundry.yml

@@ -1,8 +0,0 @@
-# Add-on pod to include foundry tooling within a fixturenet
-services:
-  foundry:
-    image: cerc/foundry:local
-    command: ["while :; do sleep 600; done"]
-    volumes:
-      - ../config/foundry/foundry.toml:/foundry.toml
-      - ./foundry/workspace:/workspace

app/data/compose/docker-compose-go-ethereum-foundry.yml

@@ -8,7 +8,7 @@ services:
         condition: service_healthy
     image: cerc/go-ethereum-foundry:local
     healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "8545"]
+      test: ["CMD", "nc", "-v", "localhost", "8545"]
       interval: 30s
       timeout: 3s
       retries: 10

app/data/compose/docker-compose-kubo.yml

@@ -1,13 +0,0 @@
-version: "3.2"
-# See: https://docs.ipfs.tech/install/run-ipfs-inside-docker/#set-up
-services:
-  ipfs:
-    image: ipfs/kubo:master-2023-02-20-714a968
-    restart: always
-    volumes:
-      - ./ipfs/import:/import
-      - ./ipfs/data:/data/ipfs
-    ports:
-      - "8080"
-      - "4001"
-      - "5001"

app/data/compose/docker-compose-mobymask-app.yml

@@ -1,31 +0,0 @@
-version: '3.2'
-
-services:
-  # Builds and serves the MobyMask react-app
-  mobymask-app:
-    image: cerc/mobymask-ui:local
-    env_file:
-      - ../config/watcher-mobymask-v2/mobymask-params.env
-    # Waits for watcher server to be up before app build
-    # Required when running with watcher stack to get deployed contract address
-    command:
-      - sh
-      - -c
-      - ./wait-for-it.sh -h $${WATCHER_HOST} -p $${WATCHER_PORT} -s -t 0 -- ./mobymask-app-start.sh
-    volumes:
-      - ../config/wait-for-it.sh:/app/wait-for-it.sh
-      - ../config/watcher-mobymask-v2/mobymask-app-config.json:/app/src/mobymask-app-config.json
-      - ../config/watcher-mobymask-v2/mobymask-app-start.sh:/app/mobymask-app-start.sh
-      - mobymask_deployment:/server
-    ports:
-      - "0.0.0.0:3002:3000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3000"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-    shm_size: '1GB'
-
-volumes:
-  mobymask_deployment:

app/data/compose/docker-compose-peer-test-app.yml

@@ -1,21 +0,0 @@
-version: '3.2'
-
-services:
-  peer-test-app:
-    # Builds and serves the peer-test react-app
-    image: cerc/react-peer:local
-    working_dir: /app/packages/test-app
-    env_file:
-      - ../config/watcher-mobymask-v2/mobymask-params.env
-    command: ["sh", "./test-app-start.sh"]
-    volumes:
-      - ../config/watcher-mobymask-v2/test-app-config.json:/app/packages/test-app/src/test-app-config.json
-      - ../config/watcher-mobymask-v2/test-app-start.sh:/app/packages/test-app/test-app-start.sh
-    ports:
-      - "0.0.0.0:3003:3000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3000"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s

app/data/compose/docker-compose-watcher-erc20.yml

@@ -39,7 +39,7 @@ services:
       - "0.0.0.0:3002:3001"
       - "0.0.0.0:9002:9001"
     healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "3001"]
+      test: ["CMD", "nc", "-v", "localhost", "3002"]
       interval: 20s
       timeout: 5s
       retries: 15

app/data/compose/docker-compose-watcher-mobymask-v2.yml

@@ -1,90 +0,0 @@
-version: '3.2'
-
-services:
-  # Starts the PostgreSQL database for watcher
-  mobymask-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=mobymask-watcher,mobymask-watcher-job-queue
-      - POSTGRES_EXTENSION=mobymask-watcher-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - mobymask_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "0.0.0.0:15432:5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-
-  # Deploys MobyMask contract and generates an invite link
-  # Deployment is skipped if DEPLOYED_CONTRACT env is already set
-  mobymask:
-    image: cerc/mobymask:local
-    working_dir: /app/packages/server
-    env_file:
-      - ../config/watcher-mobymask-v2/optimism-params.env
-      - ../config/watcher-mobymask-v2/mobymask-params.env
-    environment:
-      - ENV=PROD
-    # Waits for L2 Optimism Geth and Node servers to be up before deploying contract
-    command:
-      - sh
-      - -c
-      - |
-        ./wait-for-it.sh -h $${L2_GETH_HOST} -p $${L2_GETH_PORT} -s -t 0 && \
-        ./wait-for-it.sh -h $${L2_NODE_HOST} -p $${L2_NODE_PORT} -s -t 0 && \
-        ./deploy-and-generate-invite.sh
-    volumes:
-      - ../config/wait-for-it.sh:/app/packages/server/wait-for-it.sh
-      - ../config/watcher-mobymask-v2/secrets-template.json:/app/packages/server/secrets-template.json
-      - ../config/watcher-mobymask-v2/deploy-and-generate-invite.sh:/app/packages/server/deploy-and-generate-invite.sh
-      - mobymask_deployment:/app/packages/server
-      - fixturenet_geth_accounts:/geth-accounts:ro
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Starts the mobymask-v2-watcher server
-  mobymask-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      mobymask-watcher-db:
-        condition: service_healthy
-      mobymask:
-        condition: service_completed_successfully
-    image: cerc/watcher-mobymask-v2:local
-    env_file:
-      - ../config/watcher-mobymask-v2/optimism-params.env
-      - ../config/watcher-mobymask-v2/mobymask-params.env
-    command: ["sh", "start-server.sh"]
-    volumes:
-      - ../config/watcher-mobymask-v2/watcher-config-template.toml:/app/packages/mobymask-v2-watcher/environments/watcher-config-template.toml
-      - ../config/watcher-mobymask-v2/peer.env:/app/packages/peer/.env
-      - ../config/watcher-mobymask-v2/relay-id.json:/app/packages/mobymask-v2-watcher/relay-id.json
-      - ../config/watcher-mobymask-v2/peer-id.json:/app/packages/mobymask-v2-watcher/peer-id.json
-      - ../config/watcher-mobymask-v2/start-server.sh:/app/packages/mobymask-v2-watcher/start-server.sh
-      - mobymask_deployment:/server
-      - fixturenet_geth_accounts:/geth-accounts:ro
-    # Expose GQL, metrics and relay node ports
-    ports:
-      - "0.0.0.0:3001:3001"
-      - "0.0.0.0:9001:9001"
-      - "0.0.0.0:9090:9090"
-    healthcheck:
-      test: ["CMD", "busybox", "nc", "localhost", "9090"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  mobymask_watcher_db_data:
-  mobymask_deployment:
-  fixturenet_geth_accounts:

app/data/config/datanet-eth/datanet-eth.env

@@ -0,0 +1,9 @@
+# The password used to access test accounts (eg, via personal_unlockAccount).  The password is the same for all accounts.
+ACCOUNT_PASSWORD=secret1212
+
+# ENODE of the geth bootnode.
+BOOTNODE_KEY="b0ac22adcad37213c7c565810a50f1772291e7b0ce53fb73e7ec2a3c75bc13b5"
+ENODE="enode://af22c29c316ad069cf48a09a4ad5cf04a251b411e45098888d114c6dd7f489a13786620d5953738762afa13711d4ffb3b19aa5de772d8af72f851f7e9c5b164a@datanet-eth-bootnode-geth:30303"
+
+# JWT is required by the startup script, but won't be used without lighthouse.
+JWT="0x6cdcac3501046a08e186730dd8bd136cfaf0fdc1fc955f6e15ad3068c0ff2af0"

app/data/config/fixturenet-laconicd/create-fixturenet.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
+
+# Originally from: https://github.com/cerc-io/laconicd/blob/main/init.sh
+# TODO: fold this back into the laconicd repo
 
-# TODO: this file is now an unmodified copy of cerc-io/laconicd/init.sh
-# so we should have a mechanism to bundle it inside the container rather than link from here
-# at deploy time.
 
 KEY="mykey"
 CHAINID="laconic_9000-1"
@@ -10,7 +10,7 @@ MONIKER="localtestnet"
 KEYRING="test"
 KEYALGO="eth_secp256k1"
 LOGLEVEL="info"
-# trace evm
+# to trace evm
 TRACE="--trace"
 # TRACE=""
 
@@ -28,7 +28,7 @@ laconicd config chain-id $CHAINID
 # if $KEY exists it should be deleted
 laconicd keys add $KEY --keyring-backend $KEYRING --algo $KEYALGO
 
-# Set moniker and chain-id for Ethermint (Moniker can be anything, chain-id must be an integer)
+# Set moniker and chain-id for laconic (Moniker can be anything, chain-id must be an integer)
 laconicd init $MONIKER --chain-id $CHAINID
 
 # Change parameter token denominations to aphoton
@@ -37,28 +37,28 @@ cat $HOME/.laconicd/config/genesis.json | jq '.app_state["crisis"]["constant_fee
 cat $HOME/.laconicd/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
 cat $HOME/.laconicd/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
 # Custom modules
-cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["record_rent"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["record_rent"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_rent"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_rent"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_commit_fee"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_auction_commit_fee"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_reveal_fee"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_auction_reveal_fee"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_minimum_bid"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_auction_minimum_bid"]["denom"]="aphoton"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
 
-if [[ "$TEST_REGISTRY_EXPIRY" == "true" ]]; then
+if [[ "$TEST_NAMESERVICE_EXPIRY" == "true" ]]; then
   echo "Setting timers for expiry tests."
 
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["record_rent_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["record_rent_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_grace_period"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_grace_period"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_rent_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_rent_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
 fi
 
 if [[ "$TEST_AUCTION_ENABLED" == "true" ]]; then
   echo "Enabling auction and setting timers."
 
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_enabled"]=true' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_auction_enabled"]=true' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_rent_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_rent_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_grace_period"]="300s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_grace_period"]="300s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_commits_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_auction_commits_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
-  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["registry"]["params"]["authority_auction_reveals_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
+  cat $HOME/.laconicd/config/genesis.json | jq '.app_state["nameservice"]["params"]["authority_auction_reveals_duration"]="60s"' > $HOME/.laconicd/config/tmp_genesis.json && mv $HOME/.laconicd/config/tmp_genesis.json $HOME/.laconicd/config/genesis.json
 fi
 
 # increase block time (?)

app/data/config/fixturenet-laconicd/export-mykey.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-echo y | laconicd keys export mykey --unarmored-hex --unsafe

app/data/config/fixturenet-laconicd/registry-cli-config-template.yml

@@ -1,7 +0,0 @@
-services:
-  cns:
-    restEndpoint: 'http://laconicd:1317'
-    gqlEndpoint: 'http://laconicd:9473/api'
-    userKey: REPLACE_WITH_MYKEY
-    bondId:
-    chainId: laconic_9000-1

app/data/config/fixturenet-optimism/generate-l2-config.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# Check existing config if it exists
-if [ -f /app/jwt.txt ] && [ -f /app/rollup.json ]; then
-  echo "Found existing L2 config, cross-checking with L1 deployment config"
-
-  SOURCE_L1_CONF=$(cat /contracts-bedrock/deploy-config/getting-started.json)
-  EXP_L1_BLOCKHASH=$(echo "$SOURCE_L1_CONF" | jq -r '.l1StartingBlockTag')
-  EXP_BATCHER=$(echo "$SOURCE_L1_CONF" | jq -r '.batchSenderAddress')
-
-  GEN_L2_CONF=$(cat /app/rollup.json)
-  GEN_L1_BLOCKHASH=$(echo "$GEN_L2_CONF" | jq -r '.genesis.l1.hash')
-  GEN_BATCHER=$(echo "$GEN_L2_CONF" | jq -r '.genesis.system_config.batcherAddr')
-
-  if [ "$EXP_L1_BLOCKHASH" = "$GEN_L1_BLOCKHASH" ] && [ "$EXP_BATCHER" = "$GEN_BATCHER" ]; then
-    echo "Config cross-checked, exiting"
-    exit 0
-  fi
-
-  echo "Existing L2 config doesn't match the L1 deployment config, please clear L2 config volume before starting"
-  exit 1
-fi
-
-op-node genesis l2 \
-  --deploy-config /contracts-bedrock/deploy-config/getting-started.json \
-  --deployment-dir /contracts-bedrock/deployments/getting-started/ \
-  --outfile.l2 /app/genesis.json \
-  --outfile.rollup /app/rollup.json \
-  --l1-rpc $L1_RPC
-
-openssl rand -hex 32 > /app/jwt.txt

app/data/config/fixturenet-optimism/l1-params.env

@@ -1,14 +0,0 @@
-# Change if pointing to an external L1 endpoint
-
-# L1 endpoint
-L1_CHAIN_ID=1212
-L1_RPC="http://fixturenet-eth-geth-1:8545"
-L1_HOST="fixturenet-eth-geth-1"
-L1_PORT=8545
-
-# Credentials for accounts on L1 to send balance to Optimism Proxy contract from
-# (enables them to do transactions on L2)
-L1_ADDRESS=
-L1_PRIV_KEY=
-L1_ADDRESS_2=
-L1_PRIV_KEY_2=

app/data/config/fixturenet-optimism/optimism-contracts/run.sh

@@ -1,120 +0,0 @@
-#!/bin/bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-echo "Using L1 RPC endpoint ${L1_RPC}"
-
-IMPORT_1="import './verify-contract-deployment'"
-IMPORT_2="import './rekey-json'"
-IMPORT_3="import './send-balance'"
-
-# Append mounted tasks to tasks/index.ts file if not present
-if ! grep -Fxq "$IMPORT_1" tasks/index.ts; then
-  echo "$IMPORT_1" >> tasks/index.ts
-  echo "$IMPORT_2" >> tasks/index.ts
-  echo "$IMPORT_3" >> tasks/index.ts
-fi
-
-# Update the chainId in the hardhat config
-sed -i "/getting-started/ {n; s/.*chainId.*/      chainId: $L1_CHAIN_ID,/}" hardhat.config.ts
-
-# Exit if a deployment already exists (on restarts)
-# Note: fixturenet-eth-geth currently starts fresh on a restart
-if [ -d "deployments/getting-started" ]; then
-  echo "Deployment directory deployments/getting-started found, checking SystemDictator deployment"
-
-  # Read JSON file into variable
-  SYSTEM_DICTATOR_DETAILS=$(cat deployments/getting-started/SystemDictator.json)
-
-  # Parse JSON into variables
-  SYSTEM_DICTATOR_ADDRESS=$(echo "$SYSTEM_DICTATOR_DETAILS" | jq -r '.address')
-  SYSTEM_DICTATOR_TXHASH=$(echo "$SYSTEM_DICTATOR_DETAILS" | jq -r '.transactionHash')
-
-  if yarn hardhat verify-contract-deployment --contract "${SYSTEM_DICTATOR_ADDRESS}" --transaction-hash "${SYSTEM_DICTATOR_TXHASH}"; then
-    echo "Deployment verfication successful, exiting"
-    exit 0
-  else
-    echo "Deployment verfication failed, please clear L1 deployment volume before starting"
-    exit 1
-  fi
-fi
-
-# Generate the L2 account addresses
-yarn hardhat rekey-json --output /l2-accounts/keys.json
-
-# Read JSON file into variable
-KEYS_JSON=$(cat /l2-accounts/keys.json)
-
-# Parse JSON into variables
-ADMIN_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Admin.address')
-ADMIN_PRIV_KEY=$(echo "$KEYS_JSON" | jq -r '.Admin.privateKey')
-PROPOSER_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Proposer.address')
-BATCHER_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Batcher.address')
-SEQUENCER_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Sequencer.address')
-
-# Read the private key of L1 accounts
-if [ -f /geth-accounts/accounts.csv ]; then
-  echo "Using L1 account credentials from the mounted volume"
-  L1_ADDRESS=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 2)
-  L1_PRIV_KEY=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
-  L1_ADDRESS_2=$(awk -F, 'NR==2{print $(NF-1)}' /geth-accounts/accounts.csv)
-  L1_PRIV_KEY_2=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
-else
-  echo "Using L1 account credentials from env"
-fi
-
-# Select a finalized L1 block as the starting point for roll ups
-until FINALIZED_BLOCK=$(cast block finalized --rpc-url "$L1_RPC"); do
-    echo "Waiting for a finalized L1 block to exist, retrying after 10s"
-    sleep 10
-done
-
-L1_BLOCKNUMBER=$(echo "$FINALIZED_BLOCK" | awk '/number/{print $2}')
-L1_BLOCKHASH=$(echo "$FINALIZED_BLOCK" | awk '/hash/{print $2}')
-L1_BLOCKTIMESTAMP=$(echo "$FINALIZED_BLOCK" | awk '/timestamp/{print $2}')
-
-echo "Selected L1 block ${L1_BLOCKNUMBER} as the starting block for roll ups"
-
-# Send balances to the above L2 addresses
-yarn hardhat send-balance --to "${ADMIN_ADDRESS}" --amount 2 --private-key "${L1_PRIV_KEY}" --network getting-started
-yarn hardhat send-balance --to "${PROPOSER_ADDRESS}" --amount 5 --private-key "${L1_PRIV_KEY}" --network getting-started
-yarn hardhat send-balance --to "${BATCHER_ADDRESS}" --amount 1000 --private-key "${L1_PRIV_KEY}" --network getting-started
-
-echo "Balances sent to L2 accounts"
-
-# Update the deployment config
-sed -i 's/"l2OutputOracleStartingTimestamp": TIMESTAMP/"l2OutputOracleStartingTimestamp": '"$L1_BLOCKTIMESTAMP"'/g' deploy-config/getting-started.json
-jq --arg chainid "$L1_CHAIN_ID" '.l1ChainID = ($chainid | tonumber)' deploy-config/getting-started.json > tmp.json && mv tmp.json deploy-config/getting-started.json
-
-node update-config.js deploy-config/getting-started.json "$ADMIN_ADDRESS" "$PROPOSER_ADDRESS" "$BATCHER_ADDRESS" "$SEQUENCER_ADDRESS" "$L1_BLOCKHASH"
-
-echo "Updated the deployment config"
-
-# Create a .env file
-echo "L1_RPC=$L1_RPC" > .env
-echo "PRIVATE_KEY_DEPLOYER=$ADMIN_PRIV_KEY" >> .env
-
-echo "Deploying the L1 smart contracts, this will take a while..."
-
-# Deploy the L1 smart contracts
-yarn hardhat deploy --network getting-started
-
-echo "Deployed the L1 smart contracts"
-
-# Read Proxy contract's JSON and get the address
-PROXY_JSON=$(cat deployments/getting-started/Proxy__OVM_L1StandardBridge.json)
-PROXY_ADDRESS=$(echo "$PROXY_JSON" | jq -r '.address')
-
-# Send balance to the above Proxy contract in L1 for reflecting balance in L2
-# First account
-yarn hardhat send-balance --to "${PROXY_ADDRESS}" --amount 1 --private-key "${L1_PRIV_KEY}" --network getting-started
-# Second account
-yarn hardhat send-balance --to "${PROXY_ADDRESS}" --amount 1 --private-key "${L1_PRIV_KEY_2}" --network getting-started
-
-echo "Balance sent to Proxy L2 contract"
-echo "Use following accounts for transactions in L2:"
-echo "${L1_ADDRESS}"
-echo "${L1_ADDRESS_2}"
-echo "Done"

app/data/config/fixturenet-optimism/optimism-contracts/update-config.js

@@ -1,36 +0,0 @@
-const fs = require('fs')
-
-// Get the command-line argument
-const configFile = process.argv[2]
-const adminAddress = process.argv[3]
-const proposerAddress = process.argv[4]
-const batcherAddress = process.argv[5]
-const sequencerAddress = process.argv[6]
-const blockHash = process.argv[7]
-
-// Read the JSON file
-const configData = fs.readFileSync(configFile)
-const configObj = JSON.parse(configData)
-
-// Update the finalSystemOwner property with the ADMIN_ADDRESS value
-configObj.finalSystemOwner =
-  configObj.portalGuardian =
-  configObj.controller =
-  configObj.l2OutputOracleChallenger =
-  configObj.proxyAdminOwner =
-  configObj.baseFeeVaultRecipient =
-  configObj.l1FeeVaultRecipient =
-  configObj.sequencerFeeVaultRecipient =
-  configObj.governanceTokenOwner =
-    adminAddress
-
-configObj.l2OutputOracleProposer = proposerAddress
-
-configObj.batchSenderAddress = batcherAddress
-
-configObj.p2pSequencerAddress = sequencerAddress
-
-configObj.l1StartingBlockTag = blockHash
-
-// Write the updated JSON object back to the file
-fs.writeFileSync(configFile, JSON.stringify(configObj, null, 2))

app/data/config/fixturenet-optimism/run-op-batcher.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# Get BACTHER_KEY from keys.json
-BATCHER_KEY=$(jq -r '.Batcher.privateKey' /l2-accounts/keys.json | tr -d '"')
-
-op-batcher \
-  --l2-eth-rpc=http://op-geth:8545 \
-  --rollup-rpc=http://op-node:8547 \
-  --poll-interval=1s \
-  --sub-safety-margin=6 \
-  --num-confirmations=1 \
-  --safe-abort-nonce-too-low-count=3 \
-  --resubmission-timeout=30s \
-  --rpc.addr=0.0.0.0 \
-  --rpc.port=8548 \
-  --rpc.enable-admin \
-  --max-channel-duration=1 \
-  --target-l1-tx-size-bytes=2048 \
-  --l1-eth-rpc=$L1_RPC \
-  --private-key=$BATCHER_KEY

app/data/config/fixturenet-optimism/run-op-geth.sh

@@ -1,77 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# TODO: Add in container build or use other tool
-echo "Installing jq"
-apk update && apk add jq
-
-# Get SEQUENCER key from keys.json
-SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')
-
-# Initialize op-geth if datadir/geth not found
-if [ -f /op-node/jwt.txt ] && [ -d datadir/geth ]; then
-  echo "Found existing datadir, checking block signer key"
-
-  BLOCK_SIGNER_KEY=$(cat datadir/block-signer-key)
-
-  if [ "$SEQUENCER_KEY" = "$BLOCK_SIGNER_KEY" ]; then
-    echo "Sequencer and block signer keys match, skipping initialization"
-  else
-    echo "Sequencer and block signer keys don't match, please clear L2 geth data volume before starting"
-    exit 1
-  fi
-else
-  echo "Initializing op-geth"
-
-  mkdir -p datadir
-  echo "pwd" > datadir/password
-  echo $SEQUENCER_KEY > datadir/block-signer-key
-
-  geth account import --datadir=datadir --password=datadir/password datadir/block-signer-key
-
-  while [ ! -f "/op-node/jwt.txt" ]
-  do
-    echo "Config files not created. Checking after 5 seconds."
-    sleep 5
-  done
-
-  echo "Config files created by op-node, proceeding with the initialization..."
-
-  geth init --datadir=datadir /op-node/genesis.json
-  echo "Node Initialized"
-fi
-
-SEQUENCER_ADDRESS=$(jq -r '.Sequencer.address' /l2-accounts/keys.json | tr -d '"')
-echo "SEQUENCER_ADDRESS: ${SEQUENCER_ADDRESS}"
-
-# Run op-geth
-geth \
-  --datadir ./datadir \
-  --http \
-  --http.corsdomain="*" \
-  --http.vhosts="*" \
-  --http.addr=0.0.0.0 \
-  --http.api=web3,debug,eth,txpool,net,engine \
-  --ws \
-  --ws.addr=0.0.0.0 \
-  --ws.port=8546 \
-  --ws.origins="*" \
-  --ws.api=debug,eth,txpool,net,engine \
-  --syncmode=full \
-  --gcmode=full \
-  --nodiscover \
-  --maxpeers=0 \
-  --networkid=42069 \
-  --authrpc.vhosts="*" \
-  --authrpc.addr=0.0.0.0 \
-  --authrpc.port=8551 \
-  --authrpc.jwtsecret=/op-node/jwt.txt \
-  --rollup.disabletxpoolgossip=true \
-  --password=./datadir/password \
-  --allow-insecure-unlock \
-  --mine \
-  --miner.etherbase=$SEQUENCER_ADDRESS \
-  --unlock=$SEQUENCER_ADDRESS

app/data/config/fixturenet-optimism/run-op-node.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# Get SEQUENCER KEY from keys.json
-SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')
-
-op-node \
-  --l2=http://op-geth:8551 \
-  --l2.jwt-secret=/op-node-data/jwt.txt \
-  --sequencer.enabled \
-  --sequencer.l1-confs=3 \
-  --verifier.l1-confs=3 \
-  --rollup.config=/op-node-data/rollup.json \
-  --rpc.addr=0.0.0.0 \
-  --rpc.port=8547 \
-  --p2p.disable \
-  --rpc.enable-admin \
-  --p2p.sequencer.key=$SEQUENCER_KEY \
-  --l1=$L1_RPC \
-  --l1.rpckind=any

app/data/config/foundry/foundry.toml

@@ -1,2 +0,0 @@
-[profile.default]
-eth-rpc-url = "http://fixturenet-eth-geth-1:8545"

app/data/config/wait-for-it.sh

@@ -1,182 +0,0 @@
-#!/usr/bin/env bash
-# Use this script to test if a given TCP host/port are available
-
-WAITFORIT_cmdname=${0##*/}
-
-echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
-
-usage()
-{
-    cat << USAGE >&2
-Usage:
-    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
-    -h HOST | --host=HOST       Host or IP under test
-    -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
-    -s | --strict               Only execute subcommand if the test succeeds
-    -q | --quiet                Don't output any status messages
-    -t TIMEOUT | --timeout=TIMEOUT
-                                Timeout in seconds, zero for no timeout
-    -- COMMAND ARGS             Execute command with args after the test finishes
-USAGE
-    exit 1
-}
-
-wait_for()
-{
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    else
-        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
-    fi
-    WAITFORIT_start_ts=$(date +%s)
-    while :
-    do
-        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
-            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
-            WAITFORIT_result=$?
-        else
-            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
-            WAITFORIT_result=$?
-        fi
-        if [[ $WAITFORIT_result -eq 0 ]]; then
-            WAITFORIT_end_ts=$(date +%s)
-            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
-            break
-        fi
-        sleep 1
-    done
-    return $WAITFORIT_result
-}
-
-wait_for_wrapper()
-{
-    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
-    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    else
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    fi
-    WAITFORIT_PID=$!
-    trap "kill -INT -$WAITFORIT_PID" INT
-    wait $WAITFORIT_PID
-    WAITFORIT_RESULT=$?
-    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    fi
-    return $WAITFORIT_RESULT
-}
-
-# process arguments
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        *:* )
-        WAITFORIT_hostport=(${1//:/ })
-        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
-        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
-        shift 1
-        ;;
-        --child)
-        WAITFORIT_CHILD=1
-        shift 1
-        ;;
-        -q | --quiet)
-        WAITFORIT_QUIET=1
-        shift 1
-        ;;
-        -s | --strict)
-        WAITFORIT_STRICT=1
-        shift 1
-        ;;
-        -h)
-        WAITFORIT_HOST="$2"
-        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
-        shift 2
-        ;;
-        --host=*)
-        WAITFORIT_HOST="${1#*=}"
-        shift 1
-        ;;
-        -p)
-        WAITFORIT_PORT="$2"
-        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --port=*)
-        WAITFORIT_PORT="${1#*=}"
-        shift 1
-        ;;
-        -t)
-        WAITFORIT_TIMEOUT="$2"
-        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --timeout=*)
-        WAITFORIT_TIMEOUT="${1#*=}"
-        shift 1
-        ;;
-        --)
-        shift
-        WAITFORIT_CLI=("$@")
-        break
-        ;;
-        --help)
-        usage
-        ;;
-        *)
-        echoerr "Unknown argument: $1"
-        usage
-        ;;
-    esac
-done
-
-if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
-    echoerr "Error: you need to provide a host and port to test."
-    usage
-fi
-
-WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
-WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
-WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
-WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
-
-# Check to see if timeout is from busybox?
-WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
-WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
-
-WAITFORIT_BUSYTIMEFLAG=""
-if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-    WAITFORIT_ISBUSY=1
-    # Check if busybox timeout uses -t flag
-    # (recent Alpine versions don't support -t anymore)
-    if timeout &>/dev/stdout | grep -q -e '-t '; then
-        WAITFORIT_BUSYTIMEFLAG="-t"
-    fi
-else
-    WAITFORIT_ISBUSY=0
-fi
-
-if [[ $WAITFORIT_CHILD -gt 0 ]]; then
-    wait_for
-    WAITFORIT_RESULT=$?
-    exit $WAITFORIT_RESULT
-else
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        WAITFORIT_RESULT=$?
-    else
-        wait_for
-        WAITFORIT_RESULT=$?
-    fi
-fi
-
-if [[ $WAITFORIT_CLI != "" ]]; then
-    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
-        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
-        exit $WAITFORIT_RESULT
-    fi
-    exec "${WAITFORIT_CLI[@]}"
-else
-    exit $WAITFORIT_RESULT
-fi

app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh

@@ -1,66 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-echo "Using L2 RPC endpoint ${L2_GETH_RPC}"
-
-if [ -f /geth-accounts/accounts.csv ]; then
-  echo "Using L1 private key from the mounted volume"
-  # Read the private key of L1 account to deploy contract
-  PRIVATE_KEY_DEPLOYER=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
-else
-  echo "Using PRIVATE_KEY_DEPLOYER from env"
-fi
-
-# Set the private key
-jq --arg privateKey "$PRIVATE_KEY_DEPLOYER" '.privateKey = $privateKey' secrets-template.json > secrets.json
-
-# Set the RPC URL
-jq --arg rpcUrl "$L2_GETH_RPC" '.rpcUrl = $rpcUrl' secrets.json > secrets_updated.json && mv secrets_updated.json secrets.json
-
-export RPC_URL="${L2_GETH_RPC}"
-
-# Check if DEPLOYED_CONTRACT environment variable set to skip contract deployment
-if [[ -n "$DEPLOYED_CONTRACT" ]]; then
-  echo "DEPLOYED_CONTRACT is set to '$DEPLOYED_CONTRACT'"
-  echo "Exiting without deploying contract"
-  exit 0
-fi
-
-# Check and exit if a deployment already exists (on restarts)
-if [ -f ./config.json ]; then
-  echo "config.json already exists, checking the contract deployment"
-
-  # Read JSON file
-  DEPLOYMENT_DETAILS=$(cat config.json)
-  CONTRACT_ADDRESS=$(echo "$DEPLOYMENT_DETAILS" | jq -r '.address')
-
-  cd ../hardhat
-  if yarn verifyDeployment --network optimism --contract "${CONTRACT_ADDRESS}"; then
-    echo "Deployment verfication successful"
-    cd ../server
-  else
-    echo "Deployment verfication failed, please clear MobyMask deployment volume before starting"
-    exit 1
-  fi
-fi
-
-# Wait until balance for deployer account is updated
-cd ../hardhat
-while true; do
-  ACCOUNT_BALANCE=$(yarn balance --network optimism "$PRIVATE_KEY_DEPLOYER" | grep ETH)
-
-  if [ "$ACCOUNT_BALANCE" != "0.0 ETH" ]; then
-    echo "Account balance updated: $ACCOUNT_BALANCE"
-    break # exit the loop
-  fi
-
-  echo "Account balance not updated: $ACCOUNT_BALANCE"
-  echo "Checking after 2 seconds"
-  sleep 2
-done
-
-cd ../server
-npm run deployAndGenerateInvite

app/data/config/watcher-mobymask-v2/mobymask-app-config.json

@@ -1,9 +0,0 @@
-{
-  "name": "MobyMask",
-  "relayNodes": [
-    "/ip4/127.0.0.1/tcp/9090/ws/p2p/12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t"
-  ],
-  "peer": {
-    "enableDebugInfo": true
-  }
-}

app/data/config/watcher-mobymask-v2/mobymask-app-start.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# Use config from mounted volume if available (when running web-app along with watcher stack)
-if [ -f /server/config.json ]; then
-  echo "Merging config for deployed contract from mounted volume"
-  # Merging config files to get deployed contract address
-  jq -s '.[0] * .[1]' /app/src/mobymask-app-config.json /server/config.json > /app/src/config.json
-else
-  echo "Setting deployed contract details from env"
-
-  # Set config values from environment variables
-  jq --arg address "$DEPLOYED_CONTRACT" \
-    --argjson chainId $CHAIN_ID \
-    --argjson relayNodes "$RELAY_NODES" \
-    '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes' \
-    /app/src/mobymask-app-config.json > /app/src/config.json
-fi
-
-REACT_APP_WATCHER_URI="$APP_WATCHER_URL/graphql" npm run build
-
-serve -s build

app/data/config/watcher-mobymask-v2/mobymask-params.env

@@ -1,14 +0,0 @@
-# Change if pointing web app to external watcher endpoint
-WATCHER_HOST="mobymask-watcher-server"
-WATCHER_PORT=3001
-APP_WATCHER_URL="http://localhost:3001"
-
-# Set deployed MobyMask contract address to avoid deploying contract in stack
-# mobymask-app will use this contract address in config if run separately
-DEPLOYED_CONTRACT=
-
-# Chain ID is used by mobymask web-app for txs
-CHAIN_ID=42069
-
-# Set relay nodes to be used by web-apps
-RELAY_NODES=["/ip4/127.0.0.1/tcp/9090/ws/p2p/12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t"]

app/data/config/watcher-mobymask-v2/optimism-params.env

@@ -1,13 +0,0 @@
-# Change if pointing to an external optimism geth endpoint
-
-# L2 endpoints
-L2_GETH_RPC="http://op-geth:8545"
-L2_GETH_HOST="op-geth"
-L2_GETH_PORT=8545
-
-L2_NODE_HOST="op-node"
-L2_NODE_PORT=8547
-
-# Credentials for accounts to perform txs on L2
-PRIVATE_KEY_DEPLOYER=
-PRIVATE_KEY_PEER=

app/data/config/watcher-mobymask-v2/peer-id.json

@@ -1,5 +0,0 @@
-{
-  "id": "12D3KooWK6myjc8r1KBnfP9igp31qJkPaVfsKDjKrjoSefV5SDEo",
-  "privKey": "CAESQJMHbMaH+UEOtjGOzXYtoPO/cdHakCtN1hcnknIWzx/6ie1lxb+8kfzBjwt7apfj8fHlTCYSIVK8Q2AWu9a2h3g=",
-  "pubKey": "CAESIIntZcW/vJH8wY8Le2qX4/Hx5UwmEiFSvENgFrvWtod4"
-}

app/data/config/watcher-mobymask-v2/peer.env

@@ -1 +0,0 @@
-RELAY="/ip4/127.0.0.1/tcp/9090/ws/p2p/12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t"

app/data/config/watcher-mobymask-v2/relay-id.json

@@ -1,5 +0,0 @@
-{
-  "id": "12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t",
-  "privKey": "CAESQGsqG5o4VlWJZM9XlA3MjabyZOXWQ2MLZU5AhBQsjXGt9iSlGtTuNOrHX5xSRgLBxLuMoqWsjGxE/dDB9c46RI8=",
-  "pubKey": "CAESIPYkpRrU7jTqx1+cUkYCwcS7jKKlrIxsRP3QwfXOOkSP"
-}

app/data/config/watcher-mobymask-v2/secrets-template.json

@@ -1,5 +0,0 @@
-{
-    "rpcUrl": "",
-    "privateKey": "",
-    "baseURI": "http://127.0.0.1:3002/#"
-}

app/data/config/watcher-mobymask-v2/start-server.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-echo "Using L2 RPC endpoint ${L2_GETH_RPC}"
-
-# Use contract address from environment variable or set from config.json in mounted volume
-if [ -n "$DEPLOYED_CONTRACT" ]; then
-  CONTRACT_ADDRESS="${DEPLOYED_CONTRACT}"
-else
-  # Assign deployed contract address from server config (created by mobymask container after deploying contract)
-  CONTRACT_ADDRESS=$(jq -r '.address' /server/config.json | tr -d '"')
-fi
-
-if [ -f /geth-accounts/accounts.csv ]; then
-  echo "Using L1 private key from the mounted volume"
-  # Read the private key of L1 account for sending txs from peer
-  PRIVATE_KEY_PEER=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
-else
-  echo "Using PRIVATE_KEY_PEER from env"
-fi
-
-# Set private key and contract address for watcher peer txs to L2 only if PRIVATE_KEY_PEER variable is set
-if [ -n "$PRIVATE_KEY_PEER" ]; then
-  # Read in config template TOML file and modify it
-  CONTENT=$(cat environments/watcher-config-template.toml)
-  NEW_CONTENT=$(echo "$CONTENT" | sed -E "/\[metrics\]/i \\\n\n      [server.p2p.peer.l2TxConfig]\n        privateKey = \"${PRIVATE_KEY_PEER}\"\n        contractAddress = \"${CONTRACT_ADDRESS}\"\n")
-
-  # Write the modified content to a watcher config file
-  echo "$NEW_CONTENT" > environments/local.toml
-
-  sed -i 's|REPLACE_WITH_L2_GETH_RPC_ENDPOINT|'"${L2_GETH_RPC}"'|' environments/local.toml
-else
-  # Copy template config to watcher config without setting params for peer L2 txs
-  cp environments/watcher-config-template.toml environments/local.toml
-fi
-
-echo 'yarn server'
-yarn server

app/data/config/watcher-mobymask-v2/test-app-config.json

@@ -1,8 +0,0 @@
-{
-  "relayNodes": [
-    "/ip4/127.0.0.1/tcp/9090/ws/p2p/12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t"
-  ],
-  "peer": {
-    "enableDebugInfo": true
-  }
-}

app/data/config/watcher-mobymask-v2/test-app-start.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# Set relay nodes in config from RELAY_NODES environment variable
-jq --argjson relayNodes "$RELAY_NODES" \
-  '.relayNodes = $relayNodes' \
-  ./src/test-app-config.json > ./src/config.json
-
-yarn build
-
-serve -s build

app/data/config/watcher-mobymask-v2/watcher-config-template.toml

@@ -1,70 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3001
-  kind = "lazy"
-
-  # Checkpointing state.
-  checkpointing = true
-
-  # Checkpoint interval in number of blocks.
-  checkpointInterval = 2000
-
-  # Enable state creation
-  enableState = true
-
-  # Boolean to filter logs by contract.
-  filterLogs = true
-
-  # Max block range for which to return events in eventsInRange GQL query.
-  # Use -1 for skipping check on block range.
-  maxEventsBlockRange = -1
-
-  [server.p2p]
-    enableRelay = true
-    enablePeer = true
-
-    [server.p2p.relay]
-      host = "0.0.0.0"
-      port = 9090
-      relayPeers = []
-      peerIdFile = './relay-id.json'
-      enableDebugInfo = true
-
-    [server.p2p.peer]
-      relayMultiaddr = '/dns4/mobymask-watcher-server/tcp/9090/ws/p2p/12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t'
-      pubSubTopic = 'mobymask'
-      peerIdFile = './peer-id.json'
-      enableDebugInfo = true
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9000
-  [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "mobymask-watcher-db"
-  port = 5432
-  database = "mobymask-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-
-[upstream]
-  [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server:8083/graphql"
-    rpcProviderEndpoint = "REPLACE_WITH_L2_GETH_RPC_ENDPOINT"
-    blockDelayInMilliSecs = 60000
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@mobymask-watcher-db/mobymask-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50

app/data/container-build/cerc-act-runner-task-executor/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Build a local version of the task executor for act-runner
-docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile.task-executor ${CERC_REPO_BASE_DIR}/act_runner

app/data/container-build/cerc-act-runner/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Build a local version of the act-runner image
-docker build -t cerc/act-runner:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile ${CERC_REPO_BASE_DIR}/act_runner

app/data/container-build/cerc-builder-gerbil/Dockerfile

@@ -16,12 +16,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && export DEBCONF_NO
 RUN mkdir /scripts
 COPY install-dependencies.sh /scripts
 
-# Override the definition of GERBIL_PATH in the base image, but
-# is safe because (at present) no gerbil packages are installed in the base image
-# We do this in order to allow a set of pre-installed packages from the container
-# to be used with an arbitrary, potentially different set of projects bind mounted
-# at /src
-ENV GERBIL_PATH=/.gerbil
 RUN bash /scripts/install-dependencies.sh
 
 # Needed to prevent git from raging about /src

app/data/container-build/cerc-builder-gerbil/install-dependencies.sh

@@ -10,7 +10,6 @@ DEPS=(github.com/fare/gerbil-utils
       github.com/vyzo/gerbil-libp2p
       ) ;
 for i in ${DEPS[@]} ; do
-  echo "Installing gerbil package: $i"
+  gxpkg install $i &&
-  gxpkg install $i
   gxpkg build $i
 done

app/data/container-build/cerc-builder-js/Dockerfile

@@ -1,34 +1,14 @@
 # Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
-# Which depends on: https://github.com/nodejs/docker-node/blob/main/Dockerfile-debian.template
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=18-bullseye
+ARG VARIANT=16-bullseye
 FROM node:${VARIANT}
 
-# Set these args to change the uid/gid for the base container's "node" user to match that of the host user (so bind mounts work as expected).
-ARG CERC_HOST_UID=1000
-ARG CERC_HOST_GID=1000
-# Make these values available at runtime to allow a consistency check.
-ENV HOST_UID=${CERC_HOST_UID}
-ENV HOST_GID=${CERC_HOST_GID}
-
 ARG USERNAME=node
 ARG NPM_GLOBAL=/usr/local/share/npm-global
 
 # Add NPM global to PATH.
 ENV PATH=${NPM_GLOBAL}/bin:${PATH}
 
-SHELL ["/bin/bash", "-c"]
-
-RUN \
-    # Don't switch container uid/gid if the host uid/gid is 1000 (which means it's already correct),
-    # or root (which won't work anyway) or <= 100 (which also won't work).
-    if [[ ${CERC_HOST_GID} -ne 1000 && ${CERC_HOST_GID} -ne 0 && ${CERC_HOST_GID} -gt 100 ]]; then \
-        groupmod -g ${CERC_HOST_GID} ${USERNAME}; \
-    fi \
-    && if [[ ${CERC_HOST_UID} -ne 1000 && ${CERC_HOST_UID} -ne 0 && ${CERC_HOST_UID} -gt 100 ]]; then \
-        usermod -u ${CERC_HOST_UID} -g ${CERC_HOST_GID} ${USERNAME} && chown ${CERC_HOST_UID}:${CERC_HOST_GID} /home/${USERNAME}; \
-    fi
-
 RUN \
     # Configure global npm install location, use group to adapt to UID/GID changes
     if ! cat /etc/group | grep -e "^npm:" > /dev/null 2>&1; then groupadd -r npm; fi \
@@ -59,7 +39,6 @@ RUN mkdir /scripts
 COPY build-npm-package.sh /scripts
 COPY yarn-local-registry-fixup.sh /scripts
 COPY build-npm-package-local-dependencies.sh /scripts
-COPY check-uid.sh /scripts
 ENV PATH="${PATH}:/scripts"
 
 COPY entrypoint.sh .

app/data/container-build/cerc-builder-js/build-npm-package-local-dependencies.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Usage: build-npm-package-local-dependencies.sh <registry-url> <publish-with-this-version>
 # Runs build-npm-package.sh after first fixing up yarn.lock to use a local
-# npm registry for all packages in a spcific scope (currently @cerc-io and @lirewine)
+# npm registry for all packages in a spcific scope (currently @cerc-io)
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
     set -x
 fi
@@ -17,21 +17,18 @@ fi
 set -e
 local_npm_registry_url=$1
 package_publish_version=$2
-# If we need to handle an additional scope, add it to the list below:
+# TODO: make this a paramater and allow a list of scopes
-npm_scopes_to_handle=("@cerc-io" "@lirewine")
+npm_scope_for_local="@cerc-io"
-for npm_scope_for_local in ${npm_scopes_to_handle[@]}
+# We need to configure the local registry 
+npm config set ${npm_scope_for_local}:registry ${local_npm_registry_url}
+npm config set -- ${local_npm_registry_url}:_authToken ${CERC_NPM_AUTH_TOKEN}
+# Find the set of dependencies from the specified scope
+mapfile -t dependencies_from_scope < <(cat package.json | jq -r '.dependencies | with_entries(if (.key|test("^'${npm_scope_for_local}'/.*$")) then ( {key: .key, value: .value } ) else empty end ) | keys[]')
+echo "Fixing up dependencies"
+for package in "${dependencies_from_scope[@]}"
 do
-    # We need to configure the local registry
+    echo "Fixing up package ${package}"
-    npm config set ${npm_scope_for_local}:registry ${local_npm_registry_url}
+    yarn-local-registry-fixup.sh $package ${local_npm_registry_url}
-    npm config set -- ${local_npm_registry_url}:_authToken ${CERC_NPM_AUTH_TOKEN}
-    # Find the set of dependencies from the specified scope
-    mapfile -t dependencies_from_scope < <(cat package.json | jq -r '.dependencies | with_entries(if (.key|test("^'${npm_scope_for_local}'/.*$")) then ( {key: .key, value: .value } ) else empty end ) | keys[]')
-    echo "Fixing up dependencies in scope ${npm_scope_for_local}"
-    for package in "${dependencies_from_scope[@]}"
-    do
-        echo "Fixing up package ${package}"
-        yarn-local-registry-fixup.sh $package ${local_npm_registry_url}
-    done
 done
 echo "Running build"
 build-npm-package.sh ${local_npm_registry_url} ${package_publish_version}

app/data/container-build/cerc-builder-js/build-npm-package.sh

@@ -22,8 +22,8 @@ set -e
 # Get the name of this package from package.json since we weren't passed that
 package_name=$( cat package.json | jq -r .name )
 local_npm_registry_url=$1
-npm config set @cerc-io:registry ${local_npm_registry_url}
 npm config set @lirewine:registry ${local_npm_registry_url}
+npm config set @cerc-io:registry ${local_npm_registry_url}
 npm config set -- ${local_npm_registry_url}:_authToken ${CERC_NPM_AUTH_TOKEN}
 # First check if the version of this package we're trying to build already exists in the registry
 package_exists=$( yarn info --json ${package_name}@${package_publish_version} 2>/dev/null | jq -r .data.dist.tarball )

app/data/container-build/cerc-builder-js/check-uid.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# Make the container usable for uid/gid != 1000
-if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
-current_uid=$(id -u)
-current_gid=$(id -g)
-# Don't check if running as root
-if [[ ${current_uid} == 0 ]]; then
-    exit 0
-fi
-# Check the current uid/gid vs the uid/gid used to build the container.
-# We do this because both bind mounts and npm tooling require the uid/gid to match.
-if [[ ${current_gid} != ${HOST_GID} ]]; then
-    echo "Warning: running with gid: ${current_gid} which is not the gid for which this container was built (${HOST_GID})"
-    exit 0
-fi
-if [[ ${current_uid} != ${HOST_UID} ]]; then
-    echo "Warning: running with gid: ${current_uid} which is not the uid for which this container was built (${HOST_UID})"
-    exit 0
-fi

app/data/container-build/cerc-builder-js/entrypoint.sh

@@ -1,3 +1,2 @@
 #!/bin/sh
-/scripts/check-uid.sh
 exec "$@"

app/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh

@@ -18,9 +18,8 @@ fi
 set -e
 target_package=$1
 local_npm_registry_url=$2
-# Extract the actual version pinned in yarn.lock
+# TODO: use jq rather than sed here:
-# See: https://stackoverflow.com/questions/60454251/how-to-know-the-version-of-currently-installed-package-from-yarn-lock
+versioned_target_package=$(grep ${target_package} package.json | sed -e 's#[[:space:]]\{1,\}\"\('${target_package}'\)\":[[:space:]]\{1,\}\"\(.*\)\",#\1@\2#' )
-versioned_target_package=$(yarn list --pattern ${target_package} --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')
 # Use yarn info to get URL checksums etc from the new registry
 yarn_info_output=$(yarn info --json $versioned_target_package 2>/dev/null)
 # First check if the target version actually exists. 

app/data/container-build/cerc-datanet-eth-geth/build.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+#Build cerc/datanet-eth-geth
+
+set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+# Make sure the "build" directory is empty.
+rm -rf $SCRIPT_DIR/build
+
+# Copy the fixture-net scripts and config.
+cp -rp $SCRIPT_DIR/../cerc-fixturenet-eth-geth $SCRIPT_DIR/build
+
+# Then remove terminal_total_difficulty and replace it with capped_maximum_difficulty.
+# This has two effects:
+#   (1) Disables the Merge (so all we need is geth, not lighthouse).
+#   (2) Maintains a fast block rate, since the difficulty will never exceed the capped value.
+sed -i '' 's/^terminal_total_difficulty:.*$/capped_maximum_difficulty: 1/' $SCRIPT_DIR/build/genesis/el/el-config.yaml
+
+# Build the image.
+docker build -t cerc/datanet-eth-geth:local ${SCRIPT_DIR}/build
+
+# Clean up the "build" directory.
+rm -rf $SCRIPT_DIR/build

app/data/container-build/cerc-fixturenet-eth-geth/genesis/el/build_el.sh

@@ -21,9 +21,11 @@ istanbul_block=`cat $tmp_dir/genesis-config.yaml | grep istanbul_block | awk '{
 berlin_block=`cat $tmp_dir/genesis-config.yaml | grep berlin_block | awk '{ print $2 }'`
 london_block=`cat $tmp_dir/genesis-config.yaml | grep london_block | awk '{ print $2 }'`
 merge_fork_block=`cat $tmp_dir/genesis-config.yaml | grep merge_fork_block | awk '{ print $2 }'`
+capped_maximum_difficulty=`cat $tmp_dir/genesis-config.yaml | grep capped_maximum_difficulty | awk '{ print $2 }'`
+
+python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
 
 python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
-  jq ".config.terminalTotalDifficulty=$ttd" | \
   jq ".config.homesteadBlock=$homestead_block" | \
   jq ".config.eip150Block=$eip150_block" | \
   jq ".config.eip155Block=$eip155_block" | \
@@ -35,4 +37,19 @@ python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
   jq ".config.berlinBlock=$berlin_block" | \
   jq ".config.londonBlock=$london_block" | \
   jq ".config.mergeForkBlock=$merge_fork_block" > ../build/el/geth.json
-python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
+
+if [ -n "$ttd" ]; then
+  cat ../build/el/geth.json | jq ".config.terminalTotalDifficulty=$ttd" > ../build/el/geth.json.jq
+  mv ../build/el/geth.json.jq ../build/el/geth.json
+else
+  cat ../build/el/geth.json | jq "del(.config.terminalTotalDifficulty)" > ../build/el/geth.json.jq
+  mv ../build/el/geth.json.jq ../build/el/geth.json
+fi
+
+if [ -n "$capped_maximum_difficulty" ]; then
+  cat ../build/el/geth.json | jq ".config.cappedMaximumDifficulty=$capped_maximum_difficulty" > ../build/el/geth.json.jq
+  mv ../build/el/geth.json.jq ../build/el/geth.json
+else
+  cat ../build/el/geth.json | jq "del(.config.cappedMaximumDifficulty)" > ../build/el/geth.json.jq
+  mv ../build/el/geth.json.jq ../build/el/geth.json
+fi

app/data/container-build/cerc-fixturenet-eth-geth/run-el.sh

@@ -68,7 +68,6 @@ else
       --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=true \
       --statediff.writing=true"
     fi
@@ -79,16 +78,11 @@ else
       --http \
       --http.addr="0.0.0.0" \
       --http.vhosts="*" \
-      --http.api="${CERC_GETH_HTTP_APIS:-eth,web3,net,admin,personal,debug,statediff}" \
+      --http.api="eth,web3,net,admin,personal,debug,statediff" \
       --http.corsdomain="*" \
       --authrpc.addr="0.0.0.0" \
       --authrpc.vhosts="*" \
       --authrpc.jwtsecret="/opt/testnet/build/el/jwtsecret" \
-      --ws \
-      --ws.addr="0.0.0.0" \
-      --ws.origins="*" \
-      --ws.api="${CERC_GETH_WS_APIS:-eth,web3,net,admin,personal,debug,statediff}" \
-      --http.corsdomain="*" \
       --networkid="${NETWORK_ID}" \
       --netrestrict="${NETRESTRICT}" \
       --gcmode archive \

app/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh

@@ -24,7 +24,7 @@ if [ -z "$GETH_BASE_URL" ]; then
 fi
 
 function inc_status() {
-  echo " done"
+  echo " DONE!"
   STATUS=$((STATUS + 1))
   if [ $STATUS -lt ${#STATUSES[@]} ]; then
     echo -n "Waiting for ${STATUSES[$STATUS]}..."

app/data/container-build/cerc-foundry/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Build a local version of the foundry-rs/foundry image
-docker build -t cerc/foundry:local -f ${CERC_REPO_BASE_DIR}/foundry/Dockerfile-debian ${CERC_REPO_BASE_DIR}/foundry

app/data/container-build/cerc-go-ethereum-foundry/Dockerfile

@@ -1,9 +1,9 @@
-# Note: cerc/foundry is Debian based
+# Use locally build foundry base image to work around there being
-FROM cerc/foundry:local
+# no aarm64 image published.
-
+FROM foundry-rs/foundry:local
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends jq curl netcat
 
+RUN apk update ; apk add --no-cache --allow-untrusted ca-certificates curl bash git jq
+RUN apk add --no-cache --upgrade grep
 WORKDIR /root
 
 ARG GENESIS_FILE_PATH=genesis.json

app/data/container-build/cerc-keycloak/Dockerfile

@@ -1,4 +1,4 @@
 FROM quay.io/keycloak/keycloak:20.0
 WORKDIR /opt/keycloak/providers
 RUN curl -L https://github.com/aerogear/keycloak-metrics-spi/releases/download/2.5.3/keycloak-metrics-spi-2.5.3.jar --output keycloak-metrics-spi.jar
-RUN curl -L https://github.com/cerc-io/keycloak-api-key-demo/releases/download/v0.3/api-key-module-0.3.jar --output api-key-module.jar
+RUN curl -L https://github.com/cerc-io/keycloak-api-key-demo/releases/download/v0.2/api-key-module-0.2.jar --output api-key-module.jar

app/data/container-build/cerc-laconic-console-host/Dockerfile

@@ -1,67 +0,0 @@
-# Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
-FROM node:${VARIANT}
-
-ARG USERNAME=node
-ARG NPM_GLOBAL=/usr/local/share/npm-global
-
-# This container pulls npm packages from a local registry configured via these env vars
-ARG CERC_NPM_URL
-ARG CERC_NPM_AUTH_TOKEN
-
-# Add NPM global to PATH.
-ENV PATH=${NPM_GLOBAL}/bin:${PATH}
-
-RUN \
-    # Configure global npm install location, use group to adapt to UID/GID changes
-    if ! cat /etc/group | grep -e "^npm:" > /dev/null 2>&1; then groupadd -r npm; fi \
-    && usermod -a -G npm ${USERNAME} \
-    && umask 0002 \
-    && mkdir -p ${NPM_GLOBAL} \
-    && touch /usr/local/etc/npmrc \
-    && chown ${USERNAME}:npm ${NPM_GLOBAL} /usr/local/etc/npmrc \
-    && chmod g+s ${NPM_GLOBAL} \
-    && npm config -g set prefix ${NPM_GLOBAL} \
-    && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \
-    # Install eslint
-    && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \
-    && npm cache clean --force > /dev/null 2>&1
-
-# [Optional] Uncomment this section to install additional OS packages.
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends jq
-
-# [Optional] Uncomment if you want to install an additional version of node using nvm
-# ARG EXTRA_NODE_VERSION=10
-# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
-
-# We do this to get a yq binary from the published container, for the correct architecture we're building here
-COPY --from=docker.io/mikefarah/yq:latest /usr/bin/yq /usr/local/bin/yq
-
-RUN mkdir -p /scripts
-COPY ./apply-webapp-config.sh /scripts
-COPY ./start-serving-app.sh /scripts
-
-# [Optional] Uncomment if you want to install more global node modules
-# RUN su node -c "npm install -g <your-package-list-here>"
-
-# Configure the local npm registry
-RUN npm config set @cerc-io:registry ${CERC_NPM_URL} \
-    && npm config set @lirewine:registry ${CERC_NPM_URL} \
-    && npm config set -- ${CERC_NPM_URL}:_authToken ${CERC_NPM_AUTH_TOKEN}
-
-RUN mkdir -p /config
-COPY ./config.yml /config
-
-# Install simple web server for now (use nginx perhaps later)
-RUN yarn global add http-server
-
-# Globally install the payload web app package
-RUN yarn global add @cerc-io/console-app
-
-# Expose port for http
-EXPOSE 80
-
-# Default command sleeps forever so docker doesn't kill it
-CMD ["/scripts/start-serving-app.sh"]

app/data/container-build/cerc-laconic-console-host/apply-webapp-config.sh

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-    set -x
-fi
-if [[ $# -ne 2 ]]; then
-    echo "Illegal number of parameters" >&2
-    exit 1
-fi
-config_file_name=$1
-webapp_files_dir=$2
-if ![[ -f ${config_file_name} ]]; then
-    echo "Config file ${config_file_name} does not exist" >&2
-    exit 1
-fi
-if ![[ -d ${webapp_files_dir} ]]; then
-    echo "Webapp directory ${webapp_files_dir} does not exist" >&2
-    exit 1
-fi
-# First some magic using yq to translate our yaml config file into an array of key value pairs like:
-# LACONIC_HOSTED_CONFIG_<path-through-objects>=<value>
-readarray -t config_kv_pair_array < <( yq '.. | select(length > 2) | ([path | join("_"), .] | join("=") )' ${config_file_name} | sed 's/^/LACONIC_HOSTED_CONFIG_/' )
-declare -p config_kv_pair_array
-# Then iterate over that kv array making the template substitution in our web app files
-for kv_pair_string in "${config_kv_pair_array[@]}"
-do
-    kv_pair=(${kv_pair_string//=/ })
-    template_string_to_replace=${kv_pair[0]}
-    template_value_to_substitute=${kv_pair[1]}
-    # Run find and sed to do the substitution of one variable over all files
-    # See: https://stackoverflow.com/a/21479607/1701505
-    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"
-    # Note: we do not escape our strings, on the expectation they do not container the '#' char.
-    find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute}'#g' {} +
-done

app/data/container-build/cerc-laconic-console-host/build.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/laconic-registry-cli
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/laconic-console-host:local -f ${SCRIPT_DIR}/Dockerfile \
-  --add-host gitea.local:host-gateway \
-  --build-arg CERC_NPM_AUTH_TOKEN --build-arg CERC_NPM_URL ${SCRIPT_DIR}

app/data/container-build/cerc-laconic-console-host/config.yml

@@ -1,6 +0,0 @@
-# Config for laconic-console running in a fixturenet with laconicd
-
-services:
-  wns:
-    server: 'http://localhost:9473/api'
-    webui: 'http://localhost:9473/console'

app/data/container-build/cerc-laconic-console-host/start-serving-app.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-    set -x
-fi
-# TODO: Don't hard wire this:
-webapp_files_dir=/usr/local/share/.config/yarn/global/node_modules/@cerc-io/console-app/dist/production
-/scripts/apply-webapp-config.sh /config/config.yml ${webapp_files_dir}
-http-server -p 80 ${webapp_files_dir}

app/data/container-build/cerc-laconic-registry-cli/Dockerfile

@@ -1,6 +1,6 @@
 # Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=18-bullseye
+ARG VARIANT=16-bullseye
 FROM node:${VARIANT}
 
 ARG USERNAME=node
@@ -40,20 +40,18 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # RUN su node -c "npm install -g <your-package-list-here>"
 
 # Configure the local npm registry
-RUN npm config set @cerc-io:registry ${CERC_NPM_URL} \
+RUN npm config set @lirewine:registry ${CERC_NPM_URL} \
+    && npm config set @cerc-io:registry ${CERC_NPM_URL} \
     && npm config set @lirewine:registry ${CERC_NPM_URL} \
     && npm config set -- ${CERC_NPM_URL}:_authToken ${CERC_NPM_AUTH_TOKEN}
 
 # TODO: the image at this point could be made a base image for several different CLI images
 # that install different Node-based CLI commands
 
+# DEBUG, remove
+RUN yarn info @cerc-io/laconic-registry-cli
+
 # Globally install the cli package
 RUN yarn global add @cerc-io/laconic-registry-cli
 
-# Add scripts
+ENTRYPOINT ["laconic"]
-RUN mkdir /scripts
-ENV PATH="${PATH}:/scripts"
-COPY ./import-key.sh /scripts
-
-# Default command sleeps forever so docker doesn't kill it
-CMD ["sh", "-c", "while :; do sleep 600; done"]

app/data/container-build/cerc-laconic-registry-cli/import-key.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-sed 's/REPLACE_WITH_MYKEY/'${1}'/' registry-cli-config-template.yml > config.yml

app/data/container-build/cerc-mobymask-ui/Dockerfile

@@ -1,14 +0,0 @@
-FROM node:18.15.0-alpine3.16
-
-RUN apk --update --no-cache add make git jq bash
-
-WORKDIR /app
-
-COPY . .
-
-RUN npm install -g serve
-
-RUN echo "Building mobymask-ui" && \
-    npm install
-
-WORKDIR /app

app/data/container-build/cerc-mobymask-ui/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/mobymask-ui
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/mobymask-ui:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/mobymask-ui

app/data/container-build/cerc-mobymask/Dockerfile

@@ -1,13 +0,0 @@
-FROM node:16.17.1-alpine3.16
-
-RUN apk --update --no-cache add python3 alpine-sdk jq bash
-
-WORKDIR /app
-
-COPY . .
-
-RUN yarn
-
-# Add scripts
-RUN mkdir /scripts
-ENV PATH="${PATH}:/scripts"

app/data/container-build/cerc-mobymask/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/mobymask
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/mobymask:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/MobyMask

app/data/container-build/cerc-optimism-contracts/Dockerfile

@@ -1,22 +0,0 @@
-FROM cerc/foundry:local
-
-# Install node (local foundry is a debian based image)
-RUN apt-get update \
-  && apt-get install -y curl \
-  && curl --silent --location https://deb.nodesource.com/setup_16.x | bash - \
-  && apt-get update \
-  && apt-get install -y nodejs git busybox jq \
-  && node -v
-
-RUN corepack enable \
-  && yarn --version
-
-WORKDIR /app
-
-# Copy optimism repo contents
-COPY . .
-
-RUN echo "Building optimism" && \
-  yarn && yarn build
-
-WORKDIR /app/packages/contracts-bedrock

app/data/container-build/cerc-optimism-contracts/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/optimism-contracts
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/optimism-contracts:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/optimism

app/data/container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts

@@ -1,28 +0,0 @@
-import fs from 'fs'
-
-import { task } from 'hardhat/config'
-import { hdkey } from 'ethereumjs-wallet'
-import * as bip39 from 'bip39'
-
-task('rekey-json', 'Generates a new set of keys for a test network')
-  .addParam('output', 'JSON file to output accounts to')
-  .setAction(async ({ output: outputFile }) => {
-    const mnemonic = bip39.generateMnemonic()
-    const pathPrefix = "m/44'/60'/0'/0"
-    const labels = ['Admin', 'Proposer', 'Batcher', 'Sequencer']
-    const hdwallet = hdkey.fromMasterSeed(await bip39.mnemonicToSeed(mnemonic))
-
-    const output = {}
-
-    for (let i = 0; i < labels.length; i++) {
-      const label = labels[i]
-      const wallet = hdwallet.derivePath(`${pathPrefix}/${i}`).getWallet()
-      const addr = '0x' + wallet.getAddress().toString('hex')
-      const pk = wallet.getPrivateKey().toString('hex')
-
-      output[label] = { address: addr, privateKey: pk }
-    }
-
-    fs.writeFileSync(outputFile, JSON.stringify(output, null, 2))
-    console.log(`L2 account keys written to ${outputFile}`)
-  })

app/data/container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts

@@ -1,22 +0,0 @@
-import { task } from 'hardhat/config'
-import '@nomiclabs/hardhat-ethers'
-import { ethers } from 'ethers'
-
-task('send-balance', 'Sends Ether to a specified Ethereum account')
-  .addParam('to', 'The Ethereum address to send Ether to')
-  .addParam('amount', 'The amount of Ether to send, in Ether')
-  .addParam('privateKey', 'The private key of the sender')
-  .setAction(async ({ to, amount, privateKey }, {}) => {
-    // Open the wallet using sender's private key
-    const provider = new ethers.providers.JsonRpcProvider(`${process.env.L1_RPC}`)
-    const wallet = new ethers.Wallet(privateKey, provider)
-
-    // Send amount to the specified address
-    const tx = await wallet.sendTransaction({
-      to,
-      value: ethers.utils.parseEther(amount),
-    })
-
-    console.log(`Balance sent to: ${to}, from: ${wallet.address}`)
-    console.log(`Transaction hash: ${tx.hash}`)
-  })

app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts

@@ -1,30 +0,0 @@
-import { task } from 'hardhat/config'
-import '@nomiclabs/hardhat-ethers'
-
-task(
-  'verify-contract-deployment',
-  'Verifies the given contract deployment transaction'
-)
-  .addParam('contract', 'Address of the contract deployed')
-  .addParam('transactionHash', 'Hash of the deployment transaction')
-  .setAction(async ({ contract, transactionHash }, { ethers }) => {
-    const provider = new ethers.providers.JsonRpcProvider(
-      `${process.env.L1_RPC}`
-    )
-
-    // Get the deployment tx receipt
-    const receipt = await provider.getTransactionReceipt(transactionHash)
-    if (
-      receipt &&
-      receipt.contractAddress &&
-      receipt.contractAddress === contract
-    ) {
-      console.log(
-        `Deployment for contract ${contract} in transaction ${transactionHash} verified`
-      )
-      process.exit(0)
-    } else {
-      console.log(`Contract ${contract} deployment verification failed`)
-      process.exit(1)
-    }
-  })

app/data/container-build/cerc-optimism-l2geth/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/optimism-l2geth
-docker build -t cerc/optimism-l2geth:local ${CERC_REPO_BASE_DIR}/op-geth

app/data/container-build/cerc-optimism-op-batcher/Dockerfile

@@ -1,32 +0,0 @@
-FROM golang:1.19.0-alpine3.15 as builder
-
-ARG VERSION=v0.0.0
-
-RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
-
-# build op-batcher with the shared go.mod & go.sum files
-COPY ./op-batcher /app/op-batcher
-COPY ./op-bindings /app/op-bindings
-COPY ./op-node /app/op-node
-COPY ./op-service /app/op-service
-COPY ./op-signer /app/op-signer
-COPY ./go.mod /app/go.mod
-COPY ./go.sum /app/go.sum
-
-COPY ./.git /app/.git
-
-WORKDIR /app/op-batcher
-
-RUN go mod download
-
-ARG TARGETOS TARGETARCH
-
-RUN make op-batcher VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
-
-FROM alpine:3.15
-
-RUN apk add --no-cache jq bash
-
-COPY --from=builder /app/op-batcher/bin/op-batcher /usr/local/bin
-
-ENTRYPOINT ["op-batcher"]

app/data/container-build/cerc-optimism-op-batcher/build.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/optimism-op-batcher
-# TODO: use upstream Dockerfile once its buildx-specific content has been removed
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-docker build -t cerc/optimism-op-batcher:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/optimism

app/data/container-build/cerc-optimism-op-node/Dockerfile

@@ -1,30 +0,0 @@
-FROM golang:1.19.0-alpine3.15 as builder
-
-ARG VERSION=v0.0.0
-
-RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
-
-# build op-node with the shared go.mod & go.sum files
-COPY ./op-node /app/op-node
-COPY ./op-chain-ops /app/op-chain-ops
-COPY ./op-service /app/op-service
-COPY ./op-bindings /app/op-bindings
-COPY ./go.mod /app/go.mod
-COPY ./go.sum /app/go.sum
-COPY ./.git /app/.git
-
-WORKDIR /app/op-node
-
-RUN go mod download
-
-ARG TARGETOS TARGETARCH
-
-RUN make op-node VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
-
-FROM alpine:3.15
-
-RUN apk add --no-cache openssl jq
-
-COPY --from=builder /app/op-node/bin/op-node /usr/local/bin
-
-CMD ["op-node"]

app/data/container-build/cerc-optimism-op-node/build.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/optimism-op-node
-# TODO: use upstream Dockerfile once its buildx-specific content has been removed
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-docker build -t cerc/optimism-op-node:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/optimism

app/data/container-build/cerc-react-peer/Dockerfile

@@ -1,14 +0,0 @@
-FROM node:18.15.0-alpine3.16
-
-RUN apk --update --no-cache add make git python3 jq
-
-WORKDIR /app
-
-COPY . .
-
-RUN yarn global add serve
-
-RUN echo "Building react-peer" && \
-    yarn install --ignore-scripts && yarn build --ignore @cerc-io/test-app
-
-WORKDIR /app

app/data/container-build/cerc-react-peer/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/react-peer
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/react-peer:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/react-peer

app/data/container-build/cerc-watcher-mobymask-v2/Dockerfile

@@ -1,20 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update \
-  && apt-get install -y curl gnupg build-essential \
-  && curl --silent --location https://deb.nodesource.com/setup_18.x | bash - \
-  && apt-get update \
-  && apt-get install -y nodejs git busybox jq \
-  && node -v
-
-RUN corepack enable \
-  && yarn --version
-
-WORKDIR /app
-
-COPY . .
-
-RUN echo "Building watcher-ts" && \
-    yarn && yarn build
-
-WORKDIR /app/packages/mobymask-v2-watcher

app/data/container-build/cerc-watcher-mobymask-v2/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/watcher-mobymask-v2
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/watcher-mobymask-v2:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/watcher-ts

app/data/container-build/default-build.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 # Usage: default-build.sh <image-tag> [<repo-relative-path>]
 # if <repo-relative-path> is not supplied, the context is the directory where the Dockerfile lives
-if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
 if [[ $# -ne 2 ]]; then
     echo "Illegal number of parameters" >&2
     exit 1
@@ -11,4 +8,4 @@ fi
 image_tag=$1
 build_dir=$2
 echo "Building ${image_tag} in ${build_dir}"
-docker build -t ${image_tag} --build-arg CERC_HOST_UID=${CERC_HOST_UID} --build-arg CERC_HOST_GID=${CERC_HOST_GID} ${build_dir}
+docker build -t ${image_tag} ${build_dir}

app/data/container-build/foundry-rs-foundry/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build foundry-rs/foundry
+# HACK below : TARGETARCH needs to be derived from the host environment
+docker build -t foundry-rs/foundry:local ${CERC_REPO_BASE_DIR}/foundry

app/data/container-image-list.txt

@@ -1,4 +1,4 @@
-cerc/foundry
+foundry-rs/foundry
 cerc/test-contract
 cerc/eth-statediff-fill-service
 cerc/eth-statediff-service
@@ -11,7 +11,7 @@ cerc/ipld-eth-beacon-indexer
 cerc/ipld-eth-server
 cerc/laconicd
 cerc/laconic-registry-cli
-cerc/laconic-console-host
+cerc/datanet-eth-geth
 cerc/fixturenet-eth-geth
 cerc/fixturenet-eth-lighthouse
 cerc/watcher-mobymask
@@ -19,18 +19,9 @@ cerc/watcher-erc20
 cerc/watcher-erc721
 cerc/watcher-uniswap-v3
 cerc/uniswap-v3-info
-cerc/watcher-mobymask-v2
-cerc/react-peer
-cerc/mobymask-ui
-cerc/mobymask
 cerc/test-container
 cerc/eth-probe
 cerc/builder-js
 cerc/keycloak
 cerc/tx-spammer
 cerc/builder-gerbil
-cerc/act-runner
-cerc/act-runner-task-executor
-cerc/optimism-l2geth
-cerc/optimism-op-batcher
-cerc/optimism-op-node

app/data/npm-package-list.txt

@@ -1,7 +1,4 @@
-laconic-sdk
-laconic-registry-cli
-laconic-console
-debug
-crypto
-sdk
 gem
+laconic-sdk
+debug
+laconic-registry-cli

app/data/pod-list.txt

@@ -8,19 +8,14 @@ ipld-eth-server
 lighthouse
 laconicd
 fixturenet-laconicd
+datanet-eth
 fixturenet-eth
 fixturenet-eth-metrics
 watcher-mobymask
 watcher-erc20
 watcher-erc721
 watcher-uniswap-v3
-watcher-mobymask-v2
-mobymask-app
-peer-test-app
 test
 eth-probe
 keycloak
 tx-spammer
-kubo
-foundry
-fixturenet-optimism

app/data/repository-list.txt

@@ -9,22 +9,11 @@ cerc-io/ipld-eth-beacon-db
 cerc-io/laconicd
 cerc-io/laconic-sdk
 cerc-io/laconic-registry-cli
-cerc-io/laconic-console
 cerc-io/mobymask-watcher
 cerc-io/watcher-ts
-cerc-io/react-peer
-cerc-io/mobymask-ui
-cerc-io/MobyMask
 vulcanize/uniswap-watcher-ts
 vulcanize/uniswap-v3-info
 vulcanize/assemblyscript
 cerc-io/eth-probe
 cerc-io/tx-spammer
-dboreham/foundry
+foundry-rs/foundry
-lirewine/gem
-lirewine/debug
-lirewine/crypto
-lirewine/sdk
-telackey/act_runner
-ethereum-optimism/op-geth
-ethereum-optimism/optimism

app/data/stacks/build-support/README.md

@@ -1,62 +0,0 @@
-# Build Support Stack
-
-## Instructions
-
-JS/TS/NPM builds need an npm registry to store intermediate package artifacts.
-This can be supplied by the user (e.g. using a hosted registry or even npmjs.com), or a local registry using gitea can be deployed by stack orchestrator.
-To use a user-supplied registry set these environment variables:
-
-`CERC_NPM_REGISTRY_URL` and 
-`CERC_NPM_AUTH_TOKEN`
-
-Leave `CERC_NPM_REGISTRY_URL` un-set to use the local gitea registry.
-
-### 1. Build support containers
-
-Note: the scheme/gerbil container is excluded as it isn't currently required for the package registry.
-
-```
-$ laconic-so --stack build-support build-containers --exclude cerc/builder-gerbil
-```
-### 2. Deploy Gitea Package Registry
-
-```
-$ laconic-so --stack package-registry setup-repositories
-$ laconic-so --stack package-registry build-containers 
-$ laconic-so --stack package-registry deploy up
-[+] Running 3/3
- ⠿ Network laconic-aecc4a21d3a502b14522db97d427e850_gitea       Created                                                                                    0.0s
- ⠿ Container laconic-aecc4a21d3a502b14522db97d427e850-db-1      Started                                                                                    1.2s
- ⠿ Container laconic-aecc4a21d3a502b14522db97d427e850-server-1  Started                                                                                    1.9s
-New user 'gitea_admin' has been successfully created!
-This is your gitea access token: 84fe66a73698bf11edbdccd0a338236b7d1d5c45. Keep it safe and secure, it can not be fetched again from gitea.
-To use with laconic-so set this environment variable: export CERC_NPM_AUTH_TOKEN=3e493e77b3e83fe9e882f7e3a79dd4d5441c308b
-Created the organization cerc-io
-Gitea was configured to use host name: gitea.local, ensure that this resolves to localhost, e.g. with sudo vi /etc/hosts
-Success, gitea is properly initialized
-$
-```
-
-Note: the above commands can take several minutes depending on the specs of your machine.
-
-### 3. Configure the hostname gitea.local
-How to do this is OS-dependent but usually involves editing a `hosts` file. For example on Linux add this line to the file `/etc/hosts` (needs sudo):
-```
-127.0.0.1       gitea.local
-```
-Test with:
-```
-$ ping gitea.local
-PING gitea.local (127.0.0.1) 56(84) bytes of data.
-64 bytes from localhost (127.0.0.1): icmp_seq=1 ttl=64 time=0.147 ms
-64 bytes from localhost (127.0.0.1): icmp_seq=2 ttl=64 time=0.033 ms
-```
-Although not necessary in order to build and publish packages, you can now access the Gitea web interface at: [http://gitea.local:3000](http://gitea.local:3000) using these credentials: gitea_admin/admin1234 (Note: please properly secure Gitea if public internet access is allowed).
-
-Now npm packages can be built:
-### Build npm Packages
-Ensure that `CERC_NPM_AUTH_TOKEN` is set with the token printed above when the package-registry stack was deployed (the actual token value will be different than shown in this example):
-```
-$ export CERC_NPM_AUTH_TOKEN=84fe66a73698bf11edbdccd0a338236b7d1d5c45
-$ laconic-so build-npms --include laconic-sdk,laconic-registry-cli
-```

app/data/stacks/build-support/stack.yml

@@ -1,6 +0,0 @@
-version: "1.1"
-name: build-support
-decription: "Build Support Components"
-containers:
-  - cerc/builder-js
-  - cerc/builder-gerbil

app/data/stacks/erc20/README.md

@@ -7,13 +7,13 @@ Instructions to deploy a local ERC20 watcher stack (core + watcher) for demonstr
 Clone required repositories:
 
 ```bash
-laconic-so --stack erc20 setup-repositories
+laconic-so setup-repositories --include cerc-io/go-ethereum,cerc-io/ipld-eth-db,cerc-io/ipld-eth-server,cerc-io/watcher-ts 
 ```
 
 Build the core and watcher container images:
 
 ```bash
-laconic-so --stack erc20 build-containers
+laconic-so build-containers --include cerc/go-ethereum,cerc/go-ethereum-foundry,cerc/ipld-eth-db,cerc/ipld-eth-server,cerc/watcher-erc20
 ```
 
 This should create the required docker images in the local image registry.
@@ -21,7 +21,7 @@ This should create the required docker images in the local image registry.
 Deploy the stack:
 
 ```bash
-laconic-so --stack erc20 deploy-system up
+laconic-so deploy-system --include ipld-eth-db,go-ethereum-foundry,ipld-eth-server,watcher-erc20 up
 ```
 
 ## Demo
@@ -153,5 +153,5 @@ Transfer funds between different accounts using MetaMask and use the playground
 To stop all the services running in background run:
 
 ```bash
-laconic-so --stack erc20 deploy-system down
+laconic-so deploy-system --include ipld-eth-db,go-ethereum-foundry,ipld-eth-server,watcher-erc20 down
 ```

app/data/stacks/erc20/stack.yml

@@ -5,9 +5,7 @@ repos:
   - cerc-io/ipld-eth-db
   - cerc-io/ipld-eth-server
   - cerc-io/watcher-ts
-  - dboreham/foundry
 containers:
-  - cerc/foundry
   - cerc/go-ethereum
   - cerc/go-ethereum-foundry
   - cerc/ipld-eth-db

app/data/stacks/erc721/README.md

@@ -6,23 +6,23 @@ Instructions to deploy a local ERC721 watcher stack (core + watcher) for demonst
 
 * Clone / pull required repositories:
 
-```bash
+  ```bash
-laconic-so --stack erc721 setup-repositories
+  $ laconic-so setup-repositories --include cerc-io/go-ethereum,cerc-io/ipld-eth-db,cerc-io/ipld-eth-server,cerc-io/watcher-ts --pull
-```
+  ```
 
 * Build the core and watcher container images:
 
-```bash
+  ```bash
-laconic-so --stack erc721 build-containers
+  $ laconic-so build-containers --include cerc/go-ethereum,cerc/go-ethereum-foundry,cerc/ipld-eth-db,cerc/ipld-eth-server,cerc/watcher-erc721
-```
+  ```
 
   This should create the required docker images in the local image registry.
 
 * Deploy the stack:
 
-```bash
+  ```bash
-laconic-so --stack erc721 deploy-system up
+  $ laconic-so deploy-system --include db,go-ethereum-foundry,ipld-eth-server,watcher-erc721 up
-```
+  ```
 
 ## Demo
 
@@ -209,6 +209,6 @@ laconic-so --stack erc721 deploy-system up
 
 * To stop all the services running in background:
 
-```bash
+  ```bash
-laconic-so --stack erc721 deploy-system down
+  $ laconic-so deploy-system --include db,go-ethereum-foundry,ipld-eth-server,watcher-erc721 down
-```
+  ```

app/data/stacks/fixturenet-eth-loaded/README.md

@@ -1,6 +0,0 @@
-# fixturenet-eth
-
-A "loaded" version of fixturenet-eth, with all the bells and whistles enabled.
-
-TODO: write me
-

app/data/stacks/fixturenet-eth-loaded/stack.yml

@@ -1,24 +0,0 @@
-version: "1.0"
-name: fixturenet-eth-loaded
-decription: "Loaded Ethereum Fixturenet"
-repos:
-  - cerc-io/go-ethereum
-  - cerc-io/tx-spammer
-  - cerc-io/ipld-eth-server
-  - cerc-io/ipld-eth-db
-  - cerc/go-ethereum
-containers:
-  - cerc/lighthouse
-  - cerc/fixturenet-eth-geth
-  - cerc/fixturenet-eth-lighthouse
-  - cerc/ipld-eth-server
-  - cerc/ipld-eth-db
-  - cerc/keycloak
-  - cerc/tx-spammer
-pods:
-  - fixturenet-eth
-  - tx-spammer
-  - fixturenet-eth-metrics
-  - keycloak
-  - ipld-eth-server
-  - ipld-eth-db