NethermindEth
diff --git a/‎.dockerignore‎
Lines changed: 0 additions & 1 deletion b/‎.dockerignore‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.editorconfig‎
Lines changed: 2 additions & 2 deletions b/‎.editorconfig‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/build-nethermind-packages.yml‎
Lines changed: 5 additions & 4 deletions b/‎.github/workflows/build-nethermind-packages.yml‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎.github/workflows/hive-consensus-tests.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/hive-consensus-tests.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/nethermind-tests.yml‎
Lines changed: 35 additions & 83 deletions b/‎.github/workflows/nethermind-tests.yml‎
Lines changed: 35 additions & 83 deletions
diff --git a/‎.github/workflows/publish-packages.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/publish-packages.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 7 additions & 7 deletions b/‎.github/workflows/release.yml‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎.github/workflows/run-a-single-node-from-branch.yml‎
Lines changed: 4 additions & 4 deletions b/‎.github/workflows/run-a-single-node-from-branch.yml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎.github/workflows/sync-supported-chains.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/sync-supported-chains.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/test-assertoor.yml‎
Lines changed: 6 additions & 6 deletions b/‎.github/workflows/test-assertoor.yml‎
Lines changed: 6 additions & 6 deletions
@@ -5,4 +5,3 @@
 **/bin/
 **/obj/
 
