Pectra: fix merge conflicts

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

@@ -69,7 +69,7 @@ jobs:
 
         # Output the variables
         echo "skip_docker_build=$skip_docker_build" >> $GITHUB_OUTPUT
-        echo "wait_for_docker=$wait_for_docker" >> $GITHUB_OUTPUT
+        echo "skip_wait_for_docker=$skip_wait_for_docker" >> $GITHUB_OUTPUT
 
     - name: Trigger Docker Build Action with Cleaned Ref
       if: steps.check_conditions.outputs.skip_docker_build != 'true'

.github/workflows/nethermind-tests.yml

@@ -62,6 +62,7 @@ jobs:
           - Nethermind.Network.Dns.Test
           - Nethermind.Network.Enr.Test
           - Nethermind.Network.Test
+          - Nethermind.Optimism.Test
           - Nethermind.Overseer.Test
           - Nethermind.Runner.Test
           - Nethermind.Serialization.Ssz.Test

.github/workflows/publish-docker.yml

@@ -23,9 +23,7 @@ on:
         required: true
         default: release
         type: choice
-        options:
-          - release
-          - debug
+        options: [release, debug]
 
 jobs:
   publish-docker:
@@ -46,14 +44,16 @@ jobs:
       - name: Build and push image to Docker Hub (staging)
         run: |
           branch=$(echo "${{ github.ref }}" | sed -e "s/refs\/heads\///g")
-          original_tag=${{ github.event.inputs.tag || '$branch' }}
-          tag=$(echo "$original_tag" | sed 's/\//-/g') # replace '/' with '-' in tag name
+          tag=$(echo "${{ github.event.inputs.tag || '$branch' }}" | sed 's/\//-/g') # replace '/' with '-'
+          image_name=nethermindeth/${{ github.event.inputs.image-name || 'nethermind' }}
           build_timestamp=$(date '+%s')
+
           echo "Building image with tag $tag"
 
           docker buildx build --platform=linux/amd64,linux/arm64 \
             -f ${{ github.event.inputs.dockerfile || 'Dockerfile' }} \
-            -t "nethermindeth/${{ github.event.inputs.image-name || 'nethermind' }}:$tag" \
+            -t "$image_name:$tag" \
+            ${{ endsWith(github.ref, '/master') && github.event_name == 'push' && '-t $image_name:master-${GITHUB_SHA:0:7}' || '' }} \
             --build-arg BUILD_CONFIG=${{ github.event.inputs.build-config || 'release' }} \
             --build-arg BUILD_TIMESTAMP=$build_timestamp \
             --build-arg CI=$CI \

.github/workflows/rpc-comparison.yml

@@ -49,6 +49,8 @@ jobs:
   verify_correctness_of_setup:
     name: Verify if inputs are correct
     runs-on: ubuntu-latest
+    outputs:
+      custom_machine_type: ${{ steps.compute_machine_type.outputs.custom_machine_type }}
     steps:
       - name: Verify if inputs are correctly applied
         run: |
@@ -65,6 +67,21 @@ jobs:
           IS_PERFORMANCE_CHECK: ${{ inputs.is_performance_check }}
           BRANCH_TO_COMPARE: ${{ inputs.branch_to_compare }}
           COMPARE_WITH: ${{ inputs.compare_with }}
+
+      - name: Compute Machine Type
+        id: compute_machine_type
+        run: |
+          convert_to_paprika="${{ github.event.inputs.convert_to_paprika }}"
+          is_performance_check="${{ github.event.inputs.is_performance_check }}"
+          machine_type=""
+          if [[ "$convert_to_paprika" == 'true' && "$is_performance_check" == 'true' ]]; then
+            machine_type="g7-premium-16"
+          elif [[ "$convert_to_paprika" == 'true' ]]; then
+            machine_type="g6-standard-8"
+          elif [[ "$is_performance_check" == 'true' ]]; then
+            machine_type="g7-premium-8"
+          fi
+          echo "custom_machine_type=$machine_type" >> $GITHUB_OUTPUT
 
   create_main_node:
     name: Create node from current branch
