hack

docs/fetching-containers.md

@@ -1,9 +0,0 @@
-# Fetching pre-built container images
-When Stack Orchestrator deploys a stack containing a suite of one or more containers it expects images for those containers to be on the local machine with a tag of the form `<image-name>:local` Images for these containers can be built from source (and optionally base container images from public registries) with the `build-containers` subcommand. 
-
-However, the task of building a large number of containers from source may consume considerable time and machine resources. This is where the `fetch-containers` subcommand steps in. It is designed to work exactly like `build-containers` but instead the images, pre-built, are fetched from an image registry then re-tagged for deployment. It can be used in place of `build-containers` for any stack provided the necessary containers, built for the local machine architecture (e.g. arm64 or x86-64) have already been published in an image registry.
-## Usage
-To use `fetch-containers`, provide an image registry path, a username and token/password with read access to the registry, and optionally specify `--force-local-overwrite`. If this argument is not specified, if there is already a locally built or previously fetched image for a stack container on the machine, it will not be overwritten and a warning issued.
-```
-$ laconic-so --stack mobymask-v3-demo fetch-containers --image-registry git.vdb.to/cerc-io --registry-username <registry-user> --registry-token <registry-token> --force-local-overwrite
-```

stack_orchestrator/build/build_containers.py

@@ -25,13 +25,13 @@ import sys
 from decouple import config
 import subprocess
 import click
+import importlib.resources
 from pathlib import Path
 from stack_orchestrator.opts import opts
-from stack_orchestrator.util import include_exclude_check, stack_is_external, error_exit
+from stack_orchestrator.util import include_exclude_check, get_parsed_stack_config, stack_is_external, error_exit, warn_exit
 from stack_orchestrator.base import get_npm_registry_url
 from stack_orchestrator.build.build_types import BuildContext
 from stack_orchestrator.build.publish import publish_image
-from stack_orchestrator.build.build_util import get_containers_in_scope
 
 # TODO: find a place for this
 #    epilog="Config provided either in .env or settings.ini or env vars: CERC_REPO_BASE_DIR (defaults to ~/cerc)"
@@ -149,7 +149,24 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args, publish_imag
         if not image_registry:
             error_exit("--image-registry must be supplied with --publish-images")
 
