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

Synchronize hasInvalidBlock predicate, as it wasn't thread safe

Browse Source
This commit is contained in:
CalDescent 2022-06-25 14:12:21 +01:00
parent 7e1ce38f0a
commit a2e1efab90
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -723,39 +723,41 @@ public class Controller extends Thread {
}; };
public static final Predicate<Peer> hasInvalidBlock = peer -> { public static final Predicate<Peer> hasInvalidBlock = peer -> {
final PeerChainTipData peerChainTipData = peer.getChainTipData(); synchronized (peer.peerInfoLock) {
Map<ByteArray, Long> invalidBlockSignatures = Synchronizer.getInstance().getInvalidBlockSignatures(); final PeerChainTipData peerChainTipData = peer.getChainTipData();
List<byte[]> peerSignatures = new ArrayList<>(); Map<ByteArray, Long> invalidBlockSignatures = Synchronizer.getInstance().getInvalidBlockSignatures();
List<byte[]> peerSignatures = new ArrayList<>();
// Add peer's latest block signature // Add peer's latest block signature
if (peerChainTipData != null) { if (peerChainTipData != null) {
peerSignatures.add(peerChainTipData.getLastBlockSignature()); peerSignatures.add(peerChainTipData.getLastBlockSignature());
} }
// Add peer's blocks since common block // Add peer's blocks since common block
if (peer.getCommonBlockData() != null) { if (peer.getCommonBlockData() != null) {
List<BlockSummaryData> peerSummaries = peer.getCommonBlockData().getBlockSummariesAfterCommonBlock(); List<BlockSummaryData> peerSummaries = peer.getCommonBlockData().getBlockSummariesAfterCommonBlock();
if (peerSummaries != null) { if (peerSummaries != null) {
for (BlockSummaryData blockSummaryData : peerSummaries) { for (BlockSummaryData blockSummaryData : peerSummaries) {
peerSignatures.add(blockSummaryData.getSignature()); peerSignatures.add(blockSummaryData.getSignature());
}
} }
} }
}
// Shortcut if no data // Shortcut if no data
if (peerSignatures.isEmpty() || invalidBlockSignatures == null || invalidBlockSignatures.isEmpty()) { if (peerSignatures.isEmpty() || invalidBlockSignatures == null || invalidBlockSignatures.isEmpty()) {
return false;
}
// Loop through our known invalid blocks and check each one against supplied block summaries
for (ByteArray invalidSignature : invalidBlockSignatures.keySet()) {
for (byte[] peerSignature : peerSignatures) {
if (Arrays.equals(peerSignature, invalidSignature.value)) {
return true;
}
}
}
return false; return false;
} }
// Loop through our known invalid blocks and check each one against supplied block summaries
for (ByteArray invalidSignature : invalidBlockSignatures.keySet()) {
for (byte[] peerSignature : peerSignatures) {
if (Arrays.equals(peerSignature, invalidSignature.value)) {
return true;
}
}
}
return false;
}; };
public static final Predicate<Peer> hasNoRecentBlock = peer -> { public static final Predicate<Peer> hasNoRecentBlock = peer -> {

2
src/main/java/org/qortal/network/Peer.java
View File

@ -121,7 +121,7 @@ public class Peer {
// Peer info // Peer info
private final Object peerInfoLock = new Object(); public final Object peerInfoLock = new Object();
private String peersNodeId; private String peersNodeId;
private byte[] peersPublicKey; private byte[] peersPublicKey;