Update changes from

bisq-network#7069 and bisq-network#7070 as well as more recent resource data Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
HenrikJannsen · Apr 1, 2024 · 909a0fb · 909a0fb
1 parent 8b381bf
commit 909a0fb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java
@@ -400,7 +400,7 @@ public long getDateAsLong() {
 
     @Override
     public int maxItems() {
-        return 3000;
+        return 15000;
     }
 
     public void pruneOptionalData() {

diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java b/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java
@@ -62,6 +62,7 @@ public class RequestDataManager implements MessageListener, ConnectionListener,
     private static int NUM_SEEDS_FOR_PRELIMINARY_REQUEST = 2;
     // how many seeds additional to the first responding PreliminaryGetDataRequest seed we request the GetUpdatedDataRequest from
     private static int NUM_ADDITIONAL_SEEDS_FOR_UPDATE_REQUEST = 1;
+    private static int MAX_REPEATED_REQUESTS = 30;
     private boolean isPreliminaryDataRequest = true;
 
 
@@ -140,6 +141,7 @@ public RequestDataManager(NetworkNode networkNode,
                 if (seedNodeRepository.isSeedNode(myAddress)) {
                     NUM_SEEDS_FOR_PRELIMINARY_REQUEST = 3;
                     NUM_ADDITIONAL_SEEDS_FOR_UPDATE_REQUEST = 2;
+                    MAX_REPEATED_REQUESTS = 100;
                 }
             }
         });
@@ -361,7 +363,7 @@ public void onComplete(boolean wasTruncated) {
                                 }
 
                                 if (wasTruncated) {
-                                    if (numRepeatedRequests < 20) {
+                                    if (numRepeatedRequests < MAX_REPEATED_REQUESTS) {
                                         // If we had allDataReceived already set to true but get a response with truncated flag,
                                         // we still repeat the request to that node for higher redundancy. Otherwise, one seed node
                                         // providing incomplete data would stop others to fill the gaps.

diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_1.9.15_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.9.15_BTC_MAINNET
diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.9.15_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.9.15_BTC_MAINNET