Node version 11 release

.github/workflows/build-test.yaml

@@ -53,12 +53,12 @@ on:
 env:
   dummy: 17                # change to force cache invalidation
   CARGO_TERM_COLOR: always # implicitly adds '--color=always' to all cargo commands
+  GHC_VERSION: 9.10.2
 
 jobs:
 
   fourmolu:
     runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.draft }}
     steps:
 
     - name: Download fourmolu
@@ -93,30 +93,15 @@ jobs:
 
   rustfmt:
     runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.draft }}
-
-    strategy:
-      matrix:
-        plan:
-        - rust: "1.94"
-
     steps:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        # token: ${{ secrets.CONCORDIUM_CI }}
         submodules: recursive
 
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: ${{ matrix.plan.rust }}
-        override: true
-        components: rustfmt
-
     - name: Run rustfmt
       run: |
+        rustup component add rustfmt        
         cargo fmt --manifest-path concordium-node/Cargo.toml -- --check
         cargo fmt --manifest-path collector-backend/Cargo.toml -- --check
         cargo fmt --manifest-path collector/Cargo.toml -- --check
@@ -127,13 +112,6 @@ jobs:
     needs: [fourmolu, rustfmt]
     # Use fixed OS version because we install packages on the system.
     runs-on: ubuntu-22.04
-    if: ${{ !github.event.pull_request.draft }}
-
-    strategy:
-      matrix:
-        plan:
-        - rust: 1.94
-          ghc: 9.10.2
 
     steps:
     - name: Remove unnecessary files
@@ -160,19 +138,19 @@ jobs:
     # This must be done before checking the Rust sources (obviously)
     # but also before building the Haskell sources because the Haskell
     # build kicks of a Rust build.
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: ${{ matrix.plan.rust }}
-        override: true
-        components: clippy, llvm-tools
-        target: x86_64-pc-windows-gnu
-    # Install tool for code coverage reporting.
-    # Version cargo-llvm-cov 0.6.22 requries Rust 1.87, so we use 0.6.21 for now
-    - name: Install cargo-llvm-cov
+    - name: Install Rust tools
+      run: |
+        rustup component add clippy llvm-tools
+        rustup target add x86_64-pc-windows-gnu
+        cargo install cargo-llvm-cov --locked
+    - name: Read Rust version
+      id: read-rust-version
+      run: |
+        echo "RUST_VERSION=$(cargo --version | awk '{print $2}')" >> $GITHUB_OUTPUT
+    - name: Print Rust version
+      id: print-rust-version
       run: |
-        cargo install cargo-llvm-cov --version 0.6.21 --locked
+        echo "Rust version: ${{ steps.read-rust-version.outputs.RUST_VERSION }}"
     - name: Cache cargo dependencies and targets
       uses: actions/cache@v4
       with:
@@ -185,10 +163,10 @@ jobs:
           concordium-base/smart-contracts/lib
           concordium-node/target
           collector/target
-        key: ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ matrix.plan.rust }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}-${{ hashFiles('concordium-base/rust-src/**/*.rs','concordium-base/smart-contracts/wasm-chain-integration/**/*.rs')}}
+        key: ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ steps.read-rust-version.outputs.RUST_VERSION }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}-${{ hashFiles('concordium-base/rust-src/**/*.rs','concordium-base/smart-contracts/wasm-chain-integration/**/*.rs')}}
         restore-keys: |
-          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ matrix.plan.rust }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
-          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ matrix.plan.rust }}
+          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ steps.read-rust-version.outputs.RUST_VERSION }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
+          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ steps.read-rust-version.outputs.RUST_VERSION }}
 
     # HASKELL #
 
@@ -209,9 +187,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}
+        key: ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ matrix.plan.ghc }}
+          ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ env.GHC_VERSION }}
     - name: Cache '.stack-work'
       uses: actions/cache@v4
       with:
@@ -221,11 +199,11 @@ jobs:
           concordium-consensus/.stack-work
           concordium-consensus/haskell-lmdb/.stack-work
 
-        key: ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-${{ steps.cache-keys.outputs.base_hash }}
+        key: ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-${{ steps.cache-keys.outputs.base_hash }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-
-          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}-
-          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}
+          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-
+          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}-
+          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}
 
     # Compile Haskell sources. This must be done before running checks or tests on the Rust sources.
     - name: Build consensus and run tests (with code coverage)

.github/workflows/plt-build-test.yaml