-src/Nethermind/*.Test/
@@ -11,10 +11,10 @@ trim_trailing_whitespace = true
 
 file_header_template = SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited\nSPDX-License-Identifier: LGPL-3.0-only
 
-[*.cs]
-indent_size = 4
 [*.py]
 indent_size = 4
+[*.cs]
+indent_size = 4
 
 #### Naming styles ####
 
 
@@ -11,24 +11,25 @@ jobs:
       PACKAGE_DIR: pkg
       PACKAGE_RETENTION: 7
       PUB_DIR: pub
+      SCRIPTS_PATH: ${{ github.workspace }}/scripts/build
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
       - name: Build Nethermind.Runner
-        id: build-runner
+        id: build
         run: |
           build_timestamp=$(date '+%s')
           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
+          $SCRIPTS_PATH/build.sh $GITHUB_SHA $build_timestamp
       - name: Archive packages
         env:
-          PACKAGE_PREFIX: nethermind-preview-${{ steps.build-runner.outputs.commit-hash }}
+          PACKAGE_PREFIX: nethermind-preview-${{ steps.build.outputs.commit-hash }}
         run: |
           echo "PACKAGE_PREFIX=$PACKAGE_PREFIX" >> $GITHUB_ENV
-          scripts/deployment/archive-packages.sh
+          $SCRIPTS_PATH/archive.sh
       - name: Upload Nethermind Linux x64 package
         uses: actions/upload-artifact@v4
         with:
 
@@ -105,8 +105,8 @@ jobs:
           REPO_NAME: ${{ env.REPO_NAME }}
           REF: ${{ github.ref }}
         run: |
-          chmod +x scripts/wait-for-workflow-completed.sh
-          ./scripts/wait-for-workflow-completed.sh
+          chmod +x scripts/wait-for-workflow.sh
+          ./scripts/wait-for-workflow.sh
         working-directory: ${{ github.workspace }}
 
   generate_hive_consensus_tests:
 
@@ -19,11 +19,10 @@ on:
 env:
   COLLECT_COVERAGE: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' || github.event.inputs.coverage }}
   DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: 1
-  RETENTION: 1
   TERM: xterm
 
 jobs:
-  nethermind-tests:
+  tests:
     name: Run ${{ matrix.project }}
     runs-on: ubuntu-latest
     continue-on-error: true
@@ -32,6 +31,23 @@ jobs:
     strategy:
       matrix:
         project:
+          - Ethereum.Abi.Test
+          - Ethereum.Basic.Test
+          - Ethereum.Blockchain.Block.Legacy.Test
+          - Ethereum.Blockchain.Block.Test
+          - Ethereum.Blockchain.Legacy.Test
+          - Ethereum.Blockchain.Pyspec.Test
+          - Ethereum.Blockchain.Test
+          - Ethereum.Difficulty.Test
+          - Ethereum.HexPrefix.Test
+          - Ethereum.KeyAddress.Test
+          - Ethereum.KeyStore.Test
+          - Ethereum.PoW.Test
+          - Ethereum.Rlp.Test
+          - Ethereum.Transaction.Test
+          - Ethereum.Transition.Test
+          - Ethereum.Trie.Test
+          - Ethereum.VM.Test
           - Nethermind.Abi.Test
           - Nethermind.Api.Test
           - Nethermind.AuRa.Test
@@ -61,7 +77,7 @@ jobs:
           - Nethermind.Network.Enr.Test
           - Nethermind.Network.Test
           - Nethermind.Optimism.Test
-          - Nethermind.Overseer.Test
+          # - Nethermind.Overseer.Test
           - Nethermind.Runner.Test
           - Nethermind.Serialization.Ssz.Test
           - Nethermind.Shutter.Test
@@ -75,123 +91,59 @@ jobs:
           - Nethermind.TxPool.Test
           - Nethermind.Wallet.Test
     steps:
-    - name: Check out repository
-      uses: actions/checkout@v4
-    - name: Set up .NET
-      uses: actions/setup-dotnet@v4
-    - name: ${{ matrix.project }}
-      id: test
-      run: |
-        dotnet test src/Nethermind/${{ matrix.project }} -c release \
-          ${{ env.COLLECT_COVERAGE == 'true' && '--collect:"XPlat Code Coverage"' || '' }}
-    - name: Save test outcome
-      if: success() || failure()
-      run: echo "${{ steps.test.outcome == 'success' }}," >> nethermind.outcome
-    - name: Upload test outcome
-      if: success() || failure()
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ matrix.project }}-outcome
-        path: nethermind.outcome
-        retention-days: ${{ env.RETENTION }}
-    - name: Upload coverage report
-      if: env.COLLECT_COVERAGE == 'true'
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ matrix.project }}-coverage
-        path: src/Nethermind/${{ matrix.project }}/TestResults/**/coverage.cobertura.xml
-        retention-days: ${{ env.RETENTION }}
-
-  nethermind-tests-status:
-    name: Nethermind tests
-    needs: nethermind-tests
-    runs-on: ubuntu-latest
-    steps:
-    - name: Download test outcomes
-      uses: actions/download-artifact@v4
-    - name: Ensure tests passed
-      run: |
-        data=$(cat **/nethermind.outcome) && data=${data%?}
-        passed=$(echo "[$data]" | jq -r 'all')
-        [ $passed = 'true' ] && exit 0 || exit 1
-
-  ethereum-tests:
-    name: Run ${{ matrix.project }}
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        project:
-          - Ethereum.Abi.Test
-          - Ethereum.Basic.Test
-          - Ethereum.Blockchain.Block.Legacy.Test
-          - Ethereum.Blockchain.Block.Test
-          - Ethereum.Blockchain.Legacy.Test
-          - Ethereum.Blockchain.Pyspec.Test
-          - Ethereum.Blockchain.Test
-          - Ethereum.Difficulty.Test
-          - Ethereum.HexPrefix.Test
-          - Ethereum.KeyAddress.Test
-          - Ethereum.KeyStore.Test
-          - Ethereum.PoW.Test
-          - Ethereum.Rlp.Test
-          - Ethereum.Transaction.Test
-          - Ethereum.Transition.Test
-          - Ethereum.Trie.Test
-          - Ethereum.VM.Test
-    steps:
     - name: Check out repository
       uses: actions/checkout@v4
       with:
-        submodules: recursive
+        submodules: ${{ startsWith(matrix.project, 'Ethereum.') && 'recursive' || 'false' }}
     - name: Set up .NET
       uses: actions/setup-dotnet@v4
     - name: ${{ matrix.project }}
       id: test
       run: |
-        dotnet test src/Nethermind/${{ matrix.project }} -c release \
-          ${{ env.COLLECT_COVERAGE == 'true' && '--collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Exclude=[Nethermind.Core.Test]*,[Nethermind.Blockchain.Test]*,[Ethereum.Test.Base]*' || '' }}
+        dotnet run --project src/Nethermind/${{ matrix.project }} -c release \
+          ${{ env.COLLECT_COVERAGE == 'true' && '--coverage --coverage-output-format cobertura --coverage-settings $GITHUB_WORKSPACE/src/Nethermind/codecoverage.config' || '' }}
     - name: Save test outcome
       if: success() || failure()
