Merge branch 'main' into benjamin

Author: fbielejec

.github/actions/get-branch/action.yaml

@@ -22,8 +22,8 @@ runs:
       id: get_branch
       shell: bash
       env:
-        HEAD_REF: ${{ github.head_ref }}
+        HEAD_REF: ${{ github.head_ref || github.ref }}
       run: |
         echo "##[set-output name=branch_name;]$(echo ${HEAD_REF#refs/heads/} | tr / -)"
-        echo "##[set-output name=branch_appname;]$(printf ${HEAD_REF#refs/head/} | tr / - | tr '[:upper:]' '[:lower:]' | tr -c '[a-z0-9-.]' '-')"
+        echo "##[set-output name=branch_appname;]$(printf ${HEAD_REF#refs/heads/} | tr / - | tr '[:upper:]' '[:lower:]' | tr -c '[a-z0-9-.]' '-')"
         echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"

.github/scripts/run_consensus.sh

@@ -5,6 +5,7 @@ set -euo pipefail
 # default node count
 # change when increasing the number of node containers
 NODE_COUNT=5
+MIN_VALIDATOR_COUNT=4
 
 export NODE_IMAGE=aleph-node:latest
 

.github/workflows/build-and-push-cliain.yaml

@@ -0,0 +1,49 @@
+name: Build and push cliain docker image
+
+on:
+  push:
+    paths:
+      - 'bin/cliain/**'
+  workflow_dispatch:
+
+jobs:
+  build-image:
+    name: Build binary
+    runs-on: ubuntu-20.04
+    steps:
+      - name: GIT | Checkout source code
+        uses: actions/checkout@v2
+
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+
+      - name: Cargo | Build release binary
+        run: |
+          cd ./bin/cliain && cargo build --release
+
+      - name: GIT | Get branch name and commit SHA
+        id: get_branch
+        uses: ./.github/actions/get-branch
+      
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_MAINNET_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_MAINNET_SECRET_ACCESS_KEY }}
+      
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@master
+      
+      - name: Build and push latest docker image
+        id: build-image
+        env:
+          RELEASE_IMAGE: public.ecr.aws/p6e8q1z1/cliain:${{ steps.get_branch.outputs.branch_name == 'main' && 'latest' || steps.get_branch.outputs.branch_name }}
+        uses: docker/build-push-action@v2
+        with:
+          context: ./bin/cliain
+          builder: ${{ steps.buildx.outputs.name }}
+          file: ./bin/cliain/Dockerfile
+          push: true
+          tags: ${{ env.RELEASE_IMAGE }}

Cargo.lock

@@ -1,6 +1,7 @@
 [workspace]
 
 members = [
+    "aggregator",
     "bin/node",
     "bin/runtime",
     "finality-aleph",

Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "aggregator"
+version = "0.2.0"
+authors = ["Cardinal Cryptography"]
+edition = "2021"
+license = "Apache 2.0"
+
+
+[dependencies]
+aleph-bft-rmc = "0.5.0"
+aleph-bft-types = "0.6.0"
+
+async-trait = "0.1"
+futures = "0.3"
+codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] }
+tokio = { version = "1.17", features = [ "sync", "macros", "time", "rt-multi-thread" ] }
+log = "0.4"