Skip to content

fix(net): optimize disconnect reason for light node #6375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuny0707 merged 13 commits into from
Aug 18, 2025
Merged

fix(net): optimize disconnect reason for light node #6375

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
253ec29
fix the bug of handshake with lightnode
317787106 Dec 20, 2024
1841c88
Merge branch 'release_v4.8.1' into hotfix/light_fork
317787106 Jun 24, 2025
6b47ef7
add more log
317787106 Jun 24, 2025
c06b372
add test case
317787106 Jun 24, 2025
65aaddb
Merge branch 'release_v4.8.1' into hotfix/light_fork
317787106 Jul 1, 2025
b6c6593
use different condition when judge fork
317787106 Jul 3, 2025
da4d2ed
fix the bug of RelayServiceTest
317787106 Jul 7, 2025
574a746
modify SR
317787106 Jul 7, 2025
cac4e16
change comment
317787106 Jul 8, 2025
03d2a31
Merge branch 'release_v4.8.1' into hotfix/light_fork
317787106 Jul 8, 2025
0a16fa2
fix the bug of testcase
317787106 Jul 9, 2025
eae55fb
add testcase
317787106 Jul 10, 2025
2c727aa
merge release 4.8.1
317787106 Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.springframework.stereotype.Component;
import org.tron.common.utils.ByteArray;
import org.tron.core.ChainBaseManager;
import org.tron.core.ChainBaseManager.NodeType;
import org.tron.core.config.args.Args;
import org.tron.core.net.TronNetService;
import org.tron.core.net.message.handshake.HelloMessage;
Expand Down Expand Up @@ -96,12 +97,21 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
}

if (chainBaseManager.getSolidBlockId().getNum() >= msg.getSolidBlockId().getNum()
&& !chainBaseManager.containBlockInMainChain(msg.getSolidBlockId())) {
logger.info("Peer {} different solid block, peer->{}, me->{}",
peer.getInetSocketAddress(),
msg.getSolidBlockId().getString(),
chainBaseManager.getSolidBlockId().getString());
peer.disconnect(ReasonCode.FORKED);
&& !chainBaseManager.containBlockInMainChain(msg.getSolidBlockId())) {
if (chainBaseManager.getNodeType() == NodeType.FULL) {
Comment thread
317787106 marked this conversation as resolved.
Outdated
logger.info("Peer {} solid block is below than we and fork with me, peer->{}, me->{}",
peer.getInetSocketAddress(),
msg.getSolidBlockId().getString(),
chainBaseManager.getSolidBlockId().getString());
peer.disconnect(ReasonCode.FORKED);
} else {
logger.info("Peer {} solid block is below than we and light node doesn't contain the block,"
+ " it's unuseful, peer->{}, me->{}",
peer.getInetSocketAddress(),
msg.getSolidBlockId().getString(),
chainBaseManager.getSolidBlockId().getString());
peer.disconnect(ReasonCode.LIGHT_NODE_SYNC_FAIL);
}
return;
}

Expand Down
10 changes: 10 additions & 0 deletions framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.tron.common.utils.ReflectUtils;
import org.tron.common.utils.Sha256Hash;
import org.tron.core.ChainBaseManager;
import org.tron.core.ChainBaseManager.NodeType;
import org.tron.core.Constant;
import org.tron.core.capsule.BlockCapsule;
import org.tron.core.config.DefaultConfig;
Expand Down Expand Up @@ -256,6 +257,15 @@ public void testLowAndGenesisBlockNum() throws NoSuchMethodException {
.setNumber(sid.getNum())
.build();
builder.setSolidBlockId(sBlockId);
ChainBaseManager.getChainBaseManager().setNodeType(NodeType.FULL);
try {
HelloMessage helloMessage = new HelloMessage(builder.build().toByteArray());
method.invoke(p2pEventHandler, peer, helloMessage.getSendBytes());
} catch (Exception e) {
Assert.fail();
}

ChainBaseManager.getChainBaseManager().setNodeType(NodeType.LITE);
try {
HelloMessage helloMessage = new HelloMessage(builder.build().toByteArray());
method.invoke(p2pEventHandler, peer, helloMessage.getSendBytes());
Expand Down