From 5304d55a92e44f1e0aad5b86fb7d919ad7bdae81 Mon Sep 17 00:00:00 2001
From: zeusoo001 <zeus_oo@163.com>
Date: Tue, 24 Jun 2025 12:22:38 +0800
Subject: [PATCH 1/2] feat(net): add volatile modifier to peer attribute
 variables

---
 .../java/org/tron/core/net/peer/PeerConnection.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java b/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
index 2e08e105bed..47b199b42bd 100644
--- a/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
+++ b/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
@@ -85,7 +85,7 @@ public class PeerConnection {
 
   @Getter
   @Setter
-  private TronState tronState = TronState.INIT;
+  private volatile TronState tronState = TronState.INIT;
 
   @Autowired
   private TronNetDelegate tronNetDelegate;
@@ -123,15 +123,15 @@ public class PeerConnection {
   private Map<Item, Long> advInvRequest = new ConcurrentHashMap<>();
 
   @Setter
-  private BlockId fastForwardBlock;
+  private volatile BlockId fastForwardBlock;
 
   @Getter
-  private BlockId blockBothHave = new BlockId();
+  private volatile BlockId blockBothHave = new BlockId();
   @Getter
   private volatile long blockBothHaveUpdateTime = System.currentTimeMillis();
   @Setter
   @Getter
-  private BlockId lastSyncBlockId;
+  private volatile BlockId lastSyncBlockId;
   @Setter
   @Getter
   private volatile long remainNum;
@@ -146,7 +146,7 @@ public class PeerConnection {
   private Map<BlockId, Long> syncBlockRequested = new ConcurrentHashMap<>();
   @Setter
   @Getter
-  private Pair<Deque<BlockId>, Long> syncChainRequested = null;
+  private volatile Pair<Deque<BlockId>, Long> syncChainRequested = null;
   @Setter
   @Getter
   private Set<BlockId> syncBlockInProcess = new HashSet<>();

From 017207e326c3a56cee9bd4abfd6efacf53d05677 Mon Sep 17 00:00:00 2001
From: zeusoo001 <zeus_oo@163.com>
Date: Thu, 3 Jul 2025 14:19:58 +0800
Subject: [PATCH 2/2] feat(net): adjust the order of field assignment to solve
 concurrency issues

---
 .../java/org/tron/core/net/service/sync/SyncService.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/org/tron/core/net/service/sync/SyncService.java b/framework/src/main/java/org/tron/core/net/service/sync/SyncService.java
index e387329c467..95bdf689bec 100644
--- a/framework/src/main/java/org/tron/core/net/service/sync/SyncService.java
+++ b/framework/src/main/java/org/tron/core/net/service/sync/SyncService.java
@@ -159,9 +159,8 @@ private void invalid(BlockId blockId, PeerConnection peerConnection) {
   }
 
   private LinkedList<BlockId> getBlockChainSummary(PeerConnection peer) throws P2pException {
-
-    BlockId beginBlockId = peer.getBlockBothHave();
     List<BlockId> blockIds = new ArrayList<>(peer.getSyncBlockToFetch());
+    BlockId beginBlockId = peer.getBlockBothHave();
     List<BlockId> forkList = new LinkedList<>();
     LinkedList<BlockId> summary = new LinkedList<>();
     long syncBeginNumber = tronNetDelegate.getSyncBeginNumber();
@@ -323,9 +322,9 @@ private void processSyncBlock(BlockCapsule block, PeerConnection peerConnection)
     for (PeerConnection peer : tronNetDelegate.getActivePeer()) {
       BlockId bid = peer.getSyncBlockToFetch().peek();
       if (blockId.equals(bid)) {
+        peer.setBlockBothHave(blockId);
         peer.getSyncBlockToFetch().remove(bid);
         if (flag) {
-          peer.setBlockBothHave(blockId);
           if (peer.getSyncBlockToFetch().isEmpty() && peer.isFetchAble()) {
             syncNext(peer);
           }