-      run: echo "${{ steps.test.outcome == 'success' }}," >> ethereum.outcome
+      run: echo "${{ steps.test.outcome == 'success' }}," >> test.outcome
     - name: Upload test outcome
       if: success() || failure()
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.project }}-outcome
-        path: ethereum.outcome
-        retention-days: ${{ env.RETENTION }}
+        path: test.outcome
+        retention-days: 1
     - name: Upload coverage report
       if: env.COLLECT_COVERAGE == 'true'
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.project }}-coverage
-        path: src/Nethermind/${{ matrix.project }}/TestResults/**/coverage.cobertura.xml
-        retention-days: ${{ env.RETENTION }}
+        path: src/Nethermind/artifacts/bin/${{ matrix.project }}/release/TestResults/*.cobertura.xml
+        retention-days: 1
 
-  ethereum-tests-status:
-    name: Ethereum tests
-    needs: ethereum-tests
+  tests-summary:
+    name: Tests summary
+    needs: tests
     runs-on: ubuntu-latest
     steps:
     - name: Download test outcomes
       uses: actions/download-artifact@v4
-    - name: Ensure tests passed
+    - name: Ensure all tests passed
       run: |
-        data=$(cat **/ethereum.outcome) && data=${data%?}
+        data=$(cat **/test.outcome) && data=${data%?}
         passed=$(echo "[$data]" | jq -r 'all')
         [ $passed = 'true' ] && exit 0 || exit 1
 
   codecov-upload:
     name: Upload Codecov reports
-    needs: [nethermind-tests-status, ethereum-tests-status]
-    if: needs.nethermind-tests.outputs.collect_coverage == 'true'
+    needs: [tests-summary]
+    if: needs.tests.outputs.collect_coverage == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Download coverage reports
         uses: actions/download-artifact@v4
         with:
           path: .coverage
+          pattern: '*-coverage'
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         with:
 
@@ -30,7 +30,7 @@ jobs:
       - name: Submit package
         env:
           PPA_GPG_KEYID: ${{ secrets.PPA_GPG_KEYID }}
-        working-directory: scripts/deployment/ppa
+        working-directory: scripts/build/ppa
         run: |
           version=${{ github.event.release.tag_name }}
           json=$(curl -sL ${{ github.event.release.assets_url }})
 
@@ -16,36 +16,36 @@ env:
   PACKAGE_DIR: pkg
   PACKAGE_RETENTION: 7
   PUB_DIR: pub
-  SCRIPTS_PATH: ${{ github.workspace }}/scripts/deployment
+  SCRIPTS_PATH: ${{ github.workspace }}/scripts/build
 
 jobs:
   build:
     name: Build Nethermind packages
     runs-on: ubuntu-latest
     outputs:
-      build-timestamp: ${{ steps.build-runner.outputs.build-timestamp }}
+      build-timestamp: ${{ steps.build.outputs.build-timestamp }}
       package-prefix: ${{ steps.archive.outputs.package-prefix }}
