Merge branch 'main' into update_to_0.9.32

.github/actions/run-e2e-test/action.yml

@@ -89,4 +89,4 @@ runs:
     - name: Run finalization e2e test
       if: inputs.follow-up-finalization-check == 'true'
       shell: bash
-      run: ./.github/scripts/run_e2e_test.sh -t finalization -m "${{ inputs.min-validator-count }}"
+      run: ./.github/scripts/run_e2e_test.sh -t finalization::finalization -m "${{ inputs.min-validator-count }}"

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

@@ -17,6 +17,11 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'
+
       - name: Cargo | Build release binary
         run: |
           cd ./bin/cliain && cargo build --release

.github/workflows/build-node-and-runtime.yml

@@ -28,6 +28,11 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'
+
       - name: Install WASM target
         run: rustup target add wasm32-unknown-unknown
 

.github/workflows/build-send-postsync-hook-runtime-image.yml

@@ -33,6 +33,11 @@ jobs:
       - name: Install rust toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'        
+
       - name: Build binary
         run: |
           pushd bin/cliain/

.github/workflows/check-excluded-packages.yml

@@ -27,6 +27,11 @@ jobs:
       - name: Install rust toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'
+
       - name: Install clippy and fmt
         run: rustup component add clippy rustfmt
 

.github/workflows/e2e-tests-main-devnet.yml

@@ -64,6 +64,11 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'        
+
       - name: Restore cache
         uses: ./.github/actions/restore-cache
         with:
@@ -106,6 +111,11 @@ jobs:
       - name: Install Rust Toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'        
+
       - name: Install WASM target
         run: rustup target add wasm32-unknown-unknown
 
@@ -139,6 +149,11 @@ jobs:
       - name: Install Rust Toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'        
+
       - name: Restore cache
         uses: ./.github/actions/restore-cache
         with:
@@ -150,7 +165,8 @@ jobs:
       - name: Build binary and docker image
         run: |
           cd e2e-tests/
-          cargo build --release
+          rm -f target/release/deps/aleph_e2e_client*
+          cp $(cargo test --no-run --release --message-format=json | jq -r .executable | grep aleph_e2e_client) target/release/aleph-e2e-client
           docker build --tag aleph-e2e-client:latest -f Dockerfile .
           docker save -o aleph-e2e-client.tar aleph-e2e-client:latest
 
@@ -177,7 +193,7 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: finalization
+          test-case: finalization::finalization
         timeout-minutes: 2
 
 
@@ -192,7 +208,7 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: rewards_disable_node
+          test-case: rewards::disable_node
           follow-up-finalization-check: true
         timeout-minutes: 15
 
@@ -345,7 +361,7 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: era_payout
+          test-case: era_payout::era_payout
           follow-up-finalization-check: true
         timeout-minutes: 10
 
@@ -375,7 +391,7 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: rewards_force_new_era
+          test-case: rewards::force_new_era
           follow-up-finalization-check: true
         timeout-minutes: 10
 
@@ -390,7 +406,7 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: rewards_stake_change
+          test-case: rewards::points_stake_change
           follow-up-finalization-check: true
         timeout-minutes: 10
 
@@ -405,7 +421,7 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: rewards_change_stake_and_force_new_era
+          test-case: rewards::change_stake_and_force_new_era
           follow-up-finalization-check: true
         timeout-minutes: 10
 
@@ -424,23 +440,23 @@ jobs:
           follow-up-finalization-check: true
         timeout-minutes: 10
 
-  run-e2e-authorities-are-staking:
-    needs: [build-test-docker, build-test-client]
-    name: Run authorities are staking test
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      - name: Run e2e test
-        uses: ./.github/actions/run-e2e-test
-        with:
-          test-case: authorities_are_staking
-          node-count: 6
-          reserved-seats: 3
-          non-reserved-seats: 3
-          follow-up-finalization-check: false
-        timeout-minutes: 15
+#  run-e2e-authorities-are-staking:
+#    needs: [build-test-docker, build-test-client]
+#    name: Run authorities are staking test
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v2
+#
+#      - name: Run e2e test
+#        uses: ./.github/actions/run-e2e-test
+#        with:
+#          test-case: authorities_are_staking
+#          node-count: 6
+#          reserved-seats: 3
+#          non-reserved-seats: 3
+#          follow-up-finalization-check: false
+#        timeout-minutes: 15
 
   run-e2e-ban-automatic:
     needs: [build-test-docker, build-test-client]
@@ -513,92 +529,93 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: version_upgrade
-        env:
-          UPGRADE_VERSION: 1
-          UPGRADE_SESSION: 3
-          UPGRADE_FINALIZATION_WAIT_SESSIONS: 2
-        timeout-minutes: 10
-
-  run-e2e-failing-version-upgrade:
-    needs: [build-test-docker, build-test-client]
-    name: Run basic (failing) version-upgrade test
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      - name: Run e2e test
-        uses: ./.github/actions/run-e2e-test
-        with:
-          test-case: doomed_version_upgrade
+          test-case: version_upgrade::schedule_version_change
         env:
-          OVERRIDE_DOCKER_COMPOSE: ./.github/scripts/docker-compose.no_quorum_without_old.override.yml
           UPGRADE_VERSION: 1
           UPGRADE_SESSION: 3
           UPGRADE_FINALIZATION_WAIT_SESSIONS: 2
-          ONLY_LEGACY: true
         timeout-minutes: 10
 
