huh

.gitea/workflows/fixturenet-eth-plugeth-test.yml

@@ -2,10 +2,7 @@ name: Fixturenet-Eth-Plugeth-Test
 
 on:
   push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
+    branches: 'ci-test'
 
 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -19,16 +16,8 @@ jobs:
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
+      - name: "Install Python"
+        uses: cerc-io/setup-python@v4
         with:
           python-version: '3.8'
       - name: "Print Python version"

.gitea/workflows/fixturenet-eth-test.yml

@@ -2,10 +2,7 @@ name: Fixturenet-Eth-Test
 
 on:
   push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-eth-test'
+    branches: 'ci-test'
 
 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -19,15 +16,7 @@ jobs:
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+      - name: "Install Python"
         uses: actions/setup-python@v4
         with:
           python-version: '3.8'

.gitea/workflows/fixturenet-laconicd-test.yml

@@ -1,55 +0,0 @@
-name: Fixturenet-Laconicd-Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-laconicd-test'
-
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-
-jobs:
-  test:
-    name: "Run an Laconicd fixturenet test"
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Update'
-        run: apt-get update
-      - name: 'Setup jq'
-        run: apt-get install jq -y
-      - name: 'Check jq'
-        run: |
-          which jq
-          jq --version
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: Start dockerd # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-      - name: "Run fixturenet-laconicd tests"
-        run: ./tests/fixturenet-laconicd/run-test.sh

.gitea/workflows/publish.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - publish-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'
 
 jobs:
   publish:
@@ -20,15 +18,7 @@ jobs:
         run: |
           build_tag=$(./scripts/create_build_tag_file.sh)
           echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+      - name: "Install Python"
         uses: actions/setup-python@v4
         with:
           python-version: '3.8'

.gitea/workflows/test-deploy.yml

@@ -7,8 +7,6 @@ on:
     branches:
       - main
       - ci-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'
 
 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -21,15 +19,7 @@ jobs:
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+      - name: "Install Python"
         uses: actions/setup-python@v4
         with:
           python-version: '3.8'

.gitea/workflows/test.yml

@@ -7,8 +7,6 @@ on:
     branches:
       - main
       - ci-test
-    paths-ignore:
-      - '.gitea/workflows/triggers/*'
 
 # Needed until we can incorporate docker startup into the executor container
 env:
@@ -21,15 +19,7 @@ jobs:
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+      - name: "Install Python"
         uses: actions/setup-python@v4
         with:
           python-version: '3.8'
@@ -48,4 +38,3 @@ jobs:
       - name: "Run smoke tests"
         run: ./tests/smoke-test/run-smoke-test.sh
 
-

.gitea/workflows/triggers/fixturenet-eth-plugeth-test

@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-eth-plugeth-test CI job
-trigger

.gitea/workflows/triggers/fixturenet-eth-test

@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-eth-test CI job
-

.gitea/workflows/triggers/fixturenet-laconicd-test

@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-laconicd-test CI job
-

.github/workflows/fixturenet-eth.yml

@@ -1,30 +0,0 @@
-name: Fixturenet-Eth Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.github/workflows/triggers/fixturenet-eth-test'
-
-jobs:
-  test:
-    name: "Run fixturenet-eth test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run fixturenet-eth tests"
-        run: ./tests/fixturenet-eth/run-test.sh

.github/workflows/fixturenet-laconicd.yml

@@ -1,30 +0,0 @@
-name: Fixturenet-Laconicd Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.github/workflows/triggers/fixturenet-laconicd-test'
-
-jobs:
-  test:
-    name: "Run fixturenet-laconicd test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run fixturenet-laconicd tests"
-        run: ./tests/fixturenet-laconicd/run-test.sh

.github/workflows/triggers/fixturenet-eth-test

@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-eth-test CI job
-

.github/workflows/triggers/fixturenet-laconicd-test

@@ -1,3 +0,0 @@
-Change this file to trigger running the fixturenet-laconicd-test CI job
-
-trigger

.gitignore

@@ -6,5 +6,5 @@ laconic_stack_orchestrator.egg-info
 __pycache__
 *~
 package
-stack_orchestrator/data/build_tag.txt
-/build
+app/data/build_tag.txt
+build

README.md

