Fix premature disconnections from seeds

common/src/main/java/bisq/common/util/Utilities.java

@@ -534,7 +534,7 @@ public static String readableFileSize(long size) {
     }
 
     // Substitute for FormattingUtils if there is no dependency to core
-    public static String formatDurationAsWords(long durationMillis, boolean showSeconds, boolean showZeroValues) {
+    public static String formatDurationAsWords(long durationMillis) {
         String format = "";
         String second = "second";
         String minute = "minute";
@@ -549,11 +549,7 @@ public static String formatDurationAsWords(long durationMillis, boolean showSeco
             format = "d\' " + days + ", \'";
         }
 
-        if (showSeconds) {
-            format += "H\' " + hours + ", \'m\' " + minutes + ", \'s\' " + seconds + "\'";
-        } else {
-            format += "H\' " + hours + ", \'m\' " + minutes + "\'";
-        }
+        format += "H\' " + hours + ", \'m\' " + minutes + ", \'s\'.\'S\' " + seconds + "\'";
 
         String duration = durationMillis > 0 ? DurationFormatUtils.formatDuration(durationMillis, format) : "";
 
@@ -562,15 +558,14 @@ public static String formatDurationAsWords(long durationMillis, boolean showSeco
         duration = StringUtils.replacePattern(duration, "^1 " + hours + "|\\b1 " + hours, "1 " + hour);
         duration = StringUtils.replacePattern(duration, "^1 " + days + "|\\b1 " + days, "1 " + day);
 
-        if (!showZeroValues) {
-            duration = duration.replace(", 0 seconds", "");
-            duration = duration.replace(", 0 minutes", "");
-            duration = duration.replace(", 0 hours", "");
-            duration = StringUtils.replacePattern(duration, "^0 days, ", "");
-            duration = StringUtils.replacePattern(duration, "^0 hours, ", "");
-            duration = StringUtils.replacePattern(duration, "^0 minutes, ", "");
-            duration = StringUtils.replacePattern(duration, "^0 seconds, ", "");
-        }
+        duration = duration.replace(", 0 seconds", "");
+        duration = duration.replace(", 0 minutes", "");
+        duration = duration.replace(", 0 hours", "");
+        duration = StringUtils.replacePattern(duration, "^0 days, ", "");
+        duration = StringUtils.replacePattern(duration, "^0 hours, ", "");
+        duration = StringUtils.replacePattern(duration, "^0 minutes, ", "");
+        duration = StringUtils.replacePattern(duration, "^0 seconds, ", "");
+
         return duration.trim();
     }
 }

core/src/main/resources/i18n/displayStrings.properties

@@ -1300,7 +1300,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[IP address:port | host name:port | onion address:port] (comma separated). Port can be omitted if default is used (8333).
 settings.net.seedNode=Seed node
 settings.net.directPeer=Peer (direct)
-settings.net.initialDataExchange=Initial data exchange with {0}
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Peer
 settings.net.inbound=inbound
 settings.net.outbound=outbound

desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml

@@ -144,7 +144,7 @@
                         <PropertyValueFactory property="receivedBytes"/>
                     </cellValueFactory>
                 </TableColumn>
-                <TableColumn fx:id="peerTypeColumn" minWidth="100" maxWidth="100">
+                <TableColumn fx:id="peerTypeColumn" minWidth="170" maxWidth="170">
                     <cellValueFactory>
                         <PropertyValueFactory property="peerType"/>
                     </cellValueFactory>

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

@@ -43,7 +43,7 @@ public class ConnectionState implements MessageListener {
     // if it exceeds its limits the connectionCreationTimeStamp and lastInitialDataExchangeMessageTimeStamp can be
     // used to set priorities for closing connections.
     private static final long PEER_RESET_TIMER_DELAY_SEC = TimeUnit.MINUTES.toSeconds(4);
-    private static final long COMPLETED_TIMER_DELAY_SEC = 2;
+    private static final long COMPLETED_TIMER_DELAY_SEC = 10;
 
     // Number of expected requests in standard case. Can be different according to network conditions.
     // Is different for LiteDaoNodes and FullDaoNodes
@@ -126,7 +126,9 @@ private void onInitialDataExchange() {
     private void maybeResetInitialDataExchangeType() {
         if (numInitialDataResponses >= expectedRequests) {
             // We have received the expected messages from initial data requests. We delay a bit the reset
-            // to give time for processing the response.
+            // to give time for processing the response and more tolerance to edge cases where we expect more responses.
+            // Reset to PEER does not mean disconnection as well, but just that this connection has lower priority and
+            // runs higher risk for getting disconnected.
             if (initialDataExchangeCompletedTimer == null) {
                 initialDataExchangeCompletedTimer = UserThread.runAfter(this::resetInitialDataExchangeType, COMPLETED_TIMER_DELAY_SEC);
             }

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

@@ -23,7 +23,6 @@
 import bisq.common.proto.network.NetworkEnvelope;
 import bisq.common.util.Utilities;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -57,25 +56,32 @@ public void shutDown() {
     public String getInfo() {
         String ls = System.lineSeparator();
         long now = System.currentTimeMillis();
-        String conInstance = connection instanceof InboundConnection ? "Inbound connection from" : "Outbound connection to";
-        String age = connectionCreationTimeStamp > 0 ? Utilities.formatDurationAsWords(now - connectionCreationTimeStamp, true, true) :
+        String conInstance = connection instanceof InboundConnection ? "Inbound" : "Outbound";
+        String age = connectionCreationTimeStamp > 0 ?
+                Utilities.formatDurationAsWords(now - connectionCreationTimeStamp) :
                 "N/A";
-        return String.format("%s %s%s " +
-                        "of type %s " +
-                        "was creation on %s " +
-                        "with UID %s." + ls +
-                        "Connection age: %s" + ls +
-                        "Last message sent/received %s ms ago." + ls +
+        String lastMsg = lastMessageTimestamp > 0 ?
+                Utilities.formatDurationAsWords(now - lastMessageTimestamp) :
+                "N/A";
+        String peer = connection.getPeersNodeAddressOptional()
+                .map(NodeAddress::getFullAddress)
+                .orElse("[address not known yet]");
+        return String.format(
+                "Age: %s" + ls +
+                        "Peer: %s%s " + ls +
+                        "Type: %s " + ls +
+                        "Direction: %s" + ls +
+                        "UID: %s" + ls +
+                        "Last message sent/received: %s" + ls +
                         "Sent data: %s;" + ls +
                         "Received data: %s;",
-                conInstance,
-                connectionState.isSeedNode() ? "seed node " : "",
-                connection.getPeersNodeAddressOptional().map(NodeAddress::getFullAddress).orElse("[address not known yet]"),
+                age,
+                connectionState.isSeedNode() ? "[Seed node] " : "",
+                peer,
                 connectionState.getPeerType().name(),
-                connectionCreationTimeStamp > 0 ? new Date(connectionCreationTimeStamp) : "N/A",
+                conInstance,
                 connection.getUid(),
-                age,
-                lastMessageTimestamp > 0 ? now - lastMessageTimestamp : "N/A",
+                lastMsg,
                 sentDataMap.toString(),
                 receivedDataMap.toString());
     }

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

@@ -808,9 +808,9 @@ private void printStatistics() {
         StringBuilder sb = new StringBuilder("Connection statistics: " + ls);
         AtomicInteger counter = new AtomicInteger();
         networkNode.getAllConnections().stream()
-                .sorted(Comparator.comparingLong(o -> o.getStatistic().getLastActivityTimestamp()))
+                .sorted(Comparator.comparingLong(o -> o.getConnectionStatistics().getConnectionCreationTimeStamp()))
                 .forEach(e -> sb.append(ls).append("Connection ")
-                        .append(counter.incrementAndGet()).append(": ")
+                        .append(counter.incrementAndGet()).append(ls)
                         .append(e.getConnectionStatistics().getInfo()).append(ls));
         log.error(sb.toString());
     }

p2p/src/test/java/bisq/network/p2p/MockNode.java

@@ -19,6 +19,7 @@
 
 import bisq.network.p2p.network.Connection;
 import bisq.network.p2p.network.ConnectionState;
+import bisq.network.p2p.network.ConnectionStatistics;
 import bisq.network.p2p.network.InboundConnection;
 import bisq.network.p2p.network.NetworkNode;
 import bisq.network.p2p.network.OutboundConnection;
@@ -71,9 +72,15 @@ public MockNode(int maxConnections) throws IOException {
 
     public void addInboundConnection(PeerType peerType) {
         InboundConnection inboundConnection = mock(InboundConnection.class);
+
+        ConnectionStatistics connectionStatistics = mock(ConnectionStatistics.class);
+        when(connectionStatistics.getConnectionCreationTimeStamp()).thenReturn(0L);
+        when(inboundConnection.getConnectionStatistics()).thenReturn(connectionStatistics);
+
         ConnectionState connectionState = mock(ConnectionState.class);
         when(connectionState.getPeerType()).thenReturn(peerType);
         when(inboundConnection.getConnectionState()).thenReturn(connectionState);
+
         Statistic statistic = mock(Statistic.class);
         long lastActivityTimestamp = System.currentTimeMillis();
         when(statistic.getLastActivityTimestamp()).thenReturn(lastActivityTimestamp);
@@ -84,9 +91,15 @@ public void addInboundConnection(PeerType peerType) {
 
     public void addOutboundConnection(PeerType peerType) {
         OutboundConnection outboundConnection = mock(OutboundConnection.class);
+
+        ConnectionStatistics connectionStatistics = mock(ConnectionStatistics.class);
+        when(connectionStatistics.getConnectionCreationTimeStamp()).thenReturn(0L);
+        when(outboundConnection.getConnectionStatistics()).thenReturn(connectionStatistics);
+
         ConnectionState connectionState = mock(ConnectionState.class);
         when(connectionState.getPeerType()).thenReturn(peerType);
         when(outboundConnection.getConnectionState()).thenReturn(connectionState);
+
         Statistic statistic = mock(Statistic.class);
         long lastActivityTimestamp = System.currentTimeMillis();
         when(statistic.getLastActivityTimestamp()).thenReturn(lastActivityTimestamp);