Create new base container for pre-compiled webapps. (#507)

* Create new base container for pre-compiled webapps.

* Set the webapp dir appropriately.

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

@@ -0,0 +1,36 @@
+name: Fixturenet-Eth-Plugeth-Test
+
+on:
+  push:
+    branches: 'ci-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 Ethereum plugeth fixturenet test"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: cerc-io/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name: "Print Python version"
+        run: python3 --version
+      - name: "Install shiv"
+        run: pip install shiv
+      - name: "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-eth tests"
+        run: ./tests/fixturenet-eth-plugeth/run-test.sh

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

@@ -4,6 +4,11 @@ on:
   push:
     branches: 'ci-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 Ethereum fixturenet test"
@@ -23,5 +28,10 @@ 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-eth tests"
         run: ./tests/fixturenet-eth/run-test.sh
+

.gitea/workflows/test.yml

@@ -37,3 +37,4 @@ jobs:
           sleep 5
       - name: "Run smoke tests"
         run: ./tests/smoke-test/run-smoke-test.sh
+

README.md

@@ -6,7 +6,7 @@ Stack Orchestrator allows building and deployment of a Laconic Stack on a single
 
 ## Install
 
-**To get started quickly** on a fresh Ubuntu instance (e.g, Digital Ocean); [try this script](./scripts/quick-install-ubuntu.sh). **WARNING:** always review scripts prior to running them so that you know what is happening on your machine.
+**To get started quickly** on a fresh Ubuntu instance (e.g, Digital Ocean); [try this script](./scripts/quick-install-linux.sh). **WARNING:** always review scripts prior to running them so that you know what is happening on your machine.
 
 For any other installation, follow along below and **adapt these instructions based on the specifics of your system.**
 

app/data/compose/docker-compose-contract-sushiswap.yml

@@ -0,0 +1,49 @@
+version: '3.2'
+
+services:
+  # Deploys the core (UniswapV3Factory) contract
+  sushiswap-v3-core:
+    image: cerc/sushiswap-v3-core:local
+    restart: on-failure
+    env_file:
+      # Defaults
+      - ../config/contract-sushiswap/deployment-params.env
+    environment:
+      # Overrides
+      CERC_ETH_RPC_ENDPOINT: ${ETH_RPC_ENDPOINT}
+      CERC_CHAIN_ID: ${CHAIN_ID}
+      CERC_ACCOUNT_PRIVATE_KEY: ${ACCOUNT_PRIVATE_KEY}
+      CERC_DEPLOY: ${DEPLOY}
+    volumes:
+      - ../config/network/wait-for-it.sh:/app/wait-for-it.sh
+      - ../config/contract-sushiswap/deploy-core-contracts.sh:/app/deploy-core-contracts.sh
+      - sushiswap_core_deployment:/app/deployments/docker
+    command: ["bash", "-c", "/app/deploy-core-contracts.sh && tail -f"]
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  # Deploys the periphery (NFPM, token, etc.) contracts
+  sushiswap-v3-periphery:
+    image: cerc/sushiswap-v3-periphery:local
+    restart: on-failure
+    env_file:
+      # Defaults
+      - ../config/contract-sushiswap/deployment-params.env
+    environment:
+      # Overrides
+      CERC_ETH_RPC_ENDPOINT: ${ETH_RPC_ENDPOINT}
+      CERC_CHAIN_ID: ${CHAIN_ID}
+      CERC_ACCOUNT_PRIVATE_KEY: ${ACCOUNT_PRIVATE_KEY}
+      CERC_DEPLOY: ${DEPLOY}
+    volumes:
+      - ../config/network/wait-for-it.sh:/app/wait-for-it.sh
+      - ../config/contract-sushiswap/deploy-periphery-contracts.sh:/app/deploy-periphery-contracts.sh
+      - sushiswap_core_deployment:/app/core-deployments/docker
+      - sushiswap_periphery_deployment:/app/deployments/docker
+    command: ["bash", "-c", "/app/deploy-periphery-contracts.sh && tail -f"]
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+volumes:
+  sushiswap_core_deployment:
+  sushiswap_periphery_deployment:

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

@@ -1,6 +1,15 @@
 services:
   graph-node:
     image: cerc/graph-node:local
+    depends_on:
+      db:
+        condition: service_healthy
+      ipfs:
+        condition: service_healthy
+      lotus-node-1:
+        condition: service_healthy
+    extra_hosts:
+      - host.docker.internal:host-gateway
     environment:
       ipfs: ipfs:5001
       postgres_host: db
@@ -8,11 +17,20 @@ services:
       postgres_user: graph-node
       postgres_pass: password
       postgres_db: graph-node
+      # TODO: Get endpoint from env
+      ethereum: 'lotus-fixturenet:http://lotus-node-1:1234/rpc/v1'
+      GRAPH_LOG: info
     ports:
       - "8000"
       - "8001"
       - "8020"
       - "8030"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "8020"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 3s
   ipfs:
     image: ipfs/kubo:master-2023-02-20-714a968
     volumes:
@@ -30,6 +48,12 @@ services:
       POSTGRES_USER: "graph-node"
       POSTGRES_DB: "graph-node"
       POSTGRES_PASSWORD: "password"
+      POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C"
+    command:
+      [
+        "postgres",
+        "-cshared_preload_libraries=pg_stat_statements"
+      ]
     healthcheck:
       test: ["CMD", "nc", "-v", "localhost", "5432"]
       interval: 30s

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

@@ -3,6 +3,7 @@ services:
     restart: unless-stopped
     image: cerc/laconic-console-host:local
     environment:
+      - CERC_WEBAPP_FILES_DIR=${CERC_WEBAPP_FILES_DIR:-/usr/local/share/.config/yarn/global/node_modules/@cerc-io/console-app/dist/production}
       - LACONIC_HOSTED_ENDPOINT=${LACONIC_HOSTED_ENDPOINT:-http://localhost}
     ports:
       - "80"

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

@@ -10,7 +10,7 @@ services:
       - ../config/fixturenet-lotus/setup-miner.sh:/docker-entrypoint-scripts.d/setup-miner.sh
       - ../config/fixturenet-lotus/fund-account.sh:/fund-account.sh
       - lotus_miner_params:/var/tmp/filecoin-proof-parameters
-      - lotus-shared:/root/.lotus-shared
+      - lotus_shared:/root/.lotus-shared
       - lotus_miner_data:/root/data
     entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-miner.sh"]
     ports:
@@ -30,13 +30,13 @@ services:
     volumes:
       - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
       - lotus_node_1_params:/var/tmp/filecoin-proof-parameters
-      - lotus-shared:/root/.lotus-shared
+      - lotus_shared:/root/.lotus-shared
       - lotus_node_1_data:/root/data
     healthcheck:
       test: ["CMD", "nc", "-vz", "localhost", "1234"]
       interval: 30s
       timeout: 10s
-      retries: 10
+      retries: 60
       start_period: 3s
     depends_on:
       - lotus-miner
@@ -58,13 +58,13 @@ services:
     volumes:
       - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
       - lotus_node_2_params:/var/tmp/filecoin-proof-parameters
-      - lotus-shared:/root/.lotus-shared
+      - lotus_shared:/root/.lotus-shared
       - lotus_node_2_data:/root/data
     healthcheck:
       test: ["CMD", "nc", "-vz", "localhost", "1234"]
       interval: 30s
       timeout: 10s
-      retries: 10
+      retries: 60
       start_period: 3s
     depends_on:
       - lotus-miner
@@ -79,7 +79,7 @@ volumes:
   lotus_miner_params:
   lotus_node_1_params:
   lotus_node_2_params:
-  lotus-shared:
+  lotus_shared:
   lotus_miner_data:
   lotus_node_1_data:
   lotus_node_2_data:

app/data/compose/docker-compose-sushiswap-subgraph-v3.yml

@@ -0,0 +1,26 @@
+version: '3.2'
+
+services:
+  # Deploys the sushiswap v3 subgraph
+  sushiswap-subgraph-v3:
+    image: cerc/sushiswap-subgraphs:local
+    restart: on-failure
+    depends_on:
+      graph-node:
+        condition: service_healthy
+    environment:
+      - APP=v3
+      - NETWORK=lotus-fixturenet
+    command: ["bash", "-c", "./run-v3.sh"]
+    working_dir: /app/subgraphs/v3
+    volumes:
+      - ../config/sushiswap-subgraph-v3/lotus-fixturenet.js.template:/app/config/lotus-fixturenet.js.template
+      - ../config/sushiswap-subgraph-v3/run-v3.sh:/app/subgraphs/v3/run-v3.sh
+      - sushiswap_core_deployment:/app/subgraphs/v3/core-deployments/docker
+      - sushiswap_periphery_deployment:/app/subgraphs/v3/deployments/docker
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+volumes:
+  sushiswap_core_deployment:
+  sushiswap_periphery_deployment:

app/data/config/contract-sushiswap/deploy-core-contracts.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+# Chain config
+export ETH_RPC_ENDPOINT="${CERC_ETH_RPC_ENDPOINT:-${CERC_DEFAULT_ETH_RPC_ENDPOINT}}"
+export CHAIN_ID="${CERC_CHAIN_ID:-${CERC_DEFAULT_CHAIN_ID}}"
+export ACCOUNT_PRIVATE_KEY="${CERC_ACCOUNT_PRIVATE_KEY:-${CERC_DEFAULT_ACCOUNT_PRIVATE_KEY}}"
+
+# Option
+DEPLOY="${CERC_DEPLOY:-${CERC_DEFAULT_DEPLOY}}"
+
+# Create a .env file
+echo "ETH_RPC_ENDPOINT=$ETH_RPC_ENDPOINT" > .env
+echo "CHAIN_ID=$CHAIN_ID" >> .env
+echo "ACCOUNT_PRIVATE_KEY=$ACCOUNT_PRIVATE_KEY" >> .env
+
+echo "Using RPC endpoint ${ETH_RPC_ENDPOINT}"
+
+# Wait for the RPC endpoint to be up
+endpoint=${ETH_RPC_ENDPOINT#http://}
+endpoint=${endpoint#https://}
+RPC_HOST=$(echo "$endpoint" | awk -F'[:/]' '{print $1}')
+RPC_PORT=$(echo "$endpoint" | awk -F'[:/]' '{print $2}')
+./wait-for-it.sh -h "${RPC_HOST}" -p "${RPC_PORT}" -s -t 0
+
+if [ "$DEPLOY" = true ] && [ ! -e "/app/deployments/docker/UniswapV3Factory.json" ]; then
+  echo "Performing core contract deployments..."
+  pnpm hardhat --network docker deploy --tags UniswapV3Factory
+else
+  echo "Skipping contract deployments"
+fi
+
+echo "Done"

app/data/config/contract-sushiswap/deploy-periphery-contracts.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+
+# Chain config
+ETH_RPC_ENDPOINT="${CERC_ETH_RPC_ENDPOINT:-${CERC_DEFAULT_ETH_RPC_ENDPOINT}}"
+CHAIN_ID="${CERC_CHAIN_ID:-${CERC_DEFAULT_CHAIN_ID}}"
+ACCOUNT_PRIVATE_KEY="${CERC_ACCOUNT_PRIVATE_KEY:-${CERC_DEFAULT_ACCOUNT_PRIVATE_KEY}}"
+
+# Option
+DEPLOY="${CERC_DEPLOY:-${CERC_DEFAULT_DEPLOY}}"
+
+# Create a .env file
+echo "ETH_RPC_ENDPOINT=$ETH_RPC_ENDPOINT" > .env
+echo "CHAIN_ID=$CHAIN_ID" >> .env
+echo "ACCOUNT_PRIVATE_KEY=$ACCOUNT_PRIVATE_KEY" >> .env
+
+echo "Using RPC endpoint $ETH_RPC_ENDPOINT"
+
+# Wait for the RPC endpoint to be up
+endpoint=${ETH_RPC_ENDPOINT#http://}
+endpoint=${endpoint#https://}
+RPC_HOST=$(echo "$endpoint" | awk -F'[:/]' '{print $1}')
+RPC_PORT=$(echo "$endpoint" | awk -F'[:/]' '{print $2}')
+./wait-for-it.sh -h "${RPC_HOST}" -p "${RPC_PORT}" -s -t 0
+
+if [ "$DEPLOY" = true ] && [ ! -e "/app/deployments/docker/NonfungiblePositionManager.json" ]; then
+  # Loop until the factory deployment is detected
+  echo "Waiting for core deployments to occur"
+  while [ ! -f /app/core-deployments/docker/UniswapV3Factory.json ]; do
+    sleep 5
+  done
+
+  echo "Reading factory address from core deployments"
+  FACTORY_ADDRESS=$(jq -r '.address' /app/core-deployments/docker/UniswapV3Factory.json)
+
+  echo "Using UniswapV3Factory at $FACTORY_ADDRESS"
+  echo "FACTORY_ADDRESS=$FACTORY_ADDRESS" >> .env
+
+  echo "Performing periphery contract deployments..."
+  yarn hardhat --network docker deploy --tags NonfungiblePositionManager
+else
+  echo "Skipping contract deployments"
+fi
+
+echo "Done"

app/data/config/contract-sushiswap/deployment-params.env

@@ -0,0 +1,11 @@
+# Chain config
+
+CERC_DEFAULT_ETH_RPC_ENDPOINT="http://lotus-node-1:1234/rpc/v1"
+CERC_DEFAULT_CHAIN_ID=31415926
+
+# From app/data/config/fixturenet-lotus/fund-account.sh
+CERC_DEFAULT_ACCOUNT_PRIVATE_KEY="0xc05fd3613bcd62a4f25e5eba1f464d0b76d74c3f771a7c2f13e26ad6439444b3"
+
+# Options
+
+CERC_DEFAULT_DEPLOY=true

app/data/config/fixturenet-lotus/setup-miner.sh

@@ -33,8 +33,8 @@ while ! grep -q "started ChainNotify channel" /var/log/lotus.log ; do
 done
 echo "Daemon started."
 
-# publish bootnode peer info to shared volume
-lotus net listen | grep "$(ip addr | grep inet | grep -v '127.0.0.1' | sort | head -1 | awk '{print $2}' | cut -d '/' -f1)" | head -1 > /root/.lotus-shared/miner.addr
+# copy genesis file to shared volume
+cp /devgen.car /root/.lotus-shared
 
 # if miner not already initialized
 if [ ! -d $LOTUS_MINER_PATH ]; then
@@ -47,6 +47,9 @@ if [ ! -d $LOTUS_MINER_PATH ]; then
   lotus-miner init --genesis-miner --actor=t01000 --sector-size=2KiB --pre-sealed-sectors=/root/data/.genesis-sectors --pre-sealed-metadata=/root/data/.genesis-sectors/pre-seal-t01000.json --nosync
 fi
 
+# publish bootnode peer info to shared volume
+lotus net listen | grep "$(ip addr | grep inet | grep -v '127.0.0.1' | sort | head -1 | awk '{print $2}' | cut -d '/' -f1)" | head -1 > /root/.lotus-shared/miner.addr
+
 # start miner
 nohup lotus-miner run --nosync &
 

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

@@ -0,0 +1,20 @@
+module.exports = {
+  network: 'lotus-fixturenet',
+  v3: {
+    factory: {
+      address: 'FACTORY_ADDRESS',
+      startBlock: FACTORY_BLOCK
+    },
+    positionManager: {
+      address: 'NFPM_ADDRESS',
+      startBlock: NFPM_BLOCK
+    },
+    native: { address: 'NATIVE_ADDRESS' },
+    whitelistedTokenAddresses: [
+      'NATIVE_ADDRESS',
+    ],
+    stableTokenAddresses: [
+    ],
+    minimumEthLocked: 1.5
+  }
+}

app/data/config/sushiswap-subgraph-v3/run-v3.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+# Loop until the NFPM deployment is detected
+echo "Waiting for sushiswap-periphery deployments to occur"
+while [ ! -f ./deployments/docker/NonfungiblePositionManager.json ]; do
+  sleep 5
+done
+
+echo "Reading contract addresses and block numbers from deployments"
+FACTORY_ADDRESS=$(jq -r '.address' ./core-deployments/docker/UniswapV3Factory.json)
+FACTORY_BLOCK=$(jq -r '.receipt.blockNumber' ./core-deployments/docker/UniswapV3Factory.json)
+NATIVE_ADDRESS=$(jq -r '.address' ./deployments/docker/WFIL.json)
+NFPM_ADDRESS=$(jq -r '.address' ./deployments/docker/NonfungiblePositionManager.json)
+NFPM_BLOCK=$(jq -r '.receipt.blockNumber' ./deployments/docker/NonfungiblePositionManager.json)
+
+# Read the JavaScript file content
+file_content=$(</app/config/lotus-fixturenet.js.template)
+
+# Replace uppercase words with environment variables
+echo "Reading values in lotus-fixturenet config"
+replaced_content=$(echo "$file_content" | sed -e "s/FACTORY_ADDRESS/$FACTORY_ADDRESS/g" \
+                                              -e "s/FACTORY_BLOCK/$FACTORY_BLOCK/g" \
+                                              -e "s/NFPM_ADDRESS/$NFPM_ADDRESS/g" \
+                                              -e "s/NFPM_BLOCK/$NFPM_BLOCK/g" \
+                                              -e "s/NATIVE_ADDRESS/$NATIVE_ADDRESS/g")
+
+# Write the replaced content back to the JavaScript file
+echo "$replaced_content" > /app/config/lotus-fixturenet.js
+
+
+echo "Building subgraph and deploying to graph-node..."
+pnpm run generate
+pnpm run build
+pnpm exec graph create --node http://graph-node:8020/ sushiswap/v3-lotus
+pnpm exec graph deploy --node http://graph-node:8020/ --ipfs http://ipfs:5001 --version-label 0.1.0 sushiswap/v3-lotus
+
+echo "Done"

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

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

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

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

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

@@ -6,4 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cerc/lighthouse:local ${build_command_args} ${SCRIPT_DIR}
+docker build -t cerc/lighthouse:local ${build_command_args} --build-arg TAG_SUFFIX="" ${SCRIPT_DIR}

app/data/container-build/cerc-sushiswap-subgraphs/Dockerfile

@@ -0,0 +1,11 @@
+FROM node:18.15.0-alpine3.16
+
+RUN apk --update --no-cache add git alpine-sdk bash jq
+RUN curl -L https://unpkg.com/@pnpm/self-installer | node
+
+WORKDIR /app
+
+COPY . .
+
+RUN echo "Installing dependencies..." && \
+  pnpm install

app/data/container-build/cerc-sushiswap-subgraphs/build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Build cerc/sushiswap-subgraphs
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/sushiswap-subgraphs:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/subgraphs

app/data/container-build/cerc-sushiswap-v3-core/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:18.15.0-alpine3.16
 
-RUN apk --update --no-cache add git python3 alpine-sdk bash
+RUN apk --update --no-cache add git python3 alpine-sdk bash jq
 RUN curl -L https://unpkg.com/@pnpm/self-installer | node
 
 WORKDIR /app

app/data/container-build/cerc-sushiswap-v3-periphery/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:18.15.0-alpine3.16
 
-RUN apk --update --no-cache add git python3 alpine-sdk bash
+RUN apk --update --no-cache add git python3 alpine-sdk bash jq
 
 WORKDIR /app
 

app/data/container-build/cerc-webapp-base/Dockerfile

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

app/data/container-build/cerc-webapp-base/apply-webapp-config.sh

@@ -18,7 +18,7 @@ if ! [[ -d ${webapp_files_dir} ]]; then
 fi
 # First some magic using yq to translate our yaml config file into an array of key value pairs like:
 # LACONIC_HOSTED_CONFIG_<path-through-objects>=<value>
-readarray -t config_kv_pair_array < <( yq '.. | select(length > 2) | ([path | join("_"), .] | join("=") )' ${config_file_name} | sed 's/^/LACONIC_HOSTED_CONFIG_/' )
+readarray -t config_kv_pair_array < <( yq '.. | ([path | join("_"), .] | join("=") )' ${config_file_name} | sort -r | sed -e '$ d' | sed 's/^/LACONIC_HOSTED_CONFIG_/' )
 declare -p config_kv_pair_array
 # Then iterate over that kv array making the template substitution in our web app files
 for kv_pair_string in "${config_kv_pair_array[@]}"

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

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# 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 )
+
+docker build -t cerc/webapp-base:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${SCRIPT_DIR}

app/data/container-build/cerc-webapp-base/config.yml

@@ -0,0 +1 @@
+# Put config here.

app/data/container-build/cerc-webapp-base/start-serving-app.sh

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

app/data/container-image-list.txt

@@ -48,3 +48,5 @@ cerc/sushiswap-v3-core
 cerc/sushiswap-v3-periphery
 cerc/watcher-sushiswap
 cerc/graph-node
+cerc/sushiswap-subgraphs
+cerc/webapp-base

app/data/pod-list.txt

@@ -31,3 +31,4 @@ mainnet-go-opera
 lasso
 reth
 watcher-sushiswap
+contract-sushiswap

app/data/repository-list.txt

@@ -42,3 +42,4 @@ git.vdb.to/cerc-io/plugeth-statediff
 github.com/cerc-io/sushiswap-v3-core
 github.com/cerc-io/sushiswap-v3-periphery
 github.com/graphprotocol/graph-node
+github.com/sushiswap/subgraphs

app/data/stacks/azimuth/stack.yml

@@ -1,7 +1,7 @@
 version: "1.0"
 name: azimuth
 repos:
-  - github.com/cerc-io/azimuth-watcher-ts
+  - github.com/cerc-io/azimuth-watcher-ts@v0.1.1
 containers:
   - cerc/watcher-azimuth
 pods:

app/data/stacks/fixturenet-graph-node/stack.yml

@@ -2,9 +2,11 @@ version: "1.0"
 name: fixturenet-graph-node
 description: "A graph-node fixturenet"
 repos:
+  - github.com/filecoin-project/lotus
   - github.com/graphprotocol/graph-node
 containers:
+  - cerc/lotus
   - cerc/graph-node
 pods:
+  - fixturenet-lotus
   - fixturenet-graph-node
-

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

@@ -21,6 +21,7 @@ npms:
 containers:
   - cerc/laconicd
   - cerc/laconic-registry-cli
+  - cerc/webapp-base
   - cerc/laconic-console-host
 pods:
   - fixturenet-laconicd

app/data/stacks/mainnet-laconic/stack.yml

@@ -21,6 +21,7 @@ npms:
 containers:
   - cerc/laconicd
   - cerc/laconic-registry-cli
+  - cerc/webapp-base
   - cerc/laconic-console-host
 pods:
   - mainnet-laconicd

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

@@ -0,0 +1,111 @@
+# SushiSwap Graph
+
+## Setup
+
+Clone required repositories:
+
+```bash
+laconic-so --stack sushiswap-subgraph setup-repositories
+```
+
+Build the container images:
+
+```bash
+laconic-so --stack sushiswap-subgraph build-containers
+```
+
+## Deploy
+
+Deploy the stack:
+
+```bash
+laconic-so --stack sushiswap-subgraph deploy --cluster sushigraph up
+```
+
+After all services have started, wait and check that the subgraph has been deployed to graph-node
+
+```bash
+laconic-so --stack sushiswap-subgraph deploy --cluster sushigraph logs -f sushiswap-subgraph-v3
+
+# Expected end output
+# ...
+# sushigraph-sushiswap-subgraph-v3-1  | - Deploying to Graph node http://graph-node:8020/
+# sushigraph-sushiswap-subgraph-v3-1  | Deployed to http://graph-node:8000/subgraphs/name/sushiswap/v3-lotus/graphql
+# sushigraph-sushiswap-subgraph-v3-1  |
+# sushigraph-sushiswap-subgraph-v3-1  | Subgraph endpoints:
+# sushigraph-sushiswap-subgraph-v3-1  | Queries (HTTP):     http://graph-node:8000/subgraphs/name/sushiswap/v3-lotus
+# sushigraph-sushiswap-subgraph-v3-1  |
+# sushigraph-sushiswap-subgraph-v3-1  | Done
+```
+
+## Run
+
+To check graph-node logs:
+```bash
+laconic-so --stack sushiswap-subgraph deploy --cluster sushigraph logs -f graph-node
+```
+
+To deploy tokens run:
+```bash
+docker exec -it sushigraph-sushiswap-v3-periphery-1 yarn hardhat --network docker deploy --tags TestERC20
+```
+This can be run multiple times to deploy ERC20 tokens
+
+Take note of the deployed token addresses to use later
+
+Get contract address of factory deployed:
+```bash
+docker exec -it sushigraph-sushiswap-v3-core-1 jq -r '.address' /app/deployments/docker/UniswapV3Factory.json
+```
+Set it to environment variable `FACTORY_ADDRESS` to use later
+
+To create a pool:
+```bash
+docker exec -it sushigraph-sushiswap-v3-core-1 pnpm run pool:create:docker --factory $FACTORY_ADDRESS --token0 $TOKEN1_ADDRESS --token1 $TOKEN2_ADDRESS --fee 500
+```
+
+Set the created pool address to environment variable `POOL_ADDRESS` to use later
+
+To initialize pool:
+```bash
+docker exec -it sushigraph-sushiswap-v3-core-1 pnpm run pool:initialize:docker --sqrt-price 4295128939 --pool $POOL_ADDRESS
+```
+
+Set the recipient address to the contract deployer:
+```bash
+export RECIPIENT=0xD375B03bd3A2434A9f675bEC4Ccd68aC5e67C743
+```
+
+Trigger pool mint event:
+```bash
+docker exec -it sushigraph-sushiswap-v3-core-1 pnpm run pool:mint:docker --pool $POOL_ADDRESS --recipient $RECIPIENT --amount 10
+```
+
+Trigger pool burn event:
+```bash
+docker exec -it sushigraph-sushiswap-v3-core-1 pnpm run pool:burn:docker --pool $POOL_ADDRESS --amount 10
+```
+
+## Clean up
+
+Stop all the services running in background run:
+
+```bash
+laconic-so --stack sushiswap-subgraph deploy --cluster sushigraph down
+```
+
+Clear volumes created by this stack:
+
+```bash
+# List all relevant volumes
+docker volume ls -q --filter "name=sushigraph"
+
+# Remove all the listed volumes
+docker volume rm $(docker volume ls -q --filter "name=sushigraph")
+
+# WARNING: After removing volumes with Lotus params
+# They will be downloaded again on restart
+
+# To remove volumes that do not contain Lotus params
+docker volume rm $(docker volume ls -q --filter "name=sushigraph" | grep -v "params$")
+```

app/data/stacks/sushiswap-subgraph/stack.yml

@@ -0,0 +1,28 @@
+version: "1.0"
+name: sushiswap-subgraph
+description: "An end-to-end SushiSwap Subgraph stack"
+repos:
+  ## fixturenet-lotus repo
+  - github.com/filecoin-project/lotus
+  ## graph-node repo
+  - github.com/graphprotocol/graph-node
+  ## sushiswap repos
+  - github.com/cerc-io/sushiswap-v3-core@watcher-ts
+  - github.com/cerc-io/sushiswap-v3-periphery@watcher-ts
+  ## subgraph repo
+  - github.com/sushiswap/subgraphs
+containers:
+  ## fixturenet-lotus image
+  - cerc/lotus
+  ## fixturenet-graph-node image
+  - cerc/graph-node
+  ## sushiswap contract deployment images
+  - cerc/sushiswap-v3-core
+  - cerc/sushiswap-v3-periphery
+  ## sushiswap subgraphs image
+  - cerc/sushiswap-subgraphs
+pods:
+  - fixturenet-lotus
+  - fixturenet-graph-node
+  - contract-sushiswap
+  - sushiswap-subgraph-v3

app/deployment_create.py

@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.
 
 import click
-from dataclasses import dataclass
 from importlib import util
 import os
 from pathlib import Path
@@ -27,6 +26,7 @@ from app.deploy_types import DeploymentContext, DeployCommandContext
 def _make_default_deployment_dir():
     return "deployment-001"
 
+
 def _get_ports(stack):
     ports = {}
     parsed_stack = get_parsed_stack_config(stack)
@@ -42,6 +42,7 @@ def _get_ports(stack):
                     ports[svc_name] = [ str(x) for x in svc["ports"] ]
     return ports
 
+
 def _get_named_volumes(stack):
     # Parse the compose files looking for named volumes
     named_volumes = []
@@ -76,30 +77,30 @@ def _create_bind_dir_if_relative(volume, path_string, compose_dir):
 
 # See: https://stackoverflow.com/questions/45699189/editing-docker-compose-yml-with-pyyaml
 def _fixup_pod_file(pod, spec, compose_dir):
-   # Fix up volumes
-   if "volumes" in spec:
-       spec_volumes = spec["volumes"]
-       if "volumes" in pod:
-           pod_volumes = pod["volumes"]
-           for volume in pod_volumes.keys():
-               if volume in spec_volumes:
-                   volume_spec = spec_volumes[volume]
-                   volume_spec_fixedup = volume_spec if Path(volume_spec).is_absolute() else f".{volume_spec}"
-                   _create_bind_dir_if_relative(volume, volume_spec, compose_dir)
-                   new_volume_spec = {"driver": "local",
-                                      "driver_opts": {
+    # Fix up volumes
+    if "volumes" in spec:
+        spec_volumes = spec["volumes"]
+        if "volumes" in pod:
+            pod_volumes = pod["volumes"]
+            for volume in pod_volumes.keys():
+                if volume in spec_volumes:
+                    volume_spec = spec_volumes[volume]
+                    volume_spec_fixedup = volume_spec if Path(volume_spec).is_absolute() else f".{volume_spec}"
+                    _create_bind_dir_if_relative(volume, volume_spec, compose_dir)
+                    new_volume_spec = {"driver": "local",
+                                       "driver_opts": {
                                           "type": "none",
                                           "device": volume_spec_fixedup,
                                           "o": "bind"
                                        }
-                                      }
-                   pod["volumes"][volume] = new_volume_spec
-   # Fix up ports
-   if "ports" in spec:
-       spec_ports = spec["ports"]
-       for container_name, container_ports in spec_ports.items():
-           if container_name in pod["services"]:
-               pod["services"][container_name]["ports"] = container_ports
+                                       }
+                    pod["volumes"][volume] = new_volume_spec
+    # Fix up ports
+    if "ports" in spec:
+        spec_ports = spec["ports"]
+        for container_name, container_ports in spec_ports.items():
+            if container_name in pod["services"]:
+                pod["services"][container_name]["ports"] = container_ports
 
 
 def call_stack_deploy_init(deploy_command_context):
@@ -107,10 +108,13 @@ def call_stack_deploy_init(deploy_command_context):
     # Call a function in it
     # If no function found, return None
     python_file_path = get_stack_file_path(deploy_command_context.stack).parent.joinpath("deploy", "commands.py")
-    spec = util.spec_from_file_location("commands", python_file_path)
-    imported_stack = util.module_from_spec(spec)
-    spec.loader.exec_module(imported_stack)
-    return imported_stack.init(deploy_command_context)
+    if python_file_path.exists():
+        spec = util.spec_from_file_location("commands", python_file_path)
+        imported_stack = util.module_from_spec(spec)
+        spec.loader.exec_module(imported_stack)
+        return imported_stack.init(deploy_command_context)
+    else:
+        return None
 
 
 # TODO: fold this with function above
@@ -119,10 +123,13 @@ def call_stack_deploy_setup(deploy_command_context, extra_args):
     # Call a function in it
     # If no function found, return None
     python_file_path = get_stack_file_path(deploy_command_context.stack).parent.joinpath("deploy", "commands.py")
-    spec = util.spec_from_file_location("commands", python_file_path)
-    imported_stack = util.module_from_spec(spec)
-    spec.loader.exec_module(imported_stack)
-    return imported_stack.setup(deploy_command_context, extra_args)
+    if python_file_path.exists():
+        spec = util.spec_from_file_location("commands", python_file_path)
+        imported_stack = util.module_from_spec(spec)
+        spec.loader.exec_module(imported_stack)
+        return imported_stack.setup(deploy_command_context, extra_args)
+    else:
+        return None
 
 
 # TODO: fold this with function above
@@ -131,10 +138,13 @@ def call_stack_deploy_create(deployment_context):
     # Call a function in it
     # If no function found, return None
     python_file_path = get_stack_file_path(deployment_context.command_context.stack).parent.joinpath("deploy", "commands.py")
-    spec = util.spec_from_file_location("commands", python_file_path)
-    imported_stack = util.module_from_spec(spec)
-    spec.loader.exec_module(imported_stack)
-    return imported_stack.create(deployment_context)
+    if python_file_path.exists():
+        spec = util.spec_from_file_location("commands", python_file_path)
+        imported_stack = util.module_from_spec(spec)
+        spec.loader.exec_module(imported_stack)
+        return imported_stack.create(deployment_context)
+    else:
+        return None
 
 
 # Inspect the pod yaml to find config files referenced in subdirectories

docs/laconicd-fixturenet.md

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

scripts/quick-install-linux.sh

@@ -28,12 +28,43 @@ fi
 #   Check python3 is available
 #   Check machine resources are sufficient
 
+# Determine if we are on Debian or Ubuntu
+linux_distro=$(lsb_release -a 2>/dev/null | grep "^Distributor ID:" | cut -f 2)
+# Some systems don't have lsb_release installed (e.g. ChromeOS) and so we try to
+# use /etc/os-release instead
+if [[ -z "$linux_distro" ]]; then
+  if [[ -f "/etc/os-release" ]]; then
+    distro_name_string=$(grep "^NAME=" /etc/os-release | cut -d '=' -f 2)
+    if [[ $distro_name_string =~ Debian ]]; then
+      linux_distro="Debian"
+    elif [[ $distro_name_string =~ Ubuntu ]]; then
+      linux_distro="Ubuntu"
+    fi
+  else
+    echo "Failed to identify distro: /etc/os-release doesn't exist"
+    exit 1
+  fi
+fi
+case $linux_distro in
+  Debian)
+    echo "Installing docker for Debian"
+    ;;
+  Ubuntu)
+    echo "Installing docker for Ubuntu"
+    ;;
+  *)
+    echo "ERROR: Detected unknown distribution $linux_distro, can't install docker"
+    exit 1
+    ;;
+esac
+
 # dismiss the popups
 export DEBIAN_FRONTEND=noninteractive
 
 ## https://docs.docker.com/engine/install/ubuntu/
+## https://docs.docker.com/engine/install/debian/
 ## https://superuser.com/questions/518859/ignore-packages-that-are-not-currently-installed-when-using-apt-get-remove1
-packages_to_remove="docker docker-engine docker.io containerd runc"
+packages_to_remove="docker docker-engine docker.io containerd runc docker-compose docker-doc podman-docker"
 installed_packages_to_remove=""
 for package_to_remove in $(echo $packages_to_remove); do
   $(dpkg --info $package_to_remove &> /dev/null)
@@ -65,10 +96,25 @@ sudo apt -y install curl
 sudo apt -y install ca-certificates gnupg
 
 # Add dockerco package repository
-sudo mkdir -m 0755 -p /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+# For reasons not obvious, the dockerco instructions for installation on
+# Debian and Ubuntu are slightly different here
+case $linux_distro in
+  Debian)
+    sudo install -m 0755 -d /etc/apt/keyrings
+    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+    sudo chmod a+r /etc/apt/keyrings/docker.gpg
+    ;;
+  Ubuntu)
+    sudo mkdir -m 0755 -p /etc/apt/keyrings
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+    ;;
+  *)
+    echo "ERROR: Detected unknown distribution $linux_distro, can't install docker"
+    exit 1
+    ;;
+esac
 echo \
-  "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+  "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/${linux_distro,,} \
   "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
   sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 

tests/fixturenet-eth-plugeth/run-test.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+set -e
+echo "Running stack-orchestrator Ethereum plugeth fixturenet test"
+# Bit of a hack, test the most recent package
+TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
+CERC_STACK_NAME=fixturenet-plugeth-tx
+# Set a new unique repo dir
+export CERC_REPO_BASE_DIR=$(mktemp -d stack-orchestrator-fixturenet-eth-test.XXXXXXXXXX)
+echo "Testing this package: $TEST_TARGET_SO"
+echo "Test version command"
+reported_version_string=$( $TEST_TARGET_SO version )
+echo "Version reported is: ${reported_version_string}"
+echo "Cloning repositories into: $CERC_REPO_BASE_DIR"
+$TEST_TARGET_SO --stack $CERC_STACK_NAME setup-repositories
+echo "Building containers"
+$TEST_TARGET_SO  --stack $CERC_STACK_NAME build-containers
+echo "Images in registry:"
+docker image ls
+echo "Deploying the cluster"
+$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy up
+# Verify that the fixturenet is up and running
+$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy ps
+$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh
+initial_block_number=$($TEST_TARGET_SO --stack fixturenet-plugeth-tx deploy exec foundry "cast block-number")
+# Check that the block number increases some time later
+sleep 12
+subsequent_block_number=$($TEST_TARGET_SO  --stack $CERC_STACK_NAME deploy exec foundry "cast block-number")
+block_number_difference=$((subsequent_block_number - initial_block_number))
+# Block height difference should be between 1 and some small number
+if [[ $block_number_difference -gt 1 && $block_number_difference -lt 10 ]]; then
+  echo "Test passed"
+  test_result=0
+else
+  echo "Test failed: block numbers were ${initial_block_number} and ${subsequent_block_number}"
+  test_result=1
+fi
+$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy down
+echo "Removing cloned repositories"
+rm -rf $CERC_REPO_BASE_DIR
+exit $test_result

tests/fixturenet-eth/run-test.sh

@@ -4,36 +4,45 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-echo "Running stack-orchestrator Ethereum fixturenet test"
+echo "$(date +"%Y-%m-%d %T"): Running stack-orchestrator Ethereum fixturenet test"
 # Bit of a hack, test the most recent package
 TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
 # Set a new unique repo dir
 export CERC_REPO_BASE_DIR=$(mktemp -d stack-orchestrator-fixturenet-eth-test.XXXXXXXXXX)
-echo "Testing this package: $TEST_TARGET_SO"
-echo "Test version command"
+echo "$(date +"%Y-%m-%d %T"): Testing this package: $TEST_TARGET_SO"
+echo "$(date +"%Y-%m-%d %T"): Test version command"
 reported_version_string=$( $TEST_TARGET_SO version )
-echo "Version reported is: ${reported_version_string}"
-echo "Cloning repositories into: $CERC_REPO_BASE_DIR"
-$TEST_TARGET_SO --stack fixturenet-eth setup-repositories 
+echo "$(date +"%Y-%m-%d %T"): Version reported is: ${reported_version_string}"
+echo "$(date +"%Y-%m-%d %T"): Cloning repositories into: $CERC_REPO_BASE_DIR"
+$TEST_TARGET_SO --stack fixturenet-eth setup-repositories
+echo "$(date +"%Y-%m-%d %T"): Building containers"
 $TEST_TARGET_SO --stack fixturenet-eth build-containers
+echo "$(date +"%Y-%m-%d %T"): Starting stack"
 $TEST_TARGET_SO --stack fixturenet-eth deploy up
+echo "$(date +"%Y-%m-%d %T"): Stack started"
 # Verify that the fixturenet is up and running
 $TEST_TARGET_SO --stack fixturenet-eth deploy ps
-$TEST_TARGET_SO --stack fixturenet-eth deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh
+# echo "$(date +"%Y-%m-%d %T"): Getting stack status"
+# $TEST_TARGET_SO --stack fixturenet-eth deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh
+echo "$(date +"%Y-%m-%d %T"): Getting initial block number"
 initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number")
 # Check that the block number increases some time later
-sleep 12
+sleep 120
+echo "$(date +"%Y-%m-%d %T"): Getting subsequent block number"
 subsequent_block_number=$($TEST_TARGET_SO  --stack fixturenet-eth deploy exec foundry "cast block-number")
 block_number_difference=$((subsequent_block_number - initial_block_number))
 # Block height difference should be between 1 and some small number
-if [[ $block_number_difference -gt 1 && $block_number_difference -lt 10 ]]; then
+if [[ $block_number_difference -gt 1 && $block_number_difference -lt 100 ]]; then
   echo "Test passed"
   test_result=0
 else
   echo "Test failed: block numbers were ${initial_block_number} and ${subsequent_block_number}"
+  echo "Logs from stack:"
+  $TEST_TARGET_SO --stack fixturenet-eth deploy logs
   test_result=1
 fi
 $TEST_TARGET_SO --stack fixturenet-eth deploy down
-echo "Removing cloned repositories"
+echo "$(date +"%Y-%m-%d %T"): Removing cloned repositories"
 rm -rf $CERC_REPO_BASE_DIR
+echo "$(date +"%Y-%m-%d %T"): Test finished"
 exit $test_result