Skip to content

Commit

Permalink
Revert "Always use BlockSummariesMessage V1 (instead of V2) when resp…
Browse files Browse the repository at this point in the history
…onding to GetBlockSummaries requests."

This reverts commit 2d58118.
  • Loading branch information
archived-2 committed Oct 10, 2022
1 parent 36fcd67 commit 10d3176
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/main/java/org/qortal/controller/Controller.java
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,9 @@ private void onNetworkGetBlockSummariesMessage(Peer peer, Message message) {
// then we have no blocks after that and can short-circuit with an empty response
BlockData chainTip = getChainTip();
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());

Expand Down Expand Up @@ -1489,7 +1491,9 @@ private void onNetworkGetBlockSummariesMessage(Peer peer, Message message) {
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());
if (!peer.sendMessage(blockSummariesMessage))
peer.disconnect("failed to send block summaries");
Expand Down

0 comments on commit 10d3176

Please sign in to comment.