Merge v1.9.8

Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
bisq-network · Dec 23, 2022 · 39c59af · 39c59af
1 parent 532ad53
commit 39c59af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java
@@ -36,7 +36,7 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.9.7";
+    public static final String VERSION = "1.9.8";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.

diff --git a/core/src/main/java/bisq/core/crypto/ScryptUtil.java b/core/src/main/java/bisq/core/crypto/ScryptUtil.java
@@ -49,7 +49,7 @@ public static KeyCrypterScrypt getKeyCrypterScrypt() {
     }
 
     public static void deriveKeyWithScrypt(KeyCrypterScrypt keyCrypterScrypt, String password, DeriveKeyResultHandler resultHandler) {
-        Utilities.getThreadPoolExecutor("ScryptUtil:deriveKeyWithScrypt-%d", 1, 2, 5L).submit(() -> {
+        Utilities.getThreadPoolExecutor("ScryptUtil:deriveKeyWithScrypt", 1, 2, 5L).submit(() -> {
             try {
                 log.debug("Doing key derivation");
                 long start = System.currentTimeMillis();

diff --git a/p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java b/p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java
@@ -103,12 +103,12 @@ public abstract class NetworkNode implements MessageListener {
         connectionExecutor = Utilities.getListeningExecutorService("NetworkNode.connection",
                 maxConnections * 2,
                 maxConnections * 3,
-                10,
+                30,
                 60);
         sendMessageExecutor = Utilities.getListeningExecutorService("NetworkNode.sendMessage",
                 maxConnections * 2,
                 maxConnections * 3,
-                10,
+                30,
                 60);
         serverExecutor = Utilities.getSingleThreadExecutor("NetworkNode.server-" + servicePort);
     }