Skip to content

Commit b6c6593

Browse files
committed
use different condition when judge fork
1 parent 65aaddb commit b6c6593

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
9898

9999
if (chainBaseManager.getSolidBlockId().getNum() >= msg.getSolidBlockId().getNum()
100100
&& !chainBaseManager.containBlockInMainChain(msg.getSolidBlockId())) {
101-
if (chainBaseManager.getNodeType() == NodeType.FULL) {
102-
logger.info("Peer {} solid block is below than we and fork with me, peer->{}, me->{}",
101+
if (chainBaseManager.getLowestBlockNum() <= msg.getSolidBlockId().getNum()) {
102+
logger.info("Peer {} different solid block, fork with me, peer->{}, me->{}",
103103
peer.getInetSocketAddress(),
104104
msg.getSolidBlockId().getString(),
105105
chainBaseManager.getSolidBlockId().getString());
106106
peer.disconnect(ReasonCode.FORKED);
107107
} else {
108-
logger.info("Peer {} solid block is below than we and light node doesn't contain the block,"
108+
logger.info("Peer {} solid block is below than me and light node doesn't contain the block,"
109109
+ " it's unuseful, peer->{}, me->{}",
110110
peer.getInetSocketAddress(),
111111
msg.getSolidBlockId().getString(),

0 commit comments

Comments
 (0)