-  run-e2e-version-upgrade-catchup:
-    needs: [build-test-docker, build-cliain-image]
-    name: Run series of tests where some of the nodes need to do version-upgrade during catch-up
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        include:
-          - nodes: "Node1"
-            ports: "9934"
-            ext_status: "finalized"
-            upgrade_before_disable: "true"
-
-          - nodes: "Node1"
-            ports: "9934"
-            ext_status: "finalized"
-            upgrade_before_disable: "false"
-
-          - nodes: "Node1:Node2"
-            ports: "9934:9935"
-            ext_status: "in-block"
-            upgrade_before_disable: "true"
-
-          - nodes: "Node1:Node2"
-            ports: "9934:9935"
-            ext_status: "in-block"
-            upgrade_before_disable: "false"
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      - name: Download artifact with docker image for aleph-node
-        uses: actions/download-artifact@v2
-        with:
-          name: aleph-test-docker
-
-      - name: Load node docker image
-        shell: bash
-        run: docker load -i aleph-node.tar
-
-      - name: Download artifact with docker image for cliain
-        uses: actions/download-artifact@v2
-        with:
-          name: cliain-docker
-
-      - name: Load cliain docker image
-        shell: bash
-        run: docker load -i cliain.tar
-
-      - name: Call catchup_test.sh
-        env:
-          UPGRADE_BLOCK: 31
-          NODES: ${{ matrix.nodes }}
-          PORTS: ${{ matrix.ports }}
-          EXT_STATUS: ${{ matrix.ext_status }}
-          UPGRADE_BEFORE_DISABLE: ${{ matrix.upgrade_before_disable }}
-          DOCKER_COMPOSE: docker/docker-compose.bridged.yml
-
-        run: |
-          ./scripts/catchup_version_upgrade_test.sh
+# The tests below were written under the assumption that nonfinalized blocks are being produced, they need a rewrite before being reenabled.
+# TODO(A0-1644): Reenable these tests.
+#  run-e2e-failing-version-upgrade:
+#    needs: [build-test-docker, build-test-client]
+#    name: Run basic (failing) version-upgrade test
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v2
+#
+#      - name: Run e2e test
+#        uses: ./.github/actions/run-e2e-test
+#        with:
+#          test-case: doomed_version_upgrade
+#        env:
+#          OVERRIDE_DOCKER_COMPOSE: ./.github/scripts/docker-compose.no_quorum_without_old.override.yml
+#          UPGRADE_VERSION: 1
+#          UPGRADE_SESSION: 3
+#          UPGRADE_FINALIZATION_WAIT_SESSIONS: 2
+#          ONLY_LEGACY: true
+#        timeout-minutes: 10
+#  run-e2e-version-upgrade-catchup:
+#    needs: [build-test-docker, build-cliain-image]
+#    name: Run series of tests where some of the nodes need to do version-upgrade during catch-up
+#    runs-on: ubuntu-20.04
+#    strategy:
+#      matrix:
+#        include:
+#          - nodes: "Node1"
+#            ports: "9934"
+#            ext_status: "finalized"
+#            upgrade_before_disable: "true"
+#
+#          - nodes: "Node1"
+#            ports: "9934"
+#            ext_status: "finalized"
+#            upgrade_before_disable: "false"
+#
+#          - nodes: "Node1:Node2"
+#            ports: "9934:9935"
+#            ext_status: "in-block"
+#            upgrade_before_disable: "true"
+#
+#          - nodes: "Node1:Node2"
+#            ports: "9934:9935"
+#            ext_status: "in-block"
+#            upgrade_before_disable: "false"
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v2
+#
+#      - name: Download artifact with docker image for aleph-node
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: aleph-test-docker
+#
+#      - name: Load node docker image
+#        shell: bash
+#        run: docker load -i aleph-node.tar
+#
+#      - name: Download artifact with docker image for cliain
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: cliain-docker
+#
+#      - name: Load cliain docker image
+#        shell: bash
+#        run: docker load -i cliain.tar
+#
+#      - name: Call catchup_test.sh
+#        timeout-minutes: 10
+#        env:
+#          UPGRADE_BLOCK: 31
+#          NODES: ${{ matrix.nodes }}
+#          PORTS: ${{ matrix.ports }}
+#          EXT_STATUS: ${{ matrix.ext_status }}
+#          UPGRADE_BEFORE_DISABLE: ${{ matrix.upgrade_before_disable }}
+#          DOCKER_COMPOSE: docker/docker-compose.bridged.yml
+#        run: |
+#          ./scripts/catchup_version_upgrade_test.sh
 
   check-e2e-test-suite-completion:
     needs: [
@@ -619,14 +636,14 @@ jobs:
       run-e2e-rewards-stake-change,
       run-e2e-rewards-change-stake-force-new-era,
       run-e2e-rewards-points-basic,
-      run-e2e-authorities-are-staking,
+#      run-e2e-authorities-are-staking,
       run-e2e-ban-automatic,
       run-e2e-ban-manual,
       run-e2e-ban-counter-clearing,
       run-e2e-ban-threshold,
       run-e2e-version-upgrade,
-      run-e2e-failing-version-upgrade,
-      run-e2e-version-upgrade-catchup,
+#      run-e2e-failing-version-upgrade,
+#      run-e2e-version-upgrade-catchup,
     ]
     name: Check e2e test suite completion
     runs-on: ubuntu-20.04
@@ -776,6 +793,11 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.6.1'        
+
       - name: Install WASM target
         run: rustup target add wasm32-unknown-unknown