AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Always use BlockSummariesMessage V1 (instead of V2) when responding to GetBlockSummaries requests."

Browse Source 
This reverts commit 2d58118d7c.
This commit is contained in:
CalDescent 2022-10-10 10:28:44 +01:00
parent 36fcd6792a
commit 10d3176e70
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/qortal/controller/Controller.java
View File

@ -1430,7 +1430,9 @@ public class Controller extends Thread {
// then we have no blocks after that and can short-circuit with an empty response // then we have no blocks after that and can short-circuit with an empty response
BlockData chainTip = getChainTip(); BlockData chainTip = getChainTip();
if (chainTip != null && Arrays.equals(parentSignature, chainTip.getSignature())) { if (chainTip != null && Arrays.equals(parentSignature, chainTip.getSignature())) {
Message blockSummariesMessage = new BlockSummariesMessage(Collections.emptyList()); Message blockSummariesMessage = peer.getPeersVersion() >= BlockSummariesV2Message.MINIMUM_PEER_VERSION
? new BlockSummariesV2Message(Collections.emptyList())
: new BlockSummariesMessage(Collections.emptyList());
blockSummariesMessage.setId(message.getId()); blockSummariesMessage.setId(message.getId());
@ -1489,7 +1491,9 @@ public class Controller extends Thread {
this.stats.getBlockSummariesStats.fullyFromCache.incrementAndGet(); this.stats.getBlockSummariesStats.fullyFromCache.incrementAndGet();
} }
Message blockSummariesMessage = new BlockSummariesMessage(blockSummaries); Message blockSummariesMessage = peer.getPeersVersion() >= BlockSummariesV2Message.MINIMUM_PEER_VERSION
? new BlockSummariesV2Message(blockSummaries)
: new BlockSummariesMessage(blockSummaries);
blockSummariesMessage.setId(message.getId()); blockSummariesMessage.setId(message.getId());
if (!peer.sendMessage(blockSummariesMessage)) if (!peer.sendMessage(blockSummariesMessage))
peer.disconnect("failed to send block summaries"); peer.disconnect("failed to send block summaries");