@@ -79,10 +96,10 @@ jobs:
           "default_dockerfile_build_type": "release",
           "ssh_keys": "",
           "allowed_ips": "${{ inputs.allowed_ips }}",
-          "custom_machine_type": "${{ (inputs.convert_to_paprika == 'true' && inputs.is_performance_check == 'true' && 'g7-premium-16') || (inputs.convert_to_paprika == 'true' && 'g6-standard-8') || (inputs.is_performance_check == 'true' && 'g7-premium-8') || '' }}"
+          "custom_machine_type": "${{ needs.verify_correctness_of_setup.outputs.custom_machine_type }}"
         }
       non_validator_mode: true
-      additional_nethermind_flags: Pruning.Mode=None JsonRpc.EnabledModules=[Eth,Subscribe,Trace,TxPool,Web3,Personal,Proof,Net,Parity,Health,Rpc,Debug,Admin]
+      additional_nethermind_flags: JsonRpc.EnabledModules=[Eth,Subscribe,Trace,TxPool,Web3,Personal,Proof,Net,Parity,Health,Rpc,Debug,Admin] JsonRpc.Timeout=3600000 log=INFO
       nethermind_repo_ref: ${{ github.ref }}
       custom_run_id: ${{ github.run_id }}
       network: "${{ inputs.network || 'mainnet' }}"
@@ -102,10 +119,10 @@ jobs:
           "default_dockerfile_build_type": "release",
           "ssh_keys": "",
           "allowed_ips": "${{ inputs.allowed_ips }}",
-          "custom_machine_type": "${{ (inputs.convert_to_paprika == 'true' && inputs.is_performance_check == 'true' && 'g7-premium-16') || (inputs.convert_to_paprika == 'true' && 'g6-standard-8') || (inputs.is_performance_check == 'true' && 'g7-premium-8') || '' }}"
+          "custom_machine_type": "${{ needs.verify_correctness_of_setup.outputs.custom_machine_type }}"
         }
       non_validator_mode: true
-      additional_nethermind_flags: Pruning.Mode=None JsonRpc.EnabledModules=[Eth,Subscribe,Trace,TxPool,Web3,Personal,Proof,Net,Parity,Health,Rpc,Debug,Admin]
+      additional_nethermind_flags: JsonRpc.EnabledModules=[Eth,Subscribe,Trace,TxPool,Web3,Personal,Proof,Net,Parity,Health,Rpc,Debug,Admin] JsonRpc.Timeout=3600000 log=INFO
       nethermind_repo_ref: ${{ inputs.branch_to_compare }}
       custom_run_id: ${{ github.run_id }}
       network: "${{ inputs.network || 'mainnet' }}"
@@ -302,6 +319,11 @@ jobs:
             check_jsonrpc_responding "$url"
             check_chain_head "$url"
           fi
+
+          # Extra wait - nodes need to process a few new blocks - nice to have at least 128 of them after StateHealing
+          # Adding (128 - 32) * 12 seconds (-32 because we always keep 32 blocks to be processed after healing)
+          echo "Waiting for (128 - 32) blocks to be synced"
+          sleep 1152
 
   compare:
     name: Compare JSON-RPC responses between clients and versions
@@ -311,7 +333,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install flood
-        run: pip install git+https://github.com/kamilchodola/flood.git
+        run: pip install --force-reinstall --no-deps git+https://github.com/kamilchodola/flood.git
 
       - name: Prepare Comparison Flags
         id: prep_comparison
@@ -393,21 +415,21 @@ jobs:
                 flood "$TEST" ${compare_to_other_branch_params} --rates 10 50 100 500 1000 --output "$TEST_perf_result" --duration 30 --deep-check | tee -a "$TEST_perf_result.txt"
             done
           else
-            echo "flood all ${compare_to_other_branch_params} --output equality_result_other --equality | tee output_other_branch.txt"
-            flood all ${compare_to_other_branch_params} --output equality_result_other --equality | tee output_other_branch.txt
+            echo "flood all ${compare_to_other_branch_params} --equality | tee output_other_branch.txt"
+            flood all ${compare_to_other_branch_params} --equality | tee output_other_branch.txt
           fi
 
       - name: Compare to INFURA Endpoint
         if: env.compare_to_infura == 'true' && inputs.is_performance_check != true
         run: |