-      prerelease: ${{ steps.build-runner.outputs.prerelease }}
+      prerelease: ${{ steps.build.outputs.prerelease }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
       - name: Build Nethermind.Runner
-        id: build-runner
+        id: build
         run: |
           build_timestamp=$(date '+%s')
           echo "build-timestamp=$build_timestamp" >> $GITHUB_OUTPUT
           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
+          $SCRIPTS_PATH/build.sh $GITHUB_SHA $build_timestamp
       - name: Archive packages
         id: archive
         env:
-          PACKAGE_PREFIX: nethermind-${{ github.event.inputs.tag }}-${{ steps.build-runner.outputs.commit-hash }}
+          PACKAGE_PREFIX: nethermind-${{ github.event.inputs.tag }}-${{ steps.build.outputs.commit-hash }}
         run: |
           echo "package-prefix=$PACKAGE_PREFIX" >> $GITHUB_OUTPUT
-          $SCRIPTS_PATH/archive-packages.sh
+          $SCRIPTS_PATH/archive.sh
       - name: Upload Nethermind Linux x64 package
         uses: actions/upload-artifact@v4
         with:
 
@@ -250,8 +250,8 @@ jobs:
           REPO_NAME: ${{ env.REPO_NAME }}
           REF: ${{ inputs.nethermind_repo_ref || github.ref }}
         run: |
-          chmod +x scripts/wait-for-workflow-completed.sh
-          ./scripts/wait-for-workflow-completed.sh
+          chmod +x scripts/wait-for-workflow.sh
+          ./scripts/wait-for-workflow.sh
         working-directory: ${{ github.workspace }}
 
   trigger_node_and_vm_creation:
@@ -325,8 +325,8 @@ jobs:
           NAME_FILTER: ${{ env.BASE_TAG }}
           REF: "main"
         run: |
-          chmod +x scripts/wait-for-workflow-completed.sh
-          ./scripts/wait-for-workflow-completed.sh | tee script-output.txt
+          chmod +x scripts/wait-for-workflow.sh
+          ./scripts/wait-for-workflow.sh | tee script-output.txt
           run_id=$(grep -oP 'Run ID: \K\d+' script-output.txt)
           echo "Run ID extracted is: $run_id"
           echo "RUN_ID=$run_id" >> $GITHUB_ENV
 
@@ -39,7 +39,7 @@ jobs:
       - name: Set Matrix
         id: set-matrix
         run: |
-          matrix=$(cat nethermind/scripts/workflow_config/sync_testnets_matrix.json)
+          matrix=$(cat nethermind/scripts/config/testnet-matrix.json)
 
           if [ -n "${{ github.event.inputs.network_filter }}" ]; then
             matrix=$(echo "$matrix" | jq --arg filter "${{ github.event.inputs.network_filter }}" '[.[] | select(.network | contains($filter))]')
@@ -269,7 +269,7 @@ jobs:
         env:
           NETWORK: ${{ matrix.config.network }}
         run: |
-          python scripts/waitForSync.py
+          python scripts/wait-for-sync.py
 
       - name: Get Nethermind Debug Logs
         if: ${{ failure() || cancelled() }}
 
@@ -99,23 +99,23 @@ jobs:
         REPO_NAME: ${{ env.REPO_NAME }}
         REF: ${{ github.ref }}
       run: |
-        chmod +x main-repo/scripts/wait-for-workflow-completed.sh
-        ./main-repo/scripts/wait-for-workflow-completed.sh
+        chmod +x main-repo/scripts/wait-for-workflow.sh
+        ./main-repo/scripts/wait-for-workflow.sh
       working-directory: ${{ github.workspace }}
 
     - name: Replace Placeholders in YAML
       run: |
         assertoor_params=$(cat ${{ env.ASSERTOOR_PARAMS_FILE}})
-        sed -i "s|<DOCKER_IMAGE_PLACEHOLDER>|nethermindeth/nethermind:${{ env.CLEAN_REF }}|g" main-repo/.github/tests/assertor.yaml
+        sed -i "s|<DOCKER_IMAGE_PLACEHOLDER>|nethermindeth/nethermind:${{ env.CLEAN_REF }}|g" main-repo/scripts/config/assertoor.yml
         sed -i "/<ASSERTOOR_PARAMS_PLACEHOLDER>/ {
           r /tmp/output.txt
           d
-        }" main-repo/.github/tests/assertor.yaml
-        cat main-repo/.github/tests/assertor.yaml
+        }" main-repo/scripts/config/assertoor.yml
+        cat main-repo/scripts/config/assertoor.yml
       
     - name: Kurtosis Assertoor GitHub Action
       uses: ethpandaops/kurtosis-assertoor-github-action@v1
       with:
         ethereum_package_url: "github.com/ethpandaops/ethereum-package"
         ethereum_package_branch: ""
-        ethereum_package_args: main-repo/.github/tests/assertor.yaml
+        ethereum_package_args: main-repo/scripts/config/assertoor.yml
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,3 @@`
`5`	`5`	`**/bin/`
`6`	`6`	`**/obj/`
`7`	`7`
`8`		`-src/Nethermind/*.Test/`