Merge pull request #617 from HenrikJannsen/fix_wallet_init_for_osx

Fix wallet init for osx
bisq-network · Dec 30, 2022 · e5c16e6 · e5c16e6
2 parents e14c4fa + 996178d
commit e5c16e6
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 42 deletions.
diff --git a/application/src/main/java/bisq/application/DefaultApplicationService.java b/application/src/main/java/bisq/application/DefaultApplicationService.java
@@ -125,7 +125,13 @@ public DefaultApplicationService(String[] args) {
     public CompletableFuture<Boolean> initialize() {
         return securityService.initialize()
                 .thenCompose(result -> walletService.initialize())
-                .whenComplete((r, t) -> setState(State.START_NETWORK))
+                .whenComplete((result, throwable) -> {
+                    if (throwable == null) {
+                        setState(State.START_NETWORK);
+                    } else {
+                        log.error("Error at walletService.initialize", throwable);
+                    }
+                })
                 .thenCompose(result -> networkService.initialize())
                 .whenComplete((r, t) -> setState(State.NETWORK_STARTED))
                 .thenCompose(result -> identityService.initialize())

diff --git a/application/src/main/resources/default.conf b/application/src/main/resources/default.conf
@@ -123,6 +123,6 @@ application {
     }
 
     wallet = {
-        enabled = false
+        enabled = true
     }
 }
diff --git a/common/src/main/java/bisq/common/util/FileUtils.java b/common/src/main/java/bisq/common/util/FileUtils.java
@@ -70,33 +70,36 @@ public static void deleteOnExit(File file) {
     /**
      * @param file The file to delete and to get removed from the `DeleteOnExitHook`.
      */
-    public static void releaseTempFile(File file) {
+    public static void releaseTempFile(File file) throws IOException {
         if (!DeleteOnExitHook.isShutdownInProgress()) {
             DeleteOnExitHook.remove(file.getPath());
         }
         deleteFile(file);
     }
 
-    public static void deleteDirectory(String dirPath) {
-        deleteDirectory(new File(dirPath));
+    public static void deleteFileOrDirectory(String dirPath) throws IOException {
+        deleteFileOrDirectory(new File(dirPath));
     }
 
-    public static void deleteDirectory(File dir) {
+    public static void deleteFileOrDirectory(Path path) throws IOException {
+        deleteFileOrDirectory(path.toFile());
+    }
+
+    public static void deleteFileOrDirectory(File dir) throws IOException {
         File[] files = dir.listFiles();
         if (files != null) {
-            for (final File file : files) {
-                deleteDirectory(file);
+            for (File file : files) {
+                deleteFileOrDirectory(file);
             }
         }
-        //noinspection ResultOfMethodCallIgnored
-        dir.delete();
+        if (dir.exists()) {
+            Files.delete(dir.toPath());
+        }
     }
 
-    public static void deleteFile(File file) {
-        if (file != null && file.exists()) {
-            if (!file.delete()) {
-                log.error("Cannot delete file {}", file);
-            }
+    public static void deleteFile(File file) throws IOException {
+        if (file.exists()) {
+            Files.delete(file.toPath());
         }
     }
 

diff --git a/common/src/main/java/bisq/common/util/OsUtils.java b/common/src/main/java/bisq/common/util/OsUtils.java
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
@@ -96,6 +97,15 @@ public static String getOSName() {
         return System.getProperty("os.name").toLowerCase(Locale.US);
     }
 
+    public static void makeBinaryExecutable(Path binaryPath) {
+        boolean isSuccess = binaryPath.toFile().setExecutable(true);
+        if (!isSuccess) {
+            throw new IllegalStateException(
+                    String.format("Couldn't make `%s` executable.", binaryPath)
+            );
+        }
+    }
+
     public static boolean open(File file) {
         return open(file.getPath());
     }

diff --git a/network/tor/src/test/java/bisq/TorIntegrationTest.java b/network/tor/src/test/java/bisq/TorIntegrationTest.java
@@ -26,6 +26,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.concurrent.Executors;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -39,7 +40,12 @@ public class TorIntegrationTest {
     public void testShutdownDuringStartup() {
         String torDirPath = OsUtils.getUserDataDir() + "/TorifyIntegrationTest";
         File versionFile = new File(torDirPath + "/" + Constants.VERSION);
-        FileUtils.deleteDirectory(new File(torDirPath));
+        try {
+            FileUtils.deleteFileOrDirectory(torDirPath);
+        } catch (IOException e) {
+            log.error("Could not delete " + torDirPath, e);
+            throw new RuntimeException(e);
+        }
         assertFalse(versionFile.exists());
         Tor tor = Tor.getTor(torDirPath);
         new Thread(() -> {

diff --git a/network/tor/src/test/java/bisq/tor/AbstractTorTest.java b/network/tor/src/test/java/bisq/tor/AbstractTorTest.java
@@ -51,7 +51,12 @@ public static void cleanTorInstallDir(String torDirPathSpec) {
         File torDir = new File(torDirPathSpec);
         if (torDir.exists()) {
             log.info("Cleaning tor install dir {}", torDirPathSpec);
-            FileUtils.deleteDirectory(torDir);
+            try {
+                FileUtils.deleteFileOrDirectory(torDir);
+            } catch (IOException e) {
+                log.error("Could not delete " + torDir, e);
+                throw new RuntimeException(e);
+            }
         }
         File versionFile = new File(torDir, VERSION);
         assertFalse(versionFile.exists());

diff --git a/persistence/src/main/java/bisq/persistence/Persistence.java b/persistence/src/main/java/bisq/persistence/Persistence.java
@@ -151,7 +151,11 @@ public boolean persist(T persistableStore) {
                     log.error("Error closing stream " + ioe.getMessage(), ioe); // swallow
                 }
                 if (tempFile != null) {
-                    FileUtils.releaseTempFile(tempFile);
+                    try {
+                        FileUtils.releaseTempFile(tempFile);
+                    } catch (IOException e) {
+                        log.error("Could not delete " + tempFile, e);
+                    }
                 }
             }
             return success;

diff --git a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumBinaryExtractor.java b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumBinaryExtractor.java
@@ -19,6 +19,7 @@
 
 import bisq.common.util.FileUtils;
 import bisq.common.util.OsUtils;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,6 +32,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+@Slf4j
 public class ElectrumBinaryExtractor {
 
     public static final String LINUX_BINARY_SUFFIX = "AppImage";
@@ -113,9 +115,11 @@ private File extractFileWithSuffixFromStream(InputStream inputStream, String fil
     private void deleteElectrumAppFileIfExisting() {
         File electrumAppInDataDir = new File(destDir, "Electrum.app");
         if (electrumAppInDataDir.exists()) {
-            boolean isSuccess = electrumAppInDataDir.delete();
-            if (!isSuccess) {
-                throw new IllegalStateException("Couldn't delete old Electrum.app");
+            try {
+                FileUtils.deleteFileOrDirectory(electrumAppInDataDir);
+            } catch (IOException e) {
+                log.error("Could not delete " + electrumAppInDataDir, e);
+                throw new IllegalStateException("Couldn't delete old Electrum.app", e);
             }
         }
     }
@@ -126,19 +130,19 @@ private void copyZipFromResourcesToDataDir(InputStream inputStream) {
             Files.copy(inputStream, zipFileInDataDir.toPath(), StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
             throw new ElectrumExtractionFailedException(
-                    "Couldn't copy Electrum binaries zip file from resources to the data directory."
+                    "Couldn't copy Electrum binaries zip file from resources to the data directory.", e
             );
         }
     }
 
     private void unpackZipFileWithUnzipCommand() {
         try {
-            Process extractProcess = new ProcessBuilder("unzip", ARCHIVE_FILENAME)
+            Process extractProcess = new ProcessBuilder("unzip", "-o", ARCHIVE_FILENAME)
                     .directory(destDir)
                     .redirectOutput(ProcessBuilder.Redirect.DISCARD)
-                    .redirectError(ProcessBuilder.Redirect.DISCARD)
+                    .redirectError(ProcessBuilder.Redirect.INHERIT)
                     .start();
-            boolean isSuccess = extractProcess.waitFor(1, TimeUnit.MINUTES);
+            boolean isSuccess = extractProcess.waitFor(30, TimeUnit.SECONDS);
             if (!isSuccess) {
                 throw new ElectrumExtractionFailedException("Could not copy Electrum.app to data directory.");
             }

diff --git a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumProcess.java b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumProcess.java
@@ -45,8 +45,8 @@ public ElectrumProcess(Path electrumRootDataDir, ElectrumProcessConfig processCo
     @Override
     public void start() {
         unpackArchive();
-        if (isRunningOnLinux()) {
-            makeBinaryExecutable();
+        if (OsUtils.isLinux()) {
+            OsUtils.makeBinaryExecutable(binaryPath.orElseThrow());
         }
         createAndStartProcess();
     }
@@ -70,21 +70,6 @@ private void unpackArchive() {
         binaryPath = Optional.of(extractedFilePath);
     }
 
-    private boolean isRunningOnLinux() {
-        String osName = System.getProperty("os.name");
-        return osName.equals("Linux");
-    }
-
-    private void makeBinaryExecutable() {
-        Path binaryPath = this.binaryPath.orElseThrow();
-        boolean isSuccess = binaryPath.toFile().setExecutable(true);
-        if (!isSuccess) {
-            throw new IllegalStateException(
-                    String.format("Couldn't make `%s` executable.", binaryPath)
-            );
-        }
-    }
-
     private void createAndStartProcess() {
         Path path = binaryPath.orElseThrow();
         var process = new ElectrumRegtestProcess(path, processConfig);