-          echo "flood all ${compare_to_infura_params} --output equality_result_infura --equality | tee output_infura.txt"
-          flood all ${compare_to_infura_params} --output equality_result_infura --equality | tee output_infura.txt
+          echo "flood all ${compare_to_infura_params} --equality | tee output_infura.txt"
+          flood all ${compare_to_infura_params} --equality | tee output_infura.txt
 
       - name: Compare to Nethermind Archive Endpoint
         if: env.compare_to_archive == 'true' && inputs.is_performance_check != true
         run: |
-          echo "flood all ${compare_to_archive_params} --output equality_result_archive --equality | tee output_archive.txt"
-          flood all ${compare_to_archive_params} --output equality_result_archive --equality | tee output_archive.txt
+          echo "flood all ${compare_to_archive_params} --equality | tee output_archive.txt"
+          flood all ${compare_to_archive_params} --equality | tee output_archive.txt
 
       - name: Generate report
         run: |

.github/workflows/run-a-single-node-from-branch.yml

@@ -28,9 +28,10 @@ on:
         options:
           - lighthouse
           - lodestar
-          #- nimbus
           - prysm
           - teku
+          - nimbus
+          - nimbus_ws
       cl_custom_image:
         description: "In case of need to run non-default cl image (different than actually supported by Sedge) put it in there"
         default: ""

.github/workflows/sync-testnets.yml

@@ -20,17 +20,17 @@ jobs:
         include:
           - network: "holesky"
             checkpoint-sync-url: "https://holesky.beaconstate.ethstaker.cc/"
-            cl-client: "lighthouse:sigp/lighthouse:latest"
+            cl-client: "lodestar:chainsafe/lodestar:latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
-            agent: ubuntu-latest
+            agent: sync-agent-80gb
           - network: "chiado"
             checkpoint-sync-url: "http://139.144.26.89:4000/"
-            cl-client: "lighthouse:sigp/lighthouse:latest"
+            cl-client: "lodestar:chainsafe/lodestar:latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "sepolia"
             checkpoint-sync-url: "https://beaconstate-sepolia.chainsafe.io"
-            cl-client: "lighthouse:sigp/lighthouse:latest"
+            cl-client: "lodestar:chainsafe/lodestar:latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-160gb
     name: "Run sync of ${{ matrix.network }} testnet"
@@ -41,15 +41,6 @@ jobs:
         with:
           clean: true
 
-      - name: Configure settings
-        id: settings
-        run: |
-          echo "BUILD_TIMESTAMP=$(date '+%s')" >> $GITHUB_OUTPUT
-          echo "COMMIT_HASH=$(git describe --always --exclude=* --abbrev=40)" >> $GITHUB_OUTPUT
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
       - name: Installing requirements
         run: |
           sudo apt-get update
@@ -82,6 +73,7 @@ jobs:
           --el-extra-flag Sync.NonValidatorNode=true --el-extra-flag Sync.DownloadBodiesInFastSync=false \
           --el-extra-flag Sync.DownloadReceiptsInFastSync=false \
           --el-extra-flag JsonRpc.EnabledModules=[Eth,Subscribe,Trace,TxPool,Web3,Personal,Proof,Net,Parity,Health,Rpc,Debug] \
+          --el-extra-flag Sync.SnapSync=true \
           --checkpoint-sync-url=${{ matrix.checkpoint-sync-url }}
           echo 'Running sedge...'
           ./build/sedge run -p $GITHUB_WORKSPACE/sedge
@@ -90,51 +82,53 @@ jobs:
         id: wait
         timeout-minutes: 180
         run: |
-          set +e
-
           declare -A bad_logs
           bad_logs["Corrupt"]=1
           bad_logs["Exception"]=1
-
+      
           declare -A good_logs
           good_logs["Synced Chain Head"]=0
           good_logs["Processed"]=0
-
+      
           declare -A required_count
           required_count["Synced Chain Head"]=20
-          required_count["Processed"]=20
-
+          required_count["Processed"]=20      
+            
           counter=0
           found_bad_log=false
-
-          echo "Starting Docker logs monitoring..."
+
           docker logs -f sedge-execution-client | while read -r line; do
             echo "$line"
