Merge branch 'main' into ci-test

Former-commit-id: d82ba6ed5035203d1ce3846744309210caadda62

.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

@@ -1,7 +1,5 @@
 # Stack Orchestrator
 
-
-
 Stack Orchestrator allows building and deployment of a Laconic Stack on a single machine with minimial prerequisites. It is a Python3 CLI tool that runs on any OS with Python3 and Docker. The following diagram summarizes the relevant repositories in the Laconic Stack - and the relationship to Stack Orchestrator.
 
 ![The Stack](/docs/images/laconic-stack.png)

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

@@ -1,9 +1,8 @@
 version: '3.2'
 
 services:
-  # Builds and serves the peer-test react-app
   peer-test-app:
-    restart: unless-stopped
+    # Builds and serves the peer-test react-app
     image: cerc/react-peer:local
     working_dir: /scripts
     env_file:

app/data/stacks/fixturenet-optimism/README.md

@@ -14,6 +14,14 @@ laconic-so --stack fixturenet-optimism setup-repositories
 # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command
 ```
 
+Checkout to the required versions and branches in repos:
+
+```bash
+# Optimism
+cd ~/cerc/optimism
+git checkout v1.0.4
+```
+
 Build the container images:
 
 ```bash

app/data/stacks/fixturenet-optimism/l2-only.md

@@ -14,6 +14,14 @@ laconic-so --stack fixturenet-optimism setup-repositories --exclude github.com/c
 # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command
 ```
 
+Checkout to the required versions and branches in repos:
+
+```bash
+# Optimism
+cd ~/cerc/optimism
+git checkout v1.0.4
+```
+
 Build the container images:
 
 ```bash

app/data/stacks/fixturenet-optimism/stack.yml

@@ -3,14 +3,12 @@ name: fixturenet-optimism
 decription: "Optimism Fixturenet"
 repos:
   - github.com/cerc-io/go-ethereum
-  - github.com/cerc-io/lighthouse
   - github.com/dboreham/foundry
-  - github.com/ethereum-optimism/optimism@v1.0.4
+  - github.com/ethereum-optimism/optimism
-  - github.com/ethereum-optimism/op-geth@v1.101105.2
+  - github.com/ethereum-optimism/op-geth
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
-  - cerc/lighthouse-cli
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/foundry

app/data/stacks/fixturenet-pocket/stack.yml

@@ -3,13 +3,11 @@ name: fixturenet-pocket
 description: "A single node pocket chain that can serve relays from the geth-1 node in eth-fixturenet"
 repos:
   - github.com/cerc-io/go-ethereum
-  - github.com/cerc-io/lighthouse
   - github.com/pokt-network/pocket-core
   - github.com/pokt-network/pocket-core-deployments # contains the dockerfile
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
-  - cerc/lighthouse-cli
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/pocket

app/data/stacks/mobymask-v2/README.md

@@ -18,6 +18,26 @@ laconic-so --stack mobymask-v2 setup-repositories
 NOTE: If repositories already exist and are checked out to different versions, `setup-repositories` command will throw an error.
 For getting around this, the repositories mentioned below can be removed and then run the command.
 
+Checkout to the required versions and branches in repos
+
+```bash
+# watcher-ts
+cd ~/cerc/watcher-ts
+git checkout v0.2.41
+
+# mobymask-v2-watcher-ts
+cd ~/cerc/mobymask-v2-watcher-ts
+git checkout v0.1.1
+
+# MobyMask
+cd ~/cerc/MobyMask
+git checkout v0.1.2
+
+# Optimism
+cd ~/cerc/optimism
+git checkout v1.0.4
+```
+
 Build the container images:
 
 ```bash

app/data/stacks/mobymask-v2/mobymask-only.md

@@ -14,6 +14,22 @@ laconic-so --stack mobymask-v2 setup-repositories --include github.com/cerc-io/M
 # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command
 ```
 
