Fuse 1.32.2

.dockerignore

@@ -5,4 +5,3 @@
 **/bin/
 **/obj/
 
-src/Nethermind/*.Test/

.editorconfig

@@ -9,8 +9,10 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-file_header_template = SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited\nSPDX-License-Identifier: LGPL-3.0-only
+file_header_template = SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited\nSPDX-License-Identifier: LGPL-3.0-only
 
+[*.py]
+indent_size = 4
 [*.cs]
 indent_size = 4
 
@@ -89,3 +91,9 @@ csharp_style_expression_bodied_local_functions = false:silent
 csharp_style_var_for_built_in_types = true:silent
 csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_var_elsewhere = false:suggestion
+
+# Coding convention
+
+dotnet_diagnostic.IDE0005.severity = suggestion
+dotnet_diagnostic.IDE0041.severity = error
+

.github/workflows/build-nethermind-packages.yml

@@ -23,8 +23,6 @@ jobs:
           echo "build-timestamp=$build_timestamp" >> $GITHUB_OUTPUT
           echo "commit-hash=${GITHUB_SHA:0:8}" >> $GITHUB_OUTPUT
           scripts/deployment/build-runner.sh $GITHUB_SHA $build_timestamp
-      - name: Build Nethermind.Cli
-        run: scripts/deployment/build-cli.sh $GITHUB_SHA ${{ steps.build-runner.outputs.build-timestamp }}
       - name: Archive packages
         env:
           PACKAGE_PREFIX: nethermind-preview-${{ steps.build-runner.outputs.commit-hash }}

.github/workflows/build-solutions.yml

@@ -16,20 +16,16 @@ jobs:
         config: [release, debug]
         solution: [Nethermind, EthereumTests, Benchmarks]
     steps:
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          large-packages: false
+          tool-cache: false
       - name: Check out repository
         uses: actions/checkout@v4
         with:
           submodules: ${{ matrix.solution == 'EthereumTests' }}
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
-      - name: Cache dotnet packages
-        id: cache-dotnet
-        uses: actions/cache@v4
-        with:
-          # nuget cache files are stored in `~/.nuget/packages/` on Linux/macOS
-          path: ~/.nuget/packages/
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}
-          restore-keys: |
-            ${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}
-      - name: Build ${{ matrix.solution }}.sln
-        run: dotnet build src/Nethermind/${{ matrix.solution }}.sln -c ${{ matrix.config }}
+      - name: Build ${{ matrix.solution }}.slnx
+        run: dotnet build src/Nethermind/${{ matrix.solution }}.slnx -c ${{ matrix.config }}

.github/workflows/build-tools.yml

@@ -0,0 +1,35 @@
+name: Build tools
+
+on:
+  merge_group:
+    types: [checks_requested]
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        config: [release]
+        project:
+          - DocGen/DocGen.slnx
+          - Evm/Evm.slnx
+          - HiveCompare/HiveCompare.slnx
+          - HiveConsensusWorkflowGenerator/HiveConsensusWorkflowGenerator.slnx
+          - Nethermind.Tools.Kute/Nethermind.Tools.Kute.slnx
+          # - SchemaGenerator/SchemaGenerator.slnx
+          - SendBlobs/SendBlobs.slnx
+          - TxParser/TxParser.slnx
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Set up .NET
+        uses: actions/setup-dotnet@v4
+      - name: Build ${{ matrix.project }}
+        working-directory: tools
+        run: dotnet build ./${{ matrix.project }} -c ${{ matrix.config }}

.github/workflows/bump-version.yml

@@ -0,0 +1,59 @@
+name: Bump up version
+
+on:
+  create:
+    branches:
+      - 'release/*'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  bump-version:
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/heads/release/') && endsWith(github.ref, '.0')
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Bump up the version
+        id: version
+        run: |
+          chmod +x ./scripts/bump-version.sh
+          ./scripts/bump-version.sh "${{ github.ref }}" "src/Nethermind/Directory.Build.props" > version_output.txt
+
+          # Read the output and set step outputs
+          while IFS= read -r line; do
+            if [[ $line =~ ^(needs_update|current_version|new_version)= ]]; then
+              echo "$line" >> $GITHUB_OUTPUT
+            fi
+          done < version_output.txt
+
+      - name: Create GitHub app token
+        if: steps.version.outputs.needs_update == 'true'
+        id: gh-app
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Create pull request
+        if: steps.version.outputs.needs_update == 'true'
+        env:
+          GH_TOKEN: ${{ steps.gh-app.outputs.token }}
+        run: |
+          timestamp=$(date +%s)
+          head_branch="chore/bump-version-${{ steps.version.outputs.new_version }}-$timestamp"
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+          git checkout -b $head_branch
+          git add src/Nethermind/Directory.Build.props
+          git commit -m "Bump up the version to ${{ steps.version.outputs.new_version }}-unstable"
+          git push origin $head_branch
+          gh pr create -B master -H $head_branch \
+            -t "Bump up the version to ${{ steps.version.outputs.new_version }}-unstable" \
+            -b "Automated version bump-up from ${{ steps.version.outputs.current_version }} to ${{ steps.version.outputs.new_version }}-unstable" \
+            -l "version bump"

.github/workflows/codeql.yml

@@ -18,22 +18,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ['csharp']
+        language: ['csharp', 'actions']
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
-        with:
-          submodules: true
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
+          queries: security-and-quality
+          packs: githubsecuritylab/codeql-csharp-queries
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
       - name: Build Nethermind
         working-directory: src/Nethermind
-        run: dotnet build Nethermind.sln -c release
+        run: dotnet build Nethermind.slnx -c release
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: '/language:${{ matrix.language }}'

.github/workflows/dependency-review.yml

@@ -0,0 +1,18 @@
+name: Dependency review
+
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    name: Dependency review
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Dependency review
+        uses: actions/dependency-review-action@v4
+        with:
+          fail-on-severity: high

.github/workflows/hive-consensus-tests.yml

@@ -121,6 +121,10 @@ jobs:
         with:
           path: nethermind
           submodules: "recursive"
+      - name: Set up .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: nethermind/global.json
       - name: Generate Hive Json For Matrix
         id: set-matrix
         run: |

.github/workflows/hive-tests.yml

@@ -16,7 +16,7 @@ on:
           - ethereum/consensus
           - ethereum/engine
           - ethereum/graphql
-          - ethereum/pyspec
+          - ethereum/eest
           - ethereum/rpc
           - ethereum/rpc-compat
           - ethereum/sync
@@ -40,6 +40,15 @@ on:
         required: false
         default: master
         type: string
+      buildarg:
+        description: Simulator build argument (e.g. fixtures URL)
+        required: false
+        type: string
+      enable_buildarg:
+        description: Enable buildarg flag
+        required: true
+        default: false
+        type: boolean
 
 jobs:
   test:
@@ -53,6 +62,8 @@ jobs:
           echo "LOG_LEVEL=${{ github.event.inputs.log-level || '3' }}" >> $GITHUB_ENV
           echo "HIVE_REPO=${{ github.event.inputs.hive-repo || 'ethereum/hive' }}" >> $GITHUB_ENV
           echo "HIVE_BRANCH=${{ github.event.inputs.hive-branch || 'master' }}" >> $GITHUB_ENV
+          echo "BUILDARG=${{ github.event.inputs.buildarg || '' }}" >> $GITHUB_ENV
+          echo "ENABLE_BUILDARG=${{ github.event.inputs.enable_buildarg || false }}" >> $GITHUB_ENV
       - name: Check out Nethermind repository
         uses: actions/checkout@v4
         with:
@@ -80,15 +91,22 @@ jobs:
       - name: Load Docker image
         run: docker load --input /tmp/image.tar
       - name: Run Hive
-        if: env.LIMIT == ''
         continue-on-error: true
         working-directory: hive
-        run: ./hive --client nethermind --sim $TEST_SUITE --sim.loglevel $LOG_LEVEL
-      - name: Run Hive with limit
-        if: env.LIMIT != ''
-        continue-on-error: true
-        working-directory: hive
-        run: ./hive --client nethermind --sim $TEST_SUITE --sim.loglevel $LOG_LEVEL --sim.limit $LIMIT
+        run: |
+          HIVE_ARGS="--client nethermind --sim $TEST_SUITE --sim.loglevel $LOG_LEVEL"
+
+          # Add optional arguments based on conditions
+          if [ -n "$LIMIT" ]; then
+            HIVE_ARGS="$HIVE_ARGS --sim.limit $LIMIT"
+          fi
+
+          if [ "$ENABLE_BUILDARG" = "true" ] && [ -n "$BUILDARG" ]; then
+            HIVE_ARGS="$HIVE_ARGS --sim.buildarg \"$BUILDARG\""
+          fi
+
+          # Execute hive with constructed arguments
+          eval "./hive $HIVE_ARGS"
       - name: Upload results
         uses: actions/upload-artifact@v4
         with:

.github/workflows/nethermind-tests.yml

@@ -36,7 +36,6 @@ jobs:
           - Nethermind.Api.Test
           - Nethermind.AuRa.Test
           - Nethermind.Blockchain.Test
-          - Nethermind.Cli.Test
           - Nethermind.Clique.Test
           - Nethermind.Config.Test
           - Nethermind.Consensus.Test
@@ -46,6 +45,7 @@ jobs:
           - Nethermind.EthStats.Test
           - Nethermind.Evm.Test
           - Nethermind.Facade.Test
+          - Nethermind.Flashbots.Test
           - Nethermind.HealthChecks.Test
           - Nethermind.Hive.Test
           - Nethermind.JsonRpc.Test
@@ -64,11 +64,13 @@ jobs:
           - Nethermind.Overseer.Test
           - Nethermind.Runner.Test
           - Nethermind.Serialization.Ssz.Test
+          - Nethermind.Shutter.Test
           - Nethermind.Sockets.Test
           - Nethermind.Specs.Test
           - Nethermind.State.Test
           - Nethermind.State.Test.Runner.Test
           - Nethermind.Synchronization.Test
+          - Nethermind.Taiko.Test
           - Nethermind.Trie.Test
           - Nethermind.TxPool.Test
           - Nethermind.Wallet.Test
@@ -77,12 +79,6 @@ jobs:
       uses: actions/checkout@v4
     - name: Set up .NET
       uses: actions/setup-dotnet@v4
-    - name: Cache dotnet packages
-      id: cache-dotnet
-      uses: actions/cache/restore@v4
-      with:
-        path: ~/.nuget/packages/
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}
     - name: ${{ matrix.project }}
       id: test
       run: |
@@ -136,6 +132,7 @@ jobs:
           - Ethereum.Difficulty.Test
           - Ethereum.HexPrefix.Test
           - Ethereum.KeyAddress.Test
+          - Ethereum.KeyStore.Test
           - Ethereum.PoW.Test
           - Ethereum.Rlp.Test
           - Ethereum.Transaction.Test

.github/workflows/publish-packages.yml

@@ -26,7 +26,7 @@ jobs:
           echo "Import GPG owner trust"
           echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust
       - name: Install PPA dependencies
-        run: sudo apt-get update && sudo apt-get install debhelper devscripts -y
+        run: sudo apt-get update && sudo apt-get install build-essential debhelper devscripts -y
       - name: Submit package
         env:
           PPA_GPG_KEYID: ${{ secrets.PPA_GPG_KEYID }}
@@ -60,11 +60,13 @@ jobs:
     needs: publish-ppa
     steps:
       - name: Wait for PPA package to be published
-        run: sleep 1.5h
+        run: sleep 2h
       - name: Install PPA dependencies
         run: |
           sudo apt-get update
           sudo apt-get install debhelper devscripts ubuntu-dev-tools -y
+      - name: Set up Python
+        uses: actions/setup-python@v5
       - name: Install launchpadlib
         run: pip install launchpadlib --upgrade
       - name: Copy to other series

.github/workflows/release.yml

@@ -39,8 +39,6 @@ jobs:
           echo "commit-hash=${GITHUB_SHA:0:8}" >> $GITHUB_OUTPUT
           echo "prerelease=${{ contains(github.event.inputs.tag, '-') }}" >> $GITHUB_OUTPUT
           $SCRIPTS_PATH/build-runner.sh $GITHUB_SHA $build_timestamp
-      - name: Build Nethermind.Cli
-        run: $SCRIPTS_PATH/build-cli.sh $GITHUB_SHA ${{ steps.build-runner.outputs.build-timestamp }}
       - name: Archive packages
         id: archive
         env:

.github/workflows/rpc-comparison.yml

@@ -183,7 +183,7 @@ jobs:
     if: always() && needs.aggregate_rpcs.result == 'success'
     timeout-minutes: 1440
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Wait for the nodes to sync
         timeout-minutes: 1440