-
-            if [[ $found_bad_log == true ]]; then
-              ((counter++))
+
+            if [[ "$line" == *"All done"* ]]; then
+              echo "Unexpected termination detected: $line"
+              exit 1
+            fi
+
+            if [ "$found_bad_log" = true ]; then
+              counter=$((counter + 1))
               if [ $counter -ge 100 ]; then
                 echo "Exiting after capturing extra logs due to error."
                 exit 1
               else
                 continue
               fi
             fi
-
+      
             for bad_log in "${!bad_logs[@]}"; do
               if [[ "$line" == *"$bad_log"* ]]; then
                 echo "Error: $bad_log found in Docker logs."
-                $found_bad_log=true
-                continue 2
+                found_bad_log=true
+                break
               fi
             done
-
+      
             for good_log in "${!good_logs[@]}"; do
               if [[ "$line" == *"$good_log"* ]]; then
-                ((good_logs["$good_log"]++))
+                good_logs["$good_log"]=$((good_logs["$good_log"]+1))
               fi
             done
-
+      
             # Check if all good logs have reached the required count
             all_reached_required_count=true
             for good_log in "${!good_logs[@]}"; do
@@ -143,7 +137,7 @@ jobs:
                 break
               fi
             done
-
+      
             if $all_reached_required_count; then
               echo "All required logs found."
               exit 0

.github/workflows/update-docs.yml

@@ -39,7 +39,9 @@ jobs:
           mv d/docs/interacting/json-rpc-ns/eth_subscribe.md n/docgen/eth_subscribe.md
           mv d/docs/interacting/json-rpc-ns/eth_unsubscribe.md n/docgen/eth_unsubscribe.md
           mv d/docs/monitoring/metrics/metrics.md n/docgen/metrics.md
-          cd n/docgen && ./DocGen && cd ../..
+          cd n/docgen
+          ./DocGen --config --jsonrpc --metrics
+          cd ../..
           mv n/docgen/configuration.md d/docs/fundamentals/configuration.md
           rm -f d/docs/interacting/json-rpc-ns/*.md
           mv n/docgen/eth_subscribe.md d/docs/interacting/json-rpc-ns/eth_subscribe.md

Dockerfile

@@ -1,15 +1,14 @@
 # SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 # SPDX-License-Identifier: LGPL-3.0-only
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-noble AS build
 
 ARG BUILD_CONFIG=release
 ARG BUILD_TIMESTAMP
 ARG CI
 ARG COMMIT_HASH
 ARG TARGETARCH
 
-COPY .git .git
 COPY src/Nethermind src/Nethermind
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
@@ -19,7 +18,7 @@ RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
 # A temporary symlink to support the old executable name
 RUN ln -s -r /publish/nethermind /publish/Nethermind.Runner
 
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-noble
 
 WORKDIR /nethermind
 

Dockerfile.chiseled

@@ -1,15 +1,14 @@
 # SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
 # SPDX-License-Identifier: LGPL-3.0-only
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-noble AS build
 
 ARG BUILD_CONFIG=release
 ARG BUILD_TIMESTAMP
 ARG CI
 ARG COMMIT_HASH
 ARG TARGETARCH
 
-COPY .git .git
 COPY src/Nethermind src/Nethermind
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
@@ -22,7 +21,7 @@ RUN cd /publish && \
   mkdir logs && \
   mkdir nethermind_db
 
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled
 
 WORKDIR /nethermind
 

Dockerfile.diag

@@ -1,15 +1,14 @@
 # SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 # SPDX-License-Identifier: LGPL-3.0-only
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-noble AS build
 
 ARG BUILD_CONFIG=release
 ARG BUILD_TIMESTAMP
 ARG CI
 ARG COMMIT_HASH
 ARG TARGETARCH
 
-COPY .git .git
 COPY src/Nethermind src/Nethermind
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
@@ -23,7 +22,7 @@ RUN dotnet tool install -g dotnet-dump && \
     dotnet tool install -g dotnet-trace && \
     dotnet tool install -g JetBrains.dotTrace.GlobalTools
 
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-noble
 
 WORKDIR /nethermind