(6/6) Clean up technical debt in P2PDataStorage and ProtectedStorageEntry objects

core/src/main/java/bisq/core/account/sign/SignedWitness.java

@@ -20,7 +20,7 @@
 import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.payload.CapabilityRequiringPayload;
 import bisq.network.p2p.storage.payload.DateTolerantPayload;
-import bisq.network.p2p.storage.payload.LazyProcessedPayload;
+import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
 import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
 
 import bisq.common.app.Capabilities;
@@ -45,7 +45,7 @@
 // Supports signatures made from EC key (arbitrators) and signature created with DSA key.
 @Slf4j
 @Value
-public class SignedWitness implements LazyProcessedPayload, PersistableNetworkPayload, PersistableEnvelope,
+public class SignedWitness implements ProcessOncePersistableNetworkPayload, PersistableNetworkPayload, PersistableEnvelope,
         DateTolerantPayload, CapabilityRequiringPayload {
 
     public enum VerificationMethod {

core/src/main/java/bisq/core/account/witness/AccountAgeWitness.java

@@ -19,7 +19,7 @@
 
 import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.payload.DateTolerantPayload;
-import bisq.network.p2p.storage.payload.LazyProcessedPayload;
+import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
 import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
 
 import bisq.common.proto.persistable.PersistableEnvelope;
@@ -40,7 +40,7 @@
 // so only the newly added objects since the last release will be retrieved over the P2P network.
 @Slf4j
 @Value
-public class AccountAgeWitness implements LazyProcessedPayload, PersistableNetworkPayload, PersistableEnvelope, DateTolerantPayload {
+public class AccountAgeWitness implements ProcessOncePersistableNetworkPayload, PersistableNetworkPayload, PersistableEnvelope, DateTolerantPayload {
     private static final long TOLERANCE = TimeUnit.DAYS.toMillis(1);
 
     private final byte[] hash;                      // Ripemd160(Sha256(concatenated accountHash, signature and sigPubKey)); 20 bytes

core/src/main/java/bisq/core/alert/AlertManager.java

@@ -127,7 +127,7 @@ public boolean addAlertMessageIfKeyIsValid(Alert alert, String privKeyString) {
         if (isKeyValid) {
             signAndAddSignatureToAlertMessage(alert);
             user.setDevelopersAlert(alert);
-            boolean result = p2PService.addProtectedStorageEntry(alert, true);
+            boolean result = p2PService.addProtectedStorageEntry(alert);
             if (result) {
                 log.trace("Add alertMessage to network was successful. AlertMessage={}", alert);
             }
@@ -139,7 +139,7 @@ public boolean addAlertMessageIfKeyIsValid(Alert alert, String privKeyString) {
     public boolean removeAlertMessageIfKeyIsValid(String privKeyString) {
         Alert alert = user.getDevelopersAlert();
         if (isKeyValid(privKeyString) && alert != null) {
-            if (p2PService.removeData(alert, true))
+            if (p2PService.removeData(alert))
                 log.trace("Remove alertMessage from network was successful. AlertMessage={}", alert);
 
             user.setDevelopersAlert(null);

core/src/main/java/bisq/core/dao/governance/proposal/MyProposalListService.java

@@ -163,7 +163,7 @@ public void onFailure(TxBroadcastException exception) {
 
     public boolean remove(Proposal proposal) {
         if (canRemoveProposal(proposal, daoStateService, periodService)) {
-            boolean success = p2PService.removeData(new TempProposalPayload(proposal, signaturePubKey), true);
+            boolean success = p2PService.removeData(new TempProposalPayload(proposal, signaturePubKey));
             if (!success)
                 log.warn("Removal of proposal from p2p network failed. proposal={}", proposal);
 
@@ -214,7 +214,7 @@ private void addToP2PNetworkAsProtectedData(Proposal proposal, ErrorMessageHandl
     }
 
     private boolean addToP2PNetworkAsProtectedData(Proposal proposal) {
-        return p2PService.addProtectedStorageEntry(new TempProposalPayload(proposal, signaturePubKey), true);
+        return p2PService.addProtectedStorageEntry(new TempProposalPayload(proposal, signaturePubKey));
     }
 
     private void rePublishMyProposalsOnceWellConnected() {

core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java

@@ -20,7 +20,7 @@
 import bisq.core.dao.state.model.governance.Proposal;
 
 import bisq.network.p2p.storage.payload.ExpirablePayload;
-import bisq.network.p2p.storage.payload.LazyProcessedPayload;
+import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
 import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
 
 import bisq.common.crypto.Sig;
@@ -55,7 +55,7 @@
 @Getter
 @EqualsAndHashCode
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class TempProposalPayload implements LazyProcessedPayload, ProtectedStoragePayload,
+public class TempProposalPayload implements ProcessOncePersistableNetworkPayload, ProtectedStoragePayload,
         ExpirablePayload, PersistablePayload {
 
     protected final Proposal proposal;

core/src/main/java/bisq/core/dao/monitoring/network/StateNetworkService.java

@@ -156,7 +156,7 @@ public void requestHashesFromAllConnectedSeedNodes(int fromHeight) {
 
     public void broadcastMyStateHash(StH myStateHash) {
         NewStateHashMessage newStateHashMessage = getNewStateHashMessage(myStateHash);
-        broadcaster.broadcast(newStateHashMessage, networkNode.getNodeAddress(), null, true);
+        broadcaster.broadcast(newStateHashMessage, networkNode.getNodeAddress(), null);
     }
 
     public void requestHashes(int fromHeight, String peersAddress) {

core/src/main/java/bisq/core/dao/node/full/network/FullNodeNetworkService.java

@@ -105,7 +105,7 @@ public void publishNewBlock(Block block) {
         log.info("Publish new block at height={} and block hash={}", block.getHeight(), block.getHash());
         RawBlock rawBlock = RawBlock.fromBlock(block);
         NewBlockBroadcastMessage newBlockBroadcastMessage = new NewBlockBroadcastMessage(rawBlock);
-        broadcaster.broadcast(newBlockBroadcastMessage, networkNode.getNodeAddress(), null, true);
+        broadcaster.broadcast(newBlockBroadcastMessage, networkNode.getNodeAddress(), null);
     }
 
 

core/src/main/java/bisq/core/dao/node/lite/network/LiteNodeNetworkService.java

@@ -238,7 +238,7 @@ public void onMessage(NetworkEnvelope networkEnvelope, Connection connection) {
                 log.debug("We received a new message from peer {} and broadcast it to our peers. extBlockId={}",
                         connection.getPeersNodeAddressOptional().orElse(null), extBlockId);
                 receivedBlocks.add(extBlockId);
-                broadcaster.broadcast(newBlockBroadcastMessage, networkNode.getNodeAddress(), null, false);
+                broadcaster.broadcast(newBlockBroadcastMessage, connection.getPeersNodeAddressOptional().orElse(null), null);
                 listeners.forEach(listener -> listener.onNewBlockReceived(newBlockBroadcastMessage));
             } else {
                 log.debug("We had that message already and do not further broadcast it. extBlockId={}", extBlockId);

core/src/main/java/bisq/core/filter/FilterManager.java

@@ -265,7 +265,7 @@ public boolean addFilterMessageIfKeyIsValid(Filter filter, String privKeyString)
             signAndAddSignatureToFilter(filter);
             user.setDevelopersFilter(filter);
 
-            boolean result = p2PService.addProtectedStorageEntry(filter, true);
+            boolean result = p2PService.addProtectedStorageEntry(filter);
             if (result)
                 log.trace("Add filter to network was successful. FilterMessage = {}", filter);
 
@@ -278,7 +278,7 @@ public boolean removeFilterMessageIfKeyIsValid(String privKeyString) {
             Filter filter = user.getDevelopersFilter();
             if (filter == null) {
                 log.warn("Developers filter is null");
-            } else if (p2PService.removeData(filter, true)) {
+            } else if (p2PService.removeData(filter)) {
                 log.trace("Remove filter from network was successful. FilterMessage = {}", filter);
                 user.setDevelopersFilter(null);
             } else {

core/src/main/java/bisq/core/offer/OfferBookService.java

@@ -148,7 +148,7 @@ public void addOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandl
             return;
         }
 
-        boolean result = p2PService.addProtectedStorageEntry(offer.getOfferPayload(), true);
+        boolean result = p2PService.addProtectedStorageEntry(offer.getOfferPayload());
         if (result) {
             resultHandler.handleResult();
         } else {
@@ -164,7 +164,7 @@ public void refreshTTL(OfferPayload offerPayload,
             return;
         }
 
-        boolean result = p2PService.refreshTTL(offerPayload, true);
+        boolean result = p2PService.refreshTTL(offerPayload);
         if (result) {
             resultHandler.handleResult();
         } else {
@@ -187,7 +187,7 @@ public void deactivateOffer(OfferPayload offerPayload,
     public void removeOffer(OfferPayload offerPayload,
                             @Nullable ResultHandler resultHandler,
                             @Nullable ErrorMessageHandler errorMessageHandler) {
-        if (p2PService.removeData(offerPayload, true)) {
+        if (p2PService.removeData(offerPayload)) {
             if (resultHandler != null)
                 resultHandler.handleResult();
         } else {

core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentService.java

@@ -64,7 +64,7 @@ public void addDisputeAgent(T disputeAgent,
         log.debug("addDisputeAgent disputeAgent.hashCode() " + disputeAgent.hashCode());
         if (!BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ||
                 !Utilities.encodeToHex(disputeAgent.getRegistrationPubKey()).equals(DevEnv.DEV_PRIVILEGE_PUB_KEY)) {
-            boolean result = p2PService.addProtectedStorageEntry(disputeAgent, true);
+            boolean result = p2PService.addProtectedStorageEntry(disputeAgent);
             if (result) {
                 log.trace("Add disputeAgent to network was successful. DisputeAgent.hashCode() = " + disputeAgent.hashCode());
                 resultHandler.handleResult();
@@ -81,7 +81,7 @@ public void removeDisputeAgent(T disputeAgent,
                                    ResultHandler resultHandler,
                                    ErrorMessageHandler errorMessageHandler) {
         log.debug("removeDisputeAgent disputeAgent.hashCode() " + disputeAgent.hashCode());
-        if (p2PService.removeData(disputeAgent, true)) {
+        if (p2PService.removeData(disputeAgent)) {
             log.trace("Remove disputeAgent from network was successful. DisputeAgent.hashCode() = " + disputeAgent.hashCode());
             resultHandler.handleResult();
         } else {

core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java

@@ -24,7 +24,7 @@
 import bisq.core.offer.OfferPayload;
 
 import bisq.network.p2p.storage.payload.ExpirablePayload;
-import bisq.network.p2p.storage.payload.LazyProcessedPayload;
+import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
 import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
 
 import bisq.common.crypto.Sig;
@@ -60,7 +60,7 @@
 @Slf4j
 @EqualsAndHashCode(exclude = {"signaturePubKeyBytes"})
 @Value
-public final class TradeStatistics implements LazyProcessedPayload, ProtectedStoragePayload, ExpirablePayload, PersistablePayload {
+public final class TradeStatistics implements ProcessOncePersistableNetworkPayload, ProtectedStoragePayload, ExpirablePayload, PersistablePayload {
     private final OfferPayload.Direction direction;
     private final String baseCurrency;
     private final String counterCurrency;

core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java

@@ -25,7 +25,7 @@
 import bisq.core.offer.OfferUtil;
 
 import bisq.network.p2p.storage.payload.CapabilityRequiringPayload;
-import bisq.network.p2p.storage.payload.LazyProcessedPayload;
+import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
 import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
 
 import bisq.common.app.Capabilities;
@@ -63,7 +63,7 @@
 
 @Slf4j
 @Value
-public final class TradeStatistics2 implements LazyProcessedPayload, PersistableNetworkPayload, PersistableEnvelope, CapabilityRequiringPayload {
+public final class TradeStatistics2 implements ProcessOncePersistableNetworkPayload, PersistableNetworkPayload, PersistableEnvelope, CapabilityRequiringPayload {
 
     //We don't support arbitrators anymore so this entry will be only for pre v1.2. trades
     @Deprecated

monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java

@@ -221,20 +221,15 @@ protected boolean treatMessage(NetworkEnvelope networkEnvelope, Connection conne
                 versions.log(protectedStoragePayload);
             });
 
-            Set<PersistableNetworkPayload> persistableNetworkPayloadSet = dataResponse
-                    .getPersistableNetworkPayloadSet();
-            if (persistableNetworkPayloadSet != null) {
-                persistableNetworkPayloadSet.forEach(persistableNetworkPayload -> {
+            dataResponse.getPersistableNetworkPayloadSet().forEach(persistableNetworkPayload -> {
+                // memorize message hashes
+                //Byte[] bytes = new Byte[persistableNetworkPayload.getHash().length];
+                //Arrays.setAll(bytes, n -> persistableNetworkPayload.getHash()[n]);
 
-                    // memorize message hashes
-                    //Byte[] bytes = new Byte[persistableNetworkPayload.getHash().length];
-                    //Arrays.setAll(bytes, n -> persistableNetworkPayload.getHash()[n]);
+                //hashes.add(bytes);
 
-                    //hashes.add(bytes);
-
-                    hashes.add(persistableNetworkPayload.getHash());
-                });
-            }
+                hashes.add(persistableNetworkPayload.getHash());
+            });
 
             bucketsPerHost.put(connection.getPeersNodeAddressProperty().getValue(), result);
             versionBucketsPerHost.put(connection.getPeersNodeAddressProperty().getValue(), versions);

monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshot.java

@@ -333,20 +333,15 @@ protected boolean treatMessage(NetworkEnvelope networkEnvelope, Connection conne
                 result.log(protectedStoragePayload);
             });
 
-            Set<PersistableNetworkPayload> persistableNetworkPayloadSet = dataResponse
-                    .getPersistableNetworkPayloadSet();
-            if (persistableNetworkPayloadSet != null) {
-                persistableNetworkPayloadSet.forEach(persistableNetworkPayload -> {
+            dataResponse.getPersistableNetworkPayloadSet().forEach(persistableNetworkPayload -> {
+                // memorize message hashes
+                //Byte[] bytes = new Byte[persistableNetworkPayload.getHash().length];
+                //Arrays.setAll(bytes, n -> persistableNetworkPayload.getHash()[n]);
 
-                    // memorize message hashes
-                    //Byte[] bytes = new Byte[persistableNetworkPayload.getHash().length];
-                    //Arrays.setAll(bytes, n -> persistableNetworkPayload.getHash()[n]);
+                //hashes.add(bytes);
 
-                    //hashes.add(bytes);
-
-                    hashes.add(persistableNetworkPayload.getHash());
-                });
-            }
+                hashes.add(persistableNetworkPayload.getHash());
+            });
 
             bucketsPerHost.put(connection.getPeersNodeAddressProperty().getValue(), result);
             return true;

p2p/src/main/java/bisq/network/p2p/P2PService.java

@@ -699,7 +699,7 @@ public void onBroadcastFailed(String errorMessage) {
                             // to the logic from BroadcastHandler.sendToPeer
                         }
                     };
-                    boolean result = p2PDataStorage.addProtectedStorageEntry(protectedMailboxStorageEntry, networkNode.getNodeAddress(), listener, true);
+                    boolean result = p2PDataStorage.addProtectedStorageEntry(protectedMailboxStorageEntry, networkNode.getNodeAddress(), listener);
                     if (!result) {
                         sendMailboxMessageListener.onFault("Data already exists in our local database");
 
@@ -760,7 +760,7 @@ private void delayedRemoveEntryFromMailbox(DecryptedMessageWithPubKey decryptedM
                             expirableMailboxStoragePayload,
                             keyRing.getSignatureKeyPair(),
                             receiversPubKey);
-                    p2PDataStorage.remove(protectedMailboxStorageEntry, networkNode.getNodeAddress(), true);
+                    p2PDataStorage.remove(protectedMailboxStorageEntry, networkNode.getNodeAddress());
                 } catch (CryptoException e) {
                     log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
                 }
@@ -779,14 +779,14 @@ private void delayedRemoveEntryFromMailbox(DecryptedMessageWithPubKey decryptedM
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public boolean addPersistableNetworkPayload(PersistableNetworkPayload payload, boolean reBroadcast) {
-        return p2PDataStorage.addPersistableNetworkPayload(payload, networkNode.getNodeAddress(), true, true, reBroadcast, false);
+        return p2PDataStorage.addPersistableNetworkPayload(payload, networkNode.getNodeAddress(), reBroadcast);
     }
 
-    public boolean addProtectedStorageEntry(ProtectedStoragePayload protectedStoragePayload, boolean isDataOwner) {
+    public boolean addProtectedStorageEntry(ProtectedStoragePayload protectedStoragePayload) {
         if (isBootstrapped()) {
             try {
                 ProtectedStorageEntry protectedStorageEntry = p2PDataStorage.getProtectedStorageEntry(protectedStoragePayload, keyRing.getSignatureKeyPair());
-                return p2PDataStorage.addProtectedStorageEntry(protectedStorageEntry, networkNode.getNodeAddress(), null, isDataOwner);
+                return p2PDataStorage.addProtectedStorageEntry(protectedStorageEntry, networkNode.getNodeAddress(), null);
             } catch (CryptoException e) {
                 log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
                 return false;
@@ -796,11 +796,11 @@ public boolean addProtectedStorageEntry(ProtectedStoragePayload protectedStorage
         }
     }
 
-    public boolean refreshTTL(ProtectedStoragePayload protectedStoragePayload, boolean isDataOwner) {
+    public boolean refreshTTL(ProtectedStoragePayload protectedStoragePayload) {
         if (isBootstrapped()) {
             try {
                 RefreshOfferMessage refreshTTLMessage = p2PDataStorage.getRefreshTTLMessage(protectedStoragePayload, keyRing.getSignatureKeyPair());
-                return p2PDataStorage.refreshTTL(refreshTTLMessage, networkNode.getNodeAddress(), isDataOwner);
+                return p2PDataStorage.refreshTTL(refreshTTLMessage, networkNode.getNodeAddress());
             } catch (CryptoException e) {
                 log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
                 return false;
@@ -810,11 +810,11 @@ public boolean refreshTTL(ProtectedStoragePayload protectedStoragePayload, boole
         }
     }
 
-    public boolean removeData(ProtectedStoragePayload protectedStoragePayload, boolean isDataOwner) {
+    public boolean removeData(ProtectedStoragePayload protectedStoragePayload) {
         if (isBootstrapped()) {
             try {
                 ProtectedStorageEntry protectedStorageEntry = p2PDataStorage.getProtectedStorageEntry(protectedStoragePayload, keyRing.getSignatureKeyPair());
-                return p2PDataStorage.remove(protectedStorageEntry, networkNode.getNodeAddress(), isDataOwner);
+                return p2PDataStorage.remove(protectedStorageEntry, networkNode.getNodeAddress());
             } catch (CryptoException e) {
                 log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
                 return false;

p2p/src/main/java/bisq/network/p2p/peers/BroadcastHandler.java

@@ -111,7 +111,7 @@ public void cancel() {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public void broadcast(BroadcastMessage message, @Nullable NodeAddress sender, ResultHandler resultHandler,
-                          @Nullable Listener listener, boolean isDataOwner) {
+                          @Nullable Listener listener) {
         this.message = message;
         this.resultHandler = resultHandler;
         this.listener = listener;
@@ -127,6 +127,8 @@ public void broadcast(BroadcastMessage message, @Nullable NodeAddress sender, Re
             Collections.shuffle(connectedPeersList);
             numPeers = connectedPeersList.size();
             int delay = 50;
+
+            boolean isDataOwner = (sender != null) && sender.equals(networkNode.getNodeAddress());
             if (!isDataOwner) {
                 // for not data owner (relay nodes) we send to max. 7 nodes and use a longer delay
                 numPeers = Math.min(7, connectedPeersList.size());