@@ -0,0 +1,69 @@
+name: PLT scheduler build and run tests
+
+on:
+  push:
+    branches:
+    - main
+    paths:
+    - '.github/workflows/plt-build-test.yaml'
+    - 'concordium-base'
+    - 'plt/**'
+
+  pull_request:
+    paths:
+    - '.github/workflows/plt-build-test.yaml'
+    - 'concordium-base'
+    - 'plt/**'
+
+env:
+  CARGO_TERM_COLOR: always # implicitly adds '--color=always' to all cargo commands
+
+jobs:
+  rustfmt:
+    name: Check formatting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Run rustfmt
+        working-directory: plt
+        run: |
+          rustup component add rustfmt
+          cargo fmt --check
+
+  clippy_test:
+    name: Run Clippy and tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Install tools
+        working-directory: plt
+        run: |
+          rustup component add clippy llvm-tools
+          cargo install cargo-llvm-cov --locked
+      - name: Clippy
+        working-directory: plt
+        run: |
+          cargo clippy --locked --all-targets --all-features -- -D warnings
+      - name: Test
+        working-directory: plt
+        run: |
+          cargo llvm-cov test --locked --all-targets --all-features --no-report
+      - name: Generate a report of the tests above.
+        working-directory: plt
+        run: |
+          cargo llvm-cov report --lcov --output-path plt_lcov.info
+        # Options documented here: https://github.com/codecov/codecov-action
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          disable_telem: true
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
+          files: plt/plt_lcov.info

.github/workflows/release.yaml

@@ -21,8 +21,7 @@ on:
 
 env:
   UBUNTU_VERSION: '22.04'
-  STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.94_ghc-9.10.2'
-  RUST_VERSION: '1.94.0'
+  STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.95.0_ghc-9.10.2'
   STACK_VERSION: '3.7.1'
   FLATBUFFERS_VERSION: '23.5.26'
   GHC_VERSION: '9.10.2'
@@ -119,7 +118,6 @@ jobs:
             ghc_version=${{ env.GHC_VERSION }}
             protoc_version=${{ env.PROTOC_VERSION }}
             flatbuffers_version=${{ env.FLATBUFFERS_VERSION }}
-            rust_toolchain_version=${{ env.RUST_VERSION }}
           labels: |
             ubuntu_version=${{ env.UBUNTU_VERSION }}
             static_libraries_image_tag=${{ env.STATIC_LIBRARIES_IMAGE_TAG }}
@@ -306,17 +304,16 @@ jobs:
           smctl healthcheck --all
         shell: cmd
 
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: ${{ env.RUST_VERSION }}-x86_64-pc-windows-msvc
-          rustflags: ""
+      - name: Read Rust version
+        id: read-rust-version
+        run: |
+          $rustVersion = (cargo --version).Split(" ")[1]
+          echo "RUST_VERSION=$rustVersion" >> $env:GITHUB_OUTPUT
 
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: ${{ env.RUST_VERSION }}-x86_64-pc-windows-gnu
-          rustflags: ""
+      - name: Print Rust version
+        id: print-rust-version
+        run: |
+          echo "Rust version: ${{ steps.read-rust-version.outputs.RUST_VERSION }}"
 
       - name: Setup node folder
         run: |
@@ -362,7 +359,7 @@ jobs:
           SM_CLIENT_CERT_PASSWORD: ${{ secrets.WINDOWS_SM_CLIENT_CERT_PASSWORD }}
           SM_ARGS: "--verbose --exit-non-zero-on-fail --failfast"
         run: |
-          ./scripts/distribution/windows/build-all.ps1 -nodeVersion ${{ needs.validate-preconditions.outputs.version }} -rustVersion ${{ env.RUST_VERSION }}
+          ./scripts/distribution/windows/build-all.ps1 -nodeVersion ${{ needs.validate-preconditions.outputs.version }} -rustVersion ${{ steps.read-rust-version.outputs.RUST_VERSION }}
 
       - name: Sign installer with smctl
         working-directory: ${{steps.build.outputs.bin_dir}}
@@ -435,11 +432,6 @@ jobs:
           security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-          rustflags: ""
-
       - uses: haskell-actions/setup@v2
         with:
           ghc-version: ${{ env.GHC_VERSION }}

.gitignore

@@ -15,6 +15,7 @@ concordium-node/.idea/
 .so
 .stack-work
 .stack-work-test
+.stack-work-bench
 dist
 .cabal-sandbox
 cabal.sandbox.config
@@ -27,7 +28,6 @@ deps/internal/crypto/build
 *.ps
 scripts/static-libs/static-libs-docker/output_dir/
 result
-**/**/Cargo.lock
 0
 **/**/0
 scripts/genesis-data/genesis_data/**
@@ -49,13 +49,16 @@ genesis_data
 /concordium-consensus/a.out
 /concordium-consensus/HSdll.dll
 /concordium-consensus/HSdll.dll.a
+/concordium-consensus/*.dat
+/concordium-consensus/lib
 concordium-node/deps/static-libs
 .dir-locals.el
 hie.yaml
 **/**/TAGS
 .DS_Store
 /concordium-node/*.log
 /stack.yaml.lock
+/stack.static.yaml.lock
 
 # MacOS distribution
 /scripts/distribution/macOS-package/tools
@@ -67,4 +70,5 @@ xcuserdata/
 lcov.info
 # Test artefacts
 .stack-work-coverage*
-*.blob
+*.blob
+plt/plt-types/proptest-regressions/