Resolve merge conflict with master

.editorconfig

@@ -9,7 +9,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-file_header_template = SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited\nSPDX-License-Identifier: LGPL-3.0-only
+file_header_template = SPDX-FileCopyrightText: 2026 Demerzel Solutions Limited\nSPDX-License-Identifier: LGPL-3.0-only
 
 [*.py]
 indent_size = 4

.github/CODEOWNERS

@@ -9,3 +9,39 @@
 /Dockerfile* @nethermindeth/core-devops @rubo
 /LICENSE* @rubo @LukaszRozmej @MarekM25
 *.md @rubo @LukaszRozmej @MarekM25
+
+/src/Nethermind/Ethereum.Test.Base/ @flcl42
+/src/Nethermind/Nethermind.Abi @LukaszRozmej
+/src/Nethermind/Nethermind.Blockchain @LukaszRozmej @MarekM25 @flcl42
+/src/Nethermind/Nethermind.Consensus @LukaszRozmej @MarekM25 @flcl42
+/src/Nethermind/Nethermind.Crypto @LukaszRozmej @Marchhill
+/src/Nethermind/Nethermind.Db.Rocks @LukaszRozmej @asdacap @damian-orzechowski
+/src/Nethermind/Nethermind.Era1 @ak88 @Marchhill @smartprogrammer93
+/src/Nethermind/Nethermind.Evm.Precompiles @LukaszRozmej @benaadams @rubo @Marchhill
+/src/Nethermind/Nethermind.Evm @LukaszRozmej @benaadams @Demuirgos 
+/src/Nethermind/Nethermind.ExternalSigner.Plugin @ak88
+/src/Nethermind/Nethermind.History @LukaszRozmej @Marchhill
+/src/Nethermind/Nethermind.Hive @flcl42 @marcindsobczak 
+/src/Nethermind/Nethermind.Init @LukaszRozmej @asdacap
+/src/Nethermind/Nethermind.JsonRpc.TraceStore @LukaszRozmej
+/src/Nethermind/Nethermind.JsonRpc @LukaszRozmej @benaadams @smartprogrammer93 
+/src/Nethermind/Nethermind.Merge.Plugin @LukaszRozmej @MarekM25 @flcl42 @benaadams @Marchhill
+/src/Nethermind/Nethermind.Merkleization @ak88 @Marchhill @smartprogrammer93 @flcl42
+/src/Nethermind/Nethermind.Network.Discovery @LukaszRozmej @flcl42 @asdacap
+/src/Nethermind/Nethermind.Network @LukaszRozmej @flcl42 @asdacap @marcindsobczak
+/src/Nethermind/Nethermind.Optimism @emlautarom1 @deffrian
+/src/Nethermind/Nethermind.Runner @LukaszRozmej @flcl42
+/src/Nethermind/Nethermind.Serialization.Json @LukaszRozmej @benaadams
+/src/Nethermind/Nethermind.Serialization.Rlp @LukaszRozmej @Marchhill
+/src/Nethermind/Nethermind.Serialization.Ssz @flcl42 @ak88 @Marchhill
+/src/Nethermind/Nethermind.Serialization.SszGenerator @flcl42 @ak88 @Marchhill
+/src/Nethermind/Nethermind.Shutter @Marchhill
+/src/Nethermind/Nethermind.Sockets @LukaszRozmej @benaadams
+/src/Nethermind/Nethermind.Specs @smartprogrammer93
+/src/Nethermind/Nethermind.State @LukaszRozmej @benaadams @asdacap @flcl42 @damian-orzechowski @tanishqjasoria 
+/src/Nethermind/Nethermind.Synchronization @LukaszRozmej @benaadams @asdacap @flcl42 @marcindsobczak
+/src/Nethermind/Nethermind.Taiko @smartprogrammer93 @dipkakwani
+/src/Nethermind/Nethermind.Trie @LukaszRozmej @benaadams @asdacap @flcl42 @damian-orzechowski @tanishqjasoria
+/src/Nethermind/Nethermind.TxPool @LukaszRozmej @benaadams @flcl42 @marcindsobczak
+/src/Nethermind/Nethermind.UI @benaadams
+/src/Nethermind/Nethermind.Xdc @ak88 @Demuirgos @cicr99

.github/actions/publish-docker/action.yaml

