birbit stack

2024-01-26 17:44:31 +00:00
138 changed files with 648 additions and 4808 deletions
@@ -1,45 +0,0 @@
-name: Fixturenet-Eth-Plugeth-Arm-Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test'
-  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '2 14 * * *'
-
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-
-jobs:
-  test:
-    name: "Run an Ethereum plugeth fixturenet test"
-    runs-on: ubuntu-latest-arm
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run fixturenet-eth tests"
-        run: ./tests/fixturenet-eth-plugeth/run-test.sh
@@ -6,8 +6,6 @@ on:
    paths:
      - '!**'
      - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
-  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '2 14 * * *'

 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -6,8 +6,11 @@ on:
    paths:
      - '!**'
      - '.gitea/workflows/triggers/fixturenet-laconicd-test'
-  schedule:
-    - cron: '1 13 * * *'
+
+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+

 jobs:
  test:
@@ -44,5 +47,9 @@ jobs:
        run: ./scripts/create_build_tag_file.sh
      - name: "Build local shiv package"
        run: ./scripts/build_shiv_package.sh
+      - name: Start dockerd # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
      - name: "Run fixturenet-laconicd tests"
        run: ./tests/fixturenet-laconicd/run-test.sh
@@ -1,21 +0,0 @@
-name: Lint Checks
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    branches: '*'
-
-jobs:
-  test:
-    name: "Run linter"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name : "Run flake8"
-        uses: py-actions/flake8@v2
@@ -1,54 +0,0 @@
-name: Container Registry Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/test-container-registry'
-      - '.gitea/workflows/test-container-registry.yml'
-      - 'tests/container-registry/run-test.sh'
-  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '6 19 * * *'
-
-jobs:
-  test:
-    name: "Run contaier registry hosting test on kind/k8s"
-    runs-on: ubuntu-22.04
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Check cgroups version"
-        run: mount | grep cgroup
-      - name: "Install kind"
-        run: ./tests/scripts/install-kind.sh
-      - name: "Install Kubectl"
-        run: ./tests/scripts/install-kubectl.sh
-      - name: "Install ed" # Only needed until we remove the need to edit the spec file
-        run: apt update && apt install -y ed
-      - name: "Run container registry deployment test"
-        run: |
-          source /opt/bash-utils/cgroup-helper.sh
-          join_cgroup
-          ./tests/container-registry/run-test.sh
-
@@ -1,52 +0,0 @@
-name: Database Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/test-database'
-      - '.gitea/workflows/test-database.yml'
-      - 'tests/database/run-test.sh'
-  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '5 18 * * *'
-
-jobs:
-  test:
-    name: "Run database hosting test on kind/k8s"
-    runs-on: ubuntu-22.04
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Check cgroups version"
-        run: mount | grep cgroup
-      - name: "Install kind"
-        run: ./tests/scripts/install-kind.sh
-      - name: "Install Kubectl"
-        run: ./tests/scripts/install-kubectl.sh
-      - name: "Run database deployment test"
-        run: |
-          source /opt/bash-utils/cgroup-helper.sh
-          join_cgroup
-          ./tests/database/run-test.sh
-
@@ -1,22 +1,16 @@
 name: K8s Deploy Test

 on:
-  pull_request:
-    branches: '*'
  push:
    branches: '*'
    paths:
      - '!**'
-      - '.gitea/workflows/triggers/test-k8s-deploy'
-      - '.gitea/workflows/test-k8s-deploy.yml'
-      - 'tests/k8s-deploy/run-deploy-test.sh'
-  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '3 15 * * *'
+      - '.gitea/workflows/triggers/fixturenet-laconicd-test'

 jobs:
  test:
    name: "Run deploy test suite on kind/k8s"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-with-syn-ethdb
    steps:
      - name: "Clone project repository"
        uses: actions/checkout@v3
@@ -40,15 +34,9 @@ jobs:
        run: ./scripts/create_build_tag_file.sh
      - name: "Build local shiv package"
        run: ./scripts/build_shiv_package.sh
-      - name: "Check cgroups version"
-        run: mount | grep cgroup
      - name: "Install kind"
        run: ./tests/scripts/install-kind.sh
      - name: "Install Kubectl"
        run: ./tests/scripts/install-kubectl.sh
      - name: "Run k8s deployment test"
