From 829a2e937bee488be3c32bdd56ad58670130cca1 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 6 Mar 2022 12:58:01 +0000 Subject: [PATCH] Removed all arbitrary signature broadcasts --- .../arbitrary/ArbitraryDataFileManager.java | 8 ------- .../arbitrary/ArbitraryDataManager.java | 21 ------------------- src/main/java/org/qortal/network/Network.java | 2 -- .../transaction/ArbitraryTransaction.java | 12 ----------- 4 files changed, 43 deletions(-) diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java index 2e5ad6b8..b509ddfd 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java @@ -187,14 +187,6 @@ public class ArbitraryDataFileManager extends Thread { // We have all the chunks for this transaction, so we should invalidate the transaction's name's // data cache so that it is rebuilt the next time we serve it ArbitraryDataManager.getInstance().invalidateCache(arbitraryTransactionData); - - // We may also need to broadcast to the network that we are now hosting files for this transaction, - // but only if these files are in accordance with our storage policy - if (ArbitraryDataStorageManager.getInstance().canStoreData(arbitraryTransactionData)) { - // Use a null peer address to indicate our own - Message newArbitrarySignatureMessage = new ArbitrarySignaturesMessage(null, 0, Arrays.asList(signature)); - Network.getInstance().broadcast(broadcastPeer -> newArbitrarySignatureMessage); - } } } diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java index 72ad871c..2cac7c64 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java @@ -2,7 +2,6 @@ package org.qortal.controller.arbitrary; import java.io.IOException; import java.util.*; -import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,13 +11,11 @@ import org.qortal.arbitrary.ArbitraryDataResource; import org.qortal.arbitrary.metadata.ArbitraryDataTransactionMetadata; import org.qortal.arbitrary.misc.Service; import org.qortal.controller.Controller; -import org.qortal.data.network.ArbitraryPeerData; import org.qortal.data.transaction.ArbitraryTransactionData; import org.qortal.data.transaction.TransactionData; import org.qortal.list.ResourceListManager; import org.qortal.network.Network; import org.qortal.network.Peer; -import org.qortal.network.message.*; import org.qortal.repository.DataException; import org.qortal.repository.Repository; import org.qortal.repository.RepositoryManager; @@ -513,24 +510,6 @@ public class ArbitraryDataManager extends Thread { } - // Broadcast list of hosted signatures - - public void broadcastHostedSignatureList() { - try (final Repository repository = RepositoryManager.getRepository()) { - List hostedTransactions = ArbitraryDataStorageManager.getInstance().listAllHostedTransactions(repository, null, null); - List hostedSignatures = hostedTransactions.stream().map(ArbitraryTransactionData::getSignature).collect(Collectors.toList()); - if (!hostedSignatures.isEmpty()) { - // Broadcast the list, using null to represent our peer address - LOGGER.info("Broadcasting list of hosted signatures..."); - Message arbitrarySignatureMessage = new ArbitrarySignaturesMessage(null, 0, hostedSignatures); - Network.getInstance().broadcast(broadcastPeer -> arbitrarySignatureMessage); - } - } catch (DataException e) { - LOGGER.error("Repository issue when fetching arbitrary transaction data for broadcast", e); - } - } - - public int getPowDifficulty() { return this.powDifficulty; } diff --git a/src/main/java/org/qortal/network/Network.java b/src/main/java/org/qortal/network/Network.java index d349094a..ddc18237 100644 --- a/src/main/java/org/qortal/network/Network.java +++ b/src/main/java/org/qortal/network/Network.java @@ -1228,8 +1228,6 @@ public class Network { public void onExternalIpUpdate(String ipAddress) { LOGGER.info("External IP address updated to {}", ipAddress); - - //ArbitraryDataManager.getInstance().broadcastHostedSignatureList(); } public String getOurExternalIpAddress() { diff --git a/src/main/java/org/qortal/transaction/ArbitraryTransaction.java b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java index ddb58b0e..8abebe5c 100644 --- a/src/main/java/org/qortal/transaction/ArbitraryTransaction.java +++ b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java @@ -14,9 +14,6 @@ import org.qortal.data.PaymentData; import org.qortal.data.naming.NameData; import org.qortal.data.transaction.ArbitraryTransactionData; import org.qortal.data.transaction.TransactionData; -import org.qortal.network.Network; -import org.qortal.network.message.ArbitrarySignaturesMessage; -import org.qortal.network.message.Message; import org.qortal.payment.Payment; import org.qortal.repository.DataException; import org.qortal.repository.Repository; @@ -222,15 +219,6 @@ public class ArbitraryTransaction extends Transaction { if (arbitraryTransactionData.getName() != null) { ArbitraryDataManager.getInstance().invalidateCache(arbitraryTransactionData); } - - // We also need to broadcast to the network that we are now hosting files for this transaction, - // but only if these files are in accordance with our storage policy - if (ArbitraryDataStorageManager.getInstance().canStoreData(arbitraryTransactionData)) { - // Use a null peer address to indicate our own - byte[] signature = arbitraryTransactionData.getSignature(); - Message arbitrarySignatureMessage = new ArbitrarySignaturesMessage(null, 0, Arrays.asList(signature)); - Network.getInstance().broadcast(broadcastPeer -> arbitrarySignatureMessage); - } } }