@@ -0,0 +1,106 @@
+name: Publish Docker Image
+description: "Build and push Docker image to Docker Hub with multi-platform support"
+inputs:
+  image-name:
+    description: "Image name (without registry prefix)"
+    required: true
+    default: "nethermind"
+  tag:
+    description: "Image tag (if empty, will use branch name)"
+    required: false
+    default: ""
+  dockerfile:
+    description: "Path to Dockerfile"
+    required: true
+    default: "Dockerfile"
+  build-config:
+    description: "Build configuration (release or debug)"
+    required: true
+    default: "release"
+  docker-hub-username:
+    description: "Docker Hub username"
+    required: true
+  docker-hub-password:
+    description: "Docker Hub password or token"
+    required: true
+  platforms:
+    description: "Comma-separated list of platforms (e.g., linux/amd64,linux/arm64)"
+    required: false
+    default: "linux/amd64,linux/arm64"
+  add-master-tag:
+    description: "Whether to add master tag with commit SHA when on master branch"
+    required: false
+    default: "true"
+
+outputs:
+  image-label:
+    description: "The generated image label in format registry/image-name:tag"
+    value: ${{ steps.build-image.outputs.image-label }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ inputs.docker-hub-username }}
+        password: ${{ inputs.docker-hub-password }}
+
+    - name: Build and push image to Docker Hub
+      id: build-image
+      shell: bash
+      env:
+        IMAGE_NAME: ${{ inputs.image-name }}
+        TAG: ${{ inputs.tag }}
+        DOCKERFILE: ${{ inputs.dockerfile }}
+        BUILD_CONFIG: ${{ inputs.build-config }}
+        PLATFORMS: ${{ inputs.platforms }}
+        ADD_MASTER_TAG: ${{ inputs.add-master-tag }}
+        GITHUB_REF: ${{ github.ref }}
+        GITHUB_EVENT_NAME: ${{ github.event_name }}
+        GITHUB_SHA: ${{ github.sha }}
+      run: |
+        # Extract branch name from ref
+        branch=$(echo "$GITHUB_REF" | sed -e "s/refs\/heads\///g")
+
+        # Set image name with registry prefix
+        full_image_name="nethermindeth/${IMAGE_NAME}"
+
+        # Determine tag (use input tag or branch name)
+        if [ -z "$TAG" ]; then
+          tag=$(echo "$branch" | sed 's/\//-/g') # replace '/' with '-'
+        else
+          tag=$(echo "$TAG" | sed 's/\//-/g') # replace '/' with '-'
+        fi
+
+        # Set the image label output
+        image_label="${full_image_name}:${tag}"
+        echo "image-label=${image_label}" >> $GITHUB_OUTPUT
+
+        echo "Building image: ${image_label}"
+
+        # Build Docker buildx command
+        build_cmd="docker buildx build . --platform=${PLATFORMS} -f ${DOCKERFILE} -t ${image_label}"
+
+        # Add master tag if on master branch and enabled
+        if [ "$branch" = "master" ] && [ "$GITHUB_EVENT_NAME" = "push" ] && [ "$ADD_MASTER_TAG" = "true" ]; then
+          master_tag="${full_image_name}:master-${GITHUB_SHA:0:7}"
+          build_cmd="${build_cmd} -t ${master_tag}"
+          echo "Also tagging as: $master_tag"
+        fi
+
+        # Add build arguments
+        build_cmd="${build_cmd} --build-arg BUILD_CONFIG=${BUILD_CONFIG}"
+        build_cmd="${build_cmd} --build-arg CI=${CI}"
+        build_cmd="${build_cmd} --build-arg COMMIT_HASH=${GITHUB_SHA}"
+        build_cmd="${build_cmd} --build-arg SOURCE_DATE_EPOCH=$(git log -1 --format=%ct)"
+        build_cmd="${build_cmd} --push"
+
+        echo "Executing: $build_cmd"
+        eval "$build_cmd"

.github/actions/remove-runner/action.yaml

@@ -0,0 +1,81 @@
+name: Remove GH Runner
+description: "Remove a self-hosted GitHub Actions runner and destroy its machine"
+inputs:
+  gh-token:
+    description: "The token of the GitHub App to use for workflow invocations"
+    required: true
+  gh-runner-token:
+    description: "The token to use for runner deregistration (optional, defaults to gh-token)"
+    required: false
+    default: ""
+  runner-name:
+    description: "Name of the runner to remove from GitHub Actions"
+    required: true
+  workflow-run-id:
+    description: "The workflow run ID from the machine creation (used to destroy the machine)"
+    required: true
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: Remove runner from GitHub Actions
+      if: ${{ inputs.runner-name != '' }}
+      continue-on-error: true
+      env:
+        GH_TOKEN: ${{ inputs.gh-runner-token != '' && inputs.gh-runner-token || inputs.gh-token }}
+        TARGET_RUNNER_NAME: ${{ inputs.runner-name }}
+        ORG_NAME: ${{ github.repository_owner }}
+        REPO_NAME: ${{ github.event.repository.name }}
+      shell: bash
+      run: |
+        echo "Removing runner '$TARGET_RUNNER_NAME' from GitHub Actions..."
+
+        # Get the runner ID
+        RUNNER_ID=$(gh api \
+          --method GET \
+          -H "Accept: application/vnd.github+json" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          "/repos/${ORG_NAME}/${REPO_NAME}/actions/runners" \
+          --jq ".runners[] | select(.name == \"$TARGET_RUNNER_NAME\") | .id")
+
+        if [ -z "$RUNNER_ID" ]; then
+          echo "Warning: Runner '$TARGET_RUNNER_NAME' not found in repository. It may have already been removed."
+        else
+          echo "Found runner with ID: $RUNNER_ID"
+
+          # Remove the runner
+          gh api \
+            --method DELETE \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            "/repos/${ORG_NAME}/${REPO_NAME}/actions/runners/${RUNNER_ID}"
+
+          echo "Runner removed successfully from GitHub Actions"
+        fi
+
+    - name: Trigger machine destruction workflow
+      if: ${{ inputs.workflow-run-id != '' }}
+      env:
+        GH_TOKEN: ${{ inputs.gh-token }}
+      shell: bash
+      run: |
+        echo "Triggering machine destruction workflow..."
+        echo "Workflow Run ID: ${{ inputs.workflow-run-id }}"
+
+        gh workflow run manual-destroy-smoketests.yml \
+          --repo NethermindEth/post-merge-smoke-tests \
+          --ref main \
+          --field workflow_run_id="${{ inputs.workflow-run-id }}"
+
+        echo "Machine destruction workflow triggered successfully"
+
+    - name: Display removal summary
+      shell: bash
+      run: |
+        echo "### Self-Hosted Runner Removed" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "- **Runner Name**: ${{ inputs.runner-name }}" >> $GITHUB_STEP_SUMMARY
+        echo "- **Workflow Run ID**: ${{ inputs.workflow-run-id }}" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "The runner has been removed from GitHub Actions and the machine destruction workflow has been triggered." >> $GITHUB_STEP_SUMMARY