crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Wait until unconfirmed transactions are considered to be valid before broadcasting them.

Browse Source
This commit is contained in:
CalDescent 2023-08-18 15:37:24 +01:00
parent ecfb9a7d6d
commit 6bf2b99913
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/qortal/controller/TransactionImporter.java
View File

@ -218,12 +218,6 @@ public class TransactionImporter extends Thread {
LOGGER.debug("Finished validating signatures in incoming transactions queue (valid this round: {}, total pending import: {})...", validatedCount, sigValidTransactions.size()); LOGGER.debug("Finished validating signatures in incoming transactions queue (valid this round: {}, total pending import: {})...", validatedCount, sigValidTransactions.size());
} }
if (!newlyValidSignatures.isEmpty()) {
LOGGER.debug("Broadcasting {} newly valid signatures ahead of import", newlyValidSignatures.size());
Message newTransactionSignatureMessage = new TransactionSignaturesMessage(newlyValidSignatures);
Network.getInstance().broadcast(broadcastPeer -> newTransactionSignatureMessage);
}
} catch (DataException e) { } catch (DataException e) {
LOGGER.error("Repository issue while processing incoming transactions", e); LOGGER.error("Repository issue while processing incoming transactions", e);
} }
@ -263,6 +257,9 @@ public class TransactionImporter extends Thread {
unconfirmedTransactions.removeIf(t -> t.getType() == Transaction.TransactionType.CHAT); unconfirmedTransactions.removeIf(t -> t.getType() == Transaction.TransactionType.CHAT);
unconfirmedTransactionsCache = unconfirmedTransactions; unconfirmedTransactionsCache = unconfirmedTransactions;
// A list of signatures were imported in this round
List<byte[]> newlyImportedSignatures = new ArrayList<>();
// Import transactions with valid signatures // Import transactions with valid signatures
try { try {
for (int i = 0; i < sigValidTransactions.size(); ++i) { for (int i = 0; i < sigValidTransactions.size(); ++i) {
@ -300,6 +297,10 @@ public class TransactionImporter extends Thread {
if (transactionData.getType() != Transaction.TransactionType.CHAT && unconfirmedTransactionsCache != null) { if (transactionData.getType() != Transaction.TransactionType.CHAT && unconfirmedTransactionsCache != null) {
unconfirmedTransactionsCache.add(transactionData); unconfirmedTransactionsCache.add(transactionData);
} }
// Signature imported in this round
newlyImportedSignatures.add(transactionData.getSignature());
break; break;
} }
@ -328,6 +329,12 @@ public class TransactionImporter extends Thread {
// Transaction has been processed, even if only to reject it // Transaction has been processed, even if only to reject it
removeIncomingTransaction(transactionData.getSignature()); removeIncomingTransaction(transactionData.getSignature());
} }
if (!newlyImportedSignatures.isEmpty()) {
LOGGER.debug("Broadcasting {} newly imported signatures", newlyImportedSignatures.size());
Message newTransactionSignatureMessage = new TransactionSignaturesMessage(newlyImportedSignatures);
Network.getInstance().broadcast(broadcastPeer -> newTransactionSignatureMessage);
}
} finally { } finally {
LOGGER.debug("Finished importing {} incoming transaction{}", processedCount, (processedCount == 1 ? "" : "s")); LOGGER.debug("Finished importing {} incoming transaction{}", processedCount, (processedCount == 1 ? "" : "s"));
blockchainLock.unlock(); blockchainLock.unlock();