@@ -16,7 +16,6 @@ Ensure that the following are already installed:
 - [Python3](https://wiki.python.org/moin/BeginnersGuide/Download): `python3 --version` >= `3.8.10` (the Python3 shipped in Ubuntu 20+ is good to go)
 - [Docker](https://docs.docker.com/get-docker/): `docker --version` >= `20.10.21`
 - [jq](https://stedolan.github.io/jq/download/): `jq --version` >= `1.5`
-- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git): `git --version` >= `2.10.3`
 
 Note: if installing docker-compose via package manager on Linux (as opposed to Docker Desktop), you must [install the plugin](https://docs.docker.com/compose/install/linux/#install-the-plugin-manually), e.g. :
 
@@ -49,27 +48,15 @@ Verify operation (your version will probably be different, just check here that
 laconic-so version
 Version: 1.1.0-7a607c2-202304260513
 ```
-Save the distribution url to `~/.laconic-so/config.yml`:
-```bash
-mkdir ~/.laconic-so
-echo "distribution-url: https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so" >  ~/.laconic-so/config.yml
-```
-
-### Update
-If Stack Orchestrator was installed using the process described above, it is able to subsequently self-update to the current latest version by running:
-
-```bash
-laconic-so update
-```
 
 ## Usage
 
-The various [stacks](/stack_orchestrator/data/stacks) each contain instructions for running different stacks based on your use case. For example:
+The various [stacks](/app/data/stacks) each contain instructions for running different stacks based on your use case. For example:
 
-- [self-hosted Gitea](/stack_orchestrator/data/stacks/build-support)
-- [an Optimism Fixturenet](/stack_orchestrator/data/stacks/fixturenet-optimism)
-- [laconicd with console and CLI](stack_orchestrator/data/stacks/fixturenet-laconic-loaded)
-- [kubo (IPFS)](stack_orchestrator/data/stacks/kubo)
+- [self-hosted Gitea](/app/data/stacks/build-support)
+- [an Optimism Fixturenet](/app/data/stacks/fixturenet-optimism)
+- [laconicd with console and CLI](app/data/stacks/fixturenet-laconic-loaded)
+- [kubo (IPFS)](app/data/stacks/kubo)
 
 ## Contributing
 

app/base.py

@@ -15,7 +15,7 @@
 
 import os
 from abc import ABC, abstractmethod
-from stack_orchestrator.deploy.deploy import get_stack_status
+from app.deploy import get_stack_status
 from decouple import config
 
 

app/build_containers.py

@@ -27,8 +27,8 @@ import subprocess
 import click
 import importlib.resources
 from pathlib import Path
-from stack_orchestrator.util import include_exclude_check, get_parsed_stack_config
-from stack_orchestrator.base import get_npm_registry_url
+from app.util import include_exclude_check, get_parsed_stack_config
+from app.base import get_npm_registry_url
 
 # TODO: find a place for this
 #    epilog="Config provided either in .env or settings.ini or env vars: CERC_REPO_BASE_DIR (defaults to ~/cerc)"
@@ -52,7 +52,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
     continue_on_error = ctx.obj.continue_on_error
 
     # See: https://stackoverflow.com/questions/25389095/python-get-path-of-root-project-structure
-    container_build_dir = Path(__file__).absolute().parent.parent.joinpath("data", "container-build")
+    container_build_dir = Path(__file__).absolute().parent.joinpath("data", "container-build")
 
     if local_stack:
         dev_root_path = os.getcwd()[0:os.getcwd().rindex("stack-orchestrator")]
@@ -67,7 +67,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
         print('Dev root directory doesn\'t exist, creating')
 
     # See: https://stackoverflow.com/a/20885799/1701505
-    from stack_orchestrator import data
+    from app import data
     with importlib.resources.open_text(data, "container-image-list.txt") as container_list_file:
         all_containers = container_list_file.read().splitlines()
 

app/build_npms.py

@@ -25,8 +25,8 @@ from decouple import config
 import click
 import importlib.resources
 from python_on_whales import docker, DockerException
-from stack_orchestrator.base import get_stack
-from stack_orchestrator.util import include_exclude_check, get_parsed_stack_config
+from app.base import get_stack
+from app.util import include_exclude_check, get_parsed_stack_config
 
 builder_js_image_name = "cerc/builder-js:local"
 
@@ -83,7 +83,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
         os.makedirs(build_root_path)
 
     # See: https://stackoverflow.com/a/20885799/1701505
-    from stack_orchestrator import data
+    from app import data
     with importlib.resources.open_text(data, "npm-package-list.txt") as package_list_file:
         all_packages = package_list_file.read().splitlines()
 

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

@@ -40,7 +40,6 @@ services:
       - fixturenet-eth-bootnode-geth
     ports:
       - "8545"
-      - "8546"
       - "40000"
       - "6060"
 
@@ -62,9 +61,6 @@ services:
       - fixturenet-eth-bootnode-geth
     volumes:
       - fixturenet_eth_geth_2_data:/root/ethdata
-    ports:
-      - "8545"
-      - "8546"
 
   fixturenet-eth-bootnode-lighthouse:
     restart: always

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

@@ -70,7 +70,6 @@ services:
     command: "/run-op-geth.sh"
     ports:
       - "0.0.0.0:8545:8545"
-      - "0.0.0.0:8546:8546"
     healthcheck:
       test: ["CMD", "nc", "-vz", "localhost:8545"]
       interval: 30s

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

@@ -20,7 +20,7 @@ services:
       - SYS_PTRACE
     environment:
       CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-      CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect}
+      CERC_RUN_STATEDIFF: "detect"
       CERC_STATEDIFF_DB_NODE_ID: 1
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
     env_file:
@@ -38,7 +38,6 @@ services:
       - fixturenet-eth-bootnode-geth
     ports:
       - "8545"
-      - "8546"
       - "40000"
       - "6060"
 
@@ -60,9 +59,6 @@ services:
       - fixturenet-eth-bootnode-geth
     volumes:
       - fixturenet_plugeth_geth_2_data:/root/ethdata
-    ports:
-      - "8545"
-      - "8546"
 
   fixturenet-eth-bootnode-lighthouse:
     restart: always

app/data/compose/docker-compose-graph-node.yml

@@ -6,6 +6,9 @@ services:
         condition: service_healthy
       ipfs:
         condition: service_healthy
+      # Uncomment when running against fixturenet-lotus to wait for the Lotus node to come up
+      # lotus-node-1:
+      #   condition: service_healthy
     extra_hosts:
       - host.docker.internal:host-gateway
     environment:
@@ -15,13 +18,9 @@ services:
       postgres_user: graph-node
       postgres_pass: password
       postgres_db: graph-node
-      ethereum: ${ETH_NETWORKS:-lotus-fixturenet:http://lotus-node-1:1234/rpc/v1}
+      ethereum: ${NETWORK:-filecoin}:${ETH_RPC_ENDPOINT:-https://archive.lotus.vdb.to/rpc/v1}
       GRAPH_LOG: debug
       ETHEREUM_REORG_THRESHOLD: 3
-    entrypoint: ["bash", "-c"]
-    # Wait for ETH RPC endpoint to be up when running with fixturenet-lotus
-    command: |
-      "wait_for ${ETH_RPC_HOST:-lotus-node-1}:${ETH_RPC_PORT:-1234} -t 1800 -- start"
     ports:
       - "8000"
       - "8001"

app/data/compose/docker-compose-mainnet-eth-keycloak.yml

@@ -6,7 +6,7 @@ services:
     env_file:
       - ../config/mainnet-eth-keycloak/keycloak.env
     healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "35432"]
+      test: ["CMD", "nc", "-v", "localhost", "5432"]
       interval: 30s
       timeout: 10s
       retries: 10
@@ -14,7 +14,7 @@ services:
     volumes:
       - mainnet_eth_keycloak_db:/var/lib/postgresql/data
     ports:
-      - 35432
+      - 5432
 
   keycloak:
     image: cerc/keycloak:local

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

@@ -4,7 +4,6 @@ services:
     restart: always
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_TEST_PARAM_1: ${CERC_TEST_PARAM_1:-FAILED}
     volumes:
       - test-data:/data
     ports:

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

@@ -34,7 +34,7 @@ services:
       - ETH_RPC_URL=http://go-ethereum:8545
     command: ["sh", "-c", "yarn server"]
     volumes:
-      - ../config/watcher-erc20/erc20-watcher.toml:/app/environments/local.toml
+      - ../config/watcher-erc20/erc20-watcher.toml:/app/packages/erc20-watcher/environments/local.toml
     ports:
       - "0.0.0.0:3002:3001"
       - "0.0.0.0:9002:9001"

app/data/config/fixturenet-sushiswap-subgraph-v3/lotus-fixturenet.js.template

@@ -17,8 +17,8 @@ module.exports = {
     whitelistedTokenAddresses: [
       'NATIVE_ADDRESS',
     ],
-    stableTokenAddresses: [],
-    nativePricePool: '0x0000000000000000000000000000000000000000',
+    stableTokenAddresses: [
+    ],
     minimumEthLocked: 1.5
   }
 }