+Checkout to the required versions and branches in repos:
+
+```bash
+# watcher-ts
+cd ~/cerc/watcher-ts
+git checkout v0.2.41
+
+# mobymask-v2-watcher-ts
+cd ~/cerc/mobymask-v2-watcher-ts
+git checkout v0.1.1
+
+# MobyMask
+cd ~/cerc/MobyMask
+git checkout v0.1.2
+```
+
 Build the container images:
 
 ```bash

app/data/stacks/mobymask-v2/stack.yml

@@ -2,24 +2,21 @@ version: "1.0"
 name: mobymask-v2
 repos:
   - github.com/cerc-io/go-ethereum
-  - github.com/cerc-io/lighthouse
   - github.com/dboreham/foundry
-  - github.com/ethereum-optimism/optimism@v1.0.4
+  - github.com/ethereum-optimism/optimism
-  - github.com/ethereum-optimism/op-geth@v1.101105.2
+  - github.com/ethereum-optimism/op-geth
-  - github.com/cerc-io/watcher-ts@v0.2.43
+  - github.com/cerc-io/watcher-ts
-  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.1.1
+  - github.com/cerc-io/mobymask-v2-watcher-ts
-  - github.com/cerc-io/MobyMask@v0.1.2
+  - github.com/cerc-io/MobyMask
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
-  - cerc/lighthouse-cli
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/foundry
   - cerc/optimism-contracts
   - cerc/optimism-l2geth
   - cerc/optimism-op-batcher
-  - cerc/optimism-op-proposer
   - cerc/optimism-op-node
   - cerc/watcher-ts
   - cerc/watcher-mobymask-v2

app/data/stacks/mobymask-v2/watcher-p2p-network/watcher.md

@@ -30,6 +30,22 @@ Clone required repositories:
   # 100%|##############################################################################################################################################| 1.41k/1.41k [00:18<00:00, 76.4B/s]
   ```
 
+Checkout to the required versions and branches in repos:
+
+  ```bash
+  # watcher-ts
+  cd ~/cerc/watcher-ts
+  git checkout v0.2.41
+
+  # mobymask-v2-watcher-ts
+  cd ~/cerc/mobymask-v2-watcher-ts
+  git checkout v0.1.1
+
+  # MobyMask
+  cd ~/cerc/MobyMask
+  git checkout v0.1.2
+  ```
+
 Build the container images:
 
   ```bash

scripts/cloud-init-dev-mode-install.yaml

@@ -1,44 +0,0 @@
-#cloud-config
-
-# Used for easily testing stacks-in-development on cloud platforms
-# Assumes Ubuntu, edit the last line if targeting a different OS
-
-# Once SSH'd into the server, run:
-# `$ cd stack-orchestrator`
-# `$ git checkout <branch>
-# `$ ./scripts/developer-mode-setup.sh`
-# `$ source ./venv/bin/activate`
-
-# Followed by the stack instructions.
-
-package_update: true
-package_upgrade: true
-
-groups:
-  - docker
-
-system_info:
-  default_user:
-    groups: [ docker ]
-
-packages:
-  - apt-transport-https
-  - ca-certificates
-  - curl
-  - jq
-  - git
-  - gnupg
-  - lsb-release
-  - unattended-upgrades
-  - python3.10-venv
-  - pip
-
-runcmd:
-  - mkdir -p /etc/apt/keyrings
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-  - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-  - apt-get update
-  - 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://github.com/cerc-io/stack-orchestrator.git /home/ubuntu/stack-orchestrator

scripts/cloud-init-user-mode-install.yaml

@@ -1,35 +0,0 @@
-#cloud-config
-
-# Used for installing Stack Orchestrator on platforms that support `cloud-init`
-# Tested on Ubuntu
-
-package_update: true
-package_upgrade: true
-
-groups:
-  - docker
-
-system_info:
-  default_user:
-    groups: [ docker ]
-
-packages:
-  - apt-transport-https
-  - ca-certificates
-  - curl
-  - jq
-  - git
-  - gnupg
-  - lsb-release
-  - unattended-upgrades
-
-runcmd:
-  - mkdir -p /etc/apt/keyrings
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-  - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-  - apt-get update
-  - 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://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so
-  - chmod +x /usr/local/bin/laconic-so

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

@@ -15,7 +15,9 @@ 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 "Building containers"
 $TEST_TARGET_SO  --stack fixturenet-eth build-containers
+echo "Deploying the cluster"
 $TEST_TARGET_SO --stack fixturenet-eth deploy up
 # Verify that the fixturenet is up and running
 $TEST_TARGET_SO --stack fixturenet-eth deploy ps