-        run: |
-          source /opt/bash-utils/cgroup-helper.sh
-          join_cgroup
-          ./tests/k8s-deploy/run-deploy-test.sh
-
+        run: ./tests/k8s-deploy/run-deploy-test.sh
@@ -1,44 +0,0 @@
-name: Mobymask Demo Build
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    branches:
-      - ci-test
-      - dboreham/mobymask-v3-demo-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'
-
-jobs:
-  test:
-    name: "Run mobymask-v3-demo test suite"
-    runs-on: ubuntu-latest-arm
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Login to image registry"
-        run: |
-          echo ${{ secrets.CICD_PUBLISH_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin
-      - name: "Run mobymask v3 tests"
-        run: ./tests/mobymask-v3-demo/run-test.sh
@@ -1,44 +0,0 @@
-name: Mobymask Demo Build
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    branches:
-      - ci-test
-      - dboreham/mobymask-v3-demo-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'
-
-jobs:
-  test:
-    name: "Run mobymask-v3-demo test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Login to image registry"
-        run: |
-          echo ${{ secrets.CICD_PUBLISH_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin
-      - name: "Run mobymask v3 tests"
-        run: ./tests/mobymask-v3-demo/run-test.sh
@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-eth-plugeth-arm-test CI job
-
@@ -1,3 +1,2 @@
 Change this file to trigger running the fixturenet-eth-plugeth-test CI job
 trigger
-trigger
@@ -1,3 +1,2 @@
 Change this file to trigger running the fixturenet-laconicd-test CI job
-Trigger
-Trigger
+
@@ -1 +0,0 @@
-Change this file to trigger running the test-container-registry CI job
@@ -1,2 +0,0 @@
-Change this file to trigger running the test-database CI job
-Trigger test run
@@ -1,2 +1 @@
 Change this file to trigger running the test-k8s-deploy CI job
-Trigger test on PR branch
@@ -29,10 +29,10 @@ chmod +x ~/.docker/cli-plugins/docker-compose
 Next decide on a directory where you would like to put the stack-orchestrator program. Typically this would be 
 a "user" binary directory such as `~/bin` or perhaps `/usr/local/laconic` or possibly just the current working directory.

-Now, having selected that directory, download the latest release from [this page](https://git.vdb.to/cerc-io/stack-orchestrator/tags) into it (we're using `~/bin` below for concreteness but edit to suit if you selected a different directory). Also be sure that the destination directory exists and is writable:
+Now, having selected that directory, download the latest release from [this page](https://github.com/cerc-io/stack-orchestrator/tags) into it (we're using `~/bin` below for concreteness but edit to suit if you selected a different directory). Also be sure that the destination directory exists and is writable:

 ```bash
-curl -L -o ~/bin/laconic-so https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/latest/laconic-so
+curl -L -o ~/bin/laconic-so https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
 ```

 Give it execute permissions:
@@ -52,7 +52,7 @@ Version: 1.1.0-7a607c2-202304260513
 Save the distribution url to `~/.laconic-so/config.yml`:
 ```bash
 mkdir ~/.laconic-so
-echo "distribution-url: https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/latest/laconic-so" >  ~/.laconic-so/config.yml
+echo "distribution-url: https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so" >  ~/.laconic-so/config.yml
 ```

 ### Update
@@ -26,7 +26,7 @@ In addition to the pre-requisites listed in the [README](/README.md), the follow

 1. Clone this repository:
   ```
-   $ git clone https://git.vdb.to/cerc-io/stack-orchestrator.git
+   $ git clone https://github.com/cerc-io/stack-orchestrator.git
   ```

 2. Enter the project directory:
@@ -1,10 +1,10 @@
 # Adding a new stack

-See [this PR](https://git.vdb.to/cerc-io/stack-orchestrator/pull/434) for an example of how to currently add a minimal stack to stack orchestrator. The [reth stack](https://git.vdb.to/cerc-io/stack-orchestrator/pull/435) is another good example.
+See [this PR](https://github.com/cerc-io/stack-orchestrator/pull/434) for an example of how to currently add a minimal stack to stack orchestrator. The [reth stack](https://github.com/cerc-io/stack-orchestrator/pull/435) is another good example.

 For external developers, we recommend forking this repo and adding your stack directly to your fork. This initially requires running in "developer mode" as described [here](/docs/CONTRIBUTING.md). Check out the [Namada stack](https://github.com/vknowable/stack-orchestrator/blob/main/app/data/stacks/public-namada/digitalocean_quickstart.md) from Knowable to see how that is done.

-Core to the feature completeness of stack orchestrator is to [decouple the tool functionality from payload](https://git.vdb.to/cerc-io/stack-orchestrator/issues/315) which will no longer require forking to add a stack.
+Core to the feature completeness of stack orchestrator is to [decouple the tool functionality from payload](https://github.com/cerc-io/stack-orchestrator/issues/315) which will no longer require forking to add a stack.

 ## Example

@@ -15,139 +15,132 @@ To avoid hiccups on Mac M1/M2 and any local machine nuances that may affect the
 16 GB Memory / 8 Intel vCPUs / 160 GB Disk.

 1. Login to the droplet as root (either by SSH key or password set in the DO console)
-    ```
-    ssh root@IP
-    ```

-1. Get the install script, give it executable permissions, and run it:
+```
+ssh root@IP
+```

-    ```
-    curl -o install.sh https://raw.githubusercontent.com/cerc-io/stack-orchestrator/main/scripts/quick-install-linux.sh
-    ```
-    ```
-    chmod +x install.sh
-    ```
-    ```
-    bash install.sh
-    ```
+2. Get the install script, give it executable permissions, and run it:

-1. Confirm docker was installed and activate the changes in `~/.profile`:
+```
+curl -o install.sh https://raw.githubusercontent.com/cerc-io/stack-orchestrator/main/scripts/quick-install-linux.sh
+```
+```
+chmod +x install.sh
+```
+```
+bash install.sh
+```

-    ```
-    docker run hello-world
-   ```
-   ```
-   source ~/.profile
-   ```
+3. Confirm docker was installed and activate the changes in `~/.profile`:

-1. Verify installation:
+```
+docker run hello-world
+```
+```
+source ~/.profile
+```

-    ```
-    laconic-so version
-    ```
+4. Verify installation:
+
+```
+laconic-so version
+```

 ## Setup the laconic fixturenet stack

 1. Get the repositories

-    ```
-    laconic-so --stack fixturenet-laconic-loaded setup-repositories --include git.vdb.to/cerc-io/laconicd,git.vdb.to/cerc-io/laconic-sdk,git.vdb.to/cerc-io/laconic-registry-cli,git.vdb.to/cerc-io/laconic-console
-    ```
+```
+laconic-so --stack fixturenet-laconic-loaded setup-repositories --include git.vdb.to/cerc-io/laconicd,git.vdb.to/cerc-io/laconic-sdk,git.vdb.to/cerc-io/laconic-registry-cli,git.vdb.to/cerc-io/laconic-console
+```

-1. Build the containers:
+2. Set this environment variable to the Laconic self-hosted Gitea instance:

-    ```
-    laconic-so --stack fixturenet-laconic-loaded build-containers
-    ```
+```
+export CERC_NPM_REGISTRY_URL=https://git.vdb.to/api/packages/cerc-io/npm/
+```

-    It's possible to run into an `ESOCKETTIMEDOUT` error, e.g., `error An unexpected error occurred: "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz: ESOCKETTIMEDOUT"`. This may happen even if you have a great internet connection. In that case, re-run the `build-containers` command.
+3. Build the containers:

+```
+laconic-so --stack fixturenet-laconic-loaded build-containers
+```

-1. Set this environment variable to your droplet's IP address or fully qualified DNS host name if it has one:
+It's possible to run into an `ESOCKETTIMEDOUT` error, e.g., `error An unexpected error occurred: "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz: ESOCKETTIMEDOUT"`. This may happen even if you have a great internet connection. In that case, re-run the `build-containers` command.

-    ```
-    export BACKEND_ENDPOINT=http://<your-IP-or-hostname>:9473
-    ```
-    e.g.
-    ```
-    export BACKEND_ENDPOINT=http://my-test-server.example.com:9473
-    ```
+4. Set this environment variable to your droplet's IP address:

-1. Create a deployment directory for the stack:
-    ```
-    laconic-so --stack fixturenet-laconic-loaded deploy init --output laconic-loaded.spec --map-ports-to-host any-same --config LACONIC_HOSTED_ENDPOINT=$BACKEND_ENDPOINT
-    ```
-    ```
-    laconic-so --stack fixturenet-laconic-loaded deploy create --deployment-dir laconic-loaded-deployment --spec-file laconic-loaded.spec
-    ```
-2. Start the stack:
+```
+export LACONIC_HOSTED_ENDPOINT=http://<your-IP>
+```

-    ```
-    laconic-so deployment --dir laconic-loaded-deployment start
-    ```
+5. Deploy the stack:

-3. Check the logs:
+```
+laconic-so --stack fixturenet-laconic-loaded deploy up
+```

-    ```
-    laconic-so deployment --dir laconic-loaded-deployment logs
-    ```
+6. Check the logs:

-    You'll see output from `laconicd` and the block height should be >1 to confirm it is running:
+```
+laconic-so --stack fixturenet-laconic-loaded deploy logs
+```

-    ```
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:29PM INF indexed block exents height=12 module=txindex server=node
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF Timed out dur=4976.960115 height=13 module=consensus round=0 server=node step=1
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received proposal module=consensus proposal={"Type":32,"block_id":{"hash":"D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4","parts":{"hash":"22411A20B7F14CDA33244420FBDDAF24450C0628C7A06034FF22DAC3699DDCC8","total":1}},"height":13,"pol_round":-1,"round":0,"signature":"DEuqnaQmvyYbUwckttJmgKdpRu6eVm9i+9rQ1pIrV2PidkMNdWRZBLdmNghkIrUzGbW8Xd7UVJxtLRmwRASgBg==","timestamp":"2023-04-18T21:30:01.49450663Z"} server=node
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received complete proposal block hash=D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4 height=13 module=consensus server=node
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF finalizing commit of block hash={} height=13 module=consensus num_txs=0 root=1A8CA1AF139CCC80EC007C6321D8A63A46A793386EE2EDF9A5CA0AB2C90728B7 server=node
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF minted coins from module account amount=2059730459416582643aphoton from=mint module=x/bank
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF executed block height=13 module=state num_invalid_txs=0 num_valid_txs=0 server=node
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF commit synced commit=436F6D6D697449447B5B363520313037203630203232372039352038352032303820313334203231392032303520313433203130372031343920313431203139203139322038362031323720362031383520323533203137362031333820313735203135392031383620323334203135382031323120313431203230342037335D3A447D
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF committed state app_hash=416B3CE35F55D086DBCD8F6B958D13C0567F06B9FDB08AAF9FBAEA9E798DCC49 height=13 module=state num_txs=0 server=node
-    laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF indexed block exents height=13 module=txindex server=node
-    ```
+You'll see output from `laconicd` and the block height should be >1 to confirm it is running:

-4. Confirm operation of the registry CLI:
+```
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:29PM INF indexed block exents height=12 module=txindex server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF Timed out dur=4976.960115 height=13 module=consensus round=0 server=node step=1
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received proposal module=consensus proposal={"Type":32,"block_id":{"hash":"D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4","parts":{"hash":"22411A20B7F14CDA33244420FBDDAF24450C0628C7A06034FF22DAC3699DDCC8","total":1}},"height":13,"pol_round":-1,"round":0,"signature":"DEuqnaQmvyYbUwckttJmgKdpRu6eVm9i+9rQ1pIrV2PidkMNdWRZBLdmNghkIrUzGbW8Xd7UVJxtLRmwRASgBg==","timestamp":"2023-04-18T21:30:01.49450663Z"} server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF received complete proposal block hash=D26C088A711F912ADB97888C269F628DA33153795621967BE44DCB43C3D03CA4 height=13 module=consensus server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF finalizing commit of block hash={} height=13 module=consensus num_txs=0 root=1A8CA1AF139CCC80EC007C6321D8A63A46A793386EE2EDF9A5CA0AB2C90728B7 server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF minted coins from module account amount=2059730459416582643aphoton from=mint module=x/bank
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF executed block height=13 module=state num_invalid_txs=0 num_valid_txs=0 server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF commit synced commit=436F6D6D697449447B5B363520313037203630203232372039352038352032303820313334203231392032303520313433203130372031343920313431203139203139322038362031323720362031383520323533203137362031333820313735203135392031383620323334203135382031323120313431203230342037335D3A447D
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF committed state app_hash=416B3CE35F55D086DBCD8F6B958D13C0567F06B9FDB08AAF9FBAEA9E798DCC49 height=13 module=state num_txs=0 server=node
+laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF indexed block exents height=13 module=txindex server=node
+```

-   ```
-   laconic-so deployment --dir laconic-loaded-deployment exec cli "laconic cns status"
-   ```
+7. Confirm operation of the registry CLI:

-   ```
-   {
-     "version": "0.3.0",
-     "node": {
-       "id": "4216af2ac9f68bda33a38803fc1b5c9559312c1d",
-       "network": "laconic_9000-1",
-       "moniker": "localtestnet"
-     },
-     "sync": {
-       "latest_block_hash": "1BDF4CB9AE2390DA65BCF997C83133C18014FCDDCAE03708488F0B56FCEEA429",
-       "latest_block_height": "5",
-       "latest_block_time": "2023-08-09 16:00:30.386903172 +0000 UTC",
-       "catching_up": false
-     },
-     "validator": {
-       "address": "651FBC700B747C76E90ACFC18CC9508C3D0905B9",
-       "voting_power": "1000000000000000"
-     },
-     "validators": [
-       {
-         "address": "651FBC700B747C76E90ACFC18CC9508C3D0905B9",
-         "voting_power": "1000000000000000",
-         "proposer_priority": "0"
-       }
-     ],
-     "num_peers": "0",
-     "peers": [],
-     "disk_usage": "292.0K"
-   }
-   ```
+```
+laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns status"
+```
+
+```
+{
+  "version": "0.3.0",
+  "node": {
+    "id": "4216af2ac9f68bda33a38803fc1b5c9559312c1d",
+    "network": "laconic_9000-1",
+    "moniker": "localtestnet"
+  },
+  "sync": {
+    "latest_block_hash": "1BDF4CB9AE2390DA65BCF997C83133C18014FCDDCAE03708488F0B56FCEEA429",
+    "latest_block_height": "5",
+    "latest_block_time": "2023-08-09 16:00:30.386903172 +0000 UTC",
+    "catching_up": false
+  },
+  "validator": {
+    "address": "651FBC700B747C76E90ACFC18CC9508C3D0905B9",
+    "voting_power": "1000000000000000"
+  },
+  "validators": [
+    {
+      "address": "651FBC700B747C76E90ACFC18CC9508C3D0905B9",
+      "voting_power": "1000000000000000",
+      "proposer_priority": "0"
+    }
+  ],
+  "num_peers": "0",
+  "peers": [],
+  "disk_usage": "292.0K"
+}
+```

 ## Configure Digital Ocean firewall

-(Note this step may not be necessary depending on the droplet image used)
-
 Let's open some ports.

 1. In the Digital Ocean web console, navigate to your droplet's main page. Select the "Networking" tab and scroll down to "Firewall".
@@ -1,6 +1,6 @@
 # Specification

-Note: this page is out of date (but still useful) - it will no longer be useful once stacks are [decoupled from the tool functionality](https://git.vdb.to/cerc-io/stack-orchestrator/issues/315).
+Note: this page is out of date (but still useful) - it will no longer be useful once stacks are [decoupled from the tool functionality](https://github.com/cerc-io/stack-orchestrator/issues/315).

 ## Implementation

@@ -10,4 +10,3 @@ pydantic==1.10.9
 tomli==2.0.1
 validators==0.22.0
 kubernetes>=28.1.0
-humanfriendly>=10.0
@@ -41,4 +41,4 @@ runcmd:
  - apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
  - systemctl enable docker
  - systemctl start docker
-  - git clone https://git.vdb.to/cerc-io/stack-orchestrator.git /home/ubuntu/stack-orchestrator
+  - git clone https://github.com/cerc-io/stack-orchestrator.git /home/ubuntu/stack-orchestrator
@@ -31,5 +31,5 @@ runcmd:
  - apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
  - systemctl enable docker
  - systemctl start docker
-  - curl -L -o /usr/local/bin/laconic-so https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/latest/laconic-so
+  - curl -L -o /usr/local/bin/laconic-so https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
  - chmod +x /usr/local/bin/laconic-so
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Beginnings of a script to quickly spin up and test a deployment
-if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
-    set -x
-fi
-if [[ -n "$1" ]]; then
-	stack_name=$1
-else
-	stack_name="test"
-fi
-spec_file_name="${stack_name}-spec.yml"
-deployment_dir_name="${stack_name}-deployment"
-rm -f ${spec_file_name}
-rm -rf ${deployment_dir_name}
-laconic-so --stack ${stack_name} deploy --deploy-to compose init --output ${spec_file_name}
-laconic-so --stack ${stack_name} deploy --deploy-to compose create --deployment-dir ${deployment_dir_name} --spec-file ${spec_file_name}
-#laconic-so deployment --dir ${deployment_dir_name} start
-#laconic-so deployment --dir ${deployment_dir_name} ps
-#laconic-so deployment --dir ${deployment_dir_name} stop
@@ -137,7 +137,7 @@ fi
 echo "**************************************************************************************"
 echo "Installing laconic-so"
 # install latest `laconic-so`
-distribution_url=https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/latest/laconic-so
+distribution_url=https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
 install_filename=${install_dir}/laconic-so
 mkdir -p  ${install_dir}
 curl -L -o ${install_filename} ${distribution_url}
@@ -13,7 +13,7 @@ setup(
    description='Orchestrates deployment of the Laconic stack',
    long_description=long_description,
    long_description_content_type="text/markdown",
-    url='https://git.vdb.to/cerc-io/stack-orchestrator',
+    url='https://github.com/cerc-io/stack-orchestrator',
    py_modules=['stack_orchestrator'],
    packages=find_packages(),
    install_requires=[requirements],
@@ -25,18 +25,14 @@ 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
 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)"

-
 def make_container_build_env(dev_root_path: str,
                             container_build_dir: str,
                             debug: bool,
@@ -62,73 +58,83 @@ def make_container_build_env(dev_root_path: str,
    return container_build_env


-def process_container(build_context: BuildContext) -> bool:
-    if not opts.o.quiet:
-        print(f"Building: {build_context.container}")
+def process_container(stack: str,
+                      container,
+                      container_build_dir: str,
+                      container_build_env: dict,
+                      dev_root_path: str,
+                      quiet: bool,
+                      verbose: bool,
+                      dry_run: bool,
+                      continue_on_error: bool,
+                      ):
+    if not quiet:
+        print(f"Building: {container}")

-    default_container_tag = f"{build_context.container}:local"
-    build_context.container_build_env.update({"CERC_DEFAULT_CONTAINER_IMAGE_TAG": default_container_tag})
+    default_container_tag = f"{container}:local"
+    container_build_env.update({"CERC_DEFAULT_CONTAINER_IMAGE_TAG": default_container_tag})

    # Check if this is in an external stack
-    if stack_is_external(build_context.stack):
-        container_parent_dir = Path(build_context.stack).joinpath("container-build")
-        temp_build_dir = container_parent_dir.joinpath(build_context.container.replace("/", "-"))
+    if stack_is_external(stack):
+        container_parent_dir = Path(stack).joinpath("container-build")
+        temp_build_dir = container_parent_dir.joinpath(container.replace("/", "-"))
        temp_build_script_filename = temp_build_dir.joinpath("build.sh")
        # Now check if the container exists in the external stack.
        if not temp_build_script_filename.exists():
            # If not, revert to building an internal container
-            container_parent_dir = build_context.container_build_dir
+            container_parent_dir = container_build_dir
    else:
-        container_parent_dir = build_context.container_build_dir
+        container_parent_dir = container_build_dir

-    build_dir = container_parent_dir.joinpath(build_context.container.replace("/", "-"))
+    build_dir = container_parent_dir.joinpath(container.replace("/", "-"))
    build_script_filename = build_dir.joinpath("build.sh")

-    if opts.o.verbose:
+    if verbose:
        print(f"Build script filename: {build_script_filename}")
    if os.path.exists(build_script_filename):
        build_command = build_script_filename.as_posix()
    else:
-        if opts.o.verbose:
+        if verbose:
            print(f"No script file found: {build_script_filename}, using default build script")
-        repo_dir = build_context.container.split('/')[1]
+        repo_dir = container.split('/')[1]
        # TODO: make this less of a hack -- should be specified in some metadata somewhere
        # Check if we have a repo for this container. If not, set the context dir to the container-build subdir
-        repo_full_path = os.path.join(build_context.dev_root_path, repo_dir)
+        repo_full_path = os.path.join(dev_root_path, repo_dir)
        repo_dir_or_build_dir = repo_full_path if os.path.exists(repo_full_path) else build_dir
-        build_command = os.path.join(build_context.container_build_dir,
+        build_command = os.path.join(container_build_dir,
                                     "default-build.sh") + f" {default_container_tag} {repo_dir_or_build_dir}"
-    if not opts.o.dry_run:
-        # No PATH at all causes failures with podman.
-        if "PATH" not in build_context.container_build_env:
-            build_context.container_build_env["PATH"] = os.environ["PATH"]
-        if opts.o.verbose:
-            print(f"Executing: {build_command} with environment: {build_context.container_build_env}")
-        build_result = subprocess.run(build_command, shell=True, env=build_context.container_build_env)
-        if opts.o.verbose:
+    if not dry_run:
+        if verbose:
+            print(f"Executing: {build_command} with environment: {container_build_env}")
+        build_result = subprocess.run(build_command, shell=True, env=container_build_env)
+        if verbose:
            print(f"Return code is: {build_result.returncode}")
        if build_result.returncode != 0:
-            return False
-        else:
-            return True
+            print(f"Error running build for {container}")
+            if not continue_on_error:
+                print("FATAL Error: container build failed and --continue-on-error not set, exiting")
+                sys.exit(1)
+            else:
+                print("****** Container Build Error, continuing because --continue-on-error is set")
    else:
        print("Skipped")
-        return True
-

@click.command()
@click.option('--include', help="only build these containers")
@click.option('--exclude', help="don\'t build these containers")
@click.option("--force-rebuild", is_flag=True, default=False, help="Override dependency checking -- always rebuild")
@click.option("--extra-build-args", help="Supply extra arguments to build")
-@click.option("--publish-images", is_flag=True, default=False, help="Publish the built images in the specified image registry")
-@click.option("--image-registry", help="Specify the image registry for --publish-images")
@click.pass_context
-def command(ctx, include, exclude, force_rebuild, extra_build_args, publish_images, image_registry):
+def command(ctx, include, exclude, force_rebuild, extra_build_args):
    '''build the set of containers required for a complete stack'''

+    quiet = ctx.obj.quiet
+    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")
@@ -139,45 +145,39 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args, publish_imag
    else:
        dev_root_path = os.path.expanduser(config("CERC_REPO_BASE_DIR", default="~/cerc"))

-    if not opts.o.quiet:
+    if not quiet:
        print(f'Dev Root is: {dev_root_path}')

    if not os.path.isdir(dev_root_path):
        print('Dev root directory doesn\'t exist, creating')

-    if publish_images:
-        if not image_registry:
-            error_exit("--image-registry must be supplied with --publish-images")
+    # 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 = get_containers_in_scope(stack)
+    containers_in_scope = []
+    if stack:
+        stack_config = get_parsed_stack_config(stack)
+        containers_in_scope = stack_config['containers']
+    else:
+        containers_in_scope = all_containers
+
+    if 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,
-                                                   opts.o.debug,
+                                                   debug,
                                                   force_rebuild,
                                                   extra_build_args)

    for container in containers_in_scope:
        if include_exclude_check(container, include, exclude):
-
-            build_context = BuildContext(
-                stack,
-                container,
-                container_build_dir,
-                container_build_env,
-                dev_root_path
-            )
-            result = process_container(build_context)
-            if result:
-                if publish_images:
-                    publish_image(f"{container}:local", image_registry)
-            else:
-                print(f"Error running build for {build_context.container}")
-                if not opts.o.continue_on_error:
-                    error_exit("container build failed and --continue-on-error not set, exiting")
-                    sys.exit(1)
-                else:
-                    print("****** Container Build Error, continuing because --continue-on-error is set")
+            process_container(stack, container, container_build_dir, container_build_env,
+                              dev_root_path, quiet, verbose, dry_run, continue_on_error)
        else:
-            if opts.o.verbose:
+            if verbose:
                print(f"Excluding: {container}")
@@ -1,29 +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/>.
-
-
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Mapping
-
-
-@dataclass
-class BuildContext:
-    stack: str
-    container: str
-    container_build_dir: Path
-    container_build_env: Mapping[str,str]
-    dev_root_path: str
-
@@ -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
@@ -21,18 +21,14 @@
 # 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
-from stack_orchestrator.build.build_types import BuildContext


@click.command()
-@click.option('--base-container')
+@click.option('--base-container', default="cerc/nextjs-base")
@click.option('--source-repo', help="directory containing the webapp to build", required=True)
@click.option("--force-rebuild", is_flag=True, default=False, help="Override dependency checking -- always rebuild")
@click.option("--extra-build-args", help="Supply extra arguments to build")
@@ -42,9 +38,12 @@ def command(ctx, base_container, source_repo, force_rebuild, extra_build_args, t
    '''build the specified webapp container'''

    quiet = ctx.obj.quiet
+    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")
@@ -58,45 +57,25 @@ def command(ctx, base_container, source_repo, force_rebuild, extra_build_args, t
    if not quiet:
        print(f'Dev Root is: {dev_root_path}')

-    if not base_container:
-        base_container = determine_base_container(source_repo)
-
    # First build the base container.
    container_build_env = build_containers.make_container_build_env(dev_root_path, container_build_dir, debug,
                                                                    force_rebuild, extra_build_args)

-    build_context_1 = BuildContext(
-        stack,
-        base_container,
-        container_build_dir,
-        container_build_env,
-        dev_root_path,
-    )
-    ok = build_containers.process_container(build_context_1)
-    if not ok:
-        print("ERROR: Build failed.", file=sys.stderr)
-        sys.exit(1)
+    build_containers.process_container(None, base_container, container_build_dir, container_build_env, dev_root_path, quiet,
+                                       verbose, dry_run, continue_on_error)
+

    # 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"
    container_build_env["CERC_CONTAINER_BUILD_WORK_DIR"] = os.path.abspath(source_repo)
    container_build_env["CERC_CONTAINER_BUILD_DOCKERFILE"] = os.path.join(container_build_dir,
-                                                                          base_container.replace("/", "-"),
-                                                                          "Dockerfile.webapp")
+                                                                    base_container.replace("/", "-"),
+                                                                    "Dockerfile.webapp")
    if not tag:
        webapp_name = os.path.abspath(source_repo).split(os.path.sep)[-1]
        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,
-        base_container,
-        container_build_dir,
-        container_build_env,
-        dev_root_path,
-    )
-    ok = build_containers.process_container(build_context_2)
-    if not ok:
-        print("ERROR: Build failed.", file=sys.stderr)
-        sys.exit(1)
+    build_containers.process_container(None, base_container, container_build_dir, container_build_env, dev_root_path, quiet,
+                                       verbose, dry_run, continue_on_error)
@@ -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")
@@ -1,48 +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/>.
-
-from datetime import datetime
-from python_on_whales import DockerClient
-
-from stack_orchestrator.opts import opts
-from stack_orchestrator.util import error_exit
-
-
-def _publish_tag_for_image(local_image_tag: str, remote_repo: str, version: str):
-    # Turns image tags of the form: foo/bar:local into remote.repo/org/bar:deploy
-    (image_name, image_version) = local_image_tag.split(":")
-    if image_version == "local":
-        return f"{remote_repo}/{image_name}:{version}"
-    else:
-        error_exit("Asked to publish a non-locally built image")
-
-
-def publish_image(local_tag, registry):
-    if opts.o.verbose:
-        print(f"Publishing this image: {local_tag} to this registry: {registry}")
-    docker = DockerClient()
-    # Figure out the target image tag
-    # Eventually this version will be generated from the source repo state
-    # Using a timestemp is an intermediate step
-    version = datetime.now().strftime("%Y%m%d%H%M")
-    remote_tag = _publish_tag_for_image(local_tag, registry, version)
-    # Tag the image thus
-    if opts.o.debug:
-        print(f"Tagging {local_tag} to {remote_tag}")
-    docker.image.tag(local_tag, remote_tag)
-    # Push it to the desired registry
-    if opts.o.verbose:
-        print(f"Pushing image {remote_tag}")
-    docker.image.push(remote_tag)
@@ -27,12 +27,6 @@ kube_config_key = "kube-config"
 deploy_to_key = "deploy-to"
 network_key = "network"
 http_proxy_key = "http-proxy"
-image_registry_key = "image-registry"
-configmaps_key = "configmaps"
-resources_key = "resources"
-volumes_key = "volumes"
-security_key = "security"
-annotations_key = "annotations"
-labels_key = "labels"
+image_resigtry_key = "image-registry"
 kind_config_filename = "kind-config.yml"
 kube_config_filename = "kubeconfig.yml"
@@ -1,15 +0,0 @@
-services:
-  registry:
-    image: registry:2.8
-    restart: always
-    environment:
-      REGISTRY_LOG_LEVEL: ${REGISTRY_LOG_LEVEL}
-    volumes:
-      - config:/config:ro
-      - registry-data:/var/lib/registry
-    ports:
-      - "5000"
-
-volumes:
-  config:
-  registry-data:
@@ -2,7 +2,7 @@ services:
  laconicd:
    restart: unless-stopped
    image: cerc/laconicd:local
-    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
+    entrypoint: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
    volumes:
      # The cosmos-sdk node's database directory:
      - laconicd-data:/root/.laconicd
@@ -15,12 +15,12 @@ services:
      - "6060"
      - "26657"
      - "26656"
-      - "9473"
+      - "9473:9473"
      - "8545"
      - "8546"
      - "9090"
      - "9091"
-      - "1317"
+      - "1317:1317"
  cli:
    image: cerc/laconic-registry-cli:local
    volumes:
@@ -0,0 +1,8 @@
+version: "3.2"
+
+services:
+  geojson:
+    image: cerc/geojson:local
+    restart: always
+    ports:
+      - 0.0.0.0:8080:8080
@@ -1,12 +0,0 @@
-version: "3.2"
-
-services:
-  mars:
-    image: cerc/mars-v2:local
-    restart: always
-    ports:
-      - "3000:3000"
-    environment:
-      - URL_OSMOSIS_REST=https://lcd-osmosis.blockapsis.com
-      - URL_OSMOSIS_RPC=https://rpc-osmosis.blockapsis.com
-      - WALLET_CONNECT_ID=0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x
@@ -1,20 +0,0 @@
-version: "3.2"
-
-services:
-  mars:
-    image: cerc/mars:local
-    restart: always
-    ports:
-      - "3000:3000"
-    environment:
-      - URL_OSMOSIS_GQL=https://osmosis-node.marsprotocol.io/GGSFGSFGFG34/osmosis-hive-front/graphql
-      - URL_OSMOSIS_REST=https://lcd-osmosis.blockapsis.com
-      - URL_OSMOSIS_RPC=https://rpc-osmosis.blockapsis.com
-      - URL_NEUTRON_GQL=https://neutron.rpc.p2p.world/qgrnU6PsQZA8F9S5Fb8Fn3tV3kXmMBl2M9bcc9jWLjQy8p/hive/graphql
-      - URL_NEUTRON_REST=https://rest-kralum.neutron-1.neutron.org
-      - URL_NEUTRON_RPC=https://rpc-kralum.neutron-1.neutron.org
-      - URL_NEUTRON_TEST_GQL=https://testnet-neutron-gql.marsprotocol.io/graphql
-      - URL_NEUTRON_TEST_REST=https://rest-palvus.pion-1.ntrn.tech
-      - URL_NEUTRON_TEST_RPC=https://rpc-palvus.pion-1.ntrn.tech
-      - WALLET_CONNECT_ID=0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x
-
@@ -1,32 +0,0 @@
-version: '3.2'
-
-services:
-  # Builds and serves the MobyMask v3 react-app
-  mobymask-v3-app:
-    restart: unless-stopped
-    image: cerc/mobymask-ui:local
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
-      CERC_SNAP_URL: ${CERC_SNAP_URL}
-    working_dir: /app
-    command: ["bash", "/scripts/mobymask-app-start.sh"]
-    volumes:
-      - ../config/watcher-mobymask-v3-demo/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
-      - ../config/watcher-mobymask-v3-demo/local/keys:/server/keys
-      - mobymask_deployment:/server
-      - nitro_deployment:/nitro
-    ports:
-      - "127.0.0.1:3004:80"
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "80"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  mobymask_deployment:
-  nitro_deployment:
@@ -1,8 +0,0 @@
-version: "3.2"
-
-services:
-  ping-pub:
-    image: cerc/ping-pub:local
-    restart: always
-    ports:
-      - "5173:5173"
@@ -1,13 +0,0 @@
-services:
-  snowballtools-base-backend:
-    image: cerc/snowballtools-base-backend:local
-    restart: always
-    volumes:
-      - data:/data
-      - config:/config:ro
-    ports:
-      - 8000
-
-volumes:
-  data:
-  config:
@@ -1,20 +0,0 @@
-services:
-
-  database:
-    image: cerc/test-database-container:local
-    restart: always
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: "test-user"
-      POSTGRES_DB: "test-db"
-      POSTGRES_PASSWORD: "password"
-      POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C"
-    ports:
-      - "5432"
-    
-  test-client:
-    image: cerc/test-database-client:local
-
-volumes:
-  db-data:
@@ -5,16 +5,10 @@ services:
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_TEST_PARAM_1: ${CERC_TEST_PARAM_1:-FAILED}
-      CERC_TEST_PARAM_2: "CERC_TEST_PARAM_2_VALUE"
-      CERC_TEST_PARAM_3: ${CERC_TEST_PARAM_3:-FAILED}
    volumes:
-      - test-data-bind:/data
-      - test-data-auto:/data2
-      - test-config:/config:ro
+      - test-data:/data
    ports:
      - "80"

 volumes:
-  test-data-bind:
-  test-data-auto:
-  test-config:
+  test-data:
@@ -1,162 +0,0 @@
-version: '3.2'
-
-services:
-  # Starts the PostgreSQL database for watcher
-  mobymask-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=mobymask-watcher-1,mobymask-watcher-1-job-queue,mobymask-watcher-2,mobymask-watcher-2-job-queue,mobymask-watcher-3,mobymask-watcher-3-job-queue
-      - POSTGRES_EXTENSION=mobymask-watcher-1-job-queue:pgcrypto,mobymask-watcher-2-job-queue:pgcrypto,mobymask-watcher-3-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - mobymask_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-
-  # Deploys the MobyMask contract and generates an invite link
-  # Deployment is skipped if CERC_DEPLOYED_CONTRACT env is set
-  mobymask:
-    image: cerc/mobymask:local
-    working_dir: /app/packages/server
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      # ENV: "PROD" # Check if required
-      CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT}
-      CERC_PRIVATE_KEY_DEPLOYER: ${CERC_PRIVATE_KEY_DEPLOYER}
-      CERC_MOBYMASK_APP_BASE_URI: ${CERC_MOBYMASK_APP_BASE_URI}
-      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
-    command: ["bash", "-c", "./deploy-and-generate-invite.sh"]
-    volumes:
-      - ../config/watcher-mobymask-v3-demo/deploy-and-generate-invite.sh:/app/packages/server/deploy-and-generate-invite.sh
-      - mobymask_deployment:/app/packages/server
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Starts a MobyMask v3 watcher server #1
-  mobymask-watcher-1-server:
-    image: cerc/watcher-mobymask-v3:local
-    restart: unless-stopped
-    depends_on:
-      mobymask-watcher-db:
-        condition: service_healthy
-      mobymask:
-        condition: service_completed_successfully
-      nitro-contracts:
-        condition: service_completed_successfully
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_WATCHER_INDEX: 1
-      CERC_ETH_RPC_QUERY_ENDPOINT: ${CERC_ETH_RPC_QUERY_ENDPOINT}
-      CERC_ETH_RPC_MUTATION_ENDPOINT: ${CERC_ETH_RPC_MUTATION_ENDPOINT}
-      CERC_NITRO_CHAIN_URL: ${CERC_NITRO_CHAIN_URL}
-    command: ["bash", "./start-server.sh"]
-    volumes:
-      - ../config/watcher-mobymask-v3-demo/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-mobymask-v3-demo/watcher-config-rates.toml:/app/environments/rates.toml
-      - ../config/watcher-mobymask-v3-demo/local/keys:/app/keys
-      - ../config/watcher-mobymask-v3-demo/start-server.sh:/app/start-server.sh
-      - watcher_nitro_data:/app/out/nitro-db
-      - nitro_deployment:/nitro
-      - mobymask_deployment:/server
-    # Expose GQL, metrics and relay node ports
-    ports:
-      - "0.0.0.0:3001:3001"
-      - "9001"
-      - "0.0.0.0:9090:9090"
-    healthcheck:
-      test: ["CMD", "busybox", "nc", "localhost", "9090"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Starts a MobyMask v3 watcher server #2
-  mobymask-watcher-2-server:
-    image: cerc/watcher-mobymask-v3:local
-    restart: unless-stopped
-    depends_on:
-      mobymask-watcher-1-server:
-        condition: service_healthy
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_WATCHER_INDEX: 2
-      CERC_ETH_RPC_QUERY_ENDPOINT: ${CERC_ETH_RPC_QUERY_ENDPOINT}
-      CERC_ETH_RPC_MUTATION_ENDPOINT: ${CERC_ETH_RPC_MUTATION_ENDPOINT}
-      CERC_NITRO_CHAIN_URL: ${CERC_NITRO_CHAIN_URL}
-    command: ["bash", "./start-server.sh"]
-    volumes:
-      - ../config/watcher-mobymask-v3-demo/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-mobymask-v3-demo/watcher-config-rates.toml:/app/environments/rates.toml
-      - ../config/watcher-mobymask-v3-demo/local/keys:/app/keys
-      - ../config/watcher-mobymask-v3-demo/start-server.sh:/app/start-server.sh
-      - watcher_nitro_data:/app/out/nitro-db
-      - nitro_deployment:/nitro
-      - mobymask_deployment:/server
-    # Expose GQL, metrics and relay node ports
-    ports:
-      - "3001"
-      - "9001"
-      - "0.0.0.0:9091:9090"
-    healthcheck:
-      test: ["CMD", "busybox", "nc", "localhost", "9090"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Starts a MobyMask v3 watcher server #3
-  mobymask-watcher-3-server:
-    image: cerc/watcher-mobymask-v3:local
-    restart: unless-stopped
-    depends_on:
-      mobymask-watcher-1-server:
-        condition: service_healthy
-      mobymask-watcher-2-server:
-        condition: service_healthy
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_WATCHER_INDEX: 3
-      CERC_ETH_RPC_QUERY_ENDPOINT: ${CERC_ETH_RPC_QUERY_ENDPOINT}
-      CERC_ETH_RPC_MUTATION_ENDPOINT: ${CERC_ETH_RPC_MUTATION_ENDPOINT}
-      CERC_NITRO_CHAIN_URL: ${CERC_NITRO_CHAIN_URL}
-    command: ["bash", "./start-server.sh"]
-    volumes:
-      - ../config/watcher-mobymask-v3-demo/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-mobymask-v3-demo/watcher-config-rates.toml:/app/environments/rates.toml
-      - ../config/watcher-mobymask-v3-demo/local/keys:/app/keys
-      - ../config/watcher-mobymask-v3-demo/start-server.sh:/app/start-server.sh
-      - watcher_nitro_data:/app/out/nitro-db
-      - nitro_deployment:/nitro
-      - mobymask_deployment:/server
-    # Expose GQL, metrics and relay node ports
-    ports:
-      - "3001"
-      - "9001"
-      - "0.0.0.0:9092:9090"
-    healthcheck:
-      test: ["CMD", "busybox", "nc", "localhost", "9090"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  mobymask_watcher_db_data:
-  mobymask_deployment:
-  nitro_deployment:
-  watcher_nitro_data:
@@ -5,4 +5,4 @@ services:
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
    ports:
-      - "80"
+      - "3000"
@@ -65,7 +65,7 @@ if [ -n "$CERC_L1_ADDRESS" ] && [ -n "$CERC_L1_PRIV_KEY" ]; then
  # Sequencer
  SEQ=$(echo "$wallet3" | awk '/Address:/{print $2}')
  SEQ_KEY=$(echo "$wallet3" | awk '/Private key:/{print $3}')
-
+  
  echo "Funding accounts."
  wait_for_block 1 300
  cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 5ether $PROPOSER --private-key $ADMIN_KEY
@@ -169,4 +169,4 @@ cp -a /app/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT /l1-deploy
 cp /app/packages/contracts-bedrock/deploy-config/$DEPLOYMENT_CONTEXT.json /l2-config
 openssl rand -hex 32 > /l2-config/l2-jwt.txt

-echo "Deployment successful. Exiting."
+echo "Deployment successful. Exiting"
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# From env:
-# CERC_ETH_RPC_ENDPOINT
-# CERC_MOBYMASK_APP_BASE_URI
-# CERC_DEPLOYED_CONTRACT
-# CERC_PRIVATE_KEY_DEPLOYER
-
-# Check if CERC_DEPLOYED_CONTRACT environment variable set to skip contract deployment
-if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
-  echo "CERC_DEPLOYED_CONTRACT is set to '$CERC_DEPLOYED_CONTRACT'"
-  echo "Skipping contract deployment"
-  exit 0
-fi
-
-echo "Using ETH RPC endpoint ${CERC_ETH_RPC_ENDPOINT}"
-
-# Wait till ETH RPC endpoint is available with block number > 1
-retry_interval=5
-while true; do
-  block_number_hex=$(curl -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' ${CERC_ETH_RPC_ENDPOINT} | jq -r '.result')
-
-  # Check if the request call was successful
-  if [ $? -ne 0 ]; then
-    echo "RPC endpoint not yet available, retrying in $retry_interval seconds..."
-    sleep $retry_interval
-    continue
-  fi
-
-  # Convert hex to decimal
-  block_number_dec=$(printf %u ${block_number_hex})
-
-  # Check if block number is > 1 to avoid failures in the deployment
-  if [ "$block_number_dec" -ge 1 ]; then
-    echo "RPC endpoint is up"
-    break
-  else
-    echo "RPC endpoint not yet available, retrying in $retry_interval seconds..."
-    sleep $retry_interval
-    continue
-  fi
-done
-
-echo "Using CERC_PRIVATE_KEY_DEPLOYER from env"
-
-# Create the required JSON and write it to a file
-secrets_file="secrets.json"
-secrets_json=$(jq -n \
-  --arg privateKey "$CERC_PRIVATE_KEY_DEPLOYER" \
-  --arg rpcUrl "$CERC_ETH_RPC_ENDPOINT" \
-  --arg baseURI "$CERC_MOBYMASK_APP_BASE_URI" \
-  '.privateKey = $privateKey | .rpcUrl = $rpcUrl | .baseURI = $baseURI')
-echo "$secrets_json" > "${secrets_file}"
-
-export RPC_URL="${CERC_ETH_RPC_ENDPOINT}"
-
-# Check and exit if a deployment already exists (on restarts)
-if [ -f ./config.json ]; then
-  echo "config.json already exists, checking the contract deployment"
-
-  # Read JSON file
-  deployment_details=$(cat config.json)
-  deployed_contract=$(echo "$deployment_details" | jq -r '.address')
-
-  cd ../hardhat
-  if yarn verifyDeployment --network optimism --contract "${deployed_contract}"; then
-    echo "Deployment verfication successful"
-    cd ../server
-  else
-    echo "Deployment verfication failed, please clear MobyMask deployment volume before starting"
-    exit 1
-  fi
-fi
-
-npm run deployAndGenerateInvite
@@ -1,16 +0,0 @@
-# Watchers
-
-CERC_ETH_RPC_ENDPOINT="http://op-geth:8545"
-
-# L1 pre-funded account #4, funded on L2 as well
-CERC_PRIVATE_KEY_DEPLOYER="0xbe4aa664815ea3bc3d63118649a733f6c96b243744310806ecb6d96359ab62cf"
-CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3004/#"
-
-CERC_ETH_RPC_QUERY_ENDPOINT="http://op-geth:8545"
-CERC_ETH_RPC_MUTATION_ENDPOINT="http://op-geth:8545"
-CERC_NITRO_CHAIN_URL="http://op-geth:8546"
-
-# App
-
-CERC_APP_WATCHER_URL="http://localhost:3001"
-CERC_SNAP_URL=http://localhost:8080
@@ -1,72 +0,0 @@
-#!/bin/bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-echo "*************************************"
-
-CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
-CERC_L1_CHAIN_ID="${CERC_L1_CHAIN_ID:-${DEFAULT_CERC_L1_CHAIN_ID}}"
-CERC_L1_ACCOUNTS_CSV_URL="${CERC_L1_ACCOUNTS_CSV_URL:-${DEFAULT_CERC_L1_ACCOUNTS_CSV_URL}}"
-
-# Fixture accounts
-WATCHER_1_ACCOUNT=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
-WATCHER_2_ACCOUNT=0x70997970C51812dc3A010C7d01b50e0d17dc79C8
-WATCHER_3_ACCOUNT=0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65
-NITRO_APP_ACCOUNT=0xbDA5747bFD65F08deb54cb465eB87D40e51B197E
-
-WATCHER_1_ACCOUNT_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-WATCHER_2_ACCOUNT_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
-WATCHER_3_ACCOUNT_KEY=0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a
-NITRO_APP_ACCOUNT_KEY=0x689af8efa8c651a91ad287602527f3af2fe9f6501a7ac4b061667b5a93e037fd
-
-# Check if watcher 1 account already funded
-WATCHER_1_ACCOUNT_BALANCE=$(cast balance ${WATCHER_1_ACCOUNT} --rpc-url $CERC_L1_RPC)
-echo "WATCHER_1_ACCOUNT_BALANCE ${WATCHER_1_ACCOUNT_BALANCE}"
-if [ "$WATCHER_1_ACCOUNT_BALANCE" != "0" ]; then
-  echo "Watcher account already funded, exiting."
-  exit 0
-fi
-
-echo "Funding accounts on L2"
-
-# Fetch the L1 funded accounts
-curl -o accounts.csv $CERC_L1_ACCOUNTS_CSV_URL
-
-# Use the accounts other than the ones used for Optimism deployment
-ACCOUNT_1=$(awk -F ',' 'NR == 5 {print $2}' accounts.csv)
-ACCOUNT_1_KEY=$(awk -F ',' 'NR == 5 {print $3}' accounts.csv)
-
-ACCOUNT_2=$(awk -F ',' 'NR == 6 {print $2}' accounts.csv)
-ACCOUNT_2_KEY=$(awk -F ',' 'NR == 6 {print $3}' accounts.csv)
-
-# Get the bridge contract address
-DEPLOYMENT_CONTEXT="$CERC_L1_CHAIN_ID"
-BRIDGE=$(cat /l1-deployment/$DEPLOYMENT_CONTEXT/L1StandardBridgeProxy.json | jq -r .address)
-
-# Send balance to bridge contract on L1
-cast send --rpc-url $CERC_L1_RPC --from $ACCOUNT_1 --value 10000ether $BRIDGE --private-key $ACCOUNT_1_KEY
-cast send --rpc-url $CERC_L1_RPC --from $ACCOUNT_2 --value 10000ether $BRIDGE --private-key $ACCOUNT_2_KEY
-
-echo "Following accounts have been funded; use them for transactions on L2:"
-echo "${ACCOUNT_1}"
-echo "${ACCOUNT_2}"
-
-echo "*************************************"
-echo "Funding the watcher and app Nitro accounts on L2"
-
-cast send --rpc-url $CERC_L1_RPC --from $ACCOUNT_1 --value 200ether $WATCHER_1_ACCOUNT --private-key $ACCOUNT_1_KEY
-cast send --rpc-url $CERC_L1_RPC --from $ACCOUNT_1 --value 200ether $WATCHER_2_ACCOUNT --private-key $ACCOUNT_1_KEY
-cast send --rpc-url $CERC_L1_RPC --from $ACCOUNT_1 --value 200ether $WATCHER_3_ACCOUNT --private-key $ACCOUNT_1_KEY
-cast send --rpc-url $CERC_L1_RPC --from $ACCOUNT_1 --value 200ether $NITRO_APP_ACCOUNT --private-key $ACCOUNT_1_KEY
-
-cast send --rpc-url $CERC_L1_RPC --from $WATCHER_1_ACCOUNT --value 100ether $BRIDGE --private-key $WATCHER_1_ACCOUNT_KEY
-sleep 5
-cast send --rpc-url $CERC_L1_RPC --from $WATCHER_2_ACCOUNT --value 100ether $BRIDGE --private-key $WATCHER_2_ACCOUNT_KEY
-sleep 5
-cast send --rpc-url $CERC_L1_RPC --from $WATCHER_3_ACCOUNT --value 100ether $BRIDGE --private-key $WATCHER_3_ACCOUNT_KEY
-sleep 5
-cast send --rpc-url $CERC_L1_RPC --from $NITRO_APP_ACCOUNT --value 100ether $BRIDGE --private-key $NITRO_APP_ACCOUNT_KEY
-
-echo "Done, exiting."
@@ -1,21 +0,0 @@
-{
-  "peerId": {
-    "id": "12D3KooWAMjBkFCT9DtCnSDcxftxJzSuTBvzVojabv64cnEvX4AZ",
-    "privKey": "CAESQAKCrnY0QKTky1I18fqn+VPydXGUv1NYiV+nVKqBFkw/CAjE9sKKIDGnYAo8mivnI6dngFenERY+0Q8AJrPTaXY=",
-    "pubKey": "CAESIAgIxPbCiiAxp2AKPJor5yOnZ4BXpxEWPtEPACaz02l2"
-  },
-  "relayPeerId": {
-    "id": "12D3KooWNQJDGtH3YAZk2qG1ZbcoQvw6HaD814pfd9HHQthgX63K",
-    "privKey": "CAESQGc996T2OuyV3aY+hnna+GIexKBEcE6jDNX/RaofHr58uv2EYxXm4kcL2tO2tKgnPgtkegHFdjqy6h/xOA+YMZo=",
-    "pubKey": "CAESILr9hGMV5uJHC9rTtrSoJz4LZHoBxXY6suof8TgPmDGa"
-  },
-  "peer": {
-    "privateKey": "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
-    "nitroAddress": "0xAAA6628Ec44A8a742987EF3A114dDFE2D4F7aDCE",
-    "nitroPrivateKey": "2d999770f7b5d49b694080f987b82bbc9fc9ac2b4dcc10b0f8aba7d700f69c6d"
-  },
-  "consensus": {
-    "publicKey": "02cd17b05ca998955be5ca7bf4fd4531243d438f1aae7ce8a0ed5159f53cee5b40",
-    "privateKey": "67d80505614bdf61fca11cbad31d93acb2c7df1c653dc25975d77d05f05f154f"
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "peerId": {
-    "id": "12D3KooWBNEbY3QS4y23ngupDw9PDc4bvNvRJGVRejjV9EZLjux5",
-    "privKey": "CAESQGSTw0ymvn8+wX9Dbvyr4/Gib1q2voe0CC0VyeClMQP6FwW14x0fpRbBIx0XhLdxWHkRndphVg3gVAHyC+7ZI8o=",
-    "pubKey": "CAESIBcFteMdH6UWwSMdF4S3cVh5EZ3aYVYN4FQB8gvu2SPK"
-  },
-  "relayPeerId": {
-    "id": "12D3KooWPpBt2coC5BKEsewogHSkdgdyY9guUHJBgJFZoh66R4UL",
-    "privKey": "CAESQBdoGZzpiHsE8GlIhGGP+tl6A13sIPxOhgSwsWZR4cwmz/f7627X5GQRLD41ikH6oZ7ZeSbiiPsBtelL1+t3M80=",
-    "pubKey": "CAESIM/3++tu1+RkESw+NYpB+qGe2Xkm4oj7AbXpS9frdzPN"
-  },
-  "peer": {
-    "privateKey": "59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d",
-    "nitroAddress": "0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94",
-    "nitroPrivateKey": "0279651921cd800ac560c21ceea27aab0107b67daf436cdd25ce84cad30159b4"
-  },
-  "consensus": {
-    "publicKey": "029c8035b3e9401b8f178f7c37285b5cb22501e017340e2058b3b842f2a1f0ae45",
-    "privateKey": "0261008e8e3ec808168e99333599da38ca59a056a2ae4510a6ad3d8b5cb0918c"
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "peerId": {
-    "id": "12D3KooWSRH6ftgkAZsKZK7UX1Zr6Hx6YAsEepHqzopFszqfTxxi",
-    "privKey": "CAESQHBjlHxfVhZ2gXsBItrIEEgSGKcjMkFiGs3PPz9E3ace9qyWEkvR4oit5ve9SAROVoh20hoa42IC91NIafMaqws=",
-    "pubKey": "CAESIPaslhJL0eKIreb3vUgETlaIdtIaGuNiAvdTSGnzGqsL"
-  },
-  "relayPeerId": {
-    "id": "12D3KooWLudDC3NnS8k9xLiqTZcS9xbFNrGSttu5GPynQgNgenPW",
-    "privKey": "CAESQHuEXPB1hTQATlZaNRQnAfSvnfYUeLF9PjSNKp9L33K2pMl37tTBYghnfQ0yluse0zHOIXRJM+9+ARn9+jIr0gU=",
-    "pubKey": "CAESIKTJd+7UwWIIZ30NMpbrHtMxziF0STPvfgEZ/foyK9IF"
-  },
-  "peer": {
-    "privateKey": "47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a",
-    "nitroAddress": "0x67D5b55604d1aF90074FcB69b8C51838FFF84f8d",
-    "nitroPrivateKey": "58368d20ff12f17669c06158c21d885897aa56f9be430edc789614bf9851d53f"
-  },
-  "consensus": {
-    "publicKey": "039160c244a7ad8be16a64bdb69e6dbacdcfe20b37076792a0d06032a8097468ca",
-    "privateKey": "8894685fe81001d75662b079905472699373967451d1255ee5fc669d0a09a9ca"
-  }
-}
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-watcher_keys_dir="/server/keys"
-
-# Configure relay nodes to connect to
-# Note: Assuming host ports for watchers (1-3) relay nodes
-RELAY_NODES="[\"/ip4/127.0.0.1/tcp/9090/ws/p2p/$(jq -r '.relayPeerId.id' ${watcher_keys_dir}/watcher-1.json)\", \"/ip4/127.0.0.1/tcp/9091/ws/p2p/$(jq -r '.relayPeerId.id' ${watcher_keys_dir}/watcher-2.json)\", \"/ip4/127.0.0.1/tcp/9092/ws/p2p/$(jq -r '.relayPeerId.id' ${watcher_keys_dir}/watcher-3.json)\"]"
-
-# Configure watcher (1) Nitro account to make payments to
-PAYMENT_NITRO_ADDRESS=$(jq -r '.peer.nitroAddress' ${watcher_keys_dir}/watcher-1.json)
-
-echo "Using RELAY_NODES $RELAY_NODES"
-echo "Using PAYMENT_NITRO_ADDRESS $PAYMENT_NITRO_ADDRESS"
-
-# Use config from mounted volume
-echo "Taking config for deployed contracts from mounted volume"
-while [ ! -f /server/config.json ]; do
-  echo "Config not found, retrying in 5 seconds..."
-  sleep 5
-done
-
-# Get deployed contract address and chain id
-DEPLOYED_CONTRACT=$(jq -r '.address' /server/config.json | tr -d '"')
-CHAIN_ID=$(jq -r '.chainId' /server/config.json)
-
-echo "Using DEPLOYED_CONTRACT $DEPLOYED_CONTRACT"
-echo "Using CHAIN_ID $CHAIN_ID"
-
-nitro_addresses_file="/nitro/nitro-addresses.json"
-nitro_addresses_destination_file="/app/src/utils/nitro-addresses.json"
-if [ -f ${nitro_addresses_file} ]; then
-  echo "Using Nitro addresses from ${nitro_addresses_file}:"
-  cat "$nitro_addresses_file"
-  cat "$nitro_addresses_file" > "$nitro_addresses_destination_file"
-else
-  echo "Nitro addresses not available"
-  exit 1
-fi
-
-# Export config values in a json file
-app_config_file="/app/src/utils/config.json"
-app_config_json=$(jq -n \
-  --arg name "MobyMask" \
-  --argjson enableDebugInfo true \
-  --arg address "$DEPLOYED_CONTRACT" \
-  --argjson chainId "$CHAIN_ID" \
-  --argjson relayNodes "$RELAY_NODES" \
-  --argjson denyMultiaddrs "[]" \
-  --arg pubsub "" \
-  --argjson directPeers "[]" \
-  '.name = $name | .address = $address | .chainId = $chainId | .relayNodes = $relayNodes | .peer.enableDebugInfo = $enableDebugInfo | .peer.denyMultiaddrs = $denyMultiaddrs | .peer.pubsub = $pubsub | .peer.directPeers = $directPeers')
-echo "$app_config_json" > "${app_config_file}"
-
-echo "Using CERC_APP_WATCHER_URL $CERC_APP_WATCHER_URL"
-echo "Using CERC_SNAP_URL $CERC_SNAP_URL"
-
-REACT_APP_DEBUG_PEER=true \
-REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" \
-REACT_APP_PAY_TO_NITRO_ADDRESS="$PAYMENT_NITRO_ADDRESS" \
-REACT_APP_SNAP_ORIGIN="local:$CERC_SNAP_URL" \
-yarn build
-
-http-server -p 80 /app/build
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-watcher_keys_dir="./keys"
-
-echo "Watcher index: ${CERC_WATCHER_INDEX}"
-echo "Using RPC query endpoint ${CERC_ETH_RPC_QUERY_ENDPOINT}"
-echo "Using RPC mutation endpoint ${CERC_ETH_RPC_MUTATION_ENDPOINT}"
-echo "Using Nitro chain URL ${CERC_NITRO_CHAIN_URL}"
-
-WATCHER_DB="mobymask-watcher-${CERC_WATCHER_INDEX}"
-
-# Use the docker container's host IP for relay multiaddr in peer config
-CERC_RELAY_MULTIADDR="/dns4/mobymask-watcher-${CERC_WATCHER_INDEX}-server/tcp/9090/ws/p2p/$(jq -r '.relayPeerId.id' ${watcher_keys_dir}/watcher-${CERC_WATCHER_INDEX}.json)"
-
-# Assign deployed contract address from server config (created by mobymask container after deploying contract)
-CONTRACT_ADDRESS=$(jq -r '.address' /server/config.json | tr -d '"')
-
-nitro_addresses_file="/nitro/nitro-addresses.json"
-nitro_addresses_destination_file="./src/nitro-addresses.json"
-if [ -f ${nitro_addresses_file} ]; then
-  echo "Using Nitro addresses from ${nitro_addresses_file}:"
-  cat "$nitro_addresses_file"
-  cat "$nitro_addresses_file" > "$nitro_addresses_destination_file"
-else
-  echo "Nitro addresses not available"
-  exit 1
-fi
-
-# Build after setting the Nitro addresses
-yarn build
-
-PEER_ID_FILE='./peer-id.json'
-RELAY_PEER_ID_FILE='./relay-id.json'
-
-# Create watcher party array
-watcher_parties=()
-
-# Iterate over each fixture JSON file
-for watcher_keys_file in "$watcher_keys_dir"/*.json; do
-  # Extract the filename without the path and extension
-  filename=$(basename "$watcher_keys_file" .json)
-
-  # Read the consensus keys
-  peer_id=$(jq -r '.peerId.id' "$watcher_keys_file")
-
-  # Read the consensus keys
-  consensus_public_key=$(jq -r '.consensus.publicKey' "$watcher_keys_file")
-  consensus_private_key=$(jq -r '.consensus.privateKey' "$watcher_keys_file")
-
-  # Append watcher party
-  watcher_party=$(jq -n \
-    --arg peerId "$peer_id" \
-    --arg publicKey "$consensus_public_key" \
-    '.peerId = $peerId | .publicKey = $publicKey')
-  watcher_parties+=("$watcher_party")
-
-  if [ "$filename" = "watcher-${CERC_WATCHER_INDEX}" ]; then
-    # Export watcher peer and relay ids
-    peer_id_data=$(jq '.peerId' "$watcher_keys_file")
-    relay_peer_id_data=$(jq '.relayPeerId' "$watcher_keys_file")
-    echo "$peer_id_data" > "${PEER_ID_FILE}"
-    echo "$relay_peer_id_data" > "${RELAY_PEER_ID_FILE}"
-
-    # Set peer and nitro account keys
-    CERC_PRIVATE_KEY_PEER=$(jq -r '.peer.privateKey' "$watcher_keys_file")
-    CERC_WATCHER_NITRO_PK=$(jq -r '.peer.nitroPrivateKey' "$watcher_keys_file")
-
-    # Set consensus keys for this peer
-    CONSENSUS_PUBLIC_KEY=${consensus_public_key}
-    CONSENSUS_PRIVATE_KEY=${consensus_private_key}
-  fi
-done
-
-echo "Consensus module enabled"
-CONSENSUS_ENABLED=true
-WATCHER_PARTY_PEERS_FILE='./watcher-party-peers.json'
-
-# Export watcher party file
-watcher_parties_json=$(printf '%s\n' "${watcher_parties[@]}" | jq -s .)
-echo "$watcher_parties_json" > "${WATCHER_PARTY_PEERS_FILE}"
-echo "Watcher party peers exported to ${WATCHER_PARTY_PEERS_FILE}"
-
-# Configure relay peers for watcher 2 and 3
-CERC_RELAY_PEERS=[]
-if [ "${CERC_WATCHER_INDEX}" = "2" ]; then
-  # 2 -> 1
-  CERC_RELAY_PEERS="['/dns4/mobymask-watcher-1-server/tcp/9090/ws/p2p/$(jq -r '.relayPeerId.id' ${watcher_keys_dir}/watcher-1.json)']"
-elif [ "${CERC_WATCHER_INDEX}" = "3" ]; then
-  # 3 -> 1, 2
-  CERC_RELAY_PEERS="['/dns4/mobymask-watcher-1-server/tcp/9090/ws/p2p/$(jq -r '.relayPeerId.id' ${watcher_keys_dir}/watcher-1.json)', '/dns4/mobymask-watcher-2-server/tcp/9090/ws/p2p/$(jq -r '.relayPeerId.id' ${watcher_keys_dir}/watcher-2.json)']"
-fi
-
-# 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_RELAY_PEERS|${CERC_RELAY_PEERS}|g; \
-    s|REPLACE_WITH_CERC_RELAY_MULTIADDR|${CERC_RELAY_MULTIADDR}|g; \
-    s/REPLACE_WITH_CERC_PRIVATE_KEY_PEER/${CERC_PRIVATE_KEY_PEER}/g; \
-    s/REPLACE_WITH_CERC_WATCHER_NITRO_PK/${CERC_WATCHER_NITRO_PK}/g; \
-    s/REPLACE_WITH_CONTRACT_ADDRESS/${CONTRACT_ADDRESS}/g; \
-    s|REPLACE_WITH_CERC_NITRO_CHAIN_URL|${CERC_NITRO_CHAIN_URL}|g; \
-    s/REPLACE_WITH_CONSENSUS_ENABLED/${CONSENSUS_ENABLED}/g; \
-    s/REPLACE_WITH_CONSENSUS_PUBLIC_KEY/${CONSENSUS_PUBLIC_KEY}/g; \
-    s/REPLACE_WITH_CONSENSUS_PRIVATE_KEY/${CONSENSUS_PRIVATE_KEY}/g; \
-    s|REPLACE_WITH_WATCHER_PARTY_PEERS_FILE|${WATCHER_PARTY_PEERS_FILE}|g; \
-    s|REPLACE_WITH_CERC_ETH_RPC_QUERY_ENDPOINT|${CERC_ETH_RPC_QUERY_ENDPOINT}|g; \
-    s|REPLACE_WITH_CERC_ETH_RPC_MUTATION_ENDPOINT|${CERC_ETH_RPC_MUTATION_ENDPOINT}|g; \
-    s|REPLACE_WITH_WATCHER_DB|${WATCHER_DB}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-echo 'Running watcher server'
-yarn server
@@ -1,14 +0,0 @@
-freeQueriesLimit = 10
-
-freeQueriesList = []
-
-[queries]
-  multiNonce = '50'
-  _owner = '50'
-  isRevoked = '50'
-  isPhisher = '50'
-  isMember = '50'
-
-[mutations]
-  invoke = '100'
-  revoke = '100'
@@ -1,111 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3001
-  kind = "lazy"
-
-  # Checkpointing state.
-  checkpointing = false
-
-  # Checkpoint interval in number of blocks.
-  checkpointInterval = 2000
-
-  # Enable state creation
-  enableState = false
-
-  # Boolean to filter logs by contract.
-  filterLogs = true
-
-  # Max block range for which to return events in eventsInRange GQL query.
-  # Use -1 for skipping check on block range.
-  maxEventsBlockRange = -1
-
-  # Flag to specify whether RPC endpoint supports block hash as block tag parameter
-  rpcSupportsBlockHashParam = true
-
-  [server.p2p]
-    enableRelay = true
-    enablePeer = true
-
-    [server.p2p.relay]
-      host = "0.0.0.0"
-      port = 9090
-      relayPeers = REPLACE_WITH_CERC_RELAY_PEERS
-      denyMultiaddrs = []
-      peerIdFile = './relay-id.json'
-      announce = ''
-      pubsub = ''
-      enableDebugInfo = true
-
-    [server.p2p.peer]
-      relayMultiaddr = 'REPLACE_WITH_CERC_RELAY_MULTIADDR'
-      pubSubTopic = 'mobymask'
-      denyMultiaddrs = []
-      peerIdFile = './peer-id.json'
-      pubsub = ''
-      enableDebugInfo = true
-      enableL2Txs = true
-      pingInterval = 4000
-      pingTimeout = 1500
-      maxRelayConnections = 10
-
-      [server.p2p.peer.l2TxsConfig]
-        privateKey = 'REPLACE_WITH_CERC_PRIVATE_KEY_PEER'
-        contractAddress = 'REPLACE_WITH_CONTRACT_ADDRESS'
-
-    [server.p2p.nitro]
-      chainUrl = 'REPLACE_WITH_CERC_NITRO_CHAIN_URL'
-      store = './out/nitro-db'
-      privateKey = 'REPLACE_WITH_CERC_WATCHER_NITRO_PK'
-      chainPrivateKey = 'REPLACE_WITH_CERC_PRIVATE_KEY_PEER'
-
-      [server.p2p.nitro.payments]
-        ratesFile = './environments/rates.toml'
-        requestTimeoutInSecs = 10
-
-        [server.p2p.nitro.payments.cache]
-          maxAccounts = 1000
-          accountTTLInSecs = 1800
-          maxVouchersPerAccount = 1000
-          voucherTTLInSecs = 300
-          maxPaymentChannels = 10000
-          paymentChannelTTLInSecs = 1800
-
-    [server.p2p.consensus]
-      enabled = REPLACE_WITH_CONSENSUS_ENABLED
-      publicKey = 'REPLACE_WITH_CONSENSUS_PUBLIC_KEY'
-      privateKey = 'REPLACE_WITH_CONSENSUS_PRIVATE_KEY'
-      watcherPartyPeersFile = 'REPLACE_WITH_WATCHER_PARTY_PEERS_FILE'
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9000
-  [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "mobymask-watcher-db"
-  port = 5432
-  database = "REPLACE_WITH_WATCHER_DB"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-
-[upstream]
-  [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server:8083/graphql"
-    rpcProviderEndpoint = 'REPLACE_WITH_CERC_ETH_RPC_QUERY_ENDPOINT'
-    rpcProviderMutationEndpoint = 'REPLACE_WITH_CERC_ETH_RPC_MUTATION_ENDPOINT'
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@mobymask-watcher-db/REPLACE_WITH_WATCHER_DB-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50
-  blockDelayInMilliSecs = 60000
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build the birbit image
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/birbit:local -f ${CERC_REPO_BASE_DIR}/birbit/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/birbit
@@ -10,10 +10,9 @@ COPY genesis /opt/genesis
 COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
 COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
 COPY --from=ethgen /apps /apps
-RUN cd /apps/el-gen && pip3 install --break-system-packages -r requirements.txt
+RUN cd /apps/el-gen && pip3 install -r requirements.txt
 # web3==5.24.0 used by el-gen is broken on python 3.11
-RUN pip3 install --break-system-packages --upgrade "web3==6.5.0"
-RUN pip3 install --break-system-packages --upgrade "typing-extensions"
+RUN pip3 install --upgrade "web3==6.5.0"

 # Build genesis config
 RUN apk add --no-cache make bash envsubst jq
@@ -0,0 +1,11 @@
+FROM node:14
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm install && npm run build
+
+EXPOSE 8080
+
+CMD ["npm", "run", "serve"]
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build the geojson image
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/geojson:local -f ${CERC_CONTAINER_BASE_DIR}/cerc-geojson/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/geojson.io
+#docker build -t cerc/geojson:local -f ${CERC_REPO_BASE_DIR}/geojson.io/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/geojson.io
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build the mars-v2 image
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/mars-v2:local -f ${CERC_REPO_BASE_DIR}/mars-v2-frontend/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/mars-v2-frontend
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build the mars image
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/mars:local -f ${CERC_REPO_BASE_DIR}/mars-interface/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/mars-interface
@@ -26,22 +26,17 @@ 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.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends jq gettext-base procps
+    && apt-get -y install --no-install-recommends jq gettext-base

 # [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
+EXPOSE 3000

 COPY /scripts /scripts

@@ -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

@@ -35,8 +33,8 @@ if [ -f ".env" ]; then
  rm -f $TMP_ENV
 fi

-for f in $(find . -type f \( -regex '.*.html?' -or -regex ".*.[tj]s\(x\|on\)?$" \) | grep -v 'node_modules' | grep -v '.git'); do
-  for e in $(cat "${f}" | tr -s '[:blank:]' '\n' | tr -s '["/\\{},();]' '\n' | tr -s "[']" '\n' | egrep -o -e '^CERC_RUNTIME_ENV_.+$' -e '^LACONIC_HOSTED_CONFIG_.+$'); do
+for f in $(find "$TRG_DIR" -regex ".*.[tj]sx?$" -type f | grep -v 'node_modules'); do
+  for e in $(cat "${f}" | tr -s '[:blank:]' '\n' | tr -s '[{},();]' '\n' | egrep -o '^"CERC_RUNTIME_ENV_[^\"]+"'); do
    orig_name=$(echo -n "${e}" | sed 's/"//g')
    cur_name=$(echo -n "${orig_name}" | sed 's/CERC_RUNTIME_ENV_//g')
    cur_val=$(echo -n "\$${cur_name}" | envsubst)
@@ -9,9 +9,7 @@ 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
@@ -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
@@ -60,4 +58,4 @@ if [ "$CERC_NEXTJS_SKIP_GENERATE" != "true" ]; then
  fi
 fi

-$CERC_BUILD_TOOL start . -- -p ${CERC_LISTEN_PORT:-80}
+$CERC_BUILD_TOOL start . -p ${CERC_LISTEN_PORT:-3000}
@@ -3,17 +3,12 @@ FROM cerc/foundry:local
 # Install node (local foundry is a debian based image)
 RUN apt-get update \
  && apt-get install -y curl wget \
-  && apt-get install -y git busybox jq python3 make gcc g++
-
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash \
-  && export NVM_DIR="$HOME/.nvm" \
-  &&  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \
-  && nvm install 16.16.0 \
+  && curl --silent --location https://deb.nodesource.com/setup_16.x | bash - \
+  && apt-get update \
+  && apt-get install -y nodejs git busybox jq \
  && node -v

-SHELL ["/bin/bash", "-c"]
-RUN source $HOME/.bashrc \
-  && corepack enable \
+RUN corepack enable \
  && yarn --version

 WORKDIR /app
@@ -21,10 +16,7 @@ WORKDIR /app
 # Copy optimism repo contents
 COPY . .

-SHELL ["/bin/bash", "-c"]
-RUN source $HOME/.bashrc \
-  && echo "Building optimism" \
-  && pnpm i -g pnpm@8.15.3 \
-  && pnpm install && pnpm build
+RUN echo "Building optimism" && \
+  pnpm install && pnpm build

 WORKDIR /app/packages/contracts-bedrock
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# Build the ping pub image
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-docker build -t cerc/ping-pub:local ${build_command_args} -f $CERC_REPO_BASE_DIR/explorer/Dockerfile $CERC_REPO_BASE_DIR/explorer
@@ -1,6 +0,0 @@
-FROM cerc/snowballtools-base-backend-base:local
-
-WORKDIR /app/packages/backend
-COPY run.sh .
-
-ENTRYPOINT ["./run.sh"]
@@ -1,26 +0,0 @@
-FROM ubuntu:22.04 as builder
-
-RUN apt update && \
-      apt install -y --no-install-recommends --no-install-suggests \
-      ca-certificates curl gnupg
-
-# Node
-ARG NODE_MAJOR=20
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-      echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
-      apt update && apt install -y nodejs
-
-# npm setup
-RUN npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/ && npm install -g yarn
-
-COPY . /app/
-WORKDIR /app/
-
-RUN find . -name 'node_modules' | xargs -n1 rm -rf
-RUN yarn && yarn build --ignore frontend
-
-FROM cerc/webapp-base:local
-
-COPY --from=builder /app /app
-
-WORKDIR /app/packages/backend
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/webapp-deployer-backend
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/snowballtools-base-backend-base:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile-base ${CERC_REPO_BASE_DIR}/snowballtools-base
-docker build -t cerc/snowballtools-base-backend:local ${build_command_args} ${SCRIPT_DIR} 
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-
-LACONIC_HOSTED_CONFIG_FILE=${LACONIC_HOSTED_CONFIG_FILE}
-if [ -z "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
-  if [ -f "/config/laconic-hosted-config.yml" ]; then
-    LACONIC_HOSTED_CONFIG_FILE="/config/laconic-hosted-config.yml"
-  elif [ -f "/config/config.yml" ]; then
-    LACONIC_HOSTED_CONFIG_FILE="/config/config.yml"
-  fi
-fi
-
-if [ -f "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
-  /scripts/apply-webapp-config.sh $LACONIC_HOSTED_CONFIG_FILE "`pwd`/dist"
-fi
-
-/scripts/apply-runtime-env.sh "`pwd`/dist"
-
-yarn start
@@ -1,67 +1,21 @@
 #!/usr/bin/env bash
 set -e
-
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
  set -x
 fi
-
-echo "Test container starting"
-
-DATA_DEVICE=$(df | grep "/data$" | awk '{ print $1 }')
-if [[ -n "$DATA_DEVICE" ]]; then
-  echo "/data: MOUNTED dev=${DATA_DEVICE}"
-else
-  echo "/data: not mounted"
-fi
-
-DATA2_DEVICE=$(df | grep "/data2$" | awk '{ print $1 }')
-if [[ -n "$DATA_DEVICE" ]]; then
-  echo "/data2: MOUNTED dev=${DATA2_DEVICE}"
-else
-  echo "/data2: not mounted"
-fi
-
 # Test if the container's filesystem is old (run previously) or new
-for d in /data /data2; do
-  if [[ -f "$d/exists" ]];
-  then
-      TIMESTAMP=`cat $d/exists`
-      echo "$d filesystem is old, created: $TIMESTAMP"
-  else
-      echo "$d filesystem is fresh"
-      echo `date` > $d/exists
-  fi
-done
-
+EXISTSFILENAME=/data/exists
+echo "Test container starting"
+if [[ -f "$EXISTSFILENAME" ]];
+then
+    TIMESTAMP=`cat $EXISTSFILENAME`
+    echo "Filesystem is old, created: $TIMESTAMP" 
+else
+    echo "Filesystem is fresh"
+    echo `date` > $EXISTSFILENAME
+fi
 if [ -n "$CERC_TEST_PARAM_1" ]; then
  echo "Test-param-1: ${CERC_TEST_PARAM_1}"
 fi
-if [ -n "$CERC_TEST_PARAM_2" ]; then
-  echo "Test-param-2: ${CERC_TEST_PARAM_2}"
-fi
-if [ -n "$CERC_TEST_PARAM_3" ]; then
-  echo "Test-param-3: ${CERC_TEST_PARAM_3}"
-fi
-if [ -n "$CERC_TEST_PARAM_4" ]; then
-  echo "Test-param-4: ${CERC_TEST_PARAM_4}"
-fi
-if [ -n "$CERC_TEST_PARAM_5" ]; then
-  echo "Test-param-5: ${CERC_TEST_PARAM_5}"
-fi
-
-if [ -d "/config" ]; then
-  echo "/config: EXISTS"
-  for f in /config/*; do
-    if [[ -f "$f" ]] || [[ -L "$f" ]]; then
-      echo "$f:"
-      cat "$f"
-      echo ""
-      echo ""
-    fi
-  done
-else
-  echo "/config: does NOT EXIST"
-fi
-
 # Run nginx which will block here forever
 /usr/sbin/nginx -g "daemon off;"
@@ -1,12 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && export DEBCONF_NOWARNINGS="yes" && \
-    apt-get install -y software-properties-common && \
-    apt-get install -y postgresql-client && \
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-EXPOSE 80
-
-COPY run.sh /app/run.sh
-
-ENTRYPOINT ["/app/run.sh"]
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/test-container
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-docker build -t cerc/test-database-client:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-# TODO derive this from config
-database_url="postgresql://test-user:password@localhost:5432/test-db"
-psql_command="psql ${database_url}"
-program_name="Database test client:"
-
-wait_for_database_up () {
-    for i in {1..50}
-    do
-        ${psql_command} -c "select 1;"
-        psql_succeeded=$?
-        if [[ ${psql_succeeded} == 0 ]]; then
-            # if ready, return
-            echo "${program_name} database up"
-            return
-        else
-            # if not ready, wait
-            echo "${program_name} waiting for database: ${i}"
-            sleep 5
-        fi
-    done
-    # Timed out, error exit
-    echo "${program_name} waiting for database: FAILED"
-    exit 1
-}
-
-# Used to synchronize with the test runner
-notify_test_complete () {
-    echo "${program_name} test complete"
-}
-
-does_test_data_exist () {
-    query_result=$(${psql_command} -t -c "select count(*) from test_table_1 where key_column = 'test_key_1';" | head -1 | tr -d ' ')
-    if [[ "${query_result}" == "1" ]]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-create_test_data () {
-    ${psql_command} -c "create table test_table_1 (key_column text, value_column text, primary key(key_column));"
-    ${psql_command} -c "insert into test_table_1 values ('test_key_1', 'test_value_1');"
-}
-
-wait_forever() {
-    # Loop to keep docker/k8s happy since this is the container entrypoint
-    while :; do sleep 600; done
-}
-
-wait_for_database_up
-
-# Check if the test database content exists already
-if does_test_data_exist; then
-    # If so, log saying so. Test harness will look for this log output
-    echo "${program_name} test data already exists"
-else
-    # Otherwise log saying the content was not present
-    echo "${program_name} test data does not exist"
-    echo "${program_name} creating test data"
-    # then create it
-    create_test_data
-fi
-
-notify_test_complete
-wait_forever
@@ -1,3 +0,0 @@
-FROM postgres:16-bullseye
-
-EXPOSE 5432
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/test-container
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-docker build -t cerc/test-database-container:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -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
+ARG VARIANT=18-bullseye
 FROM node:${VARIANT}

 ARG USERNAME=node
@@ -24,15 +24,11 @@ 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.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends jq gettext-base
+    && apt-get -y install --no-install-recommends jq

 # [Optional] Uncomment if you want to install an additional version of node using nvm
 # ARG EXTRA_NODE_VERSION=10
@@ -41,12 +37,15 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # 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

-COPY scripts /scripts
+RUN mkdir -p /scripts
+COPY ./apply-webapp-config.sh /scripts
+COPY ./start-serving-app.sh /scripts

 # [Optional] Uncomment if you want to install more global node modules
 # RUN su node -c "npm install -g <your-package-list-here>"

 RUN mkdir -p /config
+COPY ./config.yml /config

 # Install simple web server for now (use nginx perhaps later)
 RUN yarn global add http-server
@@ -1,12 +0,0 @@
-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
-
-FROM cerc/webapp-base:local
-COPY --from=builder /data /data
@@ -1,29 +1,9 @@
 #!/usr/bin/env bash
-# Build cerc/webapp-base
+# Build cerc/laconic-registry-cli

 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 )

-CERC_CONTAINER_BUILD_WORK_DIR=${CERC_CONTAINER_BUILD_WORK_DIR:-$SCRIPT_DIR}
-CERC_CONTAINER_BUILD_DOCKERFILE=${CERC_CONTAINER_BUILD_DOCKERFILE:-$SCRIPT_DIR/Dockerfile}
-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
-
-if [ $? -eq 0 ] && [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/webapp-base:local" ]; then
-  cat <<EOF
-
-#################################################################
-
-Built host container for $CERC_CONTAINER_BUILD_WORK_DIR with tag:
-
-    $CERC_CONTAINER_BUILD_TAG
-
-To test locally run:
-
-    laconic-so run-webapp --image $CERC_CONTAINER_BUILD_TAG --env-file /path/to/environment.env
-
-EOF
-fi
+docker build -t cerc/webapp-base:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${SCRIPT_DIR}
@@ -0,0 +1 @@
+# Put config here.
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-    set -x
-fi
-
-WORK_DIR="${1:-./}"
-
-cd "${WORK_DIR}" || exit 1
-
-if [ -f ".env" ]; then
-  TMP_ENV=`mktemp`
-  declare -px > $TMP_ENV
-  set -a
-  source .env
-  source $TMP_ENV
-  set +a
-  rm -f $TMP_ENV
-fi
-
-for f in $(find . -type f \( -regex '.*.html?' -or -regex ".*.[tj]s\(x\|on\)?$" \) | grep -v 'node_modules' | grep -v '.git'); do
-  for e in $(cat "${f}" | tr -s '[:blank:]' '\n' | tr -s '["/\\{},();]' '\n' | tr -s "[']" '\n' | egrep -o -e '^CERC_RUNTIME_ENV_.+$' -e '^LACONIC_HOSTED_CONFIG_.+$'); do
-    orig_name=$(echo -n "${e}" | sed 's/"//g')
-    cur_name=$(echo -n "${orig_name}" | sed 's/CERC_RUNTIME_ENV_//g')
-    cur_val=$(echo -n "\$${cur_name}" | envsubst)
-    if [ "$CERC_RETAIN_ENV_QUOTES" != "true" ]; then
-      cur_val=$(sed "s/^[\"']//" <<< "$cur_val" | sed "s/[\"']//")
-    fi
-    esc_val=$(sed 's/[&/\]/\\&/g' <<< "$cur_val")
-    echo "$f: $cur_name=$cur_val"
-    sed -i "s/$orig_name/$esc_val/g" $f
-  done
-done
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-    set -x
-fi
-
-CERC_BUILD_TOOL="${CERC_BUILD_TOOL}"
-CERC_BUILD_OUTPUT_DIR="${CERC_BUILD_OUTPUT_DIR}"
-
-WORK_DIR="${1:-/app}"
-DEST_DIR="${2:-/data}"
-
-if [ -f "${WORK_DIR}/build-webapp.sh" ]; then
-  echo "Building webapp with ${WORK_DIR}/build-webapp.sh ..."
-  cd "${WORK_DIR}" || exit 1
-
-  rm -rf "${DEST_DIR}"
-  ./build-webapp.sh "${DEST_DIR}" || exit 1
-elif [ -f "${WORK_DIR}/package.json" ]; then
-  echo "Building node-based webapp ..."
-  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
-      CERC_BUILD_TOOL=yarn
-    else
-      CERC_BUILD_TOOL=npm
-    fi
-  fi
-
-  $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}"
-else
-  echo "Copying static app ..."
-  mv "${WORK_DIR}" "${DEST_DIR}"
-fi
-
-# One special fix ...
-cd "${DEST_DIR}"
-for f in $(find . -type f -name '*.htm*'); do
-  sed -i -e 's#/LACONIC_HOSTED_CONFIG_homepage/#LACONIC_HOSTED_CONFIG_homepage/#g' "$f"
-done
-
-exit 0
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-    set -x
-fi
-
-CERC_LISTEN_PORT=${CERC_LISTEN_PORT:-80}
-CERC_WEBAPP_FILES_DIR="${CERC_WEBAPP_FILES_DIR:-/data}"
-CERC_ENABLE_CORS="${CERC_ENABLE_CORS:-false}"
-CERC_SINGLE_PAGE_APP="${CERC_SINGLE_PAGE_APP}"
-
-if [ -z "${CERC_SINGLE_PAGE_APP}" ]; then
-  if [ 1 -eq $(find "${CERC_WEBAPP_FILES_DIR}" -name '*.html' | wc -l) ] && [ -d "${CERC_WEBAPP_FILES_DIR}/static" ]; then
-    CERC_SINGLE_PAGE_APP=true
-  else
-    CERC_SINGLE_PAGE_APP=false
-  fi
-fi
-
-if [ "true" == "$CERC_ENABLE_CORS" ]; then
-  CERC_HTTP_EXTRA_ARGS="$CERC_HTTP_EXTRA_ARGS --cors"
-fi
-
-if [ "true" == "$CERC_SINGLE_PAGE_APP" ]; then
-  # Create a catchall redirect back to /
-  CERC_HTTP_EXTRA_ARGS="$CERC_HTTP_EXTRA_ARGS --proxy http://localhost:${CERC_LISTEN_PORT}?"
-fi
-
-LACONIC_HOSTED_CONFIG_FILE=${LACONIC_HOSTED_CONFIG_FILE}
-if [ -z "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
-  if [ -f "/config/laconic-hosted-config.yml" ]; then
-    LACONIC_HOSTED_CONFIG_FILE="/config/laconic-hosted-config.yml"
-  elif [ -f "/config/config.yml" ]; then
-    LACONIC_HOSTED_CONFIG_FILE="/config/config.yml"
-  fi
-fi
-
-if [ -f "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
-  /scripts/apply-webapp-config.sh $LACONIC_HOSTED_CONFIG_FILE "${CERC_WEBAPP_FILES_DIR}"
-fi
-
-/scripts/apply-runtime-env.sh ${CERC_WEBAPP_FILES_DIR}
-http-server $CERC_HTTP_EXTRA_ARGS -p ${CERC_LISTEN_PORT} "${CERC_WEBAPP_FILES_DIR}"
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+    set -x
+fi
+
+CERC_WEBAPP_FILES_DIR="${CERC_WEBAPP_FILES_DIR:-/data}"
+
+/scripts/apply-webapp-config.sh /config/config.yml ${CERC_WEBAPP_FILES_DIR}
+http-server -p 80 ${CERC_WEBAPP_FILES_DIR}
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/webapp-deployer-backend
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-# See: https://stackoverflow.com/a/246128/1701505
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/webapp-deployer-backend:local ${build_command_args} ${CERC_REPO_BASE_DIR}/webapp-deployment-status-api
@@ -1,673 +0,0 @@
-# from: https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
-# via: https://kind.sigs.k8s.io/docs/user/ingress/#ingress-nginx
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  name: ingress-nginx
---
-apiVersion: v1
-automountServiceAccountToken: true
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx
-  namespace: ingress-nginx
---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx
-  namespace: ingress-nginx
-rules:
- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - pods
-  - secrets
-  - endpoints
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - update
- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - coordination.k8s.io
-  resourceNames:
-  - ingress-nginx-leader
-  resources:
-  - leases
-  verbs:
-  - get
-  - update
- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - list
-  - watch
-  - get
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
-rules:
- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - create
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx
-rules:
- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - endpoints
-  - nodes
-  - pods
-  - secrets
-  - namespaces
-  verbs:
-  - list
-  - watch
- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - list
-  - watch
- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - update
- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - list
-  - watch
-  - get
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission
-rules:
- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - validatingwebhookconfigurations
-  verbs:
-  - get
-  - update
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx
-  namespace: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: ingress-nginx
-subjects:
- kind: ServiceAccount
-  name: ingress-nginx
-  namespace: ingress-nginx
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: ingress-nginx-admission
-subjects:
- kind: ServiceAccount
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: ingress-nginx
-subjects:
- kind: ServiceAccount
-  name: ingress-nginx
-  namespace: ingress-nginx
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: ingress-nginx-admission
-subjects:
- kind: ServiceAccount
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
---
-apiVersion: v1
-data:
-  allow-snippet-annotations: "false"
-kind: ConfigMap
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
-spec:
-  ipFamilies:
-  - IPv4
-  ipFamilyPolicy: SingleStack
-  ports:
-  - appProtocol: http
-    name: http
-    port: 80
-    protocol: TCP
-    targetPort: http
-  - appProtocol: https
-    name: https
-    port: 443
-    protocol: TCP
-    targetPort: https
-  selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  type: NodePort
---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-controller-admission
-  namespace: ingress-nginx
-spec:
-  ports:
-  - appProtocol: https
-    name: https-webhook
-    port: 443
-    targetPort: webhook
-  selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  type: ClusterIP
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
-spec:
-  minReadySeconds: 0
-  revisionHistoryLimit: 10
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: controller
-      app.kubernetes.io/instance: ingress-nginx
-      app.kubernetes.io/name: ingress-nginx
-  strategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: controller
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.9.6
-    spec:
-      containers:
-      - args:
-        - /nginx-ingress-controller
-        - --election-id=ingress-nginx-leader
-        - --controller-class=k8s.io/ingress-nginx
-        - --ingress-class=nginx
-        - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
-        - --validating-webhook=:8443
-        - --validating-webhook-certificate=/usr/local/certificates/cert
-        - --validating-webhook-key=/usr/local/certificates/key
-        - --watch-ingress-without-class=true
-        - --publish-status-address=localhost
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: LD_PRELOAD
-          value: /usr/local/lib/libmimalloc.so
-        image: registry.k8s.io/ingress-nginx/controller:v1.9.6@sha256:1405cc613bd95b2c6edd8b2a152510ae91c7e62aea4698500d23b2145960ab9c
-        imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        name: controller
-        ports:
-        - containerPort: 80
-          hostPort: 80
-          name: http
-          protocol: TCP
-        - containerPort: 443
-          hostPort: 443
-          name: https
-          protocol: TCP
-        - containerPort: 8443
-          name: webhook
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        resources:
-          requests:
-            cpu: 100m
-            memory: 90Mi
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            add:
-            - NET_BIND_SERVICE
-            drop:
-            - ALL
-          readOnlyRootFilesystem: false
-          runAsNonRoot: true
-          runAsUser: 101
-          seccompProfile:
-            type: RuntimeDefault
-        volumeMounts:
-        - mountPath: /usr/local/certificates/
-          name: webhook-cert
-          readOnly: true
-      dnsPolicy: ClusterFirst
-      nodeSelector:
-        ingress-ready: "true"
-        kubernetes.io/os: linux
-      serviceAccountName: ingress-nginx
-      terminationGracePeriodSeconds: 0
-      tolerations:
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Equal
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/control-plane
-        operator: Equal
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: ingress-nginx-admission
---
-apiVersion: batch/v1
-kind: Job
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission-create
-  namespace: ingress-nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.9.6
-      name: ingress-nginx-admission-create
-    spec:
-      containers:
-      - args:
-        - create
-        - --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
-        - --namespace=$(POD_NAMESPACE)
-        - --secret-name=ingress-nginx-admission
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20231226-1a7112e06@sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084
-        imagePullPolicy: IfNotPresent
-        name: create
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - ALL
-          readOnlyRootFilesystem: true
-          runAsNonRoot: true
-          runAsUser: 65532
-          seccompProfile:
-            type: RuntimeDefault
-      nodeSelector:
-        kubernetes.io/os: linux
-      restartPolicy: OnFailure
-      serviceAccountName: ingress-nginx-admission
---
-apiVersion: batch/v1
-kind: Job
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission-patch
-  namespace: ingress-nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.9.6
-      name: ingress-nginx-admission-patch
-    spec:
-      containers:
-      - args:
-        - patch
-        - --webhook-name=ingress-nginx-admission
-        - --namespace=$(POD_NAMESPACE)
-        - --patch-mutating=false
-        - --secret-name=ingress-nginx-admission
-        - --patch-failure-policy=Fail
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20231226-1a7112e06@sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084
-        imagePullPolicy: IfNotPresent
-        name: patch
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - ALL
-          readOnlyRootFilesystem: true
-          runAsNonRoot: true
-          runAsUser: 65532
-          seccompProfile:
-            type: RuntimeDefault
-      nodeSelector:
-        kubernetes.io/os: linux
-      restartPolicy: OnFailure
-      serviceAccountName: ingress-nginx-admission
---
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: nginx
-spec:
-  controller: k8s.io/ingress-nginx
---
-apiVersion: admissionregistration.k8s.io/v1
-kind: ValidatingWebhookConfiguration
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.9.6
-  name: ingress-nginx-admission
-webhooks:
- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: ingress-nginx-controller-admission
-      namespace: ingress-nginx
-      path: /networking/v1/ingresses
-  failurePolicy: Fail
-  matchPolicy: Equivalent
-  name: validate.nginx.ingress.kubernetes.io
-  rules:
-  - apiGroups:
-    - networking.k8s.io
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - ingresses
-  sideEffects: None
@@ -0,0 +1,3 @@
+# birbit
+
+takes geo-tagged images, publishes the metadata on chain, then generates a geojson front end of that geo data
@@ -0,0 +1,19 @@
+version: "0.1"
+name: birbit
+repos:
+  #- github.com/zramsay/birbit
+  - github.com/mapbox/geojson.io
+containers:
+  #- cerc/birbit
+  - cerc/geojson
+pods:
+    # configurable process that reads from chain and generates a view for the front end
+    # for MVP is basically does nothing, b/c FE view is  reading all records
+    # imagine a 'watcher' for a specific view
+    #- birbit
+    # front end, gets its file from kubo;
+    # https://github.com/mapbox/geojson.io/blob/main/API.md#datadatatextx-url
+    # deployed via kubernetes
+  - geojson
+    # hosts all the dot geojson files that are required to generated views
+  - kubo
@@ -1,3 +0,0 @@
-# Container Registry Stack
-
-Host a container image registry
@@ -1,5 +0,0 @@
-version: "1.0"
-name: container-registry
-description: "Container registry stack"
-pods:
-  - container-registry
@@ -1,6 +1,6 @@
 # fixturenet-eth

-Instructions for deploying a local a geth + lighthouse blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator (the installation of which is covered [here](https://git.vdb.to/cerc-io/stack-orchestrator)):
+Instructions for deploying a local a geth + lighthouse blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator (the installation of which is covered [here](https://github.com/cerc-io/stack-orchestrator)):

 ## Clone required repositories

@@ -7,11 +7,11 @@ Instructions for deploying a local Laconic blockchain "fixturenet" for developme
 **Note:** For building some NPMs, access to the @lirewine repositories is required. If you don't have access, see [this tutorial](/docs/laconicd-fixturenet.md) to run this stack

 ## 1. Install Laconic Stack Orchestrator
-Installation is covered in detail [here](https://git.vdb.to/cerc-io/stack-orchestrator#user-mode) but if you're on Linux and already have docker installed it should be as simple as:
+Installation is covered in detail [here](https://github.com/cerc-io/stack-orchestrator#user-mode) but if you're on Linux and already have docker installed it should be as simple as:
 ```
 $ mkdir my-working-dir
 $ cd my-working-dir
-$ curl -L -o ./laconic-so https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/latest/laconic-so
+$ curl -L -o ./laconic-so https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
 $ chmod +x ./laconic-so
 $ export PATH=$PATH:$(pwd)  # Or move laconic-so to ~/bin or your favorite on-path directory
 ```
@@ -3,11 +3,11 @@
 Instructions for deploying a local Laconic blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator.

 ## 1. Install Laconic Stack Orchestrator
-Installation is covered in detail [here](https://git.vdb.to/cerc-io/stack-orchestrator#user-mode) but if you're on Linux and already have docker installed it should be as simple as:
+Installation is covered in detail [here](https://github.com/cerc-io/stack-orchestrator#user-mode) but if you're on Linux and already have docker installed it should be as simple as:
 ```
 $ mkdir my-working-dir
 $ cd my-working-dir
-$ curl -L -o ./laconic-so https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/latest/laconic-so
+$ curl -L -o ./laconic-so https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
 $ chmod +x ./laconic-so
 $ export PATH=$PATH:$(pwd)  # Or move laconic-so to ~/bin or your favorite on-path directory
 ```
@@ -18,7 +18,7 @@ $ laconic-so --stack mainnet-eth build-containers

 ```
 $ laconic-so --stack mainnet-eth deploy init --map-ports-to-host any-same --output mainnet-eth-spec.yml
-$ laconic-so deploy --stack mainnet-eth create --spec-file mainnet-eth-spec.yml --deployment-dir mainnet-eth-deployment
+$ laconic-so deploy create --spec-file mainnet-eth-spec.yml --deployment-dir mainnet-eth-deployment
 ```
 ## Start the stack
 ```
@@ -1,16 +0,0 @@
-# mars
-
-On a fresh Digital Ocean droplet with Ubuntu:
-
-```
-git clone https://github.com/cerc-io/stack-orchestrator
-cd stack-orchestrator
-./scripts/quick-install-linux.sh
-```
-Read and follow the instructions output from the above output to complete installation, then:
-
-```
-laconic-so --stack mars-v2 setup-repositories
-laconic-so --stack mars-v2 build-containers
-laconic-so --stack mars-v2 deploy up
-```
@@ -1,8 +0,0 @@
-version: "0.1"
-name: mars-v2
-repos:
-  - github.com/mars-protocol/mars-v2-frontend
-containers:
-  - cerc/mars-v2
-pods:
-  - mars-v2
@@ -1,16 +0,0 @@
-# mars
-
-On a fresh Digital Ocean droplet with Ubuntu:
-
-```
-git clone https://github.com/cerc-io/stack-orchestrator
-cd stack-orchestrator
-./scripts/quick-install-linux.sh
-```
-Read and follow the instructions output from the above output to complete installation, then:
-
-```
-laconic-so --stack mars setup-repositories
-laconic-so --stack mars build-containers
-laconic-so --stack mars deploy up
-```
--- a/Show More
+++ b/Show More
				`@@ -1,2 +0,0 @@`
				`Change this file to trigger running the fixturenet-eth-plugeth-arm-test CI job`
				`@@ -1 +0,0 @@`
				`Change this file to trigger running the test-container-registry CI job`