2026 Summer Release dev upgrade merge

.gitattributes

@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+*.sol linguist-language=Solidity

.github/copilot-instructions.md

@@ -0,0 +1,37 @@
+# GitHub Copilot Instructions – XDC Network client
+
+- This repository is a fork of `go-ethereum` (geth). When reviewing code, prefer patterns and APIs used in upstream geth where possible, and call out unnecessary divergence from upstream.
+
+- The codebase is mostly Go. Follow standard Go best practices: idiomatic Go style, `gofmt` formatting, clear error handling (no ignored errors), no unused imports or variables, avoid global state where not necessary, and keep functions small and focused.
+
+## Branch & PR policy
+
+- Treat `dev-upgrade` as the main staging branch for protocol / infra upgrades.  
+- **Always review PRs whose base branch is `dev-upgrade`** and:
+  - Check that the PR description clearly explains the change, scope, and any compatibility impact.
+  - Verify that tests are added/updated and relevant CI checks are enabled.
+  - Flag missing labels (e.g., `consensus`, `rpc`, `db`, `refactor`) when helpful for maintainers.
+  - Call out any change that might require a migration guide, release note, or coordination with node operators.
+
+## Code review focus
+
+- **Consensus & protocol safety:** Changes under `consensus/`, `core/`, `eth/`, `params/` or wire protocol code must not break block validation, fork choice, or network compatibility. Flag any change that alters block structure, receipts, or state transition rules without clear rationale and migration notes.
+
+- **Performance & allocations:** For hot paths (e.g., block processing, tx pool, EVM execution, database access), check for unnecessary allocations, blocking I/O, or quadratic loops. Prefer reuse of buffers and efficient iteration.
+
+- **Security:** Treat all RPC, P2P, and transaction inputs as untrusted. Ensure bounds checks, nil checks, and validation of user-supplied data. Avoid introducing custom cryptography; reuse existing primitives and helpers from upstream or audited libraries.
+
+- **EVM & JSON-RPC compatibility:** Maintain compatibility with standard Ethereum JSON-RPC methods unless the project docs explicitly state a deviation. Call out breaking RPC changes or inconsistent behavior vs. Ethereum where not documented.
+
+- **Database & state:** Be careful with changes in `core/rawdb`, `trie`, and state handling. Flag anything that might corrupt state, change database schema without migration code, or break fast-sync/snap-sync logic.
+
+## General expectations
+
+- For every non-trivial change, check that:
+  - There are unit and/or integration tests covering the new behavior.
+  - Existing tests still pass logically (not just compile).
+  - Logging is informative but not excessively noisy on hot paths.
+
+- When suggesting changes, prefer small, incremental refactors over large rewrites, and always preserve backward compatibility for network peers unless the PR is clearly marked as a consensus or protocol upgrade.
+
+- In review comments, be concise and concrete: point to specific lines, explain the impact on consensus, performance, or security, and propose idiomatic Go alternatives where appropriate.

.github/pull_request_template.md

@@ -1,21 +1,27 @@
 # Proposed changes
-Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
+
+<!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. -->
 
 ## Types of changes
 
 What types of changes does your code introduce to XDC network?
 _Put an `✅` in the boxes that apply_
 
-- [ ] Bugfix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- [ ] Documentation Update (if none of the other choices apply)
-- [ ] Regular KTLO or any of the maintaince work. e.g code style
-- [ ] CICD Improvement
+- [ ] build: Changes that affect the build system or external dependencies
+- [ ] ci: Changes to CI configuration files and scripts
+- [ ] chore: Changes that don't change source code or tests
+- [ ] docs: Documentation only changes
+- [ ] feat: A new feature
+- [ ] fix: A bug fix
+- [ ] perf: A code change that improves performance
+- [ ] refactor: A code change that neither fixes a bug nor adds a feature
+- [ ] revert: Revert something
+- [ ] style: Changes that do not affect the meaning of the code
+- [ ] test: Adding missing tests or correcting existing tests
 
 ## Impacted Components
