Merge pull request #2513 from HenrikJannsen/small-fixes

Small fixes
bisq-network · Jul 29, 2024 · 024c6d5 · 024c6d5
2 parents 08a7fd1 + 783bf23
commit 024c6d5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/network/network/src/main/java/bisq/network/p2p/node/Node.java b/network/network/src/main/java/bisq/network/p2p/node/Node.java
@@ -83,7 +83,7 @@
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Node implements Connection.Handler {
     @Setter
-    public static int preferredVersion = 1;
+    public static int preferredVersion = 0;
 
     public enum State {
         NEW,
@@ -231,6 +231,7 @@ private void doInitialize() {
                     break;
                 }
                 case STARTING: {
+                    // TODO Maybe we should add a sleep here and return once the node is running?
                     throw new IllegalStateException("Already starting. NetworkId=" + networkId + "; transportType=" + transportType);
                 }
                 case RUNNING: {

diff --git a/security/src/main/java/bisq/security/keys/KeyBundleService.java b/security/src/main/java/bisq/security/keys/KeyBundleService.java
@@ -100,8 +100,9 @@ public CompletableFuture<Boolean> initialize() {
 
                         // We write the key to the tor directory. This is used only for the default key, as that is the
                         // only supported use case (seed nodes, oracle nodes,...)
-                        TorKeyUtils.writePrivateKey(keyBundle.getTorKeyPair(), storagePath, tag);
-
+                        if (writeDefaultTorPrivateKeyToFile) {
+                            TorKeyUtils.writePrivateKey(keyBundle.getTorKeyPair(), storagePath, tag);
+                        }
                         return keyBundle;
                     })
                     .thenApply(Objects::nonNull);

diff --git a/security/src/main/java/bisq/security/keys/TorKeyUtils.java b/security/src/main/java/bisq/security/keys/TorKeyUtils.java
@@ -6,7 +6,6 @@
 import org.bouncycastle.util.encoders.Base32;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
 
@@ -22,6 +21,7 @@ public static void writePrivateKey(TorKeyPair torKeyPair, Path storageDir, Strin
         Path targetPath = Path.of(storageDir.toString(), tag);
         File torPrivateKeyDir = targetPath.toFile();
         try {
+            log.info("Store the torPrivateKey into {}", torPrivateKeyDir);
             FileUtils.makeDirs(torPrivateKeyDir);
             String dir = torPrivateKeyDir.getAbsolutePath();
 
@@ -30,7 +30,7 @@ public static void writePrivateKey(TorKeyPair torKeyPair, Path storageDir, Strin
 
             log.info("We persisted the tor private key in hex encoding for onionAddress {} for tag {} to {}.",
                     torKeyPair.getOnionAddress(), tag, dir);
-        } catch (IOException e) {
+        } catch (Exception e) {
             log.error("Could not persist torIdentity", e);
         }
     }