-    containers_in_scope = get_containers_in_scope(stack)
+    # See: https://stackoverflow.com/a/20885799/1701505
+    from stack_orchestrator import data
+    with importlib.resources.open_text(data, "container-image-list.txt") as container_list_file:
+        all_containers = container_list_file.read().splitlines()
+
+    containers_in_scope = []
+    if stack:
+        stack_config = get_parsed_stack_config(stack)
+        if "containers" not in stack_config or stack_config["containers"] is None:
+            warn_exit(f"stack {stack} does not define any containers")
+        containers_in_scope = stack_config['containers']
+    else:
+        containers_in_scope = all_containers
+
+    if opts.o.verbose:
+        print(f'Containers: {containers_in_scope}')
+        if stack:
+            print(f"Stack: {stack}")
 
     container_build_env = make_container_build_env(dev_root_path,
                                                    container_build_dir,

stack_orchestrator/build/build_util.py

@@ -1,43 +0,0 @@
-# Copyright © 2024 Vulcanize
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-import importlib.resources
-
-from stack_orchestrator.opts import opts
-from stack_orchestrator.util import get_parsed_stack_config, warn_exit
-
-
-def get_containers_in_scope(stack: str):
-
-    # See: https://stackoverflow.com/a/20885799/1701505
-    from stack_orchestrator import data
-    with importlib.resources.open_text(data, "container-image-list.txt") as container_list_file:
-        all_containers = container_list_file.read().splitlines()
-
-    containers_in_scope = []
-    if stack:
-        stack_config = get_parsed_stack_config(stack)
-        if "containers" not in stack_config or stack_config["containers"] is None:
-            warn_exit(f"stack {stack} does not define any containers")
-        containers_in_scope = stack_config['containers']
-    else:
-        containers_in_scope = all_containers
-
-    if opts.o.verbose:
-        print(f'Containers: {containers_in_scope}')
-        if stack:
-            print(f"Stack: {stack}")
-
-    return containers_in_scope

stack_orchestrator/build/build_webapp.py

@@ -21,13 +21,11 @@
 # TODO: display the available list of containers; allow re-build of either all or specific containers
 
 import os
-import sys
-
 from decouple import config
 import click
 from pathlib import Path
 from stack_orchestrator.build import build_containers
-from stack_orchestrator.deploy.webapp.util import determine_base_container, TimedLogger
+from stack_orchestrator.deploy.webapp.util import determine_base_container
 from stack_orchestrator.build.build_types import BuildContext
 
 
@@ -40,25 +38,26 @@ from stack_orchestrator.build.build_types import BuildContext
 @click.pass_context
 def command(ctx, base_container, source_repo, force_rebuild, extra_build_args, tag):
     '''build the specified webapp container'''
-    logger = TimedLogger()
 
     quiet = ctx.obj.quiet
-    debug = ctx.obj.debug
     verbose = ctx.obj.verbose
+    dry_run = ctx.obj.dry_run
+    debug = ctx.obj.debug
     local_stack = ctx.obj.local_stack
     stack = ctx.obj.stack
+    continue_on_error = ctx.obj.continue_on_error
 
     # See: https://stackoverflow.com/questions/25389095/python-get-path-of-root-project-structure
     container_build_dir = Path(__file__).absolute().parent.parent.joinpath("data", "container-build")
 
     if local_stack:
         dev_root_path = os.getcwd()[0:os.getcwd().rindex("stack-orchestrator")]
-        logger.log(f'Local stack dev_root_path (CERC_REPO_BASE_DIR) overridden to: {dev_root_path}')
+        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"))
 
-    if verbose:
-        logger.log(f'Dev Root is: {dev_root_path}')
+    if not quiet:
+        print(f'Dev Root is: {dev_root_path}')
 
     if not base_container:
         base_container = determine_base_container(source_repo)
@@ -67,9 +66,6 @@ def command(ctx, base_container, source_repo, force_rebuild, extra_build_args, t
     container_build_env = build_containers.make_container_build_env(dev_root_path, container_build_dir, debug,
                                                                     force_rebuild, extra_build_args)
 
-    if verbose:
-        logger.log(f"Building base container: {base_container}")
-
     build_context_1 = BuildContext(
         stack,
         base_container,
@@ -77,13 +73,7 @@ def command(ctx, base_container, source_repo, force_rebuild, extra_build_args, t
         container_build_env,
         dev_root_path,
     )
-    ok = build_containers.process_container(build_context_1)
-    if not ok:
-        logger.log("ERROR: Build failed.")
-        sys.exit(1)
-
-    if verbose:
-        logger.log(f"Base container {base_container} build finished.")
+    build_containers.process_container(build_context_1)
 
     # Now build the target webapp.  We use the same build script, but with a different Dockerfile and work dir.
     container_build_env["CERC_WEBAPP_BUILD_RUNNING"] = "true"
@@ -93,12 +83,9 @@ def command(ctx, base_container, source_repo, force_rebuild, extra_build_args, t
                                                                           "Dockerfile.webapp")
     if not tag:
         webapp_name = os.path.abspath(source_repo).split(os.path.sep)[-1]
-        tag = f"cerc/{webapp_name}:local"
-
-    container_build_env["CERC_CONTAINER_BUILD_TAG"] = tag
-
-    if verbose:
-        logger.log(f"Building app container: {tag}")
+        container_build_env["CERC_CONTAINER_BUILD_TAG"] = f"cerc/{webapp_name}:local"
+    else:
+        container_build_env["CERC_CONTAINER_BUILD_TAG"] = tag
 
     build_context_2 = BuildContext(
         stack,
@@ -107,11 +94,4 @@ def command(ctx, base_container, source_repo, force_rebuild, extra_build_args, t
         container_build_env,
         dev_root_path,
     )
-    ok = build_containers.process_container(build_context_2)
-    if not ok:
-        logger.log("ERROR: Build failed.")
-        sys.exit(1)
-
-    if verbose:
-        logger.log(f"App container {base_container} build finished.")
-        logger.log("build-webapp complete", show_step_time=False, show_total_time=True)
+    build_containers.process_container(build_context_2)

stack_orchestrator/build/fetch_containers.py

@@ -1,195 +0,0 @@
-# Copyright © 2024 Vulcanize
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-import click
-from dataclasses import dataclass
-import json
-import platform
-from python_on_whales import DockerClient
-from python_on_whales.components.manifest.cli_wrapper import ManifestCLI, ManifestList
-from python_on_whales.utils import run
-import requests
-from typing import List
-
-from stack_orchestrator.opts import opts
-from stack_orchestrator.util import include_exclude_check, error_exit
-from stack_orchestrator.build.build_util import get_containers_in_scope
-
-# Experimental fetch-container command
-
-
-@dataclass
-class RegistryInfo:
-    registry: str
-    registry_username: str
-    registry_token: str
-
-
-# Extending this code to support the --verbose option, cnosider contributing upstream
-# https://github.com/gabrieldemarmiesse/python-on-whales/blob/master/python_on_whales/components/manifest/cli_wrapper.py#L129
-class ExtendedManifestCLI(ManifestCLI):
-    def inspect_verbose(self, x: str) -> ManifestList:
-        """Returns a Docker manifest list object."""
-        json_str = run(self.docker_cmd + ["manifest", "inspect", "--verbose", x])
-        return json.loads(json_str)
-
-
-def _local_tag_for(container: str):
-    return f"{container}:local"
-
-
-# See: https://docker-docs.uclv.cu/registry/spec/api/
-# Emulate this:
-# $ curl -u "my-username:my-token" -X GET "https://<container-registry-hostname>/v2/cerc-io/cerc/test-container/tags/list"
-# {"name":"cerc-io/cerc/test-container","tags":["202402232130","202402232208"]}
-def _get_tags_for_container(container: str, registry_info: RegistryInfo) -> List[str]:
-    # registry looks like: git.vdb.to/cerc-io
-    registry_parts = registry_info.registry.split("/")
-    url = f"https://{registry_parts[0]}/v2/{registry_parts[1]}/{container}/tags/list"
-    if opts.o.debug:
-        print(f"Fetching tags from: {url}")
-    response = requests.get(url, auth=(registry_info.registry_username, registry_info.registry_token))
-    if response.status_code == 200:
-        tag_info = response.json()
-        if opts.o.debug:
-            print(f"container tags list: {tag_info}")
-        tags_array = tag_info["tags"]
-        return tags_array
-    else:
-        error_exit(f"failed to fetch tags from image registry, status code: {response.status_code}")
-
-
-def _find_latest(candidate_tags: List[str]):
-    # Lex sort should give us the latest first
-    sorted_candidates = sorted(candidate_tags)
-    if opts.o.debug:
-        print(f"sorted candidates: {sorted_candidates}")
-    return sorted_candidates[-1]
-
-
-def _filter_for_platform(container: str, 
-                         registry_info: RegistryInfo,
-                         tag_list: List[str]) -> List[str] :
-    filtered_tags = []
-    this_machine = platform.machine()
-    # Translate between Python and docker platform names
-    if this_machine == "x86_64":
-        this_machine = "amd64"
-    if this_machine == "aarch64":
-        this_machine = "arm64"
-    if opts.o.debug:
-        print(f"Python says the architecture is: {this_machine}")
-    docker = DockerClient()
-    for tag in tag_list:
-        remote_tag = f"{registry_info.registry}/{container}:{tag}"
-        manifest_cmd = ExtendedManifestCLI(docker.client_config)
-        manifest = manifest_cmd.inspect_verbose(remote_tag)
-        if opts.o.debug:
-            print(f"manifest: {manifest}")
-        image_architecture =  manifest["Descriptor"]["platform"]["architecture"]
-        if opts.o.debug:
-            print(f"image_architecture: {image_architecture}")
-        if this_machine == image_architecture:
-            filtered_tags.append(tag)
-    if opts.o.debug:
-        print(f"Tags filtered for platform: {filtered_tags}")
-    return filtered_tags
-
-
-def _get_latest_image(container: str, registry_info: RegistryInfo):
-    all_tags = _get_tags_for_container(container, registry_info)
-    tags_for_platform = _filter_for_platform(container, registry_info, all_tags)
-    if len(tags_for_platform) > 0:
-        latest_tag = _find_latest(tags_for_platform)
-        return f"{container}:{latest_tag}"
-    else:
-        return None
-
-
-def _fetch_image(tag: str, registry_info: RegistryInfo):
-    docker = DockerClient()
-    remote_tag = f"{registry_info.registry}/{tag}"
-    if opts.o.debug:
-        print(f"Attempting to pull this image: {remote_tag}")
-    docker.image.pull(remote_tag)
-
-
-def _exists_locally(container: str):
-    docker = DockerClient()
-    return docker.image.exists(_local_tag_for(container))
-
-
-def _add_local_tag(remote_tag: str, registry: str, local_tag: str):
-    docker = DockerClient()
-    docker.image.tag(f"{registry}/{remote_tag}", local_tag)
-
-
-@click.command()
-@click.option('--include', help="only fetch these containers")
-@click.option('--exclude', help="don\'t fetch these containers")
-@click.option("--force-local-overwrite", is_flag=True, default=False, help="Overwrite a locally built image, if present")
-@click.option("--image-registry", required=True, help="Specify the image registry to fetch from")
-@click.option("--registry-username", required=True, help="Specify the image registry username")
-@click.option("--registry-token", required=True, help="Specify the image registry access token")
-@click.pass_context
-def command(ctx, include, exclude, force_local_overwrite, image_registry, registry_username, registry_token):
-    '''EXPERIMENTAL: fetch the images for a stack from remote registry'''
-
-    registry_info = RegistryInfo(image_registry, registry_username, registry_token)
-    docker = DockerClient()
-    if not opts.o.quiet:
-        print("Logging into container registry:")
-    docker.login(registry_info.registry, registry_info.registry_username, registry_info.registry_token)
-    # Generate list of target containers
-    stack = ctx.obj.stack
-    containers_in_scope = get_containers_in_scope(stack)
-    all_containers_found = True
-    for container in containers_in_scope:
-        local_tag = _local_tag_for(container)
-        if include_exclude_check(container, include, exclude):
-            if opts.o.debug:
-                print(f"Processing: {container}")
-            # For each container, attempt to find the latest of a set of
-            # images with the correct name and platform in the specified registry
-            image_to_fetch = _get_latest_image(container, registry_info)
-            if not image_to_fetch:
-                print(f"Warning: no image found to fetch for container: {container}")
-                all_containers_found = False
-                continue
-            if opts.o.debug:
-                print(f"Fetching: {image_to_fetch}")
-            _fetch_image(image_to_fetch, registry_info)
-            # Now check if the target container already exists exists locally already
-            if (_exists_locally(container)):
-                if not opts.o.quiet:
-                    print(f"Container image {container} already exists locally")
-                # if so, fail unless the user specified force-local-overwrite
-                if (force_local_overwrite):
-                    # In that case remove the existing :local tag
-                    if not opts.o.quiet:
-                        print(f"Warning: overwriting local tag from this image: {container} because "
-                              "--force-local-overwrite was specified")
-                else:
-                    if not opts.o.quiet:
-                        print(f"Skipping local tagging for this image: {container} because that would "
-                              "overwrite an existing :local tagged image, use --force-local-overwrite to do so.")
-                    continue
-            # Tag the fetched image with the :local tag
-            _add_local_tag(image_to_fetch, image_registry, local_tag)
-        else:
-            if opts.o.verbose:
-                print(f"Excluding: {container}")
-    if not all_containers_found:
-        print("Warning: couldn't find usable images for one or more containers, this stack will not deploy")

stack_orchestrator/data/compose/docker-compose-fixturenet-urbit.yml

@@ -26,9 +26,9 @@ services:
       - "80"
     healthcheck:
       test: ["CMD", "nc", "-v", "localhost", "80"]
-      interval: 10s
+      interval: 20s
       timeout: 5s
-      retries: 30
+      retries: 15
       start_period: 10s
 
 volumes:

stack_orchestrator/data/compose/docker-compose-uniswap-interface.yml

@@ -7,12 +7,12 @@ services:
     environment:
       - REACT_APP_INFURA_KEY=${CERC_INFURA_KEY}
       - REACT_APP_AWS_API_ENDPOINT=${CERC_UNISWAP_GQL}
-      - REACT_APP_UNISWAP_API_URL=${CERC_UNISWAP_API}
     command: ["./build-app.sh"]
     volumes:
       - ../config/uniswap-interface/build-app.sh:/app/build-app.sh
       - urbit_app_builds:/app-builds
-      - ../config/uniswap-interface/urbit-files:/app/urbit-files
+      - ../config/uniswap-interface/urbit-files/mar:/app/mar
+      - ../config/uniswap-interface/urbit-files/desk.docket-0:/app/desk.docket-0
 
 volumes:
   urbit_app_builds:

stack_orchestrator/data/compose/docker-compose-vega-interface.yml

@@ -1,19 +0,0 @@
-version: "3.2"
-
-# This is a short-lived container.  It runs the Vega build and then copies the output to the
-# `urbit_app_builds` volume.
-services:
-  vega-interface:
-    image: cerc/vega-interface:local
-    restart: on-failure
-    # environment:
-    #   - REACT_APP_INFURA_KEY=${CERC_INFURA_KEY}
-    #   - REACT_APP_AWS_API_ENDPOINT=${CERC_UNISWAP_GQL}
-    entrypoint: ["./build-app.sh"]
-    volumes:
-      - ../config/vega-interface/urbit-files:/app/urbit-files
-      - ../config/vega-interface/build-app.sh:/app/build-app.sh
-      - urbit_app_builds:/app-builds
-
-volumes:
-  urbit_app_builds:

stack_orchestrator/data/compose/docker-compose-watcher-ajna.yml

@@ -1,76 +0,0 @@
-version: '3.2'
-
-services:
-  ajna-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=ajna-watcher,ajna-watcher-job-queue
-      - POSTGRES_EXTENSION=ajna-watcher-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - ajna_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-
-  ajna-watcher-job-runner:
-    restart: unless-stopped
-    depends_on:
-      ajna-watcher-db:
-        condition: service_healthy
-    image: cerc/watcher-ajna:local
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
-    command: ["bash", "./start-job-runner.sh"]
-    volumes:
-      - ../config/watcher-ajna/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-ajna/start-job-runner.sh:/app/start-job-runner.sh
-    ports:
-      - "9000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "9000"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  ajna-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      ajna-watcher-db:
-        condition: service_healthy
-      ajna-watcher-job-runner:
-        condition: service_healthy
-    image: cerc/watcher-ajna:local
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
-    command: ["bash", "./start-server.sh"]
-    volumes:
-      - ../config/watcher-ajna/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-ajna/start-server.sh:/app/start-server.sh
-    ports:
-      - "3008"
-      - "9001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3008"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  ajna_watcher_db_data:

stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml

@@ -50,6 +50,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="azimuth", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -126,6 +142,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="censures", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -202,6 +234,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="claims", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -278,6 +326,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="conditional_star_release", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -354,6 +418,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="delegated_sending", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -430,6 +510,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="ecliptic", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -506,6 +602,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="azimuth", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -582,6 +694,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="azimuth", instance="polls", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -660,6 +788,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="sushi", instance="sushiswap", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600
@@ -736,6 +880,22 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
+          - refId: latest_indexed
+            relativeTimeRange:
+              from: 600
+              to: 0
+            datasourceUid: PBFA97CFB590B2093
+            model:
+              datasource:
+                type: prometheus
+                uid: PBFA97CFB590B2093
+              editorMode: code
+              expr: sync_status_block_number{job="sushi", instance="merkl_sushiswap", kind="latest_indexed"}
+              hide: false
+              instant: true
+              legendFormat: __auto
+              range: false
+              refId: latest_indexed
           - refId: condition
             relativeTimeRange:
               from: 600

stack_orchestrator/data/config/uniswap-interface/build-app.sh

@@ -15,5 +15,7 @@ yarn build
 
 # Copy over build and other files to app-builds for urbit deployment
 mkdir -p /app-builds/uniswap
-cp -r urbit-files /app-builds/uniswap/
-cp -r ./build /app-builds/uniswap/urbit-files
+cp -r ./build /app-builds/uniswap/
+
+cp -r mar /app-builds/uniswap/
+cp desk.docket-0 /app-builds/uniswap/

stack_orchestrator/data/config/uniswap-interface/urbit-files/app/proxy.hoon

@@ -1,225 +0,0 @@
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::
-::  Proxy server
-::  ------------
-::
-::  This is a simple agent which accepts requests at the path given in the `on-init` arm-- in this
-::  case, "/apps/uniswap-proxy/"-- and proxies them to the upstream, in this case,
-::  "https://api.uniswap.org/".
-::
-::  For example, assuming your ship is running on `localhost:8080`, a request to the url
-::
-::        `http://localhost:8080/apps/uniswap-proxy/v1/graphql`
-::
-::  will be proxied to
-::
-::        `https://api.uniswap.org/v1/graphql`
-::
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::
-/+  dbug, server, default-agent
-::
-|%
-  +$  card  card:agent:gall
-  +$  state
-    $%  %0
-    ==
---
-::
-:: Path config
-|%
-  ++  base-url-path     /apps/uniswap-proxy         :: HTTP path on the ship that this agent will bind to
-  ++  upstream-api-url  "https://api.uniswap.org/"  :: Upstream HTTP api that requests should be proxied to
---
-::
-%-  agent:dbug
-::
-=|  state
-=*  state  -
-::
-^-  agent:gall
-=<
-|_  =bowl:gall
-  +*  this  .
-      default   ~(. (default-agent this) bowl)
-  ::
-  ++  on-init
-    ^-  (quip card _this)
-    :_  this
-    :~
-      [%pass /eyre/connect %arvo %e %connect [~ base-url-path] %proxy]
-    ==
-  ::
-  ++  on-poke
-    |=  [=mark =vase]
-    ^-  (quip card _this)
-    :_  this :: We have no state
-    ?+  mark  (on-poke:default mark vase)
-        %handle-http-request
-      =/  [eyre-id=@ta inbound-req=inbound-request:eyre]  !<([@ta =inbound-request:eyre] vase)
-      ~&  "Eyre id: {<eyre-id>}"
-      =/  old-req  request:inbound-req
-      =/  new-req=request:http
-        %=  old-req
-          :: Remove path prefix from the url, replace with Uniswap domain and path prefix
-          url  (rewrite-path url:old-req)
-          :: Change the "Origin" header to match the upstream (this is hacky as fuck and will break eventually)
-          header-list  (rewrite-headers header-list:old-req)
-        ==
-      ~&  "Proxying {<url.old-req>} to {<url.new-req>}"
-      ~&  "Outgoing headers: {<header-list:new-req>}"
-      :~
-        [%pass /response/[eyre-id] %arvo %i %request new-req *outbound-config:iris]
-      ==
-    ==
-  ::
-  ++  on-arvo
-    |=  [=wire =sign-arvo]
-    ^-  (quip card _this)
-    :_  this  :: We don't have any state
-    ?+  sign-arvo  (on-arvo:default wire sign-arvo)
-      ::
-      :: Arvo will respond when we initially connect to Eyre in `on-init`.  We will accept (and ignore)
-      :: that and reject any other communications.
-        [%eyre %bound *]
-      ~&  "Got eyre bound: {<sign-arvo>}"
-      ~
-        [%iris %http-response %finished *]
-      ?+  wire  (on-arvo:default wire sign-arvo)
-          [%response @ ~]
-        =/  original-eyre-id=@ta  (snag 1 `(list @ta)`wire)
-        =/  resp=client-response:iris  +:+:sign-arvo
-        ?>  ?=  %finished  -.resp
-        =/  resp-header=response-header:http  response-header:resp
-        =/  the-octs=octs  data:(need full-file:resp)
-        ::
-        =/  thedata=@t  q.the-octs
-        ~&  resp-header
-        ~&  "Proxied HTTP {<status-code:resp-header>}:  {<thedata>}"
-        %+  give-simple-payload:app:server
-          original-eyre-id
-        :-  %_(resp-header headers [['Content-type'^'application/json'] ~])
-        `the-octs
-      ==
-    ==
-  ::
-  :: Each time Eyre pokes a request to us, it will subscribe for the response.  We will just accept
-  :: those connections (wire = /http-response/[eyre-id]) and reject any others.
-  :: See: https://docs.urbit.org/system/kernel/eyre/reference/tasks#connect
-  ++  on-watch
-    |=  =path
-    ^-  (quip card _this)
-    ?+    path  (on-watch:default path)
-        [%http-response *]
-      `this
-    ==
-  ::
-  ++  on-save   on-save:default
-  ++  on-load   on-load:default
-  ++  on-leave  on-leave:default
-  ++  on-peek   on-peek:default
-  ++  on-agent  on-agent:default
-  ++  on-fail   on-fail:default
---
-::
-:: Helpers core
-|%
-  :: Rewrites a path like "/apps/uniswap-proxy/v1/graphql" to "https://api.uniswap.org/v1/graphql".
-  :: `url-path` is a path, not a full URL!
-  ++  rewrite-path
-    |=  [url-path=@t]
-    %+  rash
-      url-path
-    :: Prepend the `upstream-api-url` base url and convert back to a cord
-    %+  cook
-      |=  [a=tape]
-      (crip (weld upstream-api-url a))
-    :: Strip the base path
-    ;~  pfix
-      (ifix [(just '/') (just '/')] (jest (crip (join '/' `(list @t)`base-url-path))))
-      (star prn)
-    ==
-  ::
-  :: Change the 'Origin' http header to "https://api.uniswap.org".
-  :: I don't know why this makes the request work, but it does.
-  :: Also drop the "x-forwarded-for" header for Red Horizon; otherwise this breaks it.
-  ++  rewrite-headers
-    |=  [headers=header-list:http]
-    ^-  header-list:http
-    =/  ret  *header-list:http
-    |-
-      ?~  headers
-        ret
-      %=  $
-        ret   ?+  (crip (cass (trip key:(head headers))))
-                ::
-                :: Default: use the header
-                  (snoc ret (head headers))
-                ::
-                :: Drop "x-forwarded-for" header
-                %'x-forwarded-for'
-                  ret
-                ::
-                :: Drop the "cookie" header, which contains the Urbit auth token (!)
-                %'cookie'
-                  ret
-                ::
-                :: Rewrite "origin" header
-                %'origin'
-                  (snoc ret ['origin' 'https://api.uniswap.org'])
-              ==
-        headers  +.headers
-      ==
-  ::
-  :: Manually construct a card that can be passed to iris, simulating a Uniswap graphql request.
-  :: Can be useful for testing purposes.
-  ++  iris-request-card
-    ::
-    :: The resulting card produces an HTTP request equivalent to the following cURL command:
-    ::
-    ::        curl 'https://api.uniswap.org/v1/graphql' \
-    ::            -H 'authority: interface.gateway.uniswap.org' \
-    ::            -H 'accept: */*' \
-    ::            -H 'accept-language: en-US,en;q=0.7' \
-    ::            -H 'content-type: application/json' \
-    ::            -H 'origin: https://app.uniswap.org' \
-    ::            -H 'referer: https://app.uniswap.org/' \
-    ::            -H 'sec-ch-ua: "Not A(Brand";v="99", "Brave";v="121", "Chromium";v="121"' \
-    ::            -H 'sec-ch-ua-mobile: ?0' \
-    ::            -H 'sec-ch-ua-platform: "Linux"' \
-    ::            -H 'sec-fetch-dest: empty' \
-    ::            -H 'sec-fetch-mode: cors' \
-    ::            -H 'sec-fetch-site: same-site' \
-    ::            -H 'sec-gpc: 1' \
-    ::            -H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36' \
-    ::            --data-raw $'{"operationName":"TokenSpotPrice","variables":{"address":null,"chain":"ETHEREUM"},"query":"query TokenSpotPrice($chain: Chain\u0021, $address: String = null) {\\n  token(chain: $chain, address: $address) {\\n    id\\n    address\\n    chain\\n    name\\n    symbol\\n    project {\\n      id\\n      markets(currencies: [USD]) {\\n        id\\n        price {\\n          id\\n          value\\n          __typename\\n        }\\n        __typename\\n      }\\n      __typename\\n    }\\n    __typename\\n  }\\n}"}' \
-    ::            --compressed
-    ::
-    =/  the-request=request:http
-      :*  %'POST'  'https://api.uniswap.org/v1/graphql'
-          :~  ['Accept-Language' 'en-US,en']
-              ['Cache-Control' 'no-cache']
-              ['Connection' 'keep-alive']
-              ['Origin' 'http://localhost:8080']
-              ['Pragma' 'no-cache']
-              ['Referer' 'http://localhost:8080/']
-              ['Sec-Fetch-Dest' 'empty']
-              ['Sec-Fetch-Mode' 'cors']
-              ['Sec-Fetch-Site' 'same-site']
-              ['Sec-GPC' '1']
-              ['User-Agent' 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36']
-              ['accept' '*/*']
-              ['content-type' 'application/json']
-              ['sec-ch-ua' '"Not A(Brand";v="99", "Brave";v="121", "Chromium";v="121"']
-              ['sec-ch-ua-mobile' '?0']
-              ['sec-ch-ua-platform' '"Linux"']
-          ==
-          :-  ~  %-  as-octs:mimes:html
-          '''
-          {"operationName":"TokenSpotPrice","variables":{"address":null,"chain":"ETHEREUM"},"query":"query TokenSpotPrice($chain: Chain\u0021, $address: String = null) {\n  token(chain: $chain, address: $address) {\n    id\n    address\n    chain\n    name\n    symbol\n    project {\n      id\n      markets(currencies: [USD]) {\n        id\n        price {\n          id\n          value\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}"}
-          '''
-      ==
-    :~
-      [%pass /response/1 %arvo %i %request the-request *outbound-config:iris]
-    ==
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/desk.bill

@@ -1,2 +0,0 @@
-:~  %proxy
-==

stack_orchestrator/data/config/uniswap-interface/urbit-files/lib/dbug.hoon

@@ -1,155 +0,0 @@
-::  dbug: agent wrapper for generic debugging tools
-::
-::    usage: %-(agent:dbug your-agent)
-::
-|%
-+$  poke
-  $%  [%bowl ~]
-      [%state grab=cord]
-      [%incoming =about]
-      [%outgoing =about]
-  ==
-::
-+$  about
-  $@  ~
-  $%  [%ship =ship]
-      [%path =path]
-      [%wire =wire]
-      [%term =term]
-  ==
-::
-++  agent
-  |=  =agent:gall
-  ^-  agent:gall
-  !.
-  |_  =bowl:gall
-  +*  this  .
-      ag    ~(. agent bowl)
-  ::
-  ++  on-poke
-    |=  [=mark =vase]
-    ^-  (quip card:agent:gall agent:gall)
-    ?.  ?=(%dbug mark)
-      =^  cards  agent  (on-poke:ag mark vase)
-      [cards this]
-    =/  dbug
-      !<(poke vase)
-    =;  =tang
-      ((%*(. slog pri 1) tang) [~ this])
-    ?-  -.dbug
-      %bowl   [(sell !>(bowl))]~
-    ::
-        %state
-      =?  grab.dbug  =('' grab.dbug)  '-'
-      =;  product=^vase
-        [(sell product)]~
-      =/  state=^vase
-        ::  if the underlying app has implemented a /dbug/state scry endpoint,
-        ::  use that vase in place of +on-save's.
-        ::
-        =/  result=(each ^vase tang)
-          (mule |.(q:(need (need (on-peek:ag /x/dbug/state)))))
-        ?:(?=(%& -.result) p.result on-save:ag)
-      %+  slap
-        (slop state !>([bowl=bowl ..zuse]))
-      (ream grab.dbug)
-    ::
-        %incoming
-      =;  =tang
-        ?^  tang  tang
-        [%leaf "no matching subscriptions"]~
-      %+  murn
-        %+  sort  ~(tap by sup.bowl)
-        |=  [[* a=[=ship =path]] [* b=[=ship =path]]]
-        (aor [path ship]:a [path ship]:b)
-      |=  [=duct [=ship =path]]
-      ^-  (unit tank)
-      =;  relevant=?
-        ?.  relevant  ~
-        `>[path=path from=ship duct=duct]<
-      ?:  ?=(~ about.dbug)  &
-      ?-  -.about.dbug
-        %ship  =(ship ship.about.dbug)
-        %path  ?=(^ (find path.about.dbug path))
-        %wire  %+  lien  duct
-               |=(=wire ?=(^ (find wire.about.dbug wire)))
-        %term  !!
-      ==
-    ::
-        %outgoing
-      =;  =tang
-        ?^  tang  tang
-        [%leaf "no matching subscriptions"]~
-      %+  murn
-        %+  sort  ~(tap by wex.bowl)
-        |=  [[[a=wire *] *] [[b=wire *] *]]
-        (aor a b)
-      |=  [[=wire =ship =term] [acked=? =path]]
-      ^-  (unit tank)
-      =;  relevant=?
-        ?.  relevant  ~
-        `>[wire=wire agnt=[ship term] path=path ackd=acked]<
-      ?:  ?=(~ about.dbug)  &
-      ?-  -.about.dbug
-        %ship  =(ship ship.about.dbug)
-        %path  ?=(^ (find path.about.dbug path))
-        %wire  ?=(^ (find wire.about.dbug wire))
-        %term  =(term term.about.dbug)
-      ==
-    ==
-  ::
-  ++  on-peek
-    |=  =path
-    ^-  (unit (unit cage))
-    ?.  ?=([@ %dbug *] path)
-      (on-peek:ag path)
-    ?+  path  [~ ~]
-      [%u %dbug ~]                 ``noun+!>(&)
-      [%x %dbug %state ~]          ``noun+!>(on-save:ag)
-      [%x %dbug %subscriptions ~]  ``noun+!>([wex sup]:bowl)
-    ==
-  ::
-  ++  on-init
-    ^-  (quip card:agent:gall agent:gall)
-    =^  cards  agent  on-init:ag
-    [cards this]
-  ::
-  ++  on-save   on-save:ag
-  ::
-  ++  on-load
-    |=  old-state=vase
-    ^-  (quip card:agent:gall agent:gall)
-    =^  cards  agent  (on-load:ag old-state)
-    [cards this]
-  ::
-  ++  on-watch
-    |=  =path
-    ^-  (quip card:agent:gall agent:gall)
-    =^  cards  agent  (on-watch:ag path)
-    [cards this]
-  ::
-  ++  on-leave
-    |=  =path
-    ^-  (quip card:agent:gall agent:gall)
-    =^  cards  agent  (on-leave:ag path)
-    [cards this]
-  ::
-  ++  on-agent
-    |=  [=wire =sign:agent:gall]
-    ^-  (quip card:agent:gall agent:gall)
-    =^  cards  agent  (on-agent:ag wire sign)
-    [cards this]
-  ::
-  ++  on-arvo
-    |=  [=wire =sign-arvo]
-    ^-  (quip card:agent:gall agent:gall)
-    =^  cards  agent  (on-arvo:ag wire sign-arvo)
-    [cards this]
-  ::
-  ++  on-fail
-    |=  [=term =tang]
-    ^-  (quip card:agent:gall agent:gall)
-    =^  cards  agent  (on-fail:ag term tang)
-    [cards this]
-  --
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/lib/default-agent.hoon

@@ -1,65 +0,0 @@
-|=  [agent=agent:gall]
-|_  =bowl:gall
-++  on-init
-  `agent
-::
-++  on-save
-  !>(~)
-::
-++  on-load
-  |=  old-state=vase
-  `agent
-::
-++  on-poke
-  |=  =cage
-  ~|  "unexpected poke to {<dap.bowl>} with mark {<p.cage>}"
-  !!
-::
-++  on-watch
-  |=  =path
-  ~|  "unexpected subscription to {<dap.bowl>} on path {<path>}"
-  !!
-::
-++  on-leave
-  |=  path
-  `agent
-::
-++  on-peek
-  |=  =path
-  ~|  "unexpected scry into {<dap.bowl>} on path {<path>}"
-  !!
-::
-++  on-agent
-  |=  [=wire =sign:agent:gall]
-  ^-  (quip card:agent:gall _agent)
-  ?-    -.sign
-      %poke-ack
-    ?~  p.sign
-      `agent
-    %-  (slog leaf+"poke failed from {<dap.bowl>} on wire {<wire>}" u.p.sign)
-    `agent
-  ::
-      %watch-ack
-    ?~  p.sign
-      `agent
-    =/  =tank  leaf+"subscribe failed from {<dap.bowl>} on wire {<wire>}"
-    %-  (slog tank u.p.sign)
-    `agent
-  ::
-      %kick  `agent
-      %fact
-    ~|  "unexpected subscription update to {<dap.bowl>} on wire {<wire>}"
-    ~|  "with mark {<p.cage.sign>}"
-    !!
-  ==
-::
-++  on-arvo
-  |=  [=wire =sign-arvo]
-  ~|  "unexpected system response {<sign-arvo>} to {<dap.bowl>} on wire {<wire>}"
-  !!
-::
-++  on-fail
-  |=  [=term =tang]
-  %-  (slog leaf+"error in {<dap.bowl>}" >term< tang)
-  `agent
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/lib/server.hoon

@@ -1,159 +0,0 @@
-=,  eyre
-|%
-+$  request-line
-  $:  [ext=(unit @ta) site=(list @t)]
-      args=(list [key=@t value=@t])
-  ==
-::  +parse-request-line: take a cord and parse out a url
-::
-++  parse-request-line
-  |=  url=@t
-  ^-  request-line
-  (fall (rush url ;~(plug apat:de-purl:html yque:de-purl:html)) [[~ ~] ~])
-::
-++  manx-to-octs
-  |=  man=manx
-  ^-  octs
-  (as-octt:mimes:html (en-xml:html man))
-::
-++  json-to-octs
-  |=  jon=json
-  ^-  octs
-  (as-octs:mimes:html (en:json:html jon))
-::
-++  app
-  |%
-  ::
-  ::  +require-authorization:
-  ::      redirect to the login page when unauthenticated
-  ::      otherwise call handler on inbound request
-  ::
-  ++  require-authorization
-    |=  $:  =inbound-request:eyre
-            handler=$-(inbound-request:eyre simple-payload:http)
-        ==
-    ^-  simple-payload:http
-    ::
-    ?:  authenticated.inbound-request
-      ~!  this
-      ~!  +:*handler
-      (handler inbound-request)
-    ::
-    =-  [[307 ['location' -]~] ~]
-    %^  cat  3
-      '/~/login?redirect='
-    url.request.inbound-request
-  ::
-  ::  +require-authorization-simple:
-  ::      redirect to the login page when unauthenticated
-  ::      otherwise pass through simple-paylod
-  ::
-  ++  require-authorization-simple
-    |=  [=inbound-request:eyre =simple-payload:http]
-    ^-  simple-payload:http
-    ::
-    ?:  authenticated.inbound-request
-      ~!  this
-      simple-payload
-    ::
-    =-  [[307 ['location' -]~] ~]
-    %^  cat  3
-      '/~/login?redirect='
-    url.request.inbound-request
-  ::
-  ++  give-simple-payload
-    |=  [eyre-id=@ta =simple-payload:http]
-    ^-  (list card:agent:gall)
-    =/  header-cage
-      [%http-response-header !>(response-header.simple-payload)]
-    =/  data-cage
-      [%http-response-data !>(data.simple-payload)]
-    :~  [%give %fact ~[/http-response/[eyre-id]] header-cage]
-        [%give %fact ~[/http-response/[eyre-id]] data-cage]
-        [%give %kick ~[/http-response/[eyre-id]] ~]
-    ==
-  --
-++  gen
-  |%
-  ::
-  ++  max-1-da  ['cache-control' 'max-age=86400']
-  ++  max-1-wk  ['cache-control' 'max-age=604800']
-  ::
-  ++  html-response
-    =|  cache=?
-    |=  =octs
-    ^-  simple-payload:http
-    :_  `octs
-    [200 [['content-type' 'text/html'] ?:(cache [max-1-wk ~] ~)]]
-  ::
-  ++  css-response
-    =|  cache=?
-    |=  =octs
-    ^-  simple-payload:http
-    :_  `octs
-    [200 [['content-type' 'text/css'] ?:(cache [max-1-wk ~] ~)]]
-  ::
-  ++  js-response
-    =|  cache=?
-    |=  =octs
-    ^-  simple-payload:http
-    :_  `octs
-    [200 [['content-type' 'text/javascript'] ?:(cache [max-1-wk ~] ~)]]
-  ::
-  ++  png-response
-    =|  cache=?
-    |=  =octs
-    ^-  simple-payload:http
-    :_  `octs
-    [200 [['content-type' 'image/png'] ?:(cache [max-1-wk ~] ~)]]
-  ::
-  ++  svg-response
-    =|  cache=?
-    |=  =octs
-    ^-  simple-payload:http
-    :_  `octs
-    [200 [['content-type' 'image/svg+xml'] ?:(cache [max-1-wk ~] ~)]]
-  ::
-  ++  ico-response
-    |=  =octs
-    ^-  simple-payload:http
-    [[200 [['content-type' 'image/x-icon'] max-1-wk ~]] `octs]
-  ::
-  ++  woff2-response
-    =|  cache=?
-    |=  =octs
-    ^-  simple-payload:http
-    [[200 [['content-type' 'font/woff2'] max-1-wk ~]] `octs]
-  ::
-  ++  json-response
-    =|  cache=_|
-    |=  =json
-    ^-  simple-payload:http
-    :_  `(json-to-octs json)
-    [200 [['content-type' 'application/json'] ?:(cache [max-1-da ~] ~)]]
-  ::
-  ++  manx-response
-    =|  cache=_|
-    |=  man=manx
-    ^-  simple-payload:http
-    :_  `(manx-to-octs man)
-    [200 [['content-type' 'text/html'] ?:(cache [max-1-da ~] ~)]]
-  ::
-  ++  not-found
-    ^-  simple-payload:http
-    [[404 ~] ~]
-  ::
-  ++  login-redirect
-    |=  =request:http
-    ^-  simple-payload:http
-    =-  [[307 ['location' -]~] ~]
-    %^  cat  3
-      '/~/login?redirect='
-    url.request
-  ::
-  ++  redirect
-    |=  redirect=cord
-    ^-  simple-payload:http
-    [[307 ['location' redirect]~] ~]
-  --
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/bill.hoon

@@ -1,34 +0,0 @@
-|_  bil=(list dude:gall)
-++  grow
-  |%
-  ++  mime  `^mime`[/text/x-bill (as-octs:mimes:html hoon)]
-  ++  noun  bil
-  ++  hoon
-    ^-  @t
-    |^  (crip (of-wall:format (wrap-lines (spit-duz bil))))
-    ::
-    ++  wrap-lines
-      |=  taz=wall
-      ^-  wall
-      ?~  taz  ["~"]~
-      :-  (weld ":~  " i.taz)
-      %-  snoc  :_  "=="
-      (turn t.taz |=(t=tape (weld "    " t)))
-    ::
-    ++  spit-duz
-      |=  duz=(list dude:gall)
-      ^-  wall
-      (turn duz |=(=dude:gall ['%' (trip dude)]))
-    --
-  ++  txt   (to-wain:format hoon)
-  --
-++  grab
-  |%
-  ++  noun  (list dude:gall)
-  ++  mime
-    |=  [=mite len=@ud tex=@]
-    ~_  tex
-    !<((list dude:gall) (slap !>(~) (ream tex)))
-  --
-++  grad  %noun
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/hoon.hoon

@@ -1,36 +0,0 @@
-::::  /hoon/hoon/mar
-  ::
-/?    310
-::
-=,  eyre
-|_  own=@t
-::
-++  grow                                                ::  convert to
-  |%
-  ++  mime  `^mime`[/text/x-hoon (as-octs:mimes:html own)] ::  convert to %mime
-  ++  hymn
-    ;html
-      ;head
-        ;title:"Source"
-        ;script@"//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js";
-        ;script@"/lib/syntax/hoon.js";
-        ;link(rel "stylesheet", href "//cdnjs.cloudflare.com/ajax/libs/".
-          "codemirror/4.3.0/codemirror.min.css");
-        ;link/"/lib/syntax/codemirror.css"(rel "stylesheet");
-      ==
-      ;body
-        ;textarea#src:"{(trip own)}"
-        ;script:'CodeMirror.fromTextArea(src, {lineNumbers:true, readOnly:true})'
-      ==
-    ==
-  ++  txt
-    (to-wain:format own)
-  --
-++  grab
-  |%                                            ::  convert from
-  ++  mime  |=([p=mite q=octs] q.q)
-  ++  noun  @t                                  ::  clam from %noun
-  ++  txt   of-wain:format
-  --
-++  grad  %txt
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/kelvin.hoon

@@ -1,28 +0,0 @@
-|_  kal=waft:clay
-++  grow
-  |%
-  ++  mime  `^mime`[/text/x-kelvin (as-octs:mimes:html hoon)]
-  ++  noun  kal
-  ++  hoon
-    %+  rap  3
-    %+  turn
-      %+  sort
-        ~(tap in (waft-to-wefts:clay kal))
-      |=  [a=weft b=weft]
-      ?:  =(lal.a lal.b)
-        (gte num.a num.b)
-      (gte lal.a lal.b)
-    |=  =weft
-    (rap 3 '[%' (scot %tas lal.weft) ' ' (scot %ud num.weft) ']\0a' ~)
-  ::
-  ++  txt   (to-wain:format hoon)
-  --
-++  grab
-  |%
-  ++  noun  waft:clay
-  ++  mime
-    |=  [=mite len=@ud tex=@]
-    (cord-to-waft:clay tex)
-  --
-++  grad  %noun
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/map.hoon

@@ -0,0 +1,18 @@
+::
+::::  /hoon/map/mar
+  ::  Mark for js source maps
+/?    310
+::
+=,  eyre
+|_  mud=@
+++  grow
+  |%
+  ++  mime  [/application/octet-stream (as-octs:mimes:html (@t mud))]
+  --
+++  grab
+  |%                                                    ::  convert from
+  ++  mime  |=([p=mite q=octs] (@t q.q))
+  ++  noun  cord                                        ::  clam from %noun
+  --
+++  grad  %mime
+--

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/mime.hoon

@@ -1,32 +0,0 @@
-::
-::::  /hoon/mime/mar
-  ::
-/?    310
-::
-|_  own=mime
-++  grow
-  ^?
-  |%
-  ++  jam  `@`q.q.own
-  --
-::
-++  grab                                                ::  convert from
-  ^?
-  |%
-  ++  noun  mime                                  ::  clam from %noun
-  ++  tape
-    |=(a=_"" [/application/x-urb-unknown (as-octt:mimes:html a)])
-  --
-++  grad
-  ^?
-  |%
-  ++  form  %mime
-  ++  diff  |=(mime +<)
-  ++  pact  |=(mime +<)
-  ++  join  |=([mime mime] `(unit mime)`~)
-  ++  mash
-    |=  [[ship desk mime] [ship desk mime]]
-    ^-  mime
-    ~|(%mime-mash !!)
-  --
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/noun.hoon

@@ -1,22 +0,0 @@
-::
-::::  /hoon/noun/mar
-  ::
-/?    310
-!:
-::::  A minimal noun mark
-|_  non=*
-++  grab  |%
-          ++  noun  *
-          --
-++  grow  |%
-          ++  mime  [/application/x-urb-jam (as-octs:mimes:html (jam non))]
-          --
-++  grad
-  |%
-  ++  form  %noun
-  ++  diff  |=(* +<)
-  ++  pact  |=(* +<)
-  ++  join  |=([* *] *(unit *))
-  ++  mash  |=([[ship desk *] [ship desk *]] `*`~|(%noun-mash !!))
-  --
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/ttf.hoon

@@ -0,0 +1,12 @@
+|_  dat=octs
+++  grow
+  |%
+  ++  mime  [/font/ttf dat]
+  --
+++  grab
+  |%
+  ++  mime  |=([=mite =octs] octs)
+  ++  noun  octs
+  --
+++  grad  %mime
+--

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/txt.hoon

@@ -1,274 +0,0 @@
-::
-::::  /hoon/txt/mar
-  ::
-/?    310
-::
-=,  clay
-=,  differ
-=,  format
-=,  mimes:html
-|_  txt=wain
-::
-++  grab                                                ::  convert from
-  |%
-  ++  mime  |=((pair mite octs) (to-wain q.q))
-  ++  noun  wain                                        ::  clam from %noun
-  --
-++  grow
-  =>  v=.
-  |%
-  ++  mime  =>  v  [/text/plain (as-octs (of-wain txt))]
-  --
-++  grad
-  |%
-  ++  form  %txt-diff
-  ++  diff
-    |=  tyt=wain
-    ^-  (urge cord)
-    (lusk txt tyt (loss txt tyt))
-  ::
-  ++  pact
-    |=  dif=(urge cord)
-    ~|  [%pacting dif]
-    ^-  wain
-    (lurk txt dif)
-  ::
-  ++  join
-    |=  [ali=(urge cord) bob=(urge cord)]
-    ^-  (unit (urge cord))
-    |^
-    =.  ali  (clean ali)
-    =.  bob  (clean bob)
-    |-  ^-  (unit (urge cord))
-    ?~  ali  `bob
-    ?~  bob  `ali
-    ?-    -.i.ali
-        %&
-      ?-    -.i.bob
-          %&
-        ?:  =(p.i.ali p.i.bob)
-          %+  bind  $(ali t.ali, bob t.bob)
-          |=(cud=(urge cord) [i.ali cud])
-        ?:  (gth p.i.ali p.i.bob)
-          %+  bind  $(p.i.ali (sub p.i.ali p.i.bob), bob t.bob)
-          |=(cud=(urge cord) [i.bob cud])
-        %+  bind  $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))
-        |=(cud=(urge cord) [i.ali cud])
-      ::
-          %|
-        ?:  =(p.i.ali (lent p.i.bob))
-          %+  bind  $(ali t.ali, bob t.bob)
-          |=(cud=(urge cord) [i.bob cud])
-        ?:  (gth p.i.ali (lent p.i.bob))
-          %+  bind  $(p.i.ali (sub p.i.ali (lent p.i.bob)), bob t.bob)
-          |=(cud=(urge cord) [i.bob cud])
-        ~
-      ==
-    ::
-        %|
-      ?-  -.i.bob
-          %|
-        ?.  =(i.ali i.bob)
-          ~
-        %+  bind  $(ali t.ali, bob t.bob)
-        |=(cud=(urge cord) [i.ali cud])
-      ::
-          %&
-        ?:  =(p.i.bob (lent p.i.ali))
-          %+  bind  $(ali t.ali, bob t.bob)
-          |=(cud=(urge cord) [i.ali cud])
-        ?:  (gth p.i.bob (lent p.i.ali))
-          %+  bind  $(ali t.ali, p.i.bob (sub p.i.bob (lent p.i.ali)))
-          |=(cud=(urge cord) [i.ali cud])
-        ~
-      ==
-    ==
-    ++  clean                                          ::  clean
-      |=  wig=(urge cord)
-      ^-  (urge cord)
-      ?~  wig  ~
-      ?~  t.wig  wig
-      ?:  ?=(%& -.i.wig)
-        ?:  ?=(%& -.i.t.wig)
-          $(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
-        [i.wig $(wig t.wig)]
-      ?:  ?=(%| -.i.t.wig)
-        $(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
-      [i.wig $(wig t.wig)]
-    --
-  ::
-  ++  mash
-    |=  $:  [als=ship ald=desk ali=(urge cord)]
-            [bos=ship bod=desk bob=(urge cord)]
-        ==
-    ^-  (urge cord)
-    |^
-    =.  ali  (clean ali)
-    =.  bob  (clean bob)
-    |-  ^-  (urge cord)
-    ?~  ali  bob
-    ?~  bob  ali
-    ?-    -.i.ali
-        %&
-      ?-    -.i.bob
-          %&
-        ?:  =(p.i.ali p.i.bob)
-          [i.ali $(ali t.ali, bob t.bob)]
-        ?:  (gth p.i.ali p.i.bob)
-          [i.bob $(p.i.ali (sub p.i.ali p.i.bob), bob t.bob)]
-        [i.ali $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))]
-      ::
-          %|
-        ?:  =(p.i.ali (lent p.i.bob))
-          [i.bob $(ali t.ali, bob t.bob)]
-        ?:  (gth p.i.ali (lent p.i.bob))
-          [i.bob $(p.i.ali (sub p.i.ali (lent p.i.bob)), bob t.bob)]
-        =/  [fic=(unce cord) ali=(urge cord) bob=(urge cord)]
-            (resolve ali bob)
-        [fic $(ali ali, bob bob)]
-        ::  ~   ::  here, alice is good for a while, but not for the whole
-      ==    ::  length of bob's changes
-    ::
-        %|
-      ?-  -.i.bob
-          %|
-        =/  [fic=(unce cord) ali=(urge cord) bob=(urge cord)]
-            (resolve ali bob)
-        [fic $(ali ali, bob bob)]
-      ::
-          %&
-        ?:  =(p.i.bob (lent p.i.ali))
-          [i.ali $(ali t.ali, bob t.bob)]
-        ?:  (gth p.i.bob (lent p.i.ali))
-          [i.ali $(ali t.ali, p.i.bob (sub p.i.bob (lent p.i.ali)))]
-        =/  [fic=(unce cord) ali=(urge cord) bob=(urge cord)]
-            (resolve ali bob)
-        [fic $(ali ali, bob bob)]
-      ==
-    ==
-    ::
-    ++  annotate                                        ::  annotate conflict
-      |=  $:  ali=(list @t)
-              bob=(list @t)
-              bas=(list @t)
-          ==
-      ^-  (list @t)
-      %-  zing
-      ^-  (list (list @t))
-      %-  flop
-      ^-  (list (list @t))
-      :-  :_  ~
-          %^  cat  3  '<<<<<<<<<<<<'
-          %^  cat  3  ' '
-          %^  cat  3  `@t`(scot %p bos)
-          %^  cat  3  '/'
-          bod
-
-      :-  bob
-      :-  ~['------------']
-      :-  bas
-      :-  ~['++++++++++++']
-      :-  ali
-      :-  :_  ~
-          %^  cat  3  '>>>>>>>>>>>>'
-          %^  cat  3  ' '
-          %^  cat  3  `@t`(scot %p als)
-          %^  cat  3  '/'
-          ald
-      ~
-    ::
-    ++  clean                                          ::  clean
-      |=  wig=(urge cord)
-      ^-  (urge cord)
-      ?~  wig  ~
-      ?~  t.wig  wig
-      ?:  ?=(%& -.i.wig)
-        ?:  ?=(%& -.i.t.wig)
-          $(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
-        [i.wig $(wig t.wig)]
-      ?:  ?=(%| -.i.t.wig)
-        $(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
-      [i.wig $(wig t.wig)]
-    ::
-    ++  resolve
-      |=  [ali=(urge cord) bob=(urge cord)]
-      ^-  [fic=[%| p=(list cord) q=(list cord)] ali=(urge cord) bob=(urge cord)]
-      =-  [[%| bac (annotate alc boc bac)] ali bob]
-      |-  ^-  $:  $:  bac=(list cord)
-                      alc=(list cord)
-                      boc=(list cord)
-                  ==
-                  ali=(urge cord)
-                  bob=(urge cord)
-              ==
-      ?~  ali  [[~ ~ ~] ali bob]
-      ?~  bob  [[~ ~ ~] ali bob]
-      ?-    -.i.ali
-          %&
-        ?-    -.i.bob
-            %&  [[~ ~ ~] ali bob]                       ::  no conflict
-            %|
-          =+  lob=(lent p.i.bob)
-          ?:  =(lob p.i.ali)
-            [[p.i.bob p.i.bob q.i.bob] t.ali t.bob]
-          ?:  (lth lob p.i.ali)
-            [[p.i.bob p.i.bob q.i.bob] [[%& (sub p.i.ali lob)] t.ali] t.bob]
-          =+  wat=(scag (sub lob p.i.ali) p.i.bob)
-          =+  ^=  res
-              %=  $
-                ali  t.ali
-                bob  [[%| (scag (sub lob p.i.ali) p.i.bob) ~] t.bob]
-              ==
-          :*  :*  (welp bac.res wat)
-                  (welp alc.res wat)
-                  (welp boc.res q.i.bob)
-              ==
-              ali.res
-              bob.res
-          ==
-        ==
-      ::
-          %|
-        ?-    -.i.bob
-            %&
-          =+  loa=(lent p.i.ali)
-          ?:  =(loa p.i.bob)
-            [[p.i.ali q.i.ali p.i.ali] t.ali t.bob]
-          ?:  (lth loa p.i.bob)
-            [[p.i.ali q.i.ali p.i.ali] t.ali [[%& (sub p.i.bob loa)] t.bob]]
-          =+  wat=(slag (sub loa p.i.bob) p.i.ali)
-          =+  ^=  res
-              %=  $
-                ali  [[%| (scag (sub loa p.i.bob) p.i.ali) ~] t.ali]
-                bob  t.bob
-              ==
-          :*  :*  (welp bac.res wat)
-                  (welp alc.res q.i.ali)
-                  (welp boc.res wat)
-              ==
-              ali.res
-              bob.res
-          ==
-        ::
-            %|
-          =+  loa=(lent p.i.ali)
-          =+  lob=(lent p.i.bob)
-          ?:  =(loa lob)
-            [[p.i.ali q.i.ali q.i.bob] t.ali t.bob]
-          =+  ^=  res
-              ?:  (gth loa lob)
-                $(ali [[%| (scag (sub loa lob) p.i.ali) ~] t.ali], bob t.bob)
-              ~&  [%scagging loa=loa pibob=p.i.bob slag=(scag loa p.i.bob)]
-              $(ali t.ali, bob [[%| (scag (sub lob loa) p.i.bob) ~] t.bob])
-          :*  :*  (welp bac.res ?:((gth loa lob) p.i.bob p.i.ali))
-                  (welp alc.res q.i.ali)
-                  (welp boc.res q.i.bob)
-              ==
-              ali.res
-              bob.res
-          ==
-        ==
-      ==
-    --
-  --
---

stack_orchestrator/data/config/uniswap-interface/urbit-files/mar/woff.hoon

@@ -0,0 +1,12 @@
+|_  dat=octs
+++  grow
+  |%
+  ++  mime  [/font/woff dat]
+  --
+++  grab
+  |%
+  ++  mime  |=([=mite =octs] octs)
+  ++  noun  octs
+  --
+++  grad  %mime
+--

stack_orchestrator/data/config/urbit/deploy-app.sh

@@ -17,10 +17,16 @@ if [ -d ${app_desk_dir} ]; then
   exit 0
 fi
 
-app_files=/app-builds/${CERC_URBIT_APP}/urbit-files
+app_build=/app-builds/${CERC_URBIT_APP}/build
+app_mark_files=/app-builds/${CERC_URBIT_APP}/mar
+app_docket_file=/app-builds/${CERC_URBIT_APP}/desk.docket-0
+
+echo "Reading app build from ${app_build}"
+echo "Reading additional mark files from ${app_mark_files}"
+echo "Reading docket file ${app_docket_file}"
 
 # Loop until the app's build appears
-while [ ! -d "${app_files}/build" ]; do
+while [ ! -d ${app_build} ]; do
   echo "${CERC_URBIT_APP} app build not found, retrying in 5s..."
   sleep 5
 done
@@ -44,15 +50,14 @@ hood () {
 hood "merge %${CERC_URBIT_APP} our %landscape"
 hood "mount %${CERC_URBIT_APP}"
 
-rm "${app_desk_dir}/desk.bill"  # Don't install the landscape apps
-rm "${app_desk_dir}/desk.ship"
-
-
-echo "Copying files from ${app_files}"
-
 # Copy over build to desk data dir
-cp -r ${app_files}/* ${app_desk_dir}
-rm ${app_desk_dir}/desk.docket-0 # Remove until we have a valid glob path; it's added back again below
+cp -r ${app_build} ${app_desk_dir}
+
+# Copy over the additional mark files
+cp ${app_mark_files}/* ${app_desk_dir}/mar/
+
+rm "${app_desk_dir}/desk.bill"
+rm "${app_desk_dir}/desk.ship"
 
 # Commit changes and create a glob
 hood "commit %${CERC_URBIT_APP}"
@@ -94,8 +99,8 @@ while true; do
 done
 
 # Replace the docket file for app
-# Substitute the glob URL and hash
-cp ${app_files}/desk.docket-0 ${app_desk_dir}/
+# Substitue the glob URL and hash
+cp ${app_docket_file} ${app_desk_dir}/
 sed -i "s|REPLACE_WITH_GLOB_URL|${glob_url}|g; s|REPLACE_WITH_GLOB_HASH|${glob_hash}|g" ${app_desk_dir}/desk.docket-0
 
 # Commit changes and install the app

stack_orchestrator/data/config/vega-interface/build-app.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# Check and exit if a deployment already exists (on restarts)
-if [ -d /app-builds/vega/build ]; then
-  echo "Build already exists, remove volume to rebuild"
-  exit 0
-fi
-
-./docker/prepare-dist.sh
-
-# Post-process the output: rename files, e.g., `AlphaLyrae.woff2` => `alphalyrae.woff2`
-while read filepath; do
-  filename=$(basename "$filepath")
-  dir=$(dirname "$filepath")
-  if echo "$filename" | grep -q "[A-Z]"; then
-    newfilename=$(tr '[:upper:]' '[:lower:]' <<< "$filename")
-    echo "Translating '$filepath' => $dir/$newfilename'"
-    mv "$filepath" "$dir/$newfilename"
-    find dist-result -type f | xargs sed -i "s/$filename/$newfilename/g"
-  fi
-done < <(find dist-result/ -type f)
-
-
-# Copy over dist-result and other files to `app-builds` volume for urbit deployment
-mkdir -p /app-builds/vega
-cp -r ./dist-result /app-builds/vega/build
-cp -r urbit-files/* /app-builds/vega/

stack_orchestrator/data/config/vega-interface/urbit-files/desk.docket-0

@@ -1,10 +0,0 @@
-:~  title+'Vegas'
-    info+'vegas'
-    color+0xcd.75df
-    image+'https://vegaprotocol.eth.limo/favicon.ico'
-    base+'vegas'
-    glob-http+['REPLACE_WITH_GLOB_URL' REPLACE_WITH_GLOB_HASH]
-    version+[0 0 1]
-    website+'https://vega.xyz/'
-    license+'MIT'
-==

stack_orchestrator/data/config/vega-interface/urbit-files/lib/docket.hoon

@@ -1,223 +0,0 @@
-/-  *docket
-|%
-::
-++  mime
-  |%
-  +$  draft
-    $:  title=(unit @t)
-        info=(unit @t)
-        color=(unit @ux)
-        glob-http=(unit [=url hash=@uvH])
-        glob-ames=(unit [=ship hash=@uvH])
-        base=(unit term)
-        site=(unit path)
-        image=(unit url)
-        version=(unit version)
-        website=(unit url)
-        license=(unit cord)
-    ==
-  ::
-  ++  finalize
-    |=  =draft
-    ^-  (unit docket)
-    ?~  title.draft  ~
-    ?~  info.draft  ~
-    ?~  color.draft  ~
-    ?~  version.draft  ~
-    ?~  website.draft  ~
-    ?~  license.draft  ~
-    =/  href=(unit href)
-      ?^  site.draft  `[%site u.site.draft]
-      ?~  base.draft  ~
-      ?^  glob-http.draft
-        `[%glob u.base hash.u.glob-http %http url.u.glob-http]:draft
-      ?~  glob-ames.draft
-        ~
-      `[%glob u.base hash.u.glob-ames %ames ship.u.glob-ames]:draft
-    ?~  href  ~
-    =,  draft
-    :-  ~
-    :*  %1
-        u.title
-        u.info
-        u.color
-        u.href
-        image
-        u.version
-        u.website
-        u.license
-    ==
-  ::
-  ++  from-clauses
-    =|  =draft
-    |=  cls=(list clause)
-    ^-  (unit docket)
-    =*  loop  $
-    ?~  cls  (finalize draft)
-    =*  clause  i.cls
-    =.  draft
-      ?-  -.clause
-        %title  draft(title `title.clause)
-        %info   draft(info `info.clause)
-        %color  draft(color `color.clause)
-        %glob-http   draft(glob-http `[url hash]:clause)
-        %glob-ames   draft(glob-ames `[ship hash]:clause)
-        %base   draft(base `base.clause)
-        %site   draft(site `path.clause)
-        %image  draft(image `url.clause)
-        %version  draft(version `version.clause)
-        %website  draft(website `website.clause)
-        %license  draft(license `license.clause)
-      ==
-    loop(cls t.cls)
-  ::
-  ++  to-clauses
-    |=  d=docket
-    ^-  (list clause)
-    %-  zing
-    :~  :~  title+title.d
-            info+info.d
-            color+color.d
-            version+version.d
-            website+website.d
-            license+license.d
-        ==
-        ?~  image.d  ~  ~[image+u.image.d]
-        ?:  ?=(%site -.href.d)  ~[site+path.href.d]
-        =/  ref=glob-reference  glob-reference.href.d
-        :~  base+base.href.d
-            ?-  -.location.ref
-              %http  [%glob-http url.location.ref hash.ref]
-              %ames  [%glob-ames ship.location.ref hash.ref]
-    ==  ==  ==
-  ::
-  ++  spit-clause
-    |=  =clause
-    ^-  tape
-    %+  weld  "  {(trip -.clause)}+"
-    ?+  -.clause  "'{(trip +.clause)}'"
-      %color  (scow %ux color.clause)
-      %site   (spud path.clause)
-    ::
-        %glob-http
-      "['{(trip url.clause)}' {(scow %uv hash.clause)}]"
-    ::
-        %glob-ames
-      "[{(scow %p ship.clause)} {(scow %uv hash.clause)}]"
-    ::
-        %version
-      =,  version.clause
-      "[{(scow %ud major)} {(scow %ud minor)} {(scow %ud patch)}]"
-    ==
-  ::
-  ++  spit-docket
-    |=  dock=docket
-    ^-  tape
-    ;:  welp
-      ":~\0a"
-      `tape`(zing (join "\0a" (turn (to-clauses dock) spit-clause)))
-      "\0a=="
-    ==
-  --
-::
-++  enjs
-  =,  enjs:format
-  |%
-  ::
-  ++  charge-update
-    |=  u=^charge-update
-    ^-  json
-    %+  frond  -.u
-    ^-  json
-    ?-  -.u
-      %del-charge  s+desk.u
-    ::
-        %initial
-      %-  pairs
-      %+  turn  ~(tap by initial.u)
-      |=([=desk c=^charge] [desk (charge c)])
-    ::
-        %add-charge
-      %-  pairs
-      :~  desk+s+desk.u
-          charge+(charge charge.u)
-      ==
-    ==
-  ::
-  ++  num
-    |=  a=@u
-    ^-  ^tape
-    =/  p=json  (numb a)
-    ?>  ?=(%n -.p)
-    (trip p.p)
-  ::
-  ++  version
-    |=  v=^version
-    ^-  json
-    :-  %s
-    %-  crip
-    "{(num major.v)}.{(num minor.v)}.{(num patch.v)}"
-  ::
-  ++  merge
-    |=  [a=json b=json]
-    ^-  json
-    ?>  &(?=(%o -.a) ?=(%o -.b))
-    [%o (~(uni by p.a) p.b)]
-  ::
-  ++  href
-    |=  h=^href
-    %+  frond  -.h
-    ?-    -.h
-        %site  s+(spat path.h)
-        %glob
-      %-  pairs
-      :~  base+s+base.h
-          glob-reference+(glob-reference glob-reference.h)
-      ==
-    ==
-  ::
-  ++  glob-reference
-    |=  ref=^glob-reference
-    %-  pairs
-    :~  hash+s+(scot %uv hash.ref)
-        location+(glob-location location.ref)
-    ==
-  ::
-  ++  glob-location
-    |=  loc=^glob-location
-    ^-  json
-    %+  frond  -.loc
-    ?-  -.loc
-      %http  s+url.loc
-      %ames  s+(scot %p ship.loc)
-    ==
-  ::
-  ++  charge
-    |=  c=^charge
-    %+  merge  (docket docket.c)
-    %-  pairs
-    :~  chad+(chad chad.c)
-    ==
-  ::
-  ++  docket
-    |=  d=^docket
-    ^-  json
-    %-  pairs
-    :~  title+s+title.d
-        info+s+info.d
-        color+s+(scot %ux color.d)
-        href+(href href.d)
-        image+?~(image.d ~ s+u.image.d)
-        version+(version version.d)
-        license+s+license.d
-        website+s+website.d
-    ==
-  ::
-  ++  chad
-    |=  c=^chad
-    %+  frond  -.c
-    ?+  -.c  ~
-      %hung  s+err.c
-    ==
-  --
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/bill.hoon

@@ -1,34 +0,0 @@
-|_  bil=(list dude:gall)
-++  grow
-  |%
-  ++  mime  `^mime`[/text/x-bill (as-octs:mimes:html hoon)]
-  ++  noun  bil
-  ++  hoon
-    ^-  @t
-    |^  (crip (of-wall:format (wrap-lines (spit-duz bil))))
-    ::
-    ++  wrap-lines
-      |=  taz=wall
-      ^-  wall
-      ?~  taz  ["~"]~
-      :-  (weld ":~  " i.taz)
-      %-  snoc  :_  "=="
-      (turn t.taz |=(t=tape (weld "    " t)))
-    ::
-    ++  spit-duz
-      |=  duz=(list dude:gall)
-      ^-  wall
-      (turn duz |=(=dude:gall ['%' (trip dude)]))
-    --
-  ++  txt   (to-wain:format hoon)
-  --
-++  grab
-  |%
-  ++  noun  (list dude:gall)
-  ++  mime
-    |=  [=mite len=@ud tex=@]
-    ~_  tex
-    !<((list dude:gall) (slap !>(~) (ream tex)))
-  --
-++  grad  %noun
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/css.hoon

@@ -1,25 +0,0 @@
-::
-::::  /hoon/css/mar
-  ::
-/?    310
-=,  eyre
-=,  mimes:html
-|_  mud=@t
-++  grow                                                ::  convert to
-  |%  
-  ++  mime  [/text/css (as-octs mud)]               ::  convert to %mime
-  ++  hymn                                          ::  convert to %hymn
-    |^  html
-    ++  style  ;style                                  
-                 ;-  (trip mud)
-               ==
-    ++  html   ;html:(head:"{style}" body)
-    --
-  --
-++  grab
-  |%                                                    ::  convert from
-  ++  mime  |=([p=mite q=octs] (@t q.q))
-  ++  noun  @t                                         ::  clam from %noun
-  --
-++  grad  %mime
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/docket-0.hoon

@@ -1,25 +0,0 @@
-/+  dock=docket
-|_  =docket:dock
-++  grow
-  |%
-  ++  mime
-    ^-  ^mime
-    [/text/x-docket (as-octt:mimes:html (spit-docket:mime:dock docket))]
-  ++  noun  docket
-  ++  json  (docket:enjs:dock docket)
-  --
-++  grab
-  |%
-  ::
-  ++  mime
-    |=  [=mite len=@ud tex=@]
-    ^-  docket:dock
-    %-  need
-    %-  from-clauses:mime:dock
-    !<((list clause:dock) (slap !>(~) (ream tex)))
-
-  ::
-  ++  noun  docket:dock
-  --
-++  grad  %noun
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/hoon.hoon

@@ -1,36 +0,0 @@
-::::  /hoon/hoon/mar
-  ::
-/?    310
-::
-=,  eyre
-|_  own=@t
-::
-++  grow                                                ::  convert to
-  |%
-  ++  mime  `^mime`[/text/x-hoon (as-octs:mimes:html own)] ::  convert to %mime
-  ++  hymn
-    ;html
-      ;head
-        ;title:"Source"
-        ;script@"//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js";
-        ;script@"/lib/syntax/hoon.js";
-        ;link(rel "stylesheet", href "//cdnjs.cloudflare.com/ajax/libs/".
-          "codemirror/4.3.0/codemirror.min.css");
-        ;link/"/lib/syntax/codemirror.css"(rel "stylesheet");
-      ==
-      ;body
-        ;textarea#src:"{(trip own)}"
-        ;script:'CodeMirror.fromTextArea(src, {lineNumbers:true, readOnly:true})'
-      ==
-    ==
-  ++  txt
-    (to-wain:format own)
-  --
-++  grab
-  |%                                            ::  convert from
-  ++  mime  |=([p=mite q=octs] q.q)
-  ++  noun  @t                                  ::  clam from %noun
-  ++  txt   of-wain:format
-  --
-++  grad  %txt
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/html.hoon

@@ -1,22 +0,0 @@
-::
-::::  /hoon/html/mar
-  ::
-/?    310
-  ::
-::::  compute
-  ::
-=,  html
-|_  htm=@t
-++  grow                                                ::  convert to
-  ^?
-  |%                                                    ::
-  ++  mime  [/text/html (met 3 htm) htm]                ::  to %mime
-  ++  hymn  (need (de-xml htm))                         ::  to %hymn
-  --                                                    ::
-++  grab  ^?
-          |%                                            ::  convert from
-          ++  noun  @t                                  ::  clam from %noun
-          ++  mime  |=([p=mite q=octs] q.q)             ::  retrieve form %mime
-          --
-++  grad  %mime
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/ico.hoon

@@ -1,12 +0,0 @@
-|_  dat=@
-++  grow
-  |%
-  ++  mime  [/image/x-icon (as-octs:mimes:html dat)]
-  --
-++  grab
-  |%
-  ++  mime  |=([p=mite q=octs] q.q)
-  ++  noun  @
-  --
-++  grad  %mime
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/jpg.hoon

@@ -1,12 +0,0 @@
-|_  dat=@
-++  grow
-  |%
-  ++  mime  [/image/jpeg (as-octs:mimes:html dat)]
-  --
-++  grab
-  |%
-  ++  mime  |=([p=mite q=octs] q.q)
-  ++  noun  @
-  --
-++  grad  %mime
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/js.hoon

@@ -1,25 +0,0 @@
-::
-::::  /hoon/js/mar
-  ::
-/?    310
-::
-=,  eyre
-|_  mud=@
-++  grow
-  |%
-  ++  mime  [/application/javascript (as-octs:mimes:html (@t mud))]
-  ++  hymn                                          ::  convert to %hymn
-    |^  html
-    ++  script  ;script
-                    ;-  (trip (@t mud))
-                ==
-    ++  html    ;html:(head:"{script}" body)
-    --
-  --
-++  grab
-  |%                                                    ::  convert from
-  ++  mime  |=([p=mite q=octs] (@t q.q))
-  ++  noun  cord                                        ::  clam from %noun
-  --
-++  grad  %mime
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/json.hoon

@@ -1,26 +0,0 @@
-::
-::::  /hoon/json/mar
-  ::
-/?    310
-  ::
-::::  compute
-  ::
-=,  eyre
-=,  format
-=,  html
-|_  jon=^json
-::
-++  grow                                                ::  convert to
-  |%
-  ++  mime  [/application/json (as-octs:mimes -:txt)]   ::  convert to %mime
-  ++  txt   [(en:json jon)]~
-  --
-++  grab
-  |%                                                    ::  convert from
-  ++  mime  |=([p=mite q=octs] (fall (de:json (@t q.q)) *^json))
-  ++  noun  ^json                                        ::  clam from %noun
-  ++  numb  numb:enjs
-  ++  time  time:enjs
-  --
-++  grad  %mime
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/json/rpc/response.hoon

@@ -1,42 +0,0 @@
-::
-/-  *json-rpc
-::
-|_  res=response
-::
-++  grad  %noun
-++  grow
-  |%
-  ++  noun  res
-  --
-++  grab                                                ::  convert from
-  |%
-  ++  noun  response                                    ::  from noun
-  ++  httr                                              ::  from httr
-    |=  hit=httr:eyre
-    ^-  response
-    ~|  hit
-    ?:  ?=(%2 (div p.hit 100))
-      %-  json
-      ?~  r.hit
-        a+~
-      (need (de:json:html q:u.r.hit))
-    fail+hit
-  ++  json                                              ::  from json
-    =,  dejs-soft:format
-    |=  a=json
-    ^-  response
-    =;  dere
-      =+  res=((ar dere) a)
-      ?~  res  (need (dere a))
-      [%batch u.res]
-    |=  a=json
-    ^-  (unit response)
-    =/  res=(unit [@t json])
-      ::TODO  breaks when no id present
-      ((ot id+so result+some ~) a)
-    ?^  res  `[%result u.res]
-    ~|  a
-    :+  ~  %error  %-  need
-    ((ot id+so error+(ot code+no message+so ~) ~) a)
-  --
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/kelvin.hoon

@@ -1,28 +0,0 @@
-|_  kal=waft:clay
-++  grow
-  |%
-  ++  mime  `^mime`[/text/x-kelvin (as-octs:mimes:html hoon)]
-  ++  noun  kal
-  ++  hoon
-    %+  rap  3
-    %+  turn
-      %+  sort
-        ~(tap in (waft-to-wefts:clay kal))
-      |=  [a=weft b=weft]
-      ?:  =(lal.a lal.b)
-        (gte num.a num.b)
-      (gte lal.a lal.b)
-    |=  =weft
-    (rap 3 '[%' (scot %tas lal.weft) ' ' (scot %ud num.weft) ']\0a' ~)
-  ::
-  ++  txt   (to-wain:format hoon)
-  --
-++  grab
-  |%
-  ++  noun  waft:clay
-  ++  mime
-    |=  [=mite len=@ud tex=@]
-    (cord-to-waft:clay tex)
-  --
-++  grad  %noun
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/mime.hoon

@@ -1,32 +0,0 @@
-::
-::::  /hoon/mime/mar
-  ::
-/?    310
-::
-|_  own=mime
-++  grow
-  ^?
-  |%
-  ++  jam  `@`q.q.own
-  --
-::
-++  grab                                                ::  convert from
-  ^?
-  |%
-  ++  noun  mime                                  ::  clam from %noun
-  ++  tape
-    |=(a=_"" [/application/x-urb-unknown (as-octt:mimes:html a)])
-  --
-++  grad
-  ^?
-  |%
-  ++  form  %mime
-  ++  diff  |=(mime +<)
-  ++  pact  |=(mime +<)
-  ++  join  |=([mime mime] `(unit mime)`~)
-  ++  mash
-    |=  [[ship desk mime] [ship desk mime]]
-    ^-  mime
-    ~|(%mime-mash !!)
-  --
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/noun.hoon

@@ -1,22 +0,0 @@
-::
-::::  /hoon/noun/mar
-  ::
-/?    310
-!:
-::::  A minimal noun mark
-|_  non=*
-++  grab  |%
-          ++  noun  *
-          --
-++  grow  |%
-          ++  mime  [/application/x-urb-jam (as-octs:mimes:html (jam non))]
-          --
-++  grad
-  |%
-  ++  form  %noun
-  ++  diff  |=(* +<)
-  ++  pact  |=(* +<)
-  ++  join  |=([* *] *(unit *))
-  ++  mash  |=([[ship desk *] [ship desk *]] `*`~|(%noun-mash !!))
-  --
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/png.hoon

@@ -1,12 +0,0 @@
-|_  dat=@
-++  grow
-  |%
-  ++  mime  [/image/png (as-octs:mimes:html dat)]
-  --
-++  grab
-  |%
-  ++  mime  |=([p=mite q=octs] q.q)
-  ++  noun  @
-  --
-++  grad  %mime
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/ship.hoon

@@ -1,20 +0,0 @@
-|_  s=ship
-++  grad  %noun
-++  grow
-  |%
-  ++  noun  s
-  ++  json  s+(scot %p s)
-  ++  mime
-    ^-  ^mime
-    [/text/x-ship (as-octt:mimes:html (scow %p s))]
-
-  --
-++  grab
-  |%
-  ++  noun  ship
-  ++  json  (su:dejs:format ;~(pfix sig fed:ag))
-  ++  mime
-    |=  [=mite len=@ tex=@]
-    (slav %p (snag 0 (to-wain:format tex)))
-  --
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/txt-diff.hoon

@@ -1,16 +0,0 @@
-::
-::::  /hoon/txt-diff/mar
-  ::
-/?    310
-|_  txt-diff=(urge:clay cord)
-::
-++  grad  %noun
-++  grow
-  |%
-  ++  noun  txt-diff
-  --
-++  grab                                                ::  convert from
-  |%
-  ++  noun  (urge:clay cord)                           ::  make from %noun
-  --
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/txt.hoon

@@ -1,274 +0,0 @@
-::
-::::  /hoon/txt/mar
-  ::
-/?    310
-::
-=,  clay
-=,  differ
-=,  format
-=,  mimes:html
-|_  txt=wain
-::
-++  grab                                                ::  convert from
-  |%
-  ++  mime  |=((pair mite octs) (to-wain q.q))
-  ++  noun  wain                                        ::  clam from %noun
-  --
-++  grow
-  =>  v=.
-  |%
-  ++  mime  =>  v  [/text/plain (as-octs (of-wain txt))]
-  --
-++  grad
-  |%
-  ++  form  %txt-diff
-  ++  diff
-    |=  tyt=wain
-    ^-  (urge cord)
-    (lusk txt tyt (loss txt tyt))
-  ::
-  ++  pact
-    |=  dif=(urge cord)
-    ~|  [%pacting dif]
-    ^-  wain
-    (lurk txt dif)
-  ::
-  ++  join
-    |=  [ali=(urge cord) bob=(urge cord)]
-    ^-  (unit (urge cord))
-    |^
-    =.  ali  (clean ali)
-    =.  bob  (clean bob)
-    |-  ^-  (unit (urge cord))
-    ?~  ali  `bob
-    ?~  bob  `ali
-    ?-    -.i.ali
-        %&
-      ?-    -.i.bob
-          %&
-        ?:  =(p.i.ali p.i.bob)
-          %+  bind  $(ali t.ali, bob t.bob)
-          |=(cud=(urge cord) [i.ali cud])
-        ?:  (gth p.i.ali p.i.bob)
-          %+  bind  $(p.i.ali (sub p.i.ali p.i.bob), bob t.bob)
-          |=(cud=(urge cord) [i.bob cud])
-        %+  bind  $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))
-        |=(cud=(urge cord) [i.ali cud])
-      ::
-          %|
-        ?:  =(p.i.ali (lent p.i.bob))
-          %+  bind  $(ali t.ali, bob t.bob)
-          |=(cud=(urge cord) [i.bob cud])
-        ?:  (gth p.i.ali (lent p.i.bob))
-          %+  bind  $(p.i.ali (sub p.i.ali (lent p.i.bob)), bob t.bob)
-          |=(cud=(urge cord) [i.bob cud])
-        ~
-      ==
-    ::
-        %|
-      ?-  -.i.bob
-          %|
-        ?.  =(i.ali i.bob)
-          ~
-        %+  bind  $(ali t.ali, bob t.bob)
-        |=(cud=(urge cord) [i.ali cud])
-      ::
-          %&
-        ?:  =(p.i.bob (lent p.i.ali))
-          %+  bind  $(ali t.ali, bob t.bob)
-          |=(cud=(urge cord) [i.ali cud])
-        ?:  (gth p.i.bob (lent p.i.ali))
-          %+  bind  $(ali t.ali, p.i.bob (sub p.i.bob (lent p.i.ali)))
-          |=(cud=(urge cord) [i.ali cud])
-        ~
-      ==
-    ==
-    ++  clean                                          ::  clean
-      |=  wig=(urge cord)
-      ^-  (urge cord)
-      ?~  wig  ~
-      ?~  t.wig  wig
-      ?:  ?=(%& -.i.wig)
-        ?:  ?=(%& -.i.t.wig)
-          $(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
-        [i.wig $(wig t.wig)]
-      ?:  ?=(%| -.i.t.wig)
-        $(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
-      [i.wig $(wig t.wig)]
-    --
-  ::
-  ++  mash
-    |=  $:  [als=ship ald=desk ali=(urge cord)]
-            [bos=ship bod=desk bob=(urge cord)]
-        ==
-    ^-  (urge cord)
-    |^
-    =.  ali  (clean ali)
-    =.  bob  (clean bob)
-    |-  ^-  (urge cord)
-    ?~  ali  bob
-    ?~  bob  ali
-    ?-    -.i.ali
-        %&
-      ?-    -.i.bob
-          %&
-        ?:  =(p.i.ali p.i.bob)
-          [i.ali $(ali t.ali, bob t.bob)]
-        ?:  (gth p.i.ali p.i.bob)
-          [i.bob $(p.i.ali (sub p.i.ali p.i.bob), bob t.bob)]
-        [i.ali $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))]
-      ::
-          %|
-        ?:  =(p.i.ali (lent p.i.bob))
-          [i.bob $(ali t.ali, bob t.bob)]
-        ?:  (gth p.i.ali (lent p.i.bob))
-          [i.bob $(p.i.ali (sub p.i.ali (lent p.i.bob)), bob t.bob)]
-        =/  [fic=(unce cord) ali=(urge cord) bob=(urge cord)]
-            (resolve ali bob)
-        [fic $(ali ali, bob bob)]
-        ::  ~   ::  here, alice is good for a while, but not for the whole
-      ==    ::  length of bob's changes
-    ::
-        %|
-      ?-  -.i.bob
-          %|
-        =/  [fic=(unce cord) ali=(urge cord) bob=(urge cord)]
-            (resolve ali bob)
-        [fic $(ali ali, bob bob)]
-      ::
-          %&
-        ?:  =(p.i.bob (lent p.i.ali))
-          [i.ali $(ali t.ali, bob t.bob)]
-        ?:  (gth p.i.bob (lent p.i.ali))
-          [i.ali $(ali t.ali, p.i.bob (sub p.i.bob (lent p.i.ali)))]
-        =/  [fic=(unce cord) ali=(urge cord) bob=(urge cord)]
-            (resolve ali bob)
-        [fic $(ali ali, bob bob)]
-      ==
-    ==
-    ::
-    ++  annotate                                        ::  annotate conflict
-      |=  $:  ali=(list @t)
-              bob=(list @t)
-              bas=(list @t)
-          ==
-      ^-  (list @t)
-      %-  zing
-      ^-  (list (list @t))
-      %-  flop
-      ^-  (list (list @t))
-      :-  :_  ~
-          %^  cat  3  '<<<<<<<<<<<<'
-          %^  cat  3  ' '
-          %^  cat  3  `@t`(scot %p bos)
-          %^  cat  3  '/'
-          bod
-
-      :-  bob
-      :-  ~['------------']
-      :-  bas
-      :-  ~['++++++++++++']
-      :-  ali
-      :-  :_  ~
-          %^  cat  3  '>>>>>>>>>>>>'
-          %^  cat  3  ' '
-          %^  cat  3  `@t`(scot %p als)
-          %^  cat  3  '/'
-          ald
-      ~
-    ::
-    ++  clean                                          ::  clean
-      |=  wig=(urge cord)
-      ^-  (urge cord)
-      ?~  wig  ~
-      ?~  t.wig  wig
-      ?:  ?=(%& -.i.wig)
-        ?:  ?=(%& -.i.t.wig)
-          $(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
-        [i.wig $(wig t.wig)]
-      ?:  ?=(%| -.i.t.wig)
-        $(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
-      [i.wig $(wig t.wig)]
-    ::
-    ++  resolve
-      |=  [ali=(urge cord) bob=(urge cord)]
-      ^-  [fic=[%| p=(list cord) q=(list cord)] ali=(urge cord) bob=(urge cord)]
-      =-  [[%| bac (annotate alc boc bac)] ali bob]
-      |-  ^-  $:  $:  bac=(list cord)
-                      alc=(list cord)
-                      boc=(list cord)
-                  ==
-                  ali=(urge cord)
-                  bob=(urge cord)
-              ==
-      ?~  ali  [[~ ~ ~] ali bob]
-      ?~  bob  [[~ ~ ~] ali bob]
-      ?-    -.i.ali
-          %&
-        ?-    -.i.bob
-            %&  [[~ ~ ~] ali bob]                       ::  no conflict
-            %|
-          =+  lob=(lent p.i.bob)
-          ?:  =(lob p.i.ali)
-            [[p.i.bob p.i.bob q.i.bob] t.ali t.bob]
-          ?:  (lth lob p.i.ali)
-            [[p.i.bob p.i.bob q.i.bob] [[%& (sub p.i.ali lob)] t.ali] t.bob]
-          =+  wat=(scag (sub lob p.i.ali) p.i.bob)
-          =+  ^=  res
-              %=  $
-                ali  t.ali
-                bob  [[%| (scag (sub lob p.i.ali) p.i.bob) ~] t.bob]
-              ==
-          :*  :*  (welp bac.res wat)
-                  (welp alc.res wat)
-                  (welp boc.res q.i.bob)
-              ==
-              ali.res
-              bob.res
-          ==
-        ==
-      ::
-          %|
-        ?-    -.i.bob
-            %&
-          =+  loa=(lent p.i.ali)
-          ?:  =(loa p.i.bob)
-            [[p.i.ali q.i.ali p.i.ali] t.ali t.bob]
-          ?:  (lth loa p.i.bob)
-            [[p.i.ali q.i.ali p.i.ali] t.ali [[%& (sub p.i.bob loa)] t.bob]]
-          =+  wat=(slag (sub loa p.i.bob) p.i.ali)
-          =+  ^=  res
-              %=  $
-                ali  [[%| (scag (sub loa p.i.bob) p.i.ali) ~] t.ali]
-                bob  t.bob
-              ==
-          :*  :*  (welp bac.res wat)
-                  (welp alc.res q.i.ali)
-                  (welp boc.res wat)
-              ==
-              ali.res
-              bob.res
-          ==
-        ::
-            %|
-          =+  loa=(lent p.i.ali)
-          =+  lob=(lent p.i.bob)
-          ?:  =(loa lob)
-            [[p.i.ali q.i.ali q.i.bob] t.ali t.bob]
-          =+  ^=  res
-              ?:  (gth loa lob)
-                $(ali [[%| (scag (sub loa lob) p.i.ali) ~] t.ali], bob t.bob)
-              ~&  [%scagging loa=loa pibob=p.i.bob slag=(scag loa p.i.bob)]
-              $(ali t.ali, bob [[%| (scag (sub lob loa) p.i.bob) ~] t.bob])
-          :*  :*  (welp bac.res ?:((gth loa lob) p.i.bob p.i.ali))
-                  (welp alc.res q.i.ali)
-                  (welp boc.res q.i.bob)
-              ==
-              ali.res
-              bob.res
-          ==
-        ==
-      ==
-    --
-  --
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/woff.hoon

@@ -1,12 +0,0 @@
-|_  dat=octs
-++  grow 
-  |% 
-  ++  mime  [/font/woff dat] 
-  -- 
-++  grab 
-  |% 
-  ++  mime  |=([=mite =octs] octs) 
-  ++  noun  octs
-  -- 
-++  grad  %mime 
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/woff2.hoon

@@ -1,12 +0,0 @@
-|_  dat=octs
-++  grow 
-  |% 
-  ++  mime  [/font/woff2 dat] 
-  -- 
-++  grab 
-  |% 
-  ++  mime  |=([=mite =octs] octs) 
-  ++  noun  octs
-  -- 
-++  grad  %mime 
---

stack_orchestrator/data/config/vega-interface/urbit-files/mar/xhtml.hoon

@@ -1,5 +0,0 @@
-::
-::::  /hoon/xhtml/mar
-  ::
-/=  xhtml  /mar/html
-xhtml

stack_orchestrator/data/config/vega-interface/urbit-files/sur/docket.hoon

@@ -1,82 +0,0 @@
-|%
-::
-+$  version
-  [major=@ud minor=@ud patch=@ud]
-::
-+$  glob  (map path mime)
-::
-+$  url   cord
-::  $glob-location: How to retrieve a glob
-::
-+$  glob-reference
-  [hash=@uvH location=glob-location]
-::
-+$  glob-location
-  $%  [%http =url]
-      [%ames =ship]
-  ==
-::  $href: Where a tile links to
-::
-+$  href
-  $%  [%glob base=term =glob-reference]
-      [%site =path]
-  ==
-::  $chad: State of a docket
-::
-+$  chad
-  $~  [%install ~]
-  $%  :: Done
-      [%glob =glob]
-      [%site ~]
-      :: Waiting
-      [%install ~]
-      [%suspend glob=(unit glob)]
-      :: Error
-      [%hung err=cord]
-  ==
-::
-::  $charge: A realized $docket
-::
-+$  charge
-  $:  =docket
-      =chad
-  ==
-::
-::  $clause: A key and value, as part of a docket
-::
-::    Only used to parse $docket
-::
-+$  clause
-  $%  [%title title=@t]
-      [%info info=@t]
-      [%color color=@ux]
-      [%glob-http url=cord hash=@uvH]
-      [%glob-ames =ship hash=@uvH]
-      [%image =url]
-      [%site =path]
-      [%base base=term]
-      [%version =version]
-      [%website website=url]
-      [%license license=cord]
-  ==
-::
-::  $docket: A description of JS bundles for a desk
-::
-+$  docket
-  $:  %1
-      title=@t
-      info=@t
-      color=@ux
-      =href
-      image=(unit url)
-      =version
-      website=url
-      license=cord
-  ==
-::
-+$  charge-update
-  $%  [%initial initial=(map desk charge)]
-      [%add-charge =desk =charge]
-      [%del-charge =desk]
-  ==
---

stack_orchestrator/data/config/vega-interface/urbit-files/sys.kelvin

@@ -1 +0,0 @@
-[%zuse 412]

stack_orchestrator/data/config/watcher-ajna/start-job-runner.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-set -u
-
-echo "Using ETH RPC endpoint ${CERC_ETH_RPC_ENDPOINT}"
-
-# Read in the config template TOML file and modify it
-WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINT|${CERC_ETH_RPC_ENDPOINT}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-echo "Running job-runner..."
-DEBUG=vulcanize:* exec node --enable-source-maps dist/job-runner.js

stack_orchestrator/data/config/watcher-ajna/start-server.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-set -u
-
-echo "Using ETH RPC endpoint ${CERC_ETH_RPC_ENDPOINT}"
-
-# Read in the config template TOML file and modify it
-WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINT|${CERC_ETH_RPC_ENDPOINT}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-echo "Running server..."
-DEBUG=vulcanize:* exec node --enable-source-maps dist/server.js

stack_orchestrator/data/config/watcher-ajna/watcher-config-template.toml

@@ -1,98 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3008
-  kind = "active"
-  gqlPath = "/"
-
-  # Checkpointing state.
-  checkpointing = true
-
-  # Checkpoint interval in number of blocks.
-  checkpointInterval = 2000
-
-  # Enable state creation
-  # CAUTION: Disable only if state creation is not desired or can be filled subsequently
-  enableState = false
-
-  subgraphPath = "./subgraph-build"
-
-  # Interval to restart wasm instance periodically
-  wasmRestartBlocksInterval = 20
-
-  # Interval in number of blocks at which to clear entities cache.
-  clearEntitiesCacheInterval = 1000
-
-  # Max block range for which to return events in eventsInRange GQL query.
-  # Use -1 for skipping check on block range.
-  maxEventsBlockRange = 1000
-
-  # Flag to specify whether RPC endpoint supports block hash as block tag parameter
-  rpcSupportsBlockHashParam = false
-
-  # GQL cache settings
-  [server.gqlCache]
-    enabled = true
-
-    # Max in-memory cache size (in bytes) (default 8 MB)
-    # maxCacheSize
-
-    # GQL cache-control max-age settings (in seconds)
-    maxAge = 15
-    timeTravelMaxAge = 86400 # 1 day
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9000
-  [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "ajna-watcher-db"
-  port = 5432
-  database = "ajna-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "REPLACE_WITH_CERC_ETH_RPC_ENDPOINT"
-
-    # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
-    rpcClient = true
-
-    # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint
-    isFEVM = true
-
-    # Boolean flag to filter event logs by contracts
-    filterLogsByAddresses = true
-    # Boolean flag to filter event logs by topics
-    filterLogsByTopics = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@ajna-watcher-db/ajna-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50
-  subgraphEventsOrder = true
-  # Filecoin block time: https://docs.filecoin.io/basics/the-blockchain/blocks-and-tipsets#blocktime
-  blockDelayInMilliSecs = 30000
-
-  # Boolean to switch between modes of processing events when starting the server.
-  # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
-  # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head).
-  useBlockRanges = true
-
-  # Block range in which logs are fetched during historical blocks processing
-  historicalLogsBlockRange = 2000
-
-  # Max block range of historical processing after which it waits for completion of events processing
-  # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
-  historicalMaxFetchAhead = 10000

stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile

@@ -26,8 +26,6 @@ RUN \
     && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \
     # Install semver
     && su ${USERNAME} -c "umask 0002 && npm install -g semver" \
-    # Install pnpm
-    && su ${USERNAME} -c "umask 0002 && npm install -g pnpm" \
     && npm cache clean --force > /dev/null 2>&1
 
 # [Optional] Uncomment this section to install additional OS packages.
@@ -37,9 +35,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # [Optional] Uncomment if you want to install more global node modules
 # RUN su node -c "npm install -g <your-package-list-here>"
 
-# 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
-
 # Expose port for http
 EXPOSE 80
 

stack_orchestrator/data/container-build/cerc-nextjs-base/build.sh

@@ -11,14 +11,8 @@ CERC_CONTAINER_BUILD_DOCKERFILE=${CERC_CONTAINER_BUILD_DOCKERFILE:-$SCRIPT_DIR/D
 CERC_CONTAINER_BUILD_TAG=${CERC_CONTAINER_BUILD_TAG:-cerc/nextjs-base:local}
 
 docker build -t $CERC_CONTAINER_BUILD_TAG ${build_command_args} -f $CERC_CONTAINER_BUILD_DOCKERFILE $CERC_CONTAINER_BUILD_WORK_DIR
-rc=$?
 
-if [ $rc -ne 0 ]; then
-  echo "BUILD FAILED" 1>&2
-  exit $rc
-fi
-
-if [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/nextjs-base:local" ]; then
+if [ $? -eq 0 ] && [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/nextjs-base:local" ]; then
   cat <<EOF
 
 #################################################################

stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/apply-runtime-env.sh

@@ -10,12 +10,10 @@ TRG_DIR="${3:-.next-r}"
 
 CERC_BUILD_TOOL="${CERC_BUILD_TOOL}"
 if [ -z "$CERC_BUILD_TOOL" ]; then
-  if [ -f "pnpm-lock.yaml" ]; then
-    CERC_BUILD_TOOL=pnpm
-  elif [ -f "yarn.lock" ]; then
-    CERC_BUILD_TOOL=yarn
-  else
+  if [ -f "yarn.lock" ]; then
     CERC_BUILD_TOOL=npm
+  else
+    CERC_BUILD_TOOL=yarn
   fi
 fi
 

stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh

@@ -9,15 +9,17 @@ CERC_MIN_NEXTVER=13.4.2
 CERC_NEXT_VERSION="${CERC_NEXT_VERSION:-keep}"
 CERC_BUILD_TOOL="${CERC_BUILD_TOOL}"
 if [ -z "$CERC_BUILD_TOOL" ]; then
-  if [ -f "pnpm-lock.yaml" ]; then
-    CERC_BUILD_TOOL=pnpm
-  elif [ -f "yarn.lock" ]; then
+  if [ -f "yarn.lock" ]; then
     CERC_BUILD_TOOL=yarn
   else
     CERC_BUILD_TOOL=npm
   fi
 fi
 
+echo "for building the mars v2 frontend"
+npm install --save dotenv
+yarn install-charting-library
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 WORK_DIR="${1:-/app}"
 
@@ -115,7 +117,7 @@ if [ "$CERC_NEXT_VERSION" != "keep" ] && [ "$CUR_NEXT_VERSION" != "$CERC_NEXT_VE
   mv package.json.$$ package.json
 fi
 
-time $CERC_BUILD_TOOL install || exit 1
+$CERC_BUILD_TOOL install || exit 1
 
 CUR_NEXT_VERSION=`jq -r '.version' node_modules/next/package.json`
 
@@ -138,9 +140,9 @@ to use for the build with:
 EOF
   cat package.json | jq ".dependencies.next = \"^$CERC_MIN_NEXTVER\"" > package.json.$$
   mv package.json.$$ package.json
-  time $CERC_BUILD_TOOL install || exit 1
+  $CERC_BUILD_TOOL install || exit 1
 fi
 
-time $CERC_BUILD_TOOL run cerc_compile || exit 1
+$CERC_BUILD_TOOL run cerc_compile || exit 1
 
 exit 0

stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh

@@ -16,9 +16,7 @@ trap ctrl_c INT
 
 CERC_BUILD_TOOL="${CERC_BUILD_TOOL}"
 if [ -z "$CERC_BUILD_TOOL" ]; then
-  if [ -f "pnpm-lock.yaml" ]; then
-    CERC_BUILD_TOOL=pnpm
-  elif [ -f "yarn.lock" ]; then
+  if [ -f "yarn.lock" ] && [ ! -f "package-lock.json" ]; then
     CERC_BUILD_TOOL=yarn
   else
     CERC_BUILD_TOOL=npm

stack_orchestrator/data/container-build/cerc-vega-interface/Dockerfile

@@ -1,12 +0,0 @@
-from node:20.9.0
-
-# RUN apk --update --no-cache add git make alpine-sdk bash
-
-WORKDIR /app
-
-# Copy the Vega monorepo fork into `/app`
-COPY . .
-
-RUN yarn
-# RUN ./docker/prepare-dist.sh
-

stack_orchestrator/data/container-build/cerc-vega-interface/build.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Build the vega-interface image
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build \
-	-t cerc/vega-interface:local \
-	-f ${SCRIPT_DIR}/Dockerfile \
-	${build_command_args} \
-	${CERC_REPO_BASE_DIR}/vega-frontend-monorepo

stack_orchestrator/data/container-build/cerc-watcher-ajna/Dockerfile

@@ -1,10 +0,0 @@
-FROM node:18.17.1-alpine3.18
-
-RUN apk --update --no-cache add git python3 alpine-sdk bash curl jq
-
-WORKDIR /app
-
-COPY . .
-
-RUN echo "Installing dependencies and building ajna-watcher-ts" && \
-  yarn && yarn build

stack_orchestrator/data/container-build/cerc-watcher-ajna/build.sh

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

stack_orchestrator/data/container-build/cerc-webapp-base/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=20-bullseye-slim
+ARG VARIANT=20-bullseye
 FROM node:${VARIANT}
 
 ARG USERNAME=node
@@ -24,10 +24,6 @@ RUN \
     && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \
     # Install eslint
     && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \
-    # Install semver
-    && su ${USERNAME} -c "umask 0002 && npm install -g semver" \
-    # Install pnpm
-    && su ${USERNAME} -c "umask 0002 && npm install -g pnpm" \
     && npm cache clean --force > /dev/null 2>&1
 
 # [Optional] Uncomment this section to install additional OS packages.

stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile.webapp

@@ -1,12 +1,11 @@
 FROM cerc/webapp-base:local as builder
 
 ARG CERC_BUILD_TOOL
-ARG CERC_BUILD_OUTPUT_DIR
 
 WORKDIR /app
 COPY . .
-RUN rm -rf node_modules build dist .next*
-RUN /scripts/build-app.sh /app /data
+RUN rm -rf node_modules build .next*
+RUN /scripts/build-app.sh /app build /data
 
 FROM cerc/webapp-base:local
 COPY --from=builder /data /data

stack_orchestrator/data/container-build/cerc-webapp-base/build.sh

@@ -11,14 +11,8 @@ CERC_CONTAINER_BUILD_DOCKERFILE=${CERC_CONTAINER_BUILD_DOCKERFILE:-$SCRIPT_DIR/D
 CERC_CONTAINER_BUILD_TAG=${CERC_CONTAINER_BUILD_TAG:-cerc/webapp-base:local}
 
 docker build -t $CERC_CONTAINER_BUILD_TAG ${build_command_args} -f $CERC_CONTAINER_BUILD_DOCKERFILE $CERC_CONTAINER_BUILD_WORK_DIR
-rc=$?
 
-if [ $rc -ne 0 ]; then
-  echo "BUILD FAILED" 1>&2
-  exit $rc
-fi
-
-if [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/webapp-base:local" ]; then
+if [ $? -eq 0 ] && [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/webapp-base:local" ]; then
   cat <<EOF
 
 #################################################################

stack_orchestrator/data/container-build/cerc-webapp-base/scripts/build-app.sh

@@ -7,10 +7,9 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 
 CERC_BUILD_TOOL="${CERC_BUILD_TOOL}"
-CERC_BUILD_OUTPUT_DIR="${CERC_BUILD_OUTPUT_DIR}"
-
 WORK_DIR="${1:-/app}"
-DEST_DIR="${2:-/data}"
+OUTPUT_DIR="${2:-build}"
+DEST_DIR="${3:-/data}"
 
 if [ -f "${WORK_DIR}/build-webapp.sh" ]; then
   echo "Building webapp with ${WORK_DIR}/build-webapp.sh ..."
@@ -23,30 +22,18 @@ elif [ -f "${WORK_DIR}/package.json" ]; then
   cd "${WORK_DIR}" || exit 1
 
   if [ -z "$CERC_BUILD_TOOL" ]; then
-    if [ -f "pnpm-lock.yaml" ]; then
-      CERC_BUILD_TOOL=pnpm
-    elif [ -f "yarn.lock" ]; then
+    if [ -f "yarn.lock" ]; then
       CERC_BUILD_TOOL=yarn
     else
       CERC_BUILD_TOOL=npm
     fi
   fi
 
-  time $CERC_BUILD_TOOL install || exit 1
-  time $CERC_BUILD_TOOL build || exit 1
+  $CERC_BUILD_TOOL install || exit 1
+  $CERC_BUILD_TOOL build || exit 1
 
   rm -rf "${DEST_DIR}"
-  if [ -z "${CERC_BUILD_OUTPUT_DIR}" ]; then
-    if [ -d "${WORK_DIR}/dist" ]; then
-      CERC_BUILD_OUTPUT_DIR="${WORK_DIR}/dist"
-    elif [ -d "${WORK_DIR}/build" ]; then
-      CERC_BUILD_OUTPUT_DIR="${WORK_DIR}/build"
-    else
-      echo "ERROR: Unable to locate build output.  Set with --extra-build-args \"--build-arg CERC_BUILD_OUTPUT_DIR=path\"" 1>&2
-      exit 1
-    fi
-  fi
-  mv "${CERC_BUILD_OUTPUT_DIR}" "${DEST_DIR}"
+  mv "${WORK_DIR}/${OUTPUT_DIR}" "${DEST_DIR}"
 else
   echo "Copying static app ..."
   mv "${WORK_DIR}" "${DEST_DIR}"

stack_orchestrator/data/container-image-list.txt

@@ -60,4 +60,3 @@ cerc/nitro-rpc-client
 cerc/watcher-merkl-sushiswap-v3
 cerc/watcher-sushiswap-v3
 cerc/uniswap-interface
-cerc/vega-interface

stack_orchestrator/data/pod-list.txt

@@ -45,4 +45,3 @@ ponder
 ipld-eth-server-payments
 merkl-sushiswap-v3
 sushiswap-v3
-vega-interface

stack_orchestrator/data/repository-list.txt

@@ -50,4 +50,3 @@ github.com/cerc-io/ponder
 github.com/cerc-io/merkl-sushiswap-v3-watcher-ts
 github.com/cerc-io/sushiswap-v3-watcher-ts
 github.com/cerc-io/uniswap-interface
-git.vdb.to/LaconicNetwork/vega-frontend-monorepo

stack_orchestrator/data/stacks/ajna/README.md

@@ -1,118 +0,0 @@
-# Ajna Watcher
-
-## Setup
-
-Clone required repositories:
-
-```bash
-laconic-so --stack ajna setup-repositories --git-ssh --pull
-```
-
-Build the container images:
-
-```bash
-laconic-so --stack ajna build-containers
-```
-
-## Deploy
-
-Create a spec file for the deployment:
-
-```bash
-laconic-so --stack ajna deploy init --output ajna-spec.yml
-```
-
-### Ports
-
-Edit `network` in the spec file to map container ports to host ports as required:
-
-```yml
-...
-network:
-  ports:
-    ajna-watcher-db:
-     - 15432:5432
-    ajna-watcher-job-runner:
-     - 9000:9000
-    ajna-watcher-server:
-     - 3008:3008
-     - 9001:9001
-```
-
-### Create a deployment
-
-Create a deployment from the spec file:
-
-```bash
-laconic-so --stack ajna deploy create --spec-file ajna-spec.yml --deployment-dir ajna-deployment
-```
-
-### Configuration
-
-Inside deployment directory, open the `config.env` file  and set following env variables:
-
-```bash
-# External Filecoin (ETH RPC) endpoint to point the watcher to
-CERC_ETH_RPC_ENDPOINT=https://example-lotus-endpoint/rpc/v1
-```
-
-### Start the deployment
-
-```bash
-laconic-so deployment --dir ajna-deployment start
-```
-
-* To list down and monitor the running containers:
-
-  ```bash
-  # With status
-  docker ps -a
-
-  # Check logs for a container
-  docker logs -f <CONTAINER_ID>
-  ```
-
-* Open the GQL playground at <http://localhost:3008/graphql>
-
-  ```graphql
-  # Example query
-  query {
-    _meta {
-      block {
-        hash
-        number
-        timestamp
-      }
-      deployment
-      hasIndexingErrors
-    }
-
-    accounts {
-      id
-      txCount
-      tokensDelegated
-      rewardsClaimed
-    }
-  }
-  ```
-
-## Clean up
-
-Stop all the ajna services running in background:
-
-```bash
-# Only stop the docker containers
-laconic-so deployment --dir ajna-deployment stop
-
-# Run 'start' to restart the deployment
-```
-
-To stop all the ajna services and also delete data:
-
-```bash
-# Stop the docker containers
-laconic-so deployment --dir ajna-deployment stop --delete-volumes
-
-# Remove deployment directory (deployment will have to be recreated for a re-run)
-rm -r ajna-deployment
-```

stack_orchestrator/data/stacks/ajna/stack.yml

@@ -1,9 +0,0 @@
-version: "1.0"
-name: ajna
-description: "Ajna watcher stack"
-repos:
-  - git.vdb.to/cerc-io/ajna-watcher-ts@v0.1.1
-containers:
-  - cerc/watcher-ajna
-pods:
-  - watcher-ajna

stack_orchestrator/data/stacks/merkl-sushiswap-v3/README.md

@@ -16,55 +16,26 @@ laconic-so --stack merkl-sushiswap-v3 build-containers
 
 ## Deploy
 
-Create a spec file for the deployment:
-
-```bash
-laconic-so --stack merkl-sushiswap-v3 deploy init --output merkl-sushiswap-v3-spec.yml
-```
-
-### Ports
-
-Edit `network` in the spec file to map container ports to host ports as required:
-
-```
-...
-network:
-  ports:
-    merkl-sushiswap-v3-watcher-db:
-     - '5432'
-    merkl-sushiswap-v3-watcher-job-runner:
-     - 9002:9000
-    merkl-sushiswap-v3-watcher-server:
-     - 127.0.0.1:3007:3008
-     - 9003:9001
-```
-
-### Create a deployment
-
-Create a deployment from the spec file:
-
-```bash
-laconic-so --stack merkl-sushiswap-v3 deploy create --spec-file merkl-sushiswap-v3-spec.yml --deployment-dir merkl-sushiswap-v3-deployment
-```
-
 ### Configuration
 
-Inside deployment directory, open the `config.env` file  and set following env variables:
+Create and update an env file to be used in the next step:
+
+  ```bash
+  # External Filecoin (ETH RPC) endpoint to point the watcher
+  CERC_ETH_RPC_ENDPOINT=
+  ```
+
+### Deploy the stack
 
 ```bash
-# External Filecoin (ETH RPC) endpoint to point the watcher to
-CERC_ETH_RPC_ENDPOINT=https://example-lotus-endpoint/rpc/v1
-```
-
-### Start the deployment
-
-```bash
-laconic-so deployment --dir merkl-sushiswap-v3-deployment start
+laconic-so --stack merkl-sushiswap-v3 deploy --cluster merkl_sushiswap_v3 --env-file <PATH_TO_ENV_FILE> up
 ```
 
 * To list down and monitor the running containers:
 
   ```bash
+  laconic-so --stack merkl-sushiswap-v3 deploy --cluster merkl_sushiswap_v3 ps
+
   # With status
   docker ps -a
 
@@ -75,7 +46,6 @@ laconic-so deployment --dir merkl-sushiswap-v3-deployment start
 * Open the GQL playground at http://localhost:3007/graphql
 
   ```graphql
-  # Example query
   {
     _meta {
       block {
@@ -84,7 +54,7 @@ laconic-so deployment --dir merkl-sushiswap-v3-deployment start
       }
       hasIndexingErrors
     }
-
+    
     factories {
       id
       poolCount
@@ -94,21 +64,18 @@ laconic-so deployment --dir merkl-sushiswap-v3-deployment start
 
 ## Clean up
 
-Stop all the merkl-sushiswap-v3 services running in background:
+Stop all the services running in background:
 
 ```bash
-# Only stop the docker containers
-laconic-so deployment --dir merkl-sushiswap-v3-deployment stop
-
-# Run 'start' to restart the deployment
+laconic-so --stack merkl-sushiswap-v3 deploy --cluster merkl_sushiswap_v3 down
 ```
 
-To stop all the merkl-sushiswap-v3 services and also delete data:
+Clear volumes created by this stack:
 
 ```bash
-# Stop the docker containers
-laconic-so deployment --dir merkl-sushiswap-v3-deployment stop --delete-volumes
+# List all relevant volumes
+docker volume ls -q --filter "name=merkl_sushiswap_v3"
 
-# Remove deployment directory (deployment will have to be recreated for a re-run)
-rm -r merkl-sushiswap-v3-deployment
+# Remove all the listed volumes
+docker volume rm $(docker volume ls -q --filter "name=merkl_sushiswap_v3")
 ```

stack_orchestrator/data/stacks/merkl-sushiswap-v3/stack.yml

@@ -2,7 +2,7 @@ version: "1.0"
 name: merkl-sushiswap-v3
 description: "SushiSwap v3 watcher stack"
 repos:
-  - github.com/cerc-io/merkl-sushiswap-v3-watcher-ts@v0.1.7
+  - github.com/cerc-io/merkl-sushiswap-v3-watcher-ts@v0.1.6
 containers:
   - cerc/watcher-merkl-sushiswap-v3
 pods:

stack_orchestrator/data/stacks/monitoring/stack.yml

@@ -1,7 +1,7 @@
 version: "0.1"
 name: monitoring
 repos:
-  - github.com/cerc-io/watcher-ts@v0.2.81
+  - github.com/cerc-io/watcher-ts@v0.2.79
 containers:
   - cerc/watcher-ts
 pods:

stack_orchestrator/data/stacks/sushiswap-subgraph/README.md

@@ -55,7 +55,7 @@ ports:
 Create deployment:
 
 ```bash
-laconic-so --stack sushiswap-subgraph deploy create --spec-file sushiswap-subgraph-spec.yml --deployment-dir sushiswap-subgraph-deployment
+laconic-so deploy create --spec-file sushiswap-subgraph-spec.yml --deployment-dir sushiswap-subgraph-deployment
 ```
 
 ## Start the stack

stack_orchestrator/data/stacks/sushiswap-v3/README.md

@@ -16,55 +16,26 @@ laconic-so --stack sushiswap-v3 build-containers
 
 ## Deploy
 
-Create a spec file for the deployment:
-
-```bash
-laconic-so --stack sushiswap-v3 deploy init --output sushiswap-v3-spec.yml
-```
-
-### Ports
-
-Edit `network` in the spec file to map container ports to host ports as required:
-
-```
-...
-network:
-  ports:
-    sushiswap-v3-watcher-db:
-     - '5432'
-    sushiswap-v3-watcher-job-runner:
-     - 9000:9000
-    sushiswap-v3-watcher-server:
-     - 127.0.0.1:3008:3008
-     - 9001:9001
-```
-
-### Create a deployment
-
-Create a deployment from the spec file:
-
-```bash
-laconic-so --stack sushiswap-v3 deploy create --spec-file sushiswap-v3-spec.yml --deployment-dir sushiswap-v3-deployment
-```
-
 ### Configuration
 
-Inside deployment directory, open the `config.env` file  and set following env variables:
+Create and update an env file to be used in the next step:
+
+  ```bash
+  # External Filecoin (ETH RPC) endpoint to point the watcher
+  CERC_ETH_RPC_ENDPOINT=
+  ```
+
+### Deploy the stack
 
 ```bash
-# External Filecoin (ETH RPC) endpoint to point the watcher to
-CERC_ETH_RPC_ENDPOINT=https://example-lotus-endpoint/rpc/v1
-```
-
-### Start the deployment
-
-```bash
-laconic-so deployment --dir sushiswap-v3-deployment start
+laconic-so --stack sushiswap-v3 deploy --cluster sushiswap_v3 --env-file <PATH_TO_ENV_FILE> up
 ```
 
 * To list down and monitor the running containers:
 
   ```bash
+  laconic-so --stack sushiswap-v3 deploy --cluster sushiswap_v3 ps
+
   # With status
   docker ps -a
 
@@ -72,43 +43,20 @@ laconic-so deployment --dir sushiswap-v3-deployment start
   docker logs -f <CONTAINER_ID>
   ```
 
-* Open the GQL playground at http://localhost:3008/graphql
-
-  ```graphql
-  # Example query
-  {
-    _meta {
-      block {
-        number
-        timestamp
-      }
-      hasIndexingErrors
-    }
-
-    factories {
-      id
-      poolCount
-    }
-  }
-  ```
-
 ## Clean up
 
-Stop all the sushiswap-v3 services running in background:
+Stop all the services running in background:
 
 ```bash
-# Only stop the docker containers
-laconic-so deployment --dir sushiswap-v3-deployment stop
-
-# Run 'start' to restart the deployment
+laconic-so --stack sushiswap-v3 deploy --cluster sushiswap_v3 down
 ```
 
-To stop all the sushiswap-v3 services and also delete data:
+Clear volumes created by this stack:
 
 ```bash
-# Stop the docker containers
-laconic-so deployment --dir sushiswap-v3-deployment stop --delete-volumes
+# List all relevant volumes
+docker volume ls -q --filter "name=sushiswap_v3"
 
-# Remove deployment directory (deployment will have to be recreated for a re-run)
-rm -r sushiswap-v3-deployment
+# Remove all the listed volumes
+docker volume rm $(docker volume ls -q --filter "name=sushiswap_v3")
 ```

stack_orchestrator/data/stacks/sushiswap-v3/stack.yml

@@ -2,7 +2,7 @@ version: "1.0"
 name: sushiswap-v3
 description: "SushiSwap v3 watcher stack"
 repos:
-  - github.com/cerc-io/sushiswap-v3-watcher-ts@v0.1.7
+  - github.com/cerc-io/sushiswap-v3-watcher-ts@v0.1.6
 containers:
   - cerc/watcher-sushiswap-v3
 pods:

stack_orchestrator/data/stacks/uniswap-urbit-app/README.md

@@ -33,27 +33,23 @@ laconic-so --stack uniswap-urbit-app deploy init --output uniswap-urbit-app-spec
 
 ### Ports
 
-Edit `uniswap-urbit-app-spec.yml` such that it looks like:
+Edit `network` in spec file to map container ports to same ports in host:
 
 ```yml
-stack: uniswap-urbit-app
-deploy-to: compose
+...
 network:
   ports:
     urbit-fake-ship:
       - '8080:80'
+    proxy-server:
+      - '4000:4000'
     ipfs:
-     - '4001'
-     - '8081:8080'
-     - 0.0.0.0:5001:5001
-volumes:
-  urbit_app_builds: ./data/urbit_app_builds
-  urbit_data: ./data/urbit_data
-  ipfs-import: ./data/ipfs-import
-  ipfs-data: ./data/ipfs-data
+      - '8081:8080'
+      - '5001:5001'
+...
 ```
 
-Note: Skip the `ipfs` ports if using an externally running IPFS node, set via `config.env`, below.
+Note: Skip the `ipfs` ports if need to use an externally running IPFS node
 
 ### Data volumes
 
@@ -84,8 +80,7 @@ Inside the deployment directory, open the file `config.env` and set the followin
   # Set this to GQL proxy server endpoint for uniswap app
   # (Eg. http://localhost:4000/v1/graphql - in case stack is being run locally with proxy enabled)
   # (Eg. https://abc.xyz.com/v1/graphql - in case https://abc.xyz.com is pointed to the proxy endpoint)
-  CERC_UNISWAP_GQL=/apps/uniswap-proxy/v1/graphql
-  CERC_UNISWAP_API=/apps/uniswap-proxy/v2
+  CERC_UNISWAP_GQL=http://localhost:4000/v1/graphql
 
   # Optional
 

stack_orchestrator/data/stacks/uniswap-urbit-app/stack.yml

@@ -2,9 +2,12 @@ version: "0.1"
 name: uniswap-urbit-app
 repos:
   - github.com/cerc-io/uniswap-interface@laconic # TODO: Use release
+  - github.com/cerc-io/watcher-ts@v0.2.78
 containers:
   - cerc/uniswap-interface
+  - cerc/watcher-ts
 pods:
   - uniswap-interface
+  - proxy-server
   - fixturenet-urbit
   - kubo

stack_orchestrator/data/stacks/vega-urbit-app/README.md

@@ -1,131 +0,0 @@
-# Self-hosted Vega Frontend
-
-Instructions to setup and deploy Vega app on Urbit
-
-Build and deploy:
-
-- Urbit
-- Vega app
-
-## Setup
-
-Clone required repositories:
-
-```bash
-laconic-so --stack vega-urbit-app setup-repositories --pull
-
-# If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories and re-run the command
-```
-
-Build the container images:
-
-```bash
-laconic-so --stack vega-urbit-app build-containers
-```
-
-## Create a deployment
-
-First, create a spec file for the deployment, which will map the stack's ports and volumes to the host:
-
-```bash
-laconic-so --stack vega-urbit-app deploy init --output vega-urbit-app-spec.yml
-```
-
-### Ports
-
-Edit `vega-urbit-app-spec.yml` such that it looks like:
-
-```yml
-stack: vega-urbit-app
-deploy-to: compose
-network:
-  ports:
-    urbit-fake-ship:
-      - '8080:80'
-    ipfs:
-     - '4001'
-     - '8081:8080'
-     - 0.0.0.0:5001:5001
-volumes:
-  urbit_app_builds: ./data/urbit_app_builds
-  urbit_data: ./data/urbit_data
-  ipfs-import: ./data/ipfs-import
-  ipfs-data: ./data/ipfs-data
-```
-
-Note: Skip the `ipfs` ports if using an externally running IPFS node, set via `config.env`, below.
-
-### Data volumes
-
-Container data volumes are bind-mounted to specified paths in the host filesystem.
-The default setup (generated by `laconic-so deploy init`) places the volumes in the `./data` subdirectory of the deployment directory. The default mappings can be customized by editing the "spec" file generated by `laconic-so deploy init`.
-
----
-
-Once you've made any needed changes to the spec file, create a deployment from it:
-
-```bash
-laconic-so --stack vega-urbit-app deploy create --spec-file vega-urbit-app-spec.yml --deployment-dir vega-urbit-app-deployment
-```
-
-## Set env variables
-
-Inside the deployment directory, open the file `config.env` and set the following env variables:
-
-  ```bash
-  # App to be installed (Do not change)
-  CERC_URBIT_APP=vega
-  ```
-
-## Start the stack
-
-Start the deployment:
-
-```bash
-laconic-so deployment --dir vega-urbit-app-deployment start
-```
-
-* List and check the health status of all the containers using `docker ps` and wait for them to be `healthy`
-
-* Run the following to get login password for Urbit web interface:
-
-  ```bash
-  laconic-so deployment --dir vega-urbit-app-deployment exec urbit-fake-ship "curl -s --data '{\"source\":{\"dojo\":\"+code\"},\"sink\":{\"stdout\":null}}' http://localhost:12321"
-
-  # Expected output: "<PASSWORD>\n"%
-  ```
-
-* Open the Urbit web UI at http://localhost:8080 and use the `PASSWORD` from previous step to login
-
-* The vega app is not available when starting stack for the first time. Check `urbit-fake-ship` logs to see that app has installed:
-
-  ```bash
-  laconic-so deployment --dir vega-urbit-app-deployment logs -f
-
-  # Expected output:
-  # laconic-3ccf7ee79bdae874-urbit-fake-ship-1    | docket: fetching %http glob for %vega desk
-  # laconic-3ccf7ee79bdae874-urbit-fake-ship-1    | ">="">="vega app installed
-  ```
-
-* The vega app will be now visible at http://localhost:8080
-
-## Clean up
-
-To stop all vega-urbit-app services running in the background, while preserving data:
-
-```bash
-# Only stop the docker containers
-laconic-so deployment --dir vega-urbit-app-deployment stop
-
-# Run 'start' to restart the deployment
-```
-
-To stop all vega-urbit-app services and also delete data:
-
-```bash
-# Stop the docker containers
-laconic-so deployment --dir vega-urbit-app-deployment stop --delete-volumes
-
-# Remove deployment directory (deployment will have to be recreated for a re-run)
-rm -r vega-urbit-app-deployment
-```

stack_orchestrator/data/stacks/vega-urbit-app/stack.yml

@@ -1,10 +0,0 @@
-version: "0.1"
-name: vega-urbit-app
-repos:
-  - git.vdb.to/LaconicNetwork/vega-frontend-monorepo@urbit-build
-containers:
-  - cerc/vega-interface
-pods:
-  - vega-interface
-  - fixturenet-urbit
-  - kubo

stack_orchestrator/deploy/images.py

@@ -29,29 +29,6 @@ def _image_needs_pushed(image: str):
     return image.endswith(":local")
 
 
-def remote_image_exists(remote_repo_url: str, local_tag: str):
-    docker = DockerClient()
-    try:
-        remote_tag = remote_tag_for_image(local_tag, remote_repo_url)
-        result = docker.manifest.inspect(remote_tag)
-        return True if result else False
-    except Exception:  # noqa: E722
-        return False
-
-
-def add_tags_to_image(remote_repo_url: str, local_tag: str, *additional_tags):
-    if not additional_tags:
-        return
-
-    if not remote_image_exists(remote_repo_url, local_tag):
-        raise Exception(f"{local_tag} does not exist in {remote_repo_url}")
-
-    docker = DockerClient()
-    remote_tag = remote_tag_for_image(local_tag, remote_repo_url)
-    new_remote_tags = [remote_tag_for_image(tag, remote_repo_url) for tag in additional_tags]
-    docker.buildx.imagetools.create(sources=[remote_tag], tags=new_remote_tags)
-
-
 def remote_tag_for_image(image: str, remote_repo_url: str):
     # Turns image tags of the form: foo/bar:local into remote.repo/org/bar:deploy
     major_parts = image.split("/", 2)

stack_orchestrator/deploy/k8s/cluster_info.py

@@ -101,7 +101,7 @@ class ClusterInfo:
         )
         return service
 
-    def get_ingress(self, use_tls=False, certificate=None, cluster_issuer="letsencrypt-prod"):
+    def get_ingress(self, use_tls=False):
         # No ingress for a deployment that has no http-proxy defined, for now
         http_proxy_info_list = self.spec.get_http_proxy()
         ingress = None
@@ -114,8 +114,8 @@ class ClusterInfo:
             host_name = http_proxy_info["host-name"]
             rules = []
             tls = [client.V1IngressTLS(
-                hosts=certificate["spec"]["dnsNames"] if certificate else [host_name],
-                secret_name=certificate["spec"]["secretName"] if certificate else f"{self.app_name}-tls"
+                hosts=[host_name],
+                secret_name=f"{self.app_name}-tls"
             )] if use_tls else None
             paths = []
             for route in http_proxy_info["routes"]:
@@ -147,17 +147,13 @@ class ClusterInfo:
                 tls=tls,
                 rules=rules
             )
-
-            ingress_annotations = {
-                "kubernetes.io/ingress.class": "nginx",
-            }
-            if not certificate:
-                ingress_annotations["cert-manager.io/cluster-issuer"] = cluster_issuer
-
             ingress = client.V1Ingress(
                 metadata=client.V1ObjectMeta(
                     name=f"{self.app_name}-ingress",
-                    annotations=ingress_annotations
+                    annotations={
+                        "kubernetes.io/ingress.class": "nginx",
+                        "cert-manager.io/cluster-issuer": "letsencrypt-prod"
+                    }
                 ),
                 spec=spec
             )

stack_orchestrator/deploy/k8s/deploy_k8s.py

@@ -169,39 +169,6 @@ class K8sDeployer(Deployer):
                 print("Service created:")
                 print(f"{service_resp}")
 
-    def _find_certificate_for_host_name(self, host_name):
-        all_certificates = self.custom_obj_api.list_namespaced_custom_object(
-            group="cert-manager.io",
-            version="v1",
-            namespace=self.k8s_namespace,
-            plural="certificates"
-        )
-
-        host_parts = host_name.split(".", 1)
-        host_as_wild = None
-        if len(host_parts) == 2:
-            host_as_wild = f"*.{host_parts[1]}"
-
-        now = datetime.utcnow().replace(tzinfo=timezone.utc)
-        fmt = "%Y-%m-%dT%H:%M:%S%z"
-
-        # Walk over all the configured certificates.
-        for cert in all_certificates["items"]:
-            dns = cert["spec"]["dnsNames"]
-            # Check for an exact hostname match or a wildcard match.
-            if host_name in dns or host_as_wild in dns:
-                status = cert.get("status", {})
-                # Check the certificate date.
-                if "notAfter" in status and "notBefore" in status:
-                    before = datetime.strptime(status["notBefore"], fmt)
-                    after = datetime.strptime(status["notAfter"], fmt)
-                    if before < now < after:
-                        # Check the status is Ready
-                        for condition in status.get("conditions", []):
-                            if "True" == condition.get("status") and "Ready" == condition.get("type"):
-                                return cert
-        return None
-
     def up(self, detach, services):
         if not opts.o.dry_run:
             if self.is_kind():
@@ -222,15 +189,8 @@ class K8sDeployer(Deployer):
         self._create_volume_data()
         self._create_deployment()
 
-        http_proxy_info = self.cluster_info.spec.get_http_proxy()
         # Note: at present we don't support tls for kind (and enabling tls causes errors)
-        use_tls = http_proxy_info and not self.is_kind()
-        certificate = self._find_certificate_for_host_name(http_proxy_info[0]["host-name"]) if use_tls else None
-        if opts.o.debug:
-            if certificate:
-                print(f"Using existing certificate: {certificate}")
-
-        ingress: client.V1Ingress = self.cluster_info.get_ingress(use_tls=use_tls, certificate=certificate)
+        ingress: client.V1Ingress = self.cluster_info.get_ingress(use_tls=not self.is_kind())
         if ingress:
             if opts.o.debug:
                 print(f"Sending this ingress: {ingress}")
@@ -390,11 +350,9 @@ class K8sDeployer(Deployer):
                 name=ingress.spec.tls[0].secret_name
             )
 
-            hostname = ingress.spec.rules[0].host
+            hostname = ingress.spec.tls[0].hosts[0]
             ip = ingress.status.load_balancer.ingress[0].ip
-            tls = "notBefore: %s; notAfter: %s; names: %s" % (
-                cert["status"]["notBefore"], cert["status"]["notAfter"], ingress.spec.tls[0].hosts
-            )
+            tls = "notBefore: %s, notAfter: %s" % (cert["status"]["notBefore"], cert["status"]["notAfter"])
         except:  # noqa: E722
             pass
 

stack_orchestrator/deploy/spec.py

@@ -27,9 +27,7 @@ class ResourceLimits:
     memory: int = None
     storage: int = None
 
-    def __init__(self, obj=None):
-        if obj is None:
-            obj = {}
+    def __init__(self, obj={}):
         if "cpus" in obj:
             self.cpus = float(obj["cpus"])
         if "memory" in obj:
@@ -52,9 +50,7 @@ class Resources:
     limits: ResourceLimits = None
     reservations: ResourceLimits = None
 
-    def __init__(self, obj=None):
-        if obj is None:
-            obj = {}
+    def __init__(self, obj={}):
         if "reservations" in obj:
             self.reservations = ResourceLimits(obj["reservations"])
         if "limits" in obj:
@@ -76,9 +72,7 @@ class Spec:
     obj: typing.Any
     file_path: Path
 
-    def __init__(self, file_path: Path = None, obj=None) -> None:
-        if obj is None:
-            obj = {}
+    def __init__(self, file_path: Path = None, obj={}) -> None:
         self.file_path = file_path
         self.obj = obj
 
@@ -97,41 +91,49 @@ class Spec:
             self.file_path = file_path
 
     def get_image_registry(self):
-        return self.obj.get(constants.image_registry_key)
+        return (self.obj[constants.image_registry_key]
+                if self.obj and constants.image_registry_key in self.obj
+                else None)
 
     def get_volumes(self):
-        return self.obj.get(constants.volumes_key, {})
+        return (self.obj["volumes"]
+                if self.obj and "volumes" in self.obj
+                else {})
 
     def get_configmaps(self):
-        return self.obj.get(constants.configmaps_key, {})
+        return (self.obj["configmaps"]
+                if self.obj and "configmaps" in self.obj
+                else {})
 
     def get_container_resources(self):
-        return Resources(self.obj.get(constants.resources_key, {}).get("containers", {}))
+        return Resources(self.obj.get("resources", {}).get("containers", {}))
 
     def get_volume_resources(self):
-        return Resources(self.obj.get(constants.resources_key, {}).get(constants.volumes_key, {}))
+        return Resources(self.obj.get("resources", {}).get("volumes", {}))
 
     def get_http_proxy(self):
-        return self.obj.get(constants.network_key, {}).get(constants.http_proxy_key, [])
+        return (self.obj[constants.network_key][constants.http_proxy_key]
+                if self.obj and constants.network_key in self.obj
+                and constants.http_proxy_key in self.obj[constants.network_key]
+                else None)
 
     def get_annotations(self):
-        return self.obj.get(constants.annotations_key, {})
+        return self.obj.get("annotations", {})
 
     def get_labels(self):
-        return self.obj.get(constants.labels_key, {})
+        return self.obj.get("labels", {})
 
     def get_privileged(self):
-        return "true" == str(self.obj.get(constants.security_key, {}).get("privileged", "false")).lower()
+        return "true" == str(self.obj.get("security", {}).get("privileged", "false")).lower()
 
     def get_capabilities(self):
-        return self.obj.get(constants.security_key, {}).get("capabilities", [])
+        return self.obj.get("security", {}).get("capabilities", [])
 
     def get_deployment_type(self):
-        return self.obj.get(constants.deploy_to_key)
+        return self.obj[constants.deploy_to_key]
 
     def is_kubernetes_deployment(self):
-        return self.get_deployment_type() in [constants.k8s_kind_deploy_type,
-                                              constants.k8s_deploy_type]
+        return self.get_deployment_type() in [constants.k8s_kind_deploy_type, constants.k8s_deploy_type]
 
     def is_kind_deployment(self):
         return self.get_deployment_type() in [constants.k8s_kind_deploy_type]

stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py

@@ -24,9 +24,8 @@ import uuid
 
 import click
 
-from stack_orchestrator.deploy.images import remote_image_exists, add_tags_to_image
 from stack_orchestrator.deploy.webapp import deploy_webapp
-from stack_orchestrator.deploy.webapp.util import (LaconicRegistryClient, TimedLogger,
+from stack_orchestrator.deploy.webapp.util import (LaconicRegistryClient,
                                                    build_container_image, push_container_image,
                                                    file_hash, deploy_to_k8s, publish_deployment,
                                                    hostname_for_deployment_request, generate_hostname_for_app,
@@ -34,6 +33,7 @@ from stack_orchestrator.deploy.webapp.util import (LaconicRegistryClient, TimedL
 
 
 def process_app_deployment_request(
+    run_id,
     ctx,
     laconic: LaconicRegistryClient,
     app_deployment_request,
@@ -43,18 +43,13 @@ def process_app_deployment_request(
     deployment_parent_dir,
     kube_config,
     image_registry,
-    force_rebuild,
-    logger
+    log_file=None
 ):
-    logger.log("BEGIN - process_app_deployment_request")
-
     # 1. look up application
     app = laconic.get_record(app_deployment_request.attributes.application, require=True)
-    logger.log(f"Retrieved app record {app_deployment_request.attributes.application}")
 
     # 2. determine dns
     requested_name = hostname_for_deployment_request(app_deployment_request, laconic)
-    logger.log(f"Determined requested name: {requested_name}")
 
     # HACK
     if "." in requested_name:
@@ -72,7 +67,7 @@ def process_app_deployment_request(
             matched_owner = match_owner(app_deployment_request, laconic.get_record(dns_record.attributes.request, require=True))
 
         if matched_owner:
-            logger.log(f"Matched DnsRecord ownership: {matched_owner}")
+            print("Matched DnsRecord ownership:", matched_owner)
         else:
             raise Exception("Unable to confirm ownership of DnsRecord %s for request %s" %
                             (dns_record.id, app_deployment_request.id))
@@ -96,9 +91,7 @@ def process_app_deployment_request(
     deployment_record = laconic.get_record(app_deployment_crn)
     deployment_dir = os.path.join(deployment_parent_dir, fqdn)
     deployment_config_file = os.path.join(deployment_dir, "config.env")
-    # TODO: Is there any reason not to simplify the hash input to the app_deployment_crn?
     deployment_container_tag = "laconic-webapp/%s:local" % hashlib.md5(deployment_dir.encode()).hexdigest()
-    app_image_shared_tag = f"laconic-webapp/{app.id}:local"
     #   b. check for deployment directory (create if necessary)
     if not os.path.exists(deployment_dir):
         if deployment_record:
@@ -113,26 +106,11 @@ def process_app_deployment_request(
     needs_k8s_deploy = False
     # 6. build container (if needed)
     if not deployment_record or deployment_record.attributes.application != app.id:
+        # TODO: pull from request
+        extra_build_args = []
+        build_container_image(app, deployment_container_tag, extra_build_args, log_file)
+        push_container_image(deployment_dir, log_file)
         needs_k8s_deploy = True
-        # check if the image already exists
-        shared_tag_exists = remote_image_exists(image_registry, app_image_shared_tag)
-        if shared_tag_exists and not force_rebuild:
-            # simply add our unique tag to the existing image and we are done
-            logger.log(f"Using existing app image {app_image_shared_tag} for {deployment_container_tag}")
-            add_tags_to_image(image_registry, app_image_shared_tag, deployment_container_tag)
-            logger.log("Tag complete")
-        else:
-            extra_build_args = []  # TODO: pull from request
-            logger.log(f"Building container image {deployment_container_tag}")
-            build_container_image(app, deployment_container_tag, extra_build_args, logger)
-            logger.log("Build complete")
-            logger.log(f"Pushing container image {deployment_container_tag}")
-            push_container_image(deployment_dir, logger)
-            logger.log("Push complete")
-            # The build/push commands above will use the unique deployment tag, so now we need to add the shared tag.
-            logger.log(f"Updating app image tag {app_image_shared_tag} from build of {deployment_container_tag}")
-            add_tags_to_image(image_registry, deployment_container_tag, app_image_shared_tag)
-            logger.log("Tag complete")
 
     # 7. update config (if needed)
     if not deployment_record or file_hash(deployment_config_file) != deployment_record.attributes.meta.config:
@@ -140,13 +118,13 @@ def process_app_deployment_request(
 
     # 8. update k8s deployment
     if needs_k8s_deploy:
+        print("Deploying to k8s")
         deploy_to_k8s(
             deployment_record,
             deployment_dir,
-            logger
+            log_file
         )
 
-    logger.log("Publishing deployment to registry.")
     publish_deployment(
         laconic,
         app,
@@ -155,11 +133,8 @@ def process_app_deployment_request(
         dns_record,
         dns_crn,
         deployment_dir,
-        app_deployment_request,
-        logger
+        app_deployment_request
     )
-    logger.log("Publication complete.")
-    logger.log("END - process_app_deployment_request")
 
 
 def load_known_requests(filename):
@@ -196,13 +171,12 @@ def dump_known_requests(filename, requests, status="SEEN"):
 @click.option("--dry-run", help="Don't do anything, just report what would be done.", is_flag=True)
 @click.option("--include-tags", help="Only include requests with matching tags (comma-separated).", default="")
 @click.option("--exclude-tags", help="Exclude requests with matching tags (comma-separated).", default="")
-@click.option("--force-rebuild", help="Rebuild even if the image already exists.", is_flag=True)
 @click.option("--log-dir", help="Output build/deployment logs to directory.", default=None)
 @click.pass_context
 def command(ctx, kube_config, laconic_config, image_registry, deployment_parent_dir,  # noqa: C901
             request_id, discover, state_file, only_update_state,
             dns_suffix, record_namespace_dns, record_namespace_deployments, dry_run,
-            include_tags, exclude_tags, force_rebuild, log_dir):
+            include_tags, exclude_tags, log_dir):
     if request_id and discover:
         print("Cannot specify both --request-id and --discover", file=sys.stderr)
         sys.exit(2)
@@ -321,9 +295,8 @@ def command(ctx, kube_config, laconic_config, image_registry, deployment_parent_
                     run_log_file = open(run_log_file_path, "wt")
                     run_reg_client = LaconicRegistryClient(laconic_config, log_file=run_log_file)
 
-                logger = TimedLogger(run_id, run_log_file)
-                logger.log("Processing ...")
                 process_app_deployment_request(
+                    run_id,
                     ctx,
                     run_reg_client,
                     r,
@@ -333,15 +306,12 @@ def command(ctx, kube_config, laconic_config, image_registry, deployment_parent_
                     os.path.abspath(deployment_parent_dir),
                     kube_config,
                     image_registry,
-                    force_rebuild,
-                    logger
+                    run_log_file
                 )
                 status = "DEPLOYED"
             except Exception as e:
-                logger.log("ERROR: " + str(e))
+                print("ERROR: " + str(e), file=run_log_file)
             finally:
-                if logger:
-                    logger.log(f"DONE with status {status}", show_step_time=False, show_total_time=True)
                 dump_known_requests(state_file, [r], status)
                 if run_log_file:
                     run_log_file.close()

stack_orchestrator/deploy/webapp/util.py

@@ -13,7 +13,6 @@
 # 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 datetime
 import hashlib
 import json
 import os
@@ -40,25 +39,6 @@ class AttrDict(dict):
             return v
 
 
-class TimedLogger:
-    def __init__(self, id="", file=None):
-        self.start = datetime.datetime.now()
-        self.last = self.start
-        self.id = id
-        self.file = file
-
-    def log(self, msg, show_step_time=True, show_total_time=False):
-        prefix = f"{datetime.datetime.utcnow()} - {self.id}"
-        if show_step_time:
-            prefix += f" - {datetime.datetime.now() - self.last} (step)"
-        if show_total_time:
-            prefix += f" - {datetime.datetime.now() - self.start} (total)"
-        print(f"{prefix}: {msg}", file=self.file)
-        if self.file:
-            self.file.flush()
-        self.last = datetime.datetime.now()
-
-
 def logged_cmd(log_file, *vargs):
     result = None
     try:
@@ -239,7 +219,7 @@ def determine_base_container(clone_dir, app_type="webapp"):
     return base_container
 
 
-def build_container_image(app_record, tag, extra_build_args=[], logger=None):
+def build_container_image(app_record, tag, extra_build_args=[], log_file=None):
     tmpdir = tempfile.mkdtemp()
 
     try:
@@ -248,33 +228,31 @@ def build_container_image(app_record, tag, extra_build_args=[], logger=None):
         repo = random.choice(app_record.attributes.repository)
         clone_dir = os.path.join(tmpdir, record_id)
 
-        logger.log(f"Cloning repository {repo} to {clone_dir} ...")
+        print(f"Cloning repository {repo} to {clone_dir} ...")
         if ref:
             # TODO: Determing branch or hash, and use depth 1 if we can.
             git_env = dict(os.environ.copy())
             # Never prompt
             git_env["GIT_TERMINAL_PROMPT"] = "0"
             try:
-                subprocess.check_call(["git", "clone", repo, clone_dir], env=git_env, stdout=logger.file, stderr=logger.file)
+                subprocess.check_call(["git", "clone", repo, clone_dir], env=git_env, stdout=log_file, stderr=log_file)
             except Exception as e:
-                logger.log(f"git clone failed.  Is the repository {repo} private?")
+                print(f"git clone failed.  Is the repository {repo} private?", file=log_file)
                 raise e
             try:
-                subprocess.check_call(["git", "checkout", ref], cwd=clone_dir, env=git_env, stdout=logger.file, stderr=logger.file)
+                subprocess.check_call(["git", "checkout", ref], cwd=clone_dir, env=git_env, stdout=log_file, stderr=log_file)
             except Exception as e:
-                logger.log(f"git checkout failed.  Does ref {ref} exist?")
+                print(f"git checkout failed.  Does ref {ref} exist?", file=log_file)
                 raise e
         else:
-            result = subprocess.run(["git", "clone", "--depth", "1", repo, clone_dir], stdout=logger.file, stderr=logger.file)
+            result = subprocess.run(["git", "clone", "--depth", "1", repo, clone_dir], stdout=log_file, stderr=log_file)
             result.check_returncode()
 
         base_container = determine_base_container(clone_dir, app_record.attributes.app_type)
 
-        logger.log("Building webapp ...")
+        print("Building webapp ...")
         build_command = [
-            sys.argv[0],
-            "--verbose",
-            "build-webapp",
+            sys.argv[0], "build-webapp",
             "--source-repo", clone_dir,
             "--tag", tag,
             "--base-container", base_container
@@ -283,31 +261,28 @@ def build_container_image(app_record, tag, extra_build_args=[], logger=None):
             build_command.append("--extra-build-args")
             build_command.append(" ".join(extra_build_args))
 
-        result = subprocess.run(build_command, stdout=logger.file, stderr=logger.file)
+        result = subprocess.run(build_command, stdout=log_file, stderr=log_file)
         result.check_returncode()
     finally:
-        logged_cmd(logger.file, "rm", "-rf", tmpdir)
+        logged_cmd(log_file, "rm", "-rf", tmpdir)
 
 
-def push_container_image(deployment_dir, logger):
-    logger.log("Pushing images ...")
+def push_container_image(deployment_dir, log_file=None):
+    print("Pushing image ...")
     result = subprocess.run([sys.argv[0], "deployment", "--dir", deployment_dir, "push-images"],
-                            stdout=logger.file, stderr=logger.file)
+                            stdout=log_file, stderr=log_file)
     result.check_returncode()
-    logger.log("Finished pushing images.")
 
 
-def deploy_to_k8s(deploy_record, deployment_dir, logger):
+def deploy_to_k8s(deploy_record, deployment_dir, log_file=None):
     if not deploy_record:
         command = "up"
     else:
         command = "update"
 
-    logger.log("Deploying to k8s ...")
     result = subprocess.run([sys.argv[0], "deployment", "--dir", deployment_dir, command],
-                            stdout=logger.file, stderr=logger.file)
+                            stdout=log_file, stderr=log_file)
     result.check_returncode()
-    logger.log("Finished deploying to k8s.")
 
 
 def publish_deployment(laconic: LaconicRegistryClient,
@@ -317,8 +292,7 @@ def publish_deployment(laconic: LaconicRegistryClient,
                        dns_record,
                        dns_crn,
                        deployment_dir,
-                       app_deployment_request=None,
-                       logger=None):
+                       app_deployment_request=None):
     if not deploy_record:
         deploy_ver = "0.0.1"
     else:
@@ -348,8 +322,6 @@ def publish_deployment(laconic: LaconicRegistryClient,
     if app_deployment_request:
         new_dns_record["record"]["request"] = app_deployment_request.id
 
-    if logger:
-        logger.log("Publishing DnsRecord.")
     dns_id = laconic.publish(new_dns_record, [dns_crn])
 
     new_deployment_record = {
@@ -369,8 +341,6 @@ def publish_deployment(laconic: LaconicRegistryClient,
     if app_deployment_request:
         new_deployment_record["record"]["request"] = app_deployment_request.id
 
-    if logger:
-        logger.log("Publishing ApplicationDeploymentRecord.")
     deployment_id = laconic.publish(new_deployment_record, [deployment_crn])
     return {"dns": dns_id, "deployment": deployment_id}
 

stack_orchestrator/main.py

@@ -17,7 +17,7 @@ import click
 
 from stack_orchestrator.command_types import CommandOptions
 from stack_orchestrator.repos import setup_repositories
-from stack_orchestrator.build import build_containers, fetch_containers
+from stack_orchestrator.build import build_containers
 from stack_orchestrator.build import build_npms
 from stack_orchestrator.build import build_webapp
 from stack_orchestrator.deploy.webapp import (run_webapp,
@@ -52,7 +52,6 @@ def cli(ctx, stack, quiet, verbose, dry_run, local_stack, debug, continue_on_err
 
 cli.add_command(setup_repositories.command, "setup-repositories")
 cli.add_command(build_containers.command, "build-containers")
-cli.add_command(fetch_containers.command, "fetch-containers")
 cli.add_command(build_npms.command, "build-npms")
 cli.add_command(build_webapp.command, "build-webapp")
 cli.add_command(run_webapp.command, "run-webapp")