-Which part of the codebase this PR will touch base on,
 
+Which parts of the codebase do this PR touch?
 _Put an `✅` in the boxes that apply_
 
 - [ ] Consensus
@@ -27,9 +33,11 @@ _Put an `✅` in the boxes that apply_
 - [ ] Not sure (Please specify below)
 
 ## Checklist
+
 _Put an `✅` in the boxes once you have confirmed below actions (or provide reasons on not doing so) that_
 
 - [ ] This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
+- [ ] Tested on a private network from the genesis block and monitored the chain operating correctly for multiple epochs.
 - [ ] Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
 - [ ] Tested the backwards compatibility.
 - [ ] Tested with XDC nodes running this version co-exist with those running the previous version.

.github/workflows/ci.yml

@@ -5,12 +5,12 @@ on:
     types: [opened, synchronize, reopened]
   push:
     branches:
-      - '*'
+      - "*"
     tags:
-      - '*'
+      - "*"
 
 env:
-  GOPROXY: https://proxy.golang.org
+  GOPROXY: https://proxy.golang.org,direct
   GO111MODULE: on
   tf_version: "1.3.0"
   tf_init_cli_options: "-input=false"
@@ -51,11 +51,33 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: ${{ env.GOPATH }}/src/XDPoSChain
+      # Cache build tools to avoid downloading them each time
+      - uses: actions/cache@v4
+        with:
+          path: ${{ env.GOPATH }}/src/XDPoSChain/build/cache
+          key: ${{ runner.os }}-build-tools-cache-${{ hashFiles('**/build/checksums.txt') }}
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: '1.23.x'
+          go-version: "1.25.x"
+      - name: Check gofmt
+        run: |
+          unformatted=$(git ls-files '*.go' | xargs -r gofmt -l)
+          if [ -n "$unformatted" ]; then
+            echo "Unformatted files:"
+            echo "$unformatted"
+            exit 1
+          fi
+          echo "All Go files are properly formatted."
+      - name: Check go mod tidy
+        run: |
+          set -euo pipefail
+          go mod tidy -diff 2>&1 | sed '/^go: downloading/d'
+          echo "go.mod and go.sum are tidy."
+      - name: Validate generated files
+        run: |
+          go run build/ci.go generate
       - name: Run tests
         run: ${{ matrix.script }}
         env:
@@ -70,7 +92,7 @@ jobs:
       - name: Login to Docker Hub
         run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
       - name: Build Docker image
-        run: docker build -t xinfinorg/xdposchain:${GITHUB_REF#refs/tags/} -f cicd/Dockerfile .
+        run: docker build --build-arg GIT_COMMIT=${GITHUB_SHA} -t xinfinorg/xdposchain:${GITHUB_REF#refs/tags/} -f cicd/Dockerfile .
       - name: Push Docker image
         run: docker push xinfinorg/xdposchain:${GITHUB_REF#refs/tags/}
 
@@ -92,7 +114,7 @@ jobs:
           docker pull xinfinorg/devnet:latest
           docker tag xinfinorg/devnet:latest xinfinorg/devnet:previous
           docker rmi xinfinorg/devnet:latest
-          docker build -t xinfinorg/devnet:latest -f cicd/Dockerfile .
+          docker build --build-arg GIT_COMMIT=${GITHUB_SHA} -t xinfinorg/devnet:latest -f cicd/Dockerfile .
           docker tag xinfinorg/devnet:latest $image_name
           docker push $image_name
           docker push xinfinorg/devnet:latest
@@ -109,63 +131,78 @@ jobs:
       - name: Set up kubectl
         uses: azure/setup-kubectl@v4
         with:
-          version: 'v1.19.11'
-      - name: Decode and configure kubeconfig
+          version: "v1.19.11"
+      - name: Apply new image version to Kubernetes deployments
         run: |
           mkdir -p $HOME/.kube
           echo "${{ secrets.KUBE_CONFIG }}" | base64 --decode > $HOME/.kube/config
           chmod 600 $HOME/.kube/config
           git_hash=$(git rev-parse --short "$GITHUB_SHA")
-          kubectl set image deployment/devnet1 devnet1=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet2 devnet2=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet3 devnet3=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet4 devnet4=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet5 devnet5=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet6 devnet6=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet7 devnet7=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet8 devnet8=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet9 devnet9=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet10 devnet10=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet11 devnet11=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet12 devnet12=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet13 devnet13=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet14 devnet14=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet15 devnet15=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet16 devnet16=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet17 devnet17=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnet18 devnet18=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          echo done
+          masternodes=$(kubectl get deployment -o json | jq -r '.items[] | select(.metadata.name | test("^masternode[0-9]")) | .metadata.name' | sort)
+          rpcs=$(kubectl get deployment -o json| jq -r '.items[] | select(.metadata.name | test("rpc")) | "\(.metadata.name)"')
+          echo "Masternodes: $masternodes"
+          echo "RPCs: $rpcs"
 
-  rpc_k8_apply:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    needs: devnet_build_push
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up kubectl
-        uses: azure/setup-kubectl@v4
-        with:
-          version: 'v1.19.11'
-      - name: Decode and configure kubeconfig
-        run: |
-          mkdir -p $HOME/.kube
-          echo "${{ secrets.KUBE_CONFIG }}" | base64 --decode > $HOME/.kube/config
-          chmod 600 $HOME/.kube/config
-          git_hash=$(git rev-parse --short "$GITHUB_SHA")
-          kubectl set image deployment/devnetrpc devnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/devnetrpc2 devnetrpc2=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/testnetrpc testnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/testnetrpc2 testnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/mainnetrpc mainnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          kubectl set image deployment/mainnetrpc2 mainnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || true
-          echo done
+          # Skip masternode1 through masternode25, update the rest.
+          readarray -t mn_array <<< "$masternodes"
+          total=${#mn_array[@]}
+          echo "Total masternode deployments: $total, skipping masternode1..masternode25"
+
+          for name in "${mn_array[@]}"; do
+            if [[ $name =~ ^masternode[0-9] ]]; then
+              num=${name#masternode}
+              num=${num%%-*}
+              if [[ $num =~ ^[0-9]+$ ]] && (( num >= 1 && num <= 25 )); then
+                echo "Skipping deployment: $name"
+                continue
+              fi
+            fi
+
+            echo "Updating deployment: $name"
+            kubectl set image "deployment/$name" "$name=xinfinorg/devnet:dev-upgrade-${git_hash}" || true
+          done
+
+
+          while read -r name; do
+            kubectl set image deployment/$name $name=xinfinorg/devnet:dev-upgrade-${git_hash} || true
+          done <<< "$rpcs"
 
   devnet_send_notification:
     runs-on: ubuntu-latest
     needs: devnet_k8_apply
     if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v4
-      - name: Send deployment notification
-        run: |
-          curl --location --request POST "66.94.98.186:8080/deploy?environment=devnet&service=xdc&version=${GITHUB_SHA}"
+    - uses: actions/checkout@v4
+    - name: Send deployment notification
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SLACK_WEBHOOK: ${{ secrets.SLACK_DEPLOYMENT_WEBHOOK_URL }}
+        REPO: ${{ github.repository }}
+      run: |
+        # Extract PR number from merge commit message, e.g. "refactor(core): remove locals #30559 (#2176)"
+        # Matches the last (#NNNN) pattern to get your repo's PR, not the upstream reference
+        PR_NUMBER=$(git log -1 --format='%s' | grep -oP '\(#\K[0-9]+(?=\))' | tail -1 || true)
+
+        PR_LINE="Commit: <https://github.com/${REPO}/commit/${GITHUB_SHA}|${GITHUB_SHA::7}>"
+        if [ -n "$PR_NUMBER" ]; then
+          PR_LINE+=$'\nMerged PR: <https://github.com/'"${REPO}"'/pull/'"${PR_NUMBER}"'|#'"${PR_NUMBER}"'>'
+        fi
+
+        curl -X POST -H 'Content-type: application/json' \
+          --data "$(jq -n \
+            --arg pr_line "$PR_LINE" \
+            --arg sha "$GITHUB_SHA" \
+            '{
+              "text": ":rocket: Deployment: devnet",
+              "blocks": [
+                {
+                  "type": "header",
+                  "text": {"type": "plain_text", "text": ":rocket: Deployment: devnet"}
+                },
+                {
+                  "type": "section",
+                  "text": {"type": "mrkdwn", "text": ("Service: *xdc*\nEnvironment: *devnet*\nVersion: `" + $sha + "`\n" + $pr_line)}
+                }
+              ]
+            }')" \
+          "$SLACK_WEBHOOK"

.github/workflows/pr-notify-slack.yml

@@ -0,0 +1,63 @@
+# Notify Slack when a PR is ready for review (not draft, title does not contain WIP/wip/Wip.).
+# Triggers: new PR (non-draft, no WIP), draft -> ready, or title edited to remove WIP.
+name: PR notify Slack
+
+on:
+  pull_request_target:
+    types: [opened, reopened, ready_for_review, edited]
+  workflow_dispatch:
+
+jobs:
+  test-webhook:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'workflow_dispatch'
+    steps:
+      - name: Test Slack webhook
+        env:
+          SLACK_PULL_REQUEST_WEBHOOK_URL: ${{ secrets.SLACK_PULL_REQUEST_WEBHOOK_URL }}
+        run: |
+          if [ -z "$SLACK_PULL_REQUEST_WEBHOOK_URL" ]; then
+            echo "SLACK_PULL_REQUEST_WEBHOOK_URL secret is not set. Add it in repo Settings → Secrets → Actions."
+            exit 1
+          fi
+          BODY=$(jq -n --arg text "Test: PR notify Slack webhook is working (from ${{ github.repository }})" '{text: $text}')
+          curl -sS -X POST -H 'Content-Type: application/json' --data "$BODY" "$SLACK_PULL_REQUEST_WEBHOOK_URL"
+          echo ""
+          echo "If you see this and no curl error, check your Slack channel for the test message."
+
+  notify:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.draft == false &&
+      !startsWith(github.event.pull_request.title, 'wip') &&
+      !startsWith(github.event.pull_request.title, '[wip]') &&
+      (
+        github.event.action != 'edited' ||
+        (
+          github.event.changes.title &&
+          (
+            startsWith(github.event.changes.title.from, 'wip') ||
+            startsWith(github.event.changes.title.from, '[wip]')
+          )
+        )
+      )
+    steps:
+      - name: Send Slack notification
+        env:
+          SLACK_PULL_REQUEST_WEBHOOK_URL: ${{ secrets.SLACK_PULL_REQUEST_WEBHOOK_URL }}
+        run: |
+          if [ -z "$SLACK_PULL_REQUEST_WEBHOOK_URL" ]; then
+            echo "SLACK_PULL_REQUEST_WEBHOOK_URL secret is not set; skipping notification."
+            exit 0
+          fi
+          PR_URL="${{ github.event.pull_request.html_url }}"
+          PR_TITLE="${{ github.event.pull_request.title }}"
+          PR_AUTHOR="${{ github.event.pull_request.user.login }}"
+          # Slack mrkdwn: <url|text> for link
+          BODY=$(jq -n \
+            --arg url "$PR_URL" \
+            --arg title "$PR_TITLE" \
+            --arg author "$PR_AUTHOR" \
+            '{text: ("PR ready for review: <" + $url + "|" + $title + "> by " + $author)}')
+          curl -sS -X POST -H 'Content-Type: application/json' --data "$BODY" "$SLACK_PULL_REQUEST_WEBHOOK_URL"
+        if: env.SLACK_PULL_REQUEST_WEBHOOK_URL != ''