add further guidance when regenerating a border wallets grid

Add context menu to copy amount values from amount cells

build.gradle

@@ -7,7 +7,7 @@ plugins {
     id 'org.beryx.jlink' version '2.26.0'
 }
 
-def sparrowVersion = '1.7.3'
+def sparrowVersion = '1.7.6'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -23,6 +23,19 @@ if(System.getProperty("os.arch") == "aarch64") {
 }
 def headless = "true".equals(System.getProperty("java.awt.headless"))
 
+def vTor = '4.7.13-4'
+def vKmpTor = '1.4.2'
+def kmpOs = osName
+if(os.macOsX) {
+    kmpOs = "macos"
+} else if(os.windows) {
+    kmpOs = "mingw"
+}
+def kmpArch = "x64"
+if(System.getProperty("os.arch") == "aarch64") {
+    kmpArch = "arm64"
+}
+
 group "com.sparrowwallet"
 version "${sparrowVersion}"
 
@@ -84,10 +97,15 @@ dependencies {
     implementation("com.github.sarxos:webcam-capture${targetName}:0.3.13-SNAPSHOT") {
         exclude group: 'com.nativelibs4java', module: 'bridj'
     }
-    implementation("com.sparrowwallet:netlayer-jpms-${osName}${targetName}:0.6.8") {
-        exclude group: 'org.jetbrains.kotlin'
+    implementation "io.matthewnelson.kotlin-components:kmp-tor:${vTor}-${vKmpTor}"
+    if(kmpOs == "linux" && kmpArch == "arm64") {
+        implementation("com.sparrowwallet.kmp-tor-binary:kmp-tor-binary-${kmpOs}${kmpArch}-jvm:${vTor}")
+    } else {
+        implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-${kmpOs}${kmpArch}:${vTor}")
     }
-    implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20')
+    implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-extract:${vTor}")
+    implementation("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-manager:${vKmpTor}")
+    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.6.4')
     implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
     implementation('org.controlsfx:controlsfx:11.1.0' ) {
         exclude group: 'org.openjfx', module: 'javafx-base'
@@ -103,12 +121,12 @@ dependencies {
     implementation('org.slf4j:jul-to-slf4j:1.7.30') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.35')
+    implementation('com.sparrowwallet.nightjar:nightjar:0.2.36')
     implementation('io.reactivex.rxjava2:rxjava:2.2.15')
     implementation('io.reactivex.rxjava2:rxjavafx:2.2.2')
     implementation('org.apache.commons:commons-lang3:3.7')
     implementation('net.sourceforge.streamsupport:streamsupport:1.7.0')
-    implementation('com.github.librepdf:openpdf:1.3.27')
+    implementation('com.github.librepdf:openpdf:1.3.30')
     implementation('com.googlecode.lanterna:lanterna:3.1.1')
     implementation('net.coobird:thumbnailator:0.4.18')
     implementation('com.github.hervegirod:fxsvgimage:1.0b2')
@@ -160,9 +178,11 @@ run {
                                  "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
                                  "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
+                                 "--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow",
                                  "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
                                  "--add-opens=java.base/java.io=com.google.gson",
-                                 "--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow"]
+                                 "--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow",
+                                 "--add-reads=kotlin.stdlib=kotlinx.coroutines.core.jvm"]
 
     if(os.macOsX) {
         applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
@@ -208,6 +228,7 @@ jlink {
                    "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
+                   "--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow",
                    "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
                    "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
                    "--add-opens=java.base/java.io=com.google.gson",
@@ -219,7 +240,8 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
-                   "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor"]
+                   "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor",
+                   "--add-reads=kotlin.stdlib=kotlinx.coroutines.core.jvm"]
 
         if(os.windows) {
             jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
@@ -401,11 +423,6 @@ extraJavaModuleInfo {
         requires('java.xml')
         requires('java.logging')
     }
-    module('kotlin-logging-1.5.4.jar', 'io.github.microutils.kotlin.logging', '1.5.4') {
-        exports('mu')
-        requires('kotlin.stdlib')
-        requires('org.slf4j')
-    }
     module('failureaccess-1.0.1.jar', 'failureaccess', '1.0.1') {
         exports('com.google.common.util.concurrent.internal')
     }
@@ -481,13 +498,6 @@ extraJavaModuleInfo {
         requires('javafx.graphics')
     }
     module('jai-imageio-core-1.4.0.jar', 'com.github.jai.imageio.jai.imageio.core', '1.4.0')
-    module('kotlin-stdlib-jdk8-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.jdk8', '1.5.20')
-    module('kotlin-stdlib-jdk7-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.jdk7', '1.5.20')
-    module('kotlin-stdlib-1.5.20.jar', 'kotlin.stdlib', '1.5.20') {
-        exports('kotlin')
-        exports('kotlin.jvm')
-        exports('kotlin.collections')
-    }
     module('hummingbird-1.6.3.jar', 'com.sparrowwallet.hummingbird', '1.6.3') {
         exports('com.sparrowwallet.hummingbird')
         exports('com.sparrowwallet.hummingbird.registry')
@@ -498,7 +508,7 @@ extraJavaModuleInfo {
         exports('co.nstant.in.cbor.model')
         exports('co.nstant.in.cbor.builder')
     }
-    module('nightjar-0.2.35.jar', 'com.sparrowwallet.nightjar', '0.2.35') {
+    module('nightjar-0.2.36.jar', 'com.sparrowwallet.nightjar', '0.2.36') {
         requires('com.google.common')
         requires('net.sourceforge.streamsupport')
         requires('org.slf4j')
@@ -595,29 +605,131 @@ extraJavaModuleInfo {
         requires('javafx.graphics')
         requires('java.xml')
     }
-    module("netlayer-jpms-${osName}${targetName}-0.6.8.jar", 'netlayer.jpms', '0.6.8') {
-        exports('org.berndpruenster.netlayer.tor')
-        requires('com.github.ravn.jsocks')
-        requires('com.github.JesusMcCloud.jtorctl')
+    module('kotlinx-coroutines-core-jvm-1.6.4.jar', 'kotlinx.coroutines.core.jvm', '1.6.4') {
+        exports('kotlinx.coroutines')
         requires('kotlin.stdlib')
-        requires('commons.compress')
-        requires('org.tukaani.xz')
+        requires('java.instrument')
+        uses('kotlinx.coroutines.CoroutineExceptionHandler')
+        uses('kotlinx.coroutines.internal.MainDispatcherFactory')
+    }
+    module('kotlinx-coroutines-javafx-1.6.4.jar', 'kotlinx.coroutines.javafx', '1.6.4') {
+        exports('kotlinx.coroutines.javafx')
+        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlin.stdlib')
+        requires('javafx.graphics')
+    }
+    module("kmp-tor-jvm-${vKmpTor}.jar", 'kmp.tor.jvm', "${vTor}-${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor')
+        requires('kmp.tor.binary.extract.jvm')
+        requires('kmp.tor.manager.jvm')
+        requires('kmp.tor.manager.common.jvm')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.coroutines.core.jvm')
         requires('java.management')
-        requires('io.github.microutils.kotlin.logging')
     }
-    module('jtorctl-1.5.jar', 'com.github.JesusMcCloud.jtorctl', '1.5') {
-        exports('net.freehaven.tor.control')
+    if(kmpOs == "linux" && kmpArch == "arm64") {
+        module("kmp-tor-binary-${kmpOs}${kmpArch}-jvm-${vTor}.jar", "kmp.tor.binary.${kmpOs}${kmpArch}", "${vTor}") {
+            exports("io.matthewnelson.kmp.tor.resource.${kmpOs}.${kmpArch}")
+            exports("kmptor.${kmpOs}.${kmpArch}")
+        }
+    } else {
+        module("kmp-tor-binary-${kmpOs}${kmpArch}-jvm-${vTor}.jar", "kmp.tor.binary.${kmpOs}${kmpArch}", "${vTor}") {
+            exports("io.matthewnelson.kmp.tor.binary.${kmpOs}.${kmpArch}")
+            exports("kmptor.${kmpOs}.${kmpArch}")
+        }
     }
-    module('commons-compress-1.18.jar', 'commons.compress', '1.18') {
-        exports('org.apache.commons.compress')
-        requires('org.tukaani.xz')
+    module("kmp-tor-binary-extract-jvm-${vTor}.jar", 'kmp.tor.binary.extract.jvm', "${vTor}") {
+        exports('io.matthewnelson.kmp.tor.binary.extract')
+        exports('io.matthewnelson.kmp.tor.binary.extract.internal')
+        requires('kotlin.stdlib')
+        requires("kmp.tor.binary.${kmpOs}${kmpArch}")
+        requires('kmp.tor.binary.geoip.jvm')
     }
-    module('xz-1.6.jar', 'org.tukaani.xz', '1.6') {
-        exports('org.tukaani.xz')
+    module("kmp-tor-manager-jvm-${vKmpTor}.jar", 'kmp.tor.manager.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.manager')
+        exports('io.matthewnelson.kmp.tor.manager.util')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kmp.tor.manager.common.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.atomicfu')
+        requires('kmp.tor.controller.jvm')
+        requires('kmp.tor.common.jvm')
     }
-    module('jsocks-1.0.jar', 'com.github.ravn.jsocks', '1.0') {
-        exports('com.runjva.sourceforge.jsocks.protocol')
-        requires('org.slf4j')
+    module("kmp-tor-manager-common-jvm-${vKmpTor}.jar", 'kmp.tor.manager.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.manager.common')
+        exports('io.matthewnelson.kmp.tor.manager.common.event')
+        exports('io.matthewnelson.kmp.tor.manager.common.state')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kmp.tor.common.jvm')
+        requires('kotlin.stdlib')
+    }
+    module("kmp-tor-controller-common-jvm-${vKmpTor}.jar", 'kmp.tor.controller.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.controller.common.config')
+        exports('io.matthewnelson.kmp.tor.controller.common.file')
+        exports('io.matthewnelson.kmp.tor.controller.common.control')
+        exports('io.matthewnelson.kmp.tor.controller.common.control.usecase')
+        exports('io.matthewnelson.kmp.tor.controller.common.events')
+        exports('io.matthewnelson.kmp.tor.controller.common.exceptions')
+        requires('kmp.tor.common.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.atomicfu')
+    }
+    module("kmp-tor-common-jvm-${vKmpTor}.jar", 'kmp.tor.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.common.address')
+        requires('parcelize.jvm')
+        requires('kotlin.stdlib')
+    }
+    module("kmp-tor-controller-jvm-${vKmpTor}.jar", 'kmp.tor.controller.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.controller.internal.controller')
+        requires('kmp.tor.common.jvm')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.atomicfu')
+        requires('encoding.core.jvm')
+        requires('encoding.base16.jvm')
+    }
+    module("kmp-tor-ext-callback-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.ext.callback.common')
+    }
+    module("kmp-tor-ext-callback-manager-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.manager.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.ext.callback.manager')
+        requires('kmp.tor.manager.jvm')
+        requires('kmp.tor.ext.callback.common.jvm')
+        requires('kmp.tor.ext.callback.manager.common.jvm')
+        requires('kmp.tor.ext.callback.controller.common.jvm')
+        requires('kmp.tor.manager.common.jvm')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.coroutines.core.jvm')
+    }
+    module("kmp-tor-ext-callback-manager-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.manager.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.ext.callback.manager.common')
+        requires('kmp.tor.ext.callback.controller.common.jvm')
+    }
+    module("kmp-tor-ext-callback-controller-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.controller.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.ext.callback.controller.common.control')
+        exports('io.matthewnelson.kmp.tor.ext.callback.controller.common.control.usecase')
+    }
+    module("kmp-tor-binary-geoip-jvm-${vTor}.jar", 'kmp.tor.binary.geoip.jvm', "${vTor}") {
+        exports('io.matthewnelson.kmp.tor.binary.geoip')
+        exports('kmptor')
+    }
+    module("encoding-base16-jvm-1.2.1.jar", 'encoding.base16.jvm', "1.2.1") {
+        exports('io.matthewnelson.encoding.base16')
+        requires('encoding.core.jvm')
+        requires('kotlin.stdlib')
+    }
+    module("encoding-base32-jvm-1.2.1.jar", 'encoding.base32.jvm', "1.2.1")
+    module("encoding-base64-jvm-1.2.1.jar", 'encoding.base64.jvm', "1.2.1")
+    module("encoding-core-jvm-1.2.1.jar", 'encoding.core.jvm', "1.2.1") {
+        exports('io.matthewnelson.encoding.core')
+        requires('kotlin.stdlib')
+    }
+    module("parcelize-jvm-0.1.2.jar", 'parcelize.jvm', "0.1.2") {
+        exports('io.matthewnelson.component.parcelize')
     }
     module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
     module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {

docs/reproducible.md

@@ -82,7 +82,7 @@ sudo apt install -y rpm fakeroot binutils
 First, assign a temporary variable in your shell for the specific release you want to build. For the current one specify:
 
 ```shell
-GIT_TAG="1.7.3"
+GIT_TAG="1.7.5"
 ```
 
 The project can then be initially cloned as follows:

src/main/deploy/package/osx/Info.plist

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.7.3</string>
+  <string>1.7.6</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->

src/main/java/com/sparrowwallet/sparrow/AppController.java

@@ -753,7 +753,7 @@ public class AppController implements Initializable {
                         writer.print(transactionTabData.getPsbt().toBase64String(includeXpubs));
                         writer.flush();
                     } else {
-                        outputStream.write(transactionTabData.getPsbt().serialize(includeXpubs));
+                        outputStream.write(transactionTabData.getPsbt().serialize(includeXpubs, true));
                     }
                 } catch(IOException e) {
                     log.error("Error saving PSBT", e);

src/main/java/com/sparrowwallet/sparrow/AppServices.java

@@ -50,7 +50,6 @@ import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafx.util.Duration;
-import org.berndpruenster.netlayer.tor.Tor;
 import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -252,7 +251,7 @@ public class AppServices {
         }
 
         if(Tor.getDefault() != null) {
-            Tor.getDefault().shutdown();
+            Tor.getDefault().getTorManager().destroy(true, success -> {});
         }
     }
 
@@ -414,23 +413,6 @@ public class AppServices {
             EventManager.get().post(new TorReadyStatusEvent());
         });
         torService.setOnFailed(workerStateEvent -> {
-            Throwable exception = workerStateEvent.getSource().getException();
-            if(exception instanceof TorServerAlreadyBoundException) {
-                String proxyServer = Config.get().getProxyServer();
-                if(proxyServer == null || proxyServer.equals("")) {
-                    proxyServer = "localhost:9050";
-                    Config.get().setProxyServer(proxyServer);
-                }
-
-                if(proxyServer.equals("localhost:9050") || proxyServer.equals("127.0.0.1:9050")) {
-                    Config.get().setUseProxy(true);
-                    torService.cancel();
-                    restartServices();
-                    EventManager.get().post(new TorExternalStatusEvent());
-                    return;
-                }
-            }
-
             EventManager.get().post(new TorFailedStatusEvent(workerStateEvent.getSource().getException()));
         });
 
@@ -490,8 +472,7 @@ public class AppServices {
             InetSocketAddress proxyAddress = new InetSocketAddress(proxyHostAndPort.getHost(), proxyHostAndPort.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
             proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
         } else if(AppServices.isTorRunning()) {
-            InetSocketAddress proxyAddress = new InetSocketAddress("localhost", TorService.PROXY_PORT);
-            proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
+            proxy = Tor.getDefault().getProxy();
         }
 
         //Setting new proxy authentication credentials will force a new Tor circuit to be created
@@ -546,7 +527,7 @@ public class AppServices {
 
     public static HostAndPort getTorProxy() {
         return AppServices.isTorRunning() ?
-                HostAndPort.fromParts("localhost", TorService.PROXY_PORT) :
+                Tor.getDefault().getProxyHostAndPort() :
                 (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer()));
     }
 

src/main/java/com/sparrowwallet/sparrow/SparrowWallet.java

@@ -18,7 +18,7 @@ import java.util.*;
 public class SparrowWallet {
     public static final String APP_ID = "com.sparrowwallet.sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.7.3";
+    public static final String APP_VERSION = "1.7.6";
     public static final String APP_VERSION_SUFFIX = "";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";

src/main/java/com/sparrowwallet/sparrow/TorLogHandler.java

@@ -1,17 +0,0 @@
-package com.sparrowwallet.sparrow;
-
-import com.sparrowwallet.drongo.LogHandler;
-import com.sparrowwallet.sparrow.event.TorStatusEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.event.Level;
-
-public class TorLogHandler implements LogHandler {
-    private static final Logger log = LoggerFactory.getLogger(TorLogHandler.class);
-
-    @Override
-    public void handleLog(String threadName, Level level, String message, String loggerName, long timestamp, StackTraceElement[] callerData) {
-        log.debug(message);
-        EventManager.get().post(new TorStatusEvent(message));
-    }
-}

src/main/java/com/sparrowwallet/sparrow/control/CardImportPane.java

@@ -33,6 +33,8 @@ import javax.smartcardio.CardException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import static com.sparrowwallet.sparrow.io.CardApi.isReaderAvailable;
+
 public class CardImportPane extends TitledDescriptionPane {
     private static final Logger log = LoggerFactory.getLogger(CardImportPane.class);
 
@@ -62,6 +64,12 @@ public class CardImportPane extends TitledDescriptionPane {
     }
 
     private void importCard() {
+        if(!isReaderAvailable()) {
+            setError("No reader", "No card reader was detected.");
+            importButton.setDisable(false);
+            return;
+        }
+
         if(pin.get().length() < 6) {
             setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
             setContent(getPinEntry());

src/main/java/com/sparrowwallet/sparrow/control/CoinCell.java

@@ -4,15 +4,16 @@ import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHash;
 import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
 import com.sparrowwallet.sparrow.wallet.TransactionEntry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Tooltip;
-import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.*;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.Region;
 import javafx.util.Duration;
 import org.controlsfx.tools.Platform;
@@ -21,6 +22,7 @@ import java.text.DecimalFormat;
 
 class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsListener {
     private final CoinTooltip tooltip;
+    private final CoinContextMenu contextMenu;
 
     private IntegerProperty confirmationsProperty;
 
@@ -28,6 +30,7 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
         super();
         tooltip = new CoinTooltip();
         tooltip.setShowDelay(Duration.millis(500));
+        contextMenu = new CoinContextMenu();
         getStyleClass().add("coin-cell");
         if(Platform.getCurrent() == Platform.OSX) {
             getStyleClass().add("number-field");
@@ -42,6 +45,7 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
             setText(null);
             setGraphic(null);
             setTooltip(null);
+            setContextMenu(null);
         } else {
             Entry entry = getTreeTableView().getTreeItem(getIndex()).getValue();
             EntryCell.applyRowStyles(this, entry);
@@ -62,6 +66,8 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
                 setText(satsValue);
             }
             setTooltip(tooltip);
+            contextMenu.updateAmount(amount);
+            setContextMenu(contextMenu);
 
             if(entry instanceof TransactionEntry transactionEntry) {
                 tooltip.showConfirmations(transactionEntry.confirmationsProperty());
@@ -155,4 +161,36 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
             }
         }
     }
+
+    private static class CoinContextMenu extends ContextMenu {
+        private Number amount;
+
+        public void updateAmount(Number amount) {
+            if(amount.equals(this.amount)) {
+                return;
+            }
+
+            this.amount = amount;
+            getItems().clear();
+
+            MenuItem copySatsValue = new MenuItem("Copy Value in sats");
+            copySatsValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(amount.toString());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            MenuItem copyBtcValue = new MenuItem("Copy Value in BTC");
+            copyBtcValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+                content.putString(format.formatBtcValue(amount.longValue()));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            getItems().addAll(copySatsValue, copyBtcValue);
+        }
+    }
 }

src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java

@@ -0,0 +1,398 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.PdfUtils;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.event.Event;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.StackPane;
+import javafx.stage.FileChooser;
+import org.controlsfx.control.spreadsheet.*;
+import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.tools.Platform;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.stream.Collectors;
+
+
+public class MnemonicGridDialog extends Dialog<List<String>> {
+    private final SpreadsheetView spreadsheetView;
+
+    private final int GRID_COLUMN_COUNT = 16;
+
+    private final BooleanProperty initializedProperty = new SimpleBooleanProperty(false);
+    private final BooleanProperty wordsSelectedProperty = new SimpleBooleanProperty(false);
+
+    private final List<TablePosition> selectedCells = new ArrayList<>();
+
+    public MnemonicGridDialog() {
+        DialogPane dialogPane = new MnemonicGridDialogPane();
+        setDialogPane(dialogPane);
+        setTitle("Border Wallets Grid");
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("grid.css").toExternalForm());
+        dialogPane.setHeaderText("Load a Border Wallets PDF, or generate a grid from a BIP39 seed.\nThen select 11 or 23 words in a pattern on the grid, one at a time (do not drag).\nThe order of selection is important!");
+        javafx.scene.image.Image image = new Image("/image/border-wallets.png");
+        dialogPane.setGraphic(new ImageView(image));
+
+        String[][] emptyWordGrid = new String[128][GRID_COLUMN_COUNT];
+        Grid grid = getGrid(emptyWordGrid);
+
+        spreadsheetView = new SpreadsheetView(grid);
+        spreadsheetView.addEventFilter(MouseEvent.MOUSE_PRESSED, event -> {
+            try {
+                Field f = event.getClass().getDeclaredField(Platform.getCurrent() == Platform.OSX ? "metaDown" : "controlDown");
+                f.setAccessible(true);
+                f.set(event, true);
+            } catch(IllegalAccessException | NoSuchFieldException e) {
+                //ignore
+            }
+        });
+        spreadsheetView.setId("grid");
+        spreadsheetView.setEditable(false);
+        spreadsheetView.setFixingColumnsAllowed(false);
+        spreadsheetView.setFixingRowsAllowed(false);
+
+        spreadsheetView.getSelectionModel().getSelectedCells().addListener(new ListChangeListener<>() {
+            @Override
+            public void onChanged(Change<? extends TablePosition> c) {
+                while(c.next()) {
+                    if(c.wasRemoved()) {
+                        selectedCells.removeAll(c.getRemoved());
+                    }
+                    if(c.wasAdded()) {
+                        selectedCells.addAll(c.getAddedSubList());
+                    }
+                }
+
+                int numWords = c.getList().size();
+                wordsSelectedProperty.set(numWords == 11 || numWords == 23);
+            }
+        });
+
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().add(spreadsheetView);
+        dialogPane.setContent(stackPane);
+
+        stackPane.widthProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null) {
+                for(SpreadsheetColumn column : spreadsheetView.getColumns()) {
+                    column.setPrefWidth((newValue.doubleValue() - spreadsheetView.getRowHeaderWidth() - 3) / 17);
+                }
+            }
+        });
+
+        dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+        final ButtonType loadCsvButtonType = new javafx.scene.control.ButtonType("Load PDF...", ButtonBar.ButtonData.LEFT);
+        dialogPane.getButtonTypes().add(loadCsvButtonType);
+
+        final ButtonType generateButtonType = new javafx.scene.control.ButtonType("Generate Grid...", ButtonBar.ButtonData.HELP_2);
+        dialogPane.getButtonTypes().add(generateButtonType);
+
+        final ButtonType clearButtonType = new javafx.scene.control.ButtonType("Clear Selection", ButtonBar.ButtonData.OTHER);
+        dialogPane.getButtonTypes().add(clearButtonType);
+
+        Button okButton = (Button)dialogPane.lookupButton(ButtonType.OK);
+        okButton.disableProperty().bind(Bindings.not(Bindings.and(initializedProperty, wordsSelectedProperty)));
+
+        setResultConverter((dialogButton) -> {
+            ButtonBar.ButtonData data = dialogButton == null ? null : dialogButton.getButtonData();
+            return data == ButtonBar.ButtonData.OK_DONE ? getSelectedWords() : null;
+        });
+
+        dialogPane.setPrefWidth(850);
+        dialogPane.setPrefHeight(500);
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.moveToActiveWindowScreen(this);
+    }
+
+    private Grid getGrid(String[][] wordGrid) {
+        int rowCount = wordGrid.length;
+        int columnCount = wordGrid[0].length;
+        GridBase grid = new GridBase(rowCount, columnCount);
+        ObservableList<ObservableList<SpreadsheetCell>> rows = FXCollections.observableArrayList();
+        grid.getColumnHeaders().setAll("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P");
+        for(int i = 0; i < rowCount; i++) {
+            final ObservableList<SpreadsheetCell> list = FXCollections.observableArrayList();
+            for(int j = 0; j < columnCount; j++) {
+                list.add(createCell(i, j, wordGrid[i][j]));
+            }
+            rows.add(list);
+            grid.getRowHeaders().add(String.format("%03d", i + 1));
+        }
+        grid.setRows(rows);
+
+        return grid;
+    }
+
+    private SpreadsheetCell createCell(int row, int column, String word) {
+        return SpreadsheetCellType.STRING.createCell(row, column, 1, 1, word == null ? "" : word);
+    }
+
+    private List<String> getSelectedWords() {
+        List<String> abbreviations = selectedCells.stream()
+                .map(position -> (String)spreadsheetView.getGrid().getRows().get(position.getRow()).get(position.getColumn()).getItem()).collect(Collectors.toList());
+
+        List<String> words = new ArrayList<>();
+        for(String abbreviation : abbreviations) {
+            for(String word : Bip39MnemonicCode.INSTANCE.getWordList()) {
+                if((abbreviation.length() == 3 && word.equals(abbreviation)) || (abbreviation.length() >= 4 && word.startsWith(abbreviation))) {
+                    words.add(word);
+                    break;
+                }
+            }
+
+            try {
+                int index = Integer.parseInt(abbreviation);
+                words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
+            } catch(NumberFormatException e) {
+                //ignore
+            }
+        }
+
+        if(words.size() != abbreviations.size()) {
+            abbreviations.removeIf(abbr -> words.stream().anyMatch(w -> w.startsWith(abbr)));
+            throw new IllegalStateException("Could not find words for abbreviations: " + abbreviations);
+        }
+
+        return words;
+    }
+
+    public List<String> shuffle(List<String> mnemonic) {
+        String mnemonicString = String.join(" ", mnemonic);
+        List<String> words = new ArrayList<>(Bip39MnemonicCode.INSTANCE.getWordList());
+
+        UltraHighEntropyPrng uhePrng = new UltraHighEntropyPrng();
+        uhePrng.initState();
+        uhePrng.hashString(mnemonicString);
+        for(int i = words.size() - 1; i > 0; i--) {
+            int j = (int)uhePrng.random(i + 1);
+            String tmp = words.get(i);
+            words.set(i, words.get(j));
+            words.set(j, tmp);
+        }
+
+        return words;
+    }
+
+    private String[][] toGrid(List<String> words) {
+        String[][] grid = new String[words.size()/GRID_COLUMN_COUNT][GRID_COLUMN_COUNT];
+
+        int row = 0;
+        int col = 0;
+        for(String word : words) {
+            String abbr = word.length() < 4 ? word : word.substring(0, 4);
+            grid[row][col] = abbr;
+            col++;
+            if(col >= GRID_COLUMN_COUNT) {
+                col = 0;
+                row++;
+            }
+        }
+
+        return grid;
+    }
+
+    private class MnemonicGridDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            Node button;
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                Button loadButton = new Button(buttonType.getText());
+                loadButton.setGraphicTextGap(5);
+                loadButton.setGraphic(getGlyph(FontAwesome5.Glyph.ARROW_UP));
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(loadButton, buttonData);
+                loadButton.setOnAction(event -> {
+                    FileChooser fileChooser = new FileChooser();
+                    fileChooser.setTitle("Open PDF");
+                    fileChooser.getExtensionFilters().addAll(
+                            new FileChooser.ExtensionFilter("All Files", org.controlsfx.tools.Platform.getCurrent().equals(org.controlsfx.tools.Platform.UNIX) ? "*" : "*.*"),
+                            new FileChooser.ExtensionFilter("PDF", "*.pdf")
+                    );
+
+                    AppServices.moveToActiveWindowScreen(this.getScene().getWindow(), 800, 450);
+                    File file = fileChooser.showOpenDialog(this.getScene().getWindow());
+                    if(file != null) {
+                        try(BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
+                            String[][] wordGrid = PdfUtils.getWordGrid(inputStream);
+                            spreadsheetView.setGrid(getGrid(wordGrid));
+                            selectedCells.clear();
+                            spreadsheetView.getSelectionModel().clearSelection();
+                            initializedProperty.set(true);
+                        } catch(Exception e) {
+                            AppServices.showErrorDialog("Cannot load PDF", e.getMessage());
+                        }
+                    }
+                });
+
+                button = loadButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.HELP_2) {
+                Button generateButton = new Button(buttonType.getText());
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(generateButton, buttonData);
+                generateButton.setOnAction(event -> {
+                    SeedEntryDialog seedEntryDialog = new SeedEntryDialog("Border Wallets Entropy Grid Recovery Seed", 12);
+                    Optional<List<String>> optWords = seedEntryDialog.showAndWait();
+                    if(optWords.isPresent()) {
+                        List<String> mnemonicWords = optWords.get();
+                        List<String> shuffledWordList = shuffle(mnemonicWords);
+                        String[][] wordGrid = toGrid(shuffledWordList);
+                        spreadsheetView.setGrid(getGrid(wordGrid));
+                        selectedCells.clear();
+                        spreadsheetView.getSelectionModel().clearSelection();
+                        initializedProperty.set(true);
+
+                        if(seedEntryDialog.isGenerated()) {
+                            PdfUtils.saveWordGrid(wordGrid, mnemonicWords);
+                        }
+                    }
+                });
+
+                button = generateButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.OTHER) {
+                Button clearButton = new Button(buttonType.getText());
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(clearButton, buttonData);
+                clearButton.setOnAction(event -> {
+                    selectedCells.clear();
+                    spreadsheetView.getSelectionModel().clearSelection();
+                });
+
+                button = clearButton;
+            } else {
+                button = super.createButton(buttonType);
+            }
+
+            return button;
+        }
+
+        private Glyph getGlyph(FontAwesome5.Glyph glyphName) {
+            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphName);
+            glyph.setFontSize(11);
+            return glyph;
+        }
+    }
+
+    public static class UltraHighEntropyPrng {
+        private final int order;
+        private double carry;
+        private int phase;
+        private final double[] intermediates;
+        private int i, j, k; // general purpose locals
+
+        public UltraHighEntropyPrng() {
+            order = 48; // set the 'order' number of ENTROPY-holding 32-bit values
+            carry = 1; // init the 'carry' used by the multiply-with-carry (MWC) algorithm
+            phase = order; // init the 'phase' (max-1) of the intermediate variable pointer
+            intermediates = new double[order]; // declare our intermediate variables array
+
+            for(i = 0; i < order; i++) {
+                // Used to simulate javascript's Math.random
+                Random random = new Random();
+                intermediates[i] = mash(random.nextInt(Integer.MAX_VALUE)); // fill the array with initial mash hash values
+            }
+        }
+
+        public double random(int range) {
+            return Math.floor(range * (rawPrng() + ((long)(rawPrng() * 0x200000L)) * 1.1102230246251565e-16)); // 2^-53
+        }
+
+        private String randomString(int count) {
+            StringBuilder stringBuilder = new StringBuilder();
+            for(i = 0; i < count; i++) {
+                char newChar = (char) (33 + random(94));
+                stringBuilder.append(newChar);
+            }
+            return stringBuilder.toString();
+        }
+
+        private double rawPrng() {
+            if(++phase >= order) {
+                phase = 0;
+            }
+            double t = 1768863 * intermediates[phase] + carry * 2.3283064365386963e-10; // 2^-32
+            long temp = (long)t;
+            return intermediates[phase] = t - (carry = temp);
+        }
+
+        private void hash(String args) {
+            for(i = 0; i < args.length(); i++) {
+                for(j = 0; j < order; j++) {
+                    intermediates[j] -= mash(args.charAt(i));
+                    if(intermediates[j] < 0) {
+                        intermediates[j] = intermediates[j] + 1;
+                    }
+                }
+            }
+        }
+
+        public void hashString(String input) {
+            mash(input); // use the string to evolve the 'mash' state
+
+            char[] inputAry = input.toCharArray();
+            for(i = 0; i < inputAry.length; i++) // scan through the characters in our string
+            {
+                k = inputAry[i]; // get the character code at the location
+                for(j = 0; j < order; j++) // "mash" it into the UHEPRNG state
+                {
+                    intermediates[j] -= mash(k);
+                    if(intermediates[j] < 0) {
+                        intermediates[j] += 1;
+                    }
+                }
+            }
+        }
+
+        public void initState() {
+            mash(null);
+            for(i = 0; i < order; i++) {
+                intermediates[i] = mash(' '); // fill the array with initial mash hash values
+            }
+            carry = 1; // init our multiply-with-carry carry
+            phase = order; // init our phase
+        }
+
+        double n = Integer.toUnsignedLong(0xefc8249d);
+
+        private double mash(Object data) {
+            if(data != null) {
+                String strData = data.toString();
+                for(int i = 0; i < strData.length(); i++) {
+                    n += strData.charAt(i);
+                    double h = 0.02519603282416938 * n;
+                    n = Integer.toUnsignedLong((int)h);
+                    h -= n;
+                    h *= n;
+                    n = Integer.toUnsignedLong((int)h);
+                    h -= n;
+                    n += h * 0x100000000L; // 2^32
+                }
+                return ((long)n) * 2.3283064365386963e-10; // 2^-32
+            } else {
+                n = Integer.toUnsignedLong(0xefc8249d);
+            }
+
+            return n;
+        }
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreDisplayPane.java

@@ -1,6 +1,5 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.drongo.wallet.DeterministicSeed;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.WalletModel;
 import javafx.beans.property.SimpleListProperty;
@@ -25,7 +24,7 @@ public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
     }
 
     @Override
-    protected Node getMnemonicWordsEntry(int numWords, boolean editPassphrase) {
+    protected Node getMnemonicWordsEntry(int numWords, boolean showPassphrase, boolean editPassphrase) {
         VBox vBox = new VBox();
         vBox.setSpacing(10);
 

src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreEntryPane.java

@@ -0,0 +1,95 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.List;
+
+public class MnemonicKeystoreEntryPane extends MnemonicKeystorePane {
+    private final BooleanProperty validProperty = new SimpleBooleanProperty(false);
+
+    private boolean generated;
+
+    public MnemonicKeystoreEntryPane(String name, int numWords) {
+        super(name, "Enter seed words", "", "image/" + WalletModel.SEED.getType() + ".png");
+        showHideLink.setVisible(false);
+        buttonBox.getChildren().clear();
+
+        defaultWordSizeProperty.set(numWords);
+        setDescription("Generate new or enter existing");
+        showHideLink.setVisible(false);
+        setContent(getMnemonicWordsEntry(numWords, false, true));
+        setExpanded(true);
+    }
+
+    @Override
+    protected List<Node> createRightButtons() {
+        Button button = new Button("Next");
+        button.setVisible(false);
+        return List.of(button);
+    }
+
+    @Override
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        if(!empty && validWords) {
+            try {
+                Bip39MnemonicCode.INSTANCE.check(wordEntriesProperty.get());
+                validChecksum = true;
+            } catch(MnemonicException e) {
+                invalidLabel.setText("Invalid checksum");
+                invalidLabel.setTooltip(null);
+            }
+        }
+
+        validProperty.set(validChecksum);
+        validLabel.setVisible(validChecksum);
+        invalidLabel.setVisible(!validChecksum && !empty);
+    }
+
+    public void generateNew() {
+        int mnemonicSeedLength = wordEntriesProperty.get().size() * 11;
+        int entropyLength = mnemonicSeedLength - (mnemonicSeedLength/33);
+
+        SecureRandom secureRandom;
+        try {
+            secureRandom = SecureRandom.getInstanceStrong();
+        } catch(NoSuchAlgorithmException e) {
+            secureRandom = new SecureRandom();
+        }
+
+        DeterministicSeed deterministicSeed = new DeterministicSeed(secureRandom, entropyLength, "");
+        displayMnemonicCode(deterministicSeed);
+        generated = true;
+    }
+
+    private void displayMnemonicCode(DeterministicSeed deterministicSeed) {
+        setDescription("Write down these words");
+        showHideLink.setVisible(false);
+
+        for (int i = 0; i < wordsPane.getChildren().size(); i++) {
+            WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
+            wordEntry.getEditor().setText(deterministicSeed.getMnemonicCode().get(i));
+            wordEntry.getEditor().setEditable(false);
+        }
+    }
+
+    public boolean isValid() {
+        return validProperty.get();
+    }
+
+    public BooleanProperty validProperty() {
+        return validProperty;
+    }
+
+    public boolean isGenerated() {
+        return generated;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java

@@ -223,7 +223,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
     private void confirmBackup() {
         setDescription("Confirm backup by re-entering words");
         showHideLink.setVisible(false);
-        setContent(getMnemonicWordsEntry(wordEntriesProperty.get().size(), false));
+        setContent(getMnemonicWordsEntry(wordEntriesProperty.get().size(), true, false));
         setExpanded(true);
         backButton.setVisible(true);
         generateButton.setVisible(false);

src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java

@@ -12,6 +12,8 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Task;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
@@ -20,8 +22,8 @@ import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.layout.*;
 import javafx.util.Callback;
+import javafx.util.Duration;
 import org.controlsfx.control.textfield.AutoCompletionBinding;
-import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -44,7 +46,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
     protected Label invalidLabel;
 
     protected SimpleListProperty<String> wordEntriesProperty;
-    protected final SimpleStringProperty passphraseProperty = new SimpleStringProperty();
+    protected final SimpleStringProperty passphraseProperty = new SimpleStringProperty("");
     protected IntegerProperty defaultWordSizeProperty;
 
     public MnemonicKeystorePane(String title, String description, String content, String imageUrl) {
@@ -79,6 +81,12 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
             enterMnemonicButton.getItems().add(item);
         }
         enterMnemonicButton.getItems().add(new SeparatorMenuItem());
+        MenuItem gridItem = new MenuItem("Border Wallets Grid...");
+        gridItem.setOnAction(event -> {
+            showGrid();
+        });
+        enterMnemonicButton.getItems().add(gridItem);
+
         MenuItem scanItem = new MenuItem("Scan QR...");
         scanItem.setOnAction(event -> {
             scanQR();
@@ -87,6 +95,43 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         enterMnemonicButton.managedProperty().bind(enterMnemonicButton.visibleProperty());
     }
 
+    protected void showGrid() {
+        MnemonicGridDialog mnemonicGridDialog = new MnemonicGridDialog();
+        Optional<List<String>> optWords = mnemonicGridDialog.showAndWait();
+        if(optWords.isPresent()) {
+            List<String> words = optWords.get();
+            defaultWordSizeProperty.set(words.size() + 1);
+            setContent(getMnemonicWordsEntry(words.size() + 1, true, true));
+            setExpanded(true);
+
+            for(int i = 0; i < wordsPane.getChildren().size(); i++) {
+                WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
+                if(i < words.size()) {
+                    wordEntry.getEditor().setText(words.get(i));
+                    wordEntry.getEditor().setEditable(false);
+                } else {
+                    ScheduledService<Void> service = new ScheduledService<>() {
+                        @Override
+                        protected Task<Void> createTask() {
+                            return new Task<>() {
+                                @Override
+                                protected Void call() {
+                                    return null;
+                                }
+                            };
+                        }
+                    };
+                    service.setDelay(Duration.millis(500));
+                    service.setOnSucceeded(event1 -> {
+                        service.cancel();
+                        Platform.runLater(() -> wordEntry.getEditor().requestFocus());
+                    });
+                    service.start();
+                }
+            }
+        }
+    }
+
     protected void scanQR() {
         QRScanDialog qrScanDialog = new QRScanDialog();
         Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
@@ -106,7 +151,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
     protected void showWordList(DeterministicSeed seed) {
         List<String> words = seed.getMnemonicCode();
-        setContent(getMnemonicWordsEntry(words.size(), true));
+        setContent(getMnemonicWordsEntry(words.size(), true, true));
         setExpanded(true);
 
         for(int i = 0; i < wordsPane.getChildren().size(); i++) {
@@ -119,11 +164,11 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
     protected void enterMnemonic(int numWords) {
         setDescription("Generate new or enter existing");
         showHideLink.setVisible(false);
-        setContent(getMnemonicWordsEntry(numWords, true));
+        setContent(getMnemonicWordsEntry(numWords, true, true));
         setExpanded(true);
     }
 
-    protected Node getMnemonicWordsEntry(int numWords, boolean editPassphrase) {
+    protected Node getMnemonicWordsEntry(int numWords, boolean showPassphrase, boolean editPassphrase) {
         VBox vBox = new VBox();
         vBox.setSpacing(10);
 
@@ -152,10 +197,12 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
         vBox.getChildren().add(wordsPane);
 
-        PassphraseEntry passphraseEntry = new PassphraseEntry(editPassphrase);
-        wordEntries.get(wordEntries.size() - 1).setNextField(passphraseEntry.getEditor());
-        passphraseEntry.setPadding(new Insets(0, 26, 10, 10));
-        vBox.getChildren().add(passphraseEntry);
+        if(showPassphrase) {
+            PassphraseEntry passphraseEntry = new PassphraseEntry(editPassphrase);
+            wordEntries.get(wordEntries.size() - 1).setNextField(passphraseEntry.getEditor());
+            passphraseEntry.setPadding(new Insets(0, 26, 10, 10));
+            vBox.getChildren().add(passphraseEntry);
+        }
 
         AnchorPane buttonPane = new AnchorPane();
         buttonPane.setPadding(new Insets(0, 26, 0, 10));
@@ -250,9 +297,14 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                     if(clipboard.hasString() && clipboard.getString().matches("(?m).+[\\n\\s][\\S\\s]*")) {
                         String[] words = clipboard.getString().split("[\\n\\s]");
                         WordEntry entry = WordEntry.this;
-                        for(String word : words) {
+                        for(int i = 0; i < words.length; i++) {
+                            String word = words[i];
                             if(entry.nextField != null) {
-                                entry.nextField.requestFocus();
+                                if(i == words.length - 2 && isValid(word)) {
+                                    label.requestFocus();
+                                } else {
+                                    entry.nextField.requestFocus();
+                                }
                             }
 
                             entry.wordField.setText(word);
@@ -282,7 +334,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
             wordField.setTextFormatter(formatter);
 
             wordList = Bip39MnemonicCode.INSTANCE.getWordList();
-            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList));
+            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList, wordNumber, wordEntryList));
             autoCompletionBinding.setDelay(50);
             autoCompletionBinding.setOnAutoCompleted(event -> {
                 if(nextField != null) {
@@ -290,11 +342,20 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                 }
             });
 
+            //Show autocomplete for the last word on focus if empty
+            boolean lastWord = wordNumber == wordEntryList.size() - 1;
+            if(lastWord) {
+                wordField.focusedProperty().addListener((observable, oldValue, focused) -> {
+                    if(focused && wordField.getText().isEmpty()) {
+                        autoCompletionBinding.setUserInput("");
+                    }
+                });
+            }
+
             ValidationSupport validationSupport = new ValidationSupport();
             validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
             validationSupport.registerValidator(wordField, Validator.combine(
-                    Validator.createEmptyValidator("Word is required"),
-                    (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid word", !wordList.contains(newValue))
+                    (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid word", (newValue.length() > 0 || !lastWord) && !wordList.contains(newValue))
             ));
 
             wordField.textProperty().addListener((observable, oldValue, newValue) -> {
@@ -323,13 +384,30 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
     protected static class WordlistSuggestionProvider implements Callback<AutoCompletionBinding.ISuggestionRequest, Collection<String>> {
         private final List<String> wordList;
+        private final int wordNumber;
+        private final ObservableList<String> wordEntryList;
 
-        public WordlistSuggestionProvider(List<String> wordList) {
+        public WordlistSuggestionProvider(List<String> wordList, int wordNumber, ObservableList<String> wordEntryList) {
             this.wordList = wordList;
+            this.wordNumber = wordNumber;
+            this.wordEntryList = wordEntryList;
         }
 
         @Override
         public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
+            if(wordNumber == wordEntryList.size() - 1 && allPreviousWordsValid()) {
+                try {
+                    List<String> possibleLastWords = Bip39MnemonicCode.INSTANCE.getPossibleLastWords(wordEntryList.subList(0, wordEntryList.size() - 1));
+                    if(!request.getUserText().isEmpty()) {
+                        possibleLastWords.removeIf(s -> !s.startsWith(request.getUserText()));
+                    }
+
+                    return possibleLastWords;
+                } catch(Exception e) {
+                    log.warn("Cannot determine possible last words", e);
+                }
+            }
+
             List<String> suggestions = new ArrayList<>();
             if(!request.getUserText().isEmpty()) {
                 for(String word : wordList) {
@@ -341,6 +419,16 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
             return suggestions;
         }
+
+        private boolean allPreviousWordsValid() {
+            for(int i = 0; i < wordEntryList.size() - 1; i++) {
+                if(!WordEntry.isValid(wordEntryList.get(i))) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 
     protected class PassphraseEntry extends HBox {

src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java

@@ -260,7 +260,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 DeterministicSeed seed;
                 try {
                     extendedKey = ExtendedKey.fromDescriptor(qrtext);
-                    result = new Result(extendedKey);
+                    result = new Result(extendedKey, null);
                     return;
                 } catch(Exception e) {
                     //Ignore, not a valid xpub
@@ -409,7 +409,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 } else if(urRegistryType.equals(RegistryType.CRYPTO_HDKEY)) {
                     CryptoHDKey cryptoHDKey = (CryptoHDKey)ur.decodeFromRegistry();
                     ExtendedKey extendedKey = getExtendedKey(cryptoHDKey);
-                    return new Result(extendedKey);
+                    return new Result(extendedKey, cryptoHDKey.getName());
                 } else if(urRegistryType.equals(RegistryType.CRYPTO_OUTPUT)) {
                     CryptoOutput cryptoOutput = (CryptoOutput)ur.decodeFromRegistry();
                     OutputDescriptor outputDescriptor = getOutputDescriptor(cryptoOutput);
@@ -662,6 +662,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
         public final PSBT psbt;
         public final BitcoinURI uri;
         public final ExtendedKey extendedKey;
+        public final String extendedKeyName;
         public final OutputDescriptor outputDescriptor;
         public final List<Wallet> wallets;
         public final DeterministicSeed seed;
@@ -673,6 +674,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = null;
@@ -685,6 +687,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = psbt;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = null;
@@ -697,6 +700,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = uri;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = null;
@@ -709,6 +713,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = BitcoinURI.fromAddress(address);
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = null;
@@ -716,11 +721,12 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.exception = null;
         }
 
-        public Result(ExtendedKey extendedKey) {
+        public Result(ExtendedKey extendedKey, String name) {
             this.transaction = null;
             this.psbt = null;
             this.uri = null;
             this.extendedKey = extendedKey;
+            this.extendedKeyName = name;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = null;
@@ -733,6 +739,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = outputDescriptor;
             this.wallets = null;
             this.seed = null;
@@ -745,6 +752,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = wallets;
             this.seed = null;
@@ -757,6 +765,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = seed;
@@ -769,6 +778,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = null;
@@ -781,6 +791,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
             this.seed = null;

src/main/java/com/sparrowwallet/sparrow/control/SeedEntryDialog.java

@@ -0,0 +1,91 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.application.Platform;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.StackPane;
+
+import java.util.List;
+
+public class SeedEntryDialog extends Dialog<List<String>> {
+    private final MnemonicKeystoreEntryPane keystorePane;
+
+    public SeedEntryDialog(String name, int numWords) {
+        final DialogPane dialogPane = new MnemonicGridDialogPane();
+        setDialogPane(dialogPane);
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        int lines = numWords / 3;
+        int height = lines * 40;
+
+        StackPane stackPane = new StackPane();
+        dialogPane.setContent(stackPane);
+
+        AnchorPane anchorPane = new AnchorPane();
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.getStyleClass().add("edge-to-edge");
+        scrollPane.setPrefHeight(104 + height);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        anchorPane.getChildren().add(scrollPane);
+        scrollPane.setFitToWidth(true);
+        AnchorPane.setLeftAnchor(scrollPane, 0.0);
+        AnchorPane.setRightAnchor(scrollPane, 0.0);
+
+        Accordion keystoreAccordion = new Accordion();
+        scrollPane.setContent(keystoreAccordion);
+
+        keystorePane = new MnemonicKeystoreEntryPane(name, numWords);
+        keystorePane.setAnimated(false);
+        keystoreAccordion.getPanes().add(keystorePane);
+
+        stackPane.getChildren().addAll(anchorPane);
+
+        dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+        Button okButton = (Button)dialogPane.lookupButton(ButtonType.OK);
+        okButton.disableProperty().bind(keystorePane.validProperty().not());
+
+        final ButtonType generateButtonType = new javafx.scene.control.ButtonType("Generate New", ButtonBar.ButtonData.LEFT);
+        dialogPane.getButtonTypes().add(generateButtonType);
+
+        setResultConverter((dialogButton) -> {
+            ButtonBar.ButtonData data = dialogButton == null ? null : dialogButton.getButtonData();
+            return data == ButtonBar.ButtonData.OK_DONE ? keystorePane.wordEntriesProperty.get() : null;
+        });
+
+        dialogPane.setPrefWidth(500);
+        dialogPane.setPrefHeight(180 + height);
+        AppServices.moveToActiveWindowScreen(this);
+
+        Platform.runLater(() -> keystoreAccordion.setExpandedPane(keystorePane));
+    }
+
+    private class MnemonicGridDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            Node button;
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                Button generateButton = new Button(buttonType.getText());
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(generateButton, buttonData);
+                generateButton.setOnAction(event -> {
+                    keystorePane.generateNew();
+                });
+
+                button = generateButton;
+            } else {
+                button = super.createButton(buttonType);
+            }
+
+            return button;
+        }
+    }
+
+    public boolean isGenerated() {
+        return keystorePane.isGenerated();
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java

@@ -11,10 +11,13 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.*;
 import java.util.Optional;
 
 public class TextAreaDialog extends Dialog<String> {
@@ -22,6 +25,8 @@ public class TextAreaDialog extends Dialog<String> {
 
     private final TextArea textArea;
     private final String defaultValue;
+    private final String fileName;
+    private final byte[] fileBytes;
 
     public TextAreaDialog() {
         this("");
@@ -31,7 +36,11 @@ public class TextAreaDialog extends Dialog<String> {
         this(defaultValue, true);
     }
 
-    public TextAreaDialog(@NamedArg("defaultValue") String defaultValue, @NamedArg("editable") boolean editable) {
+    public TextAreaDialog(String defaultValue, boolean editable) {
+        this(defaultValue, editable, null, null);
+    }
+
+    public TextAreaDialog(@NamedArg("defaultValue") String defaultValue, @NamedArg("editable") boolean editable, @NamedArg("fileName") String fileName, @NamedArg("fileBytes") byte[] fileBytes) {
         final DialogPane dialogPane = new TextAreaDialogPane();
         setDialogPane(dialogPane);
 
@@ -48,6 +57,8 @@ public class TextAreaDialog extends Dialog<String> {
         HBox.setHgrow(this.textArea, Priority.ALWAYS);
 
         this.defaultValue = defaultValue;
+        this.fileName = fileName;
+        this.fileBytes = fileBytes;
 
         dialogPane.setContent(hbox);
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
@@ -60,6 +71,9 @@ public class TextAreaDialog extends Dialog<String> {
 
             final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.LEFT);
             dialogPane.getButtonTypes().add(scanButtonType);
+        } else if(fileBytes != null) {
+            final ButtonType saveButtonType = new javafx.scene.control.ButtonType("Save File...", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(saveButtonType);
         }
 
         Platform.runLater(textArea::requestFocus);
@@ -86,7 +100,7 @@ public class TextAreaDialog extends Dialog<String> {
         @Override
         protected Node createButton(ButtonType buttonType) {
             Node button;
-            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT && buttonType.getText().equals("Scan QR")) {
                 Button scanButton = new Button(buttonType.getText());
                 scanButton.setGraphicTextGap(5);
                 scanButton.setGraphic(getGlyph(FontAwesome5.Glyph.CAMERA));
@@ -118,6 +132,38 @@ public class TextAreaDialog extends Dialog<String> {
                 });
 
                 button = scanButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT && buttonType.getText().equals("Save File...")) {
+                Button saveButton = new Button(buttonType.getText());
+
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(saveButton, buttonData);
+
+                saveButton.setOnAction(event -> {
+                    Stage window = new Stage();
+
+                    FileChooser fileChooser = new FileChooser();
+                    fileChooser.setTitle("Save File");
+
+                    if(fileName != null) {
+                        fileChooser.setInitialFileName(fileName);
+                    }
+
+                    AppServices.moveToActiveWindowScreen(window, 800, 450);
+                    File file = fileChooser.showSaveDialog(window);
+                    if(file != null) {
+                        try {
+                            try(OutputStream outputStream = new FileOutputStream(file)) {
+                                outputStream.write(fileBytes);
+                                outputStream.flush();
+                            }
+                        } catch(IOException e) {
+                            log.error("Error saving file", e);
+                            AppServices.showErrorDialog("Error saving file", "Cannot write to " + file.getAbsolutePath());
+                        }
+                    }
+                });
+
+                button = saveButton;
             } else {
                 button = super.createButton(buttonType);
             }

src/main/java/com/sparrowwallet/sparrow/control/TorStatusLabel.java

@@ -6,6 +6,7 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
 import javafx.geometry.Insets;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -33,15 +34,15 @@ public class TorStatusLabel extends Label {
     }
 
     public void update() {
-        boolean proxyInUse = AppServices.isUsingProxy();
-        boolean internal = AppServices.isTorRunning();
-
-        if(!proxyInUse || internal) {
+        if(!Config.get().isUseProxy()) {
             torConnectionTest.cancel();
-            if(internal) {
+            if(AppServices.isTorRunning()) {
                 setTooltip(new Tooltip("Internal Tor proxy enabled"));
             }
         } else if(!torConnectionTest.isRunning()) {
+            if(torConnectionTest.getState() == Worker.State.CANCELLED || torConnectionTest.getState() == Worker.State.FAILED) {
+                torConnectionTest.reset();
+            }
             torConnectionTest.setPeriod(Duration.seconds(20.0));
             torConnectionTest.setBackoffStrategy(null);
             torConnectionTest.setOnSucceeded(workerStateEvent -> {

src/main/java/com/sparrowwallet/sparrow/event/TorFailedStatusEvent.java

@@ -1,13 +1,10 @@
 package com.sparrowwallet.sparrow.event;
 
-import com.sparrowwallet.sparrow.net.TorServerAlreadyBoundException;
-
 public class TorFailedStatusEvent extends TorStatusEvent {
     private final Throwable exception;
 
     public TorFailedStatusEvent(Throwable exception) {
-        super("Tor failed to start: " + (exception instanceof TorServerAlreadyBoundException ? exception.getCause().getMessage() + " Is a Tor proxy already running?" :
-                (exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage())));
+        super("Tor failed to start: " + (exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage()));
         this.exception = exception;
     }
 

src/main/java/com/sparrowwallet/sparrow/event/WalletGapLimitChangedEvent.java

@@ -1,17 +1,41 @@
 package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletNode;
 
 /**
  * This event is posted if the wallet's gap limit has changed, and triggers a history fetch for the new nodes.
  *
  */
 public class WalletGapLimitChangedEvent extends WalletChangedEvent {
-    public WalletGapLimitChangedEvent(Wallet wallet) {
+    private final String walletId;
+    private final int previousGapLimit;
+
+    public WalletGapLimitChangedEvent(String walletId, Wallet wallet, int previousGapLimit) {
         super(wallet);
+        this.walletId = walletId;
+        this.previousGapLimit = previousGapLimit;
+    }
+
+    public String getWalletId() {
+        return walletId;
     }
 
     public int getGapLimit() {
         return getWallet().getGapLimit();
     }
+
+    public int getPreviousGapLimit() {
+        return previousGapLimit;
+    }
+
+    public int getPreviousLookAheadIndex(WalletNode node) {
+        int lookAheadIndex = getPreviousGapLimit() - 1;
+        Integer highestUsed = node.getHighestUsedIndex();
+        if(highestUsed != null) {
+            lookAheadIndex = highestUsed + getPreviousGapLimit();
+        }
+
+        return lookAheadIndex;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/io/PdfUtils.java

@@ -9,10 +9,14 @@ import com.google.zxing.qrcode.QRCodeWriter;
 import com.lowagie.text.*;
 import com.lowagie.text.Font;
 import com.lowagie.text.Image;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.alignment.HorizontalAlignment;
+import com.lowagie.text.alignment.VerticalAlignment;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.parser.PdfTextExtractor;
 import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.UREncoder;
@@ -25,8 +29,8 @@ import org.slf4j.LoggerFactory;
 
 import java.awt.*;
 import java.io.*;
-import java.util.Locale;
-import java.util.Scanner;
+import java.util.*;
+import java.util.List;
 
 public class PdfUtils {
     private static final Logger log = LoggerFactory.getLogger(PdfUtils.class);
@@ -108,4 +112,106 @@ public class PdfUtils {
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         return new javafx.scene.image.Image(bais);
     }
+
+    public static String[][] getWordGrid(InputStream inputStream) {
+        try {
+            PdfReader pdfReader = new PdfReader(inputStream);
+            String allText = "";
+            for(int page = 1; page <= pdfReader.getNumberOfPages(); page++) {
+                PdfTextExtractor textExtractor = new PdfTextExtractor(pdfReader);
+                allText += textExtractor.getTextFromPage(page) + "\n";
+            }
+
+            List<String[]> rows = new ArrayList<>();
+            Scanner scanner = new Scanner(allText);
+            while(scanner.hasNextLine()) {
+                String line = scanner.nextLine().trim();
+                String[] words = line.split(" ");
+                if(words.length > 16 && Utils.isNumber(words[0])) {
+                    rows.add(Arrays.copyOfRange(words, 1, 17));
+                }
+            }
+
+            if(rows.size() < 128) {
+                throw new IllegalArgumentException("Not a valid Border Wallets PDF");
+            }
+
+            return rows.toArray(new String[][]{new String[0]});
+        } catch(Exception e) {
+            throw new IllegalArgumentException("Not a valid Border Wallets PDF");
+        }
+    }
+
+    public static void saveWordGrid(String[][] wordGrid, List<String> mnemonicWords) {
+        Stage window = new Stage();
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Save Border Wallet Grid");
+        fileChooser.setInitialFileName("BorderWalletEntropyGrid.pdf");
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            try(Document document = new Document()) {
+                document.setMargins(0, 0, 10, 10);
+                PdfWriter.getInstance(document, new FileOutputStream(file));
+
+                Font headerFont = new Font(Font.HELVETICA, 8, Font.BOLD, Color.DARK_GRAY);
+                Font font = new Font(Font.HELVETICA, 8, Font.NORMAL, Color.DARK_GRAY);
+
+                HeaderFooter footer = new HeaderFooter(false, new Phrase("Recovery Phrase: " + String.join(" ", mnemonicWords), font));
+                footer.setAlignment(Element.ALIGN_CENTER);
+                footer.setBorder(Rectangle.NO_BORDER);
+                footer.setBorderWidth(0);
+                document.setFooter(footer);
+
+                document.open();
+
+                int rowCount = wordGrid.length;
+                int columnCount = wordGrid[0].length;
+
+                Table table = new Table(columnCount + 2);
+                table.setBorderWidth(0.5f);
+                table.setBorderColor(new Color(208, 208, 208));
+                table.setBorderWidthLeft(0);
+                table.setBorderWidthRight(0);
+
+                List<String> headers = List.of(" ", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", " ");
+                for(String header : headers) {
+                    Paragraph paragraph = new Paragraph(header, headerFont);
+                    Cell cell = new Cell(paragraph);
+                    cell.setBackgroundColor(new Color(218, 218, 218));
+                    cell.setHorizontalAlignment(HorizontalAlignment.CENTER);
+                    cell.setVerticalAlignment(VerticalAlignment.CENTER);
+                    cell.setBorderWidth(0.5f);
+                    cell.setBorderColor(new Color(208, 208, 208));
+                    cell.setHeader(true);
+                    table.addCell(cell);
+                }
+                table.endHeaders();
+
+                for(int i = 0; i < rowCount; i++) {
+                    for(int j = 0; j < columnCount + 2; j++) {
+                        Cell cell;
+                        if(j == 0 || j == columnCount + 1) {
+                            cell = new Cell(new Paragraph(String.format("%03d", i + 1), headerFont));
+                            cell.setBackgroundColor(new Color(218, 218, 218));
+                        } else {
+                            cell = new Cell(new Paragraph(wordGrid[i][j-1], font));
+                        }
+                        cell.setHorizontalAlignment(HorizontalAlignment.CENTER);
+                        cell.setVerticalAlignment(VerticalAlignment.CENTER);
+                        cell.setBorderWidth(0.5f);
+                        cell.setBorderColor(new Color(208, 208, 208));
+                        table.addCell(cell);
+                    }
+                }
+
+                document.add(table);
+            } catch(Exception e) {
+                log.error("Error creating word grid PDF", e);
+                AppServices.showErrorDialog("Error creating word grid PDF", e.getMessage());
+            }
+        } else {
+            AppServices.showWarningDialog("Entropy Grid PDF not saved", "You have chosen to not save the entropy grid PDF.\n\nDo not store funds on a seed selected from this grid - you will not be able to regenerate it!");
+        }
+    }
 }

src/main/java/com/sparrowwallet/sparrow/io/SpecterDesktop.java

@@ -1,7 +1,6 @@
 package com.sparrowwallet.sparrow.io;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.google.gson.*;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.wallet.*;
 import org.slf4j.Logger;
@@ -12,6 +11,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 
 public class SpecterDesktop implements WalletImport, WalletExport {
@@ -54,7 +54,44 @@ public class SpecterDesktop implements WalletImport, WalletExport {
     public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
         try {
             Gson gson = new Gson();
-            SpecterWallet specterWallet = gson.fromJson(new InputStreamReader(inputStream, StandardCharsets.UTF_8), SpecterWallet.class);
+            JsonObject jsonObj = gson.fromJson(new InputStreamReader(inputStream, StandardCharsets.UTF_8), JsonElement.class).getAsJsonObject();
+
+            SpecterWallet specterWallet = new SpecterWallet();
+            if(jsonObj.get("descriptor") != null) {
+                specterWallet.descriptor = jsonObj.get("descriptor").getAsString();
+            } else if(jsonObj.get("recv_descriptor") != null) {
+                specterWallet.descriptor = jsonObj.get("recv_descriptor").getAsString();
+            }
+
+            if(jsonObj.get("label") != null) {
+                specterWallet.label = jsonObj.get("label").getAsString();
+            } else if(jsonObj.get("name") != null) {
+                specterWallet.label = jsonObj.get("name").getAsString();
+            }
+
+            if(jsonObj.get("blockheight") != null) {
+                specterWallet.blockheight = jsonObj.get("blockheight").getAsInt();
+            }
+
+            if(jsonObj.get("devices") != null) {
+                JsonArray jsonDevices = jsonObj.get("devices").getAsJsonArray();
+                specterWallet.devices = new ArrayList<>();
+                for(JsonElement jsonDevice : jsonDevices) {
+                    SpecterWalletDevice specterWalletDevice = new SpecterWalletDevice();
+                    if(jsonDevice.isJsonObject()) {
+                        JsonObject jsonDeviceObj = (JsonObject)jsonDevice;
+                        if(jsonDeviceObj.get("label") != null) {
+                            specterWalletDevice.label = jsonDeviceObj.get("label").getAsString();
+                        }
+                        if(jsonDeviceObj.get("type") != null) {
+                            specterWalletDevice.type = jsonDeviceObj.get("type").getAsString();
+                        }
+                    } else if(jsonDevice.isJsonPrimitive()) {
+                        specterWalletDevice.label = jsonDevice.getAsString();
+                    }
+                    specterWallet.devices.add(specterWalletDevice);
+                }
+            }
 
             if(specterWallet.descriptor != null) {
                 OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(specterWallet.descriptor);
@@ -80,6 +117,9 @@ public class SpecterDesktop implements WalletImport, WalletExport {
                             } else {
                                 keystore.setSource(KeystoreSource.HW_AIRGAPPED);
                             }
+                        } else {
+                            keystore.setWalletModel(WalletModel.SPARROW);
+                            keystore.setSource(KeystoreSource.SW_WATCH);
                         }
                     }
                 }

src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java

@@ -15,8 +15,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import static com.sparrowwallet.sparrow.io.CardApi.isReaderAvailable;
-
 public class HwAirgappedController extends KeystoreImportDetailController {
     private static final Logger log = LoggerFactory.getLogger(HwAirgappedController.class);
 
@@ -40,10 +38,7 @@ public class HwAirgappedController extends KeystoreImportDetailController {
             }
         }
 
-        List<KeystoreCardImport> cardImporters = Collections.emptyList();
-        if(isReaderAvailable()) {
-            cardImporters = List.of(new Tapsigner());
-        }
+        List<KeystoreCardImport> cardImporters = List.of(new Tapsigner());
         for(KeystoreCardImport importer : cardImporters) {
             if(!importer.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
                 CardImportPane importPane = new CardImportPane(getMasterController().getWallet(), importer, getMasterController().getRequiredDerivation());

src/main/java/com/sparrowwallet/sparrow/net/Auth47.java

@@ -128,7 +128,7 @@ public class Auth47 {
         }
 
         Proxy proxy = AppServices.getProxy();
-        if(proxy == null && callback.getHost().toLowerCase(Locale.ROOT).endsWith(TorService.TOR_ADDRESS_SUFFIX)) {
+        if(proxy == null && callback.getHost().toLowerCase(Locale.ROOT).endsWith(Tor.TOR_ADDRESS_SUFFIX)) {
             throw new Auth47Exception("A Tor proxy must be configured to authenticate this resource.");
         }
 

src/main/java/com/sparrowwallet/sparrow/net/BroadcastSource.java

@@ -56,6 +56,8 @@ public enum BroadcastSource {
                 return new URL(getBaseUrl(proxy) + "/api/tx");
             } else if(Network.get() == Network.TESTNET) {
                 return new URL(getBaseUrl(proxy) + "/testnet/api/tx");
+            } else if(Network.get() == Network.SIGNET) {
+                return new URL(getBaseUrl(proxy) + "/signet/api/tx");
             } else {
                 throw new IllegalStateException("Cannot broadcast transaction to " + getName() + " on network " + Network.get());
             }

src/main/java/com/sparrowwallet/sparrow/net/Bwt.java

@@ -184,7 +184,7 @@ public class Bwt {
 
     private HostAndPort getTorProxy() {
         return AppServices.isTorRunning() ?
-                HostAndPort.fromParts("127.0.0.1", TorService.PROXY_PORT) :
+                Tor.getDefault().getProxyHostAndPort() :
                 (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer().replace("localhost", "127.0.0.1")));
     }
 

src/main/java/com/sparrowwallet/sparrow/net/LnurlAuth.java

@@ -108,7 +108,7 @@ public class LnurlAuth {
         }
 
         Proxy proxy = AppServices.getProxy();
-        if(proxy == null && callback.getHost().toLowerCase(Locale.ROOT).endsWith(TorService.TOR_ADDRESS_SUFFIX)) {
+        if(proxy == null && callback.getHost().toLowerCase(Locale.ROOT).endsWith(Tor.TOR_ADDRESS_SUFFIX)) {
             throw new LnurlAuthException("A Tor proxy must be configured to authenticate this resource.");
         }
 

src/main/java/com/sparrowwallet/sparrow/net/Protocol.java

@@ -129,7 +129,9 @@ public enum Protocol {
     public abstract CloseableTransport getTransport(HostAndPort server, File serverCert, HostAndPort proxy) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException;
 
     public HostAndPort getServerHostAndPort(String url) {
-        return HostAndPort.fromString(url.substring(this.toUrlString().length()));
+        String lessProtocol = url.substring(this.toUrlString().length());
+        int pathStart = lessProtocol.indexOf('/');
+        return HostAndPort.fromString(pathStart < 0 ? lessProtocol : lessProtocol.substring(0, pathStart));
     }
 
     public String toUrlString() {
@@ -149,7 +151,7 @@ public enum Protocol {
     }
 
     public static boolean isOnionHost(String host) {
-        return host != null && host.toLowerCase(Locale.ROOT).endsWith(TorService.TOR_ADDRESS_SUFFIX);
+        return host != null && host.toLowerCase(Locale.ROOT).endsWith(Tor.TOR_ADDRESS_SUFFIX);
     }
 
     public static boolean isOnionAddress(Server server) {

src/main/java/com/sparrowwallet/sparrow/net/ProxyTcpOverTlsTransport.java

@@ -32,7 +32,7 @@ public class ProxyTcpOverTlsTransport extends TcpOverTlsTransport {
     protected void createSocket() throws IOException {
         InetSocketAddress proxyAddr = new InetSocketAddress(proxy.getHost(), proxy.getPortOrDefault(DEFAULT_PROXY_PORT));
         socket = new Socket(new Proxy(Proxy.Type.SOCKS, proxyAddr));
-        socket.connect(new InetSocketAddress(server.getHost(), server.getPortOrDefault(Protocol.SSL.getDefaultPort())));
+        socket.connect(new InetSocketAddress(server.getHost(), server.getPortOrDefault(getDefaultPort())));
         socket = sslSocketFactory.createSocket(socket, proxy.getHost(), proxy.getPortOrDefault(DEFAULT_PROXY_PORT), true);
         startHandshake((SSLSocket)socket);
     }

src/main/java/com/sparrowwallet/sparrow/net/PublicElectrumServer.java

@@ -13,6 +13,7 @@ public enum PublicElectrumServer {
     LUKECHILDS_CO("bitcoin.lu.ke", "ssl://bitcoin.lu.ke:50002", Network.MAINNET),
     EMZY_DE("electrum.emzy.de", "ssl://electrum.emzy.de:50002", Network.MAINNET),
     BITAROO_NET("electrum.bitaroo.net", "ssl://electrum.bitaroo.net:50002", Network.MAINNET),
+    DIYNODES_COM("electrum.diynodes.com", "ssl://electrum.diynodes.com:50022", Network.MAINNET),
     TESTNET_ARANGUREN_ORG("testnet.aranguren.org", "ssl://testnet.aranguren.org:51002", Network.TESTNET);
 
     PublicElectrumServer(String name, String url, Network network) {

src/main/java/com/sparrowwallet/sparrow/net/TcpOverTlsTransport.java

@@ -125,4 +125,9 @@ public class TcpOverTlsTransport extends TcpTransport {
 
         return Storage.getCertificateFile(server.getHost()) == null;
     }
+
+    @Override
+    protected int getDefaultPort() {
+        return Protocol.SSL.getDefaultPort();
+    }
 }

src/main/java/com/sparrowwallet/sparrow/net/TcpTransport.java

@@ -254,7 +254,11 @@ public class TcpTransport implements CloseableTransport, TimeoutCounter {
 
     protected void createSocket() throws IOException {
         socket = socketFactory.createSocket();
-        socket.connect(new InetSocketAddress(server.getHost(), server.getPortOrDefault(Protocol.TCP.getDefaultPort())));
+        socket.connect(new InetSocketAddress(server.getHost(), server.getPortOrDefault(getDefaultPort())));
+    }
+
+    protected int getDefaultPort() {
+        return Protocol.TCP.getDefaultPort();
     }
 
     public boolean isClosed() {

src/main/java/com/sparrowwallet/sparrow/net/Tor.java

@@ -0,0 +1,158 @@
+package com.sparrowwallet.sparrow.net;
+
+import com.google.common.net.HostAndPort;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.TorStatusEvent;
+import com.sparrowwallet.sparrow.io.Storage;
+import io.matthewnelson.kmp.tor.KmpTorLoaderJvm;
+import io.matthewnelson.kmp.tor.PlatformInstaller;
+import io.matthewnelson.kmp.tor.TorConfigProviderJvm;
+import io.matthewnelson.kmp.tor.binary.extract.TorBinaryResource;
+import io.matthewnelson.kmp.tor.common.address.Port;
+import io.matthewnelson.kmp.tor.common.address.ProxyAddress;
+import io.matthewnelson.kmp.tor.controller.common.config.TorConfig;
+import io.matthewnelson.kmp.tor.controller.common.file.Path;
+import io.matthewnelson.kmp.tor.ext.callback.manager.CallbackTorManager;
+import io.matthewnelson.kmp.tor.manager.TorManager;
+import io.matthewnelson.kmp.tor.manager.common.event.TorManagerEvent;
+import io.matthewnelson.kmp.tor.manager.util.PortUtil;
+import org.controlsfx.tools.Platform;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.util.List;
+
+public class Tor {
+    private static final Logger log = LoggerFactory.getLogger(Tor.class);
+
+    public static final String TOR_DIR = "tor";
+    public static final String TOR_ADDRESS_SUFFIX = ".onion";
+
+    private static Tor tor;
+
+    private final Path path = Path.invoke(Storage.getSparrowHome().getAbsolutePath()).builder().addSegment(TOR_DIR).build();
+    private final CallbackTorManager instance;
+    private ProxyAddress socksAddress;
+
+    public Tor() {
+        Platform platform = Platform.getCurrent();
+        String arch = System.getProperty("os.arch");
+        PlatformInstaller installer;
+        PlatformInstaller.InstallOption installOption = PlatformInstaller.InstallOption.CleanInstallIfMissing;
+
+        if(platform == Platform.OSX) {
+            if(arch.equals("aarch64")) {
+                installer = PlatformInstaller.macosArm64(installOption);
+            } else {
+                installer = PlatformInstaller.macosX64(installOption);
+            }
+        } else if(platform == Platform.WINDOWS) {
+            installer = PlatformInstaller.mingwX64(installOption);
+        } else if(platform == Platform.UNIX) {
+            if(arch.equals("aarch64")) {
+                TorBinaryResource linuxArm64 = TorBinaryResource.from(TorBinaryResource.OS.Linux, "arm64",
+                        "588496f3164d52b91f17e4db3372d8dfefa6366a8df265eebd4a28d4128992aa",
+                        List.of("libevent-2.1.so.7.gz", "libstdc++.so.6.gz", "libcrypto.so.1.1.gz", "tor.gz", "libssl.so.1.1.gz"));
+                installer = PlatformInstaller.custom(installOption, linuxArm64);
+            } else {
+                installer = PlatformInstaller.linuxX64(installOption);
+            }
+        } else {
+            throw new UnsupportedOperationException("Sparrow's bundled Tor is not supported on " + platform + " " + arch);
+        }
+
+        TorConfigProviderJvm torConfigProviderJvm = new TorConfigProviderJvm() {
+            @NotNull
+            @Override
+            public Path getWorkDir() {
+                return path.builder().addSegment("work").build();
+            }
+
+            @NotNull
+            @Override
+            public Path getCacheDir() {
+                return path.builder().addSegment("cache").build();
+            }
+
+            @NotNull
+            @Override
+            protected TorConfig provide() {
+                TorConfig.Builder builder = new TorConfig.Builder();
+
+                TorConfig.Setting.DormantCanceledByStartup dormantCanceledByStartup = new TorConfig.Setting.DormantCanceledByStartup();
+                dormantCanceledByStartup.set(TorConfig.Option.AorTorF.getTrue());
+                builder.put(dormantCanceledByStartup);
+
+                return builder.build();
+            }
+        };
+
+        KmpTorLoaderJvm jvmLoader = new KmpTorLoaderJvm(installer, torConfigProviderJvm);
+        TorManager torManager = TorManager.newInstance(jvmLoader);
+
+        torManager.debug(true);
+        torManager.addListener(new TorManagerEvent.Listener() {
+            @Override
+            public void managerEventWarn(@NotNull String message) {
+                log.warn(message);
+                EventManager.get().post(new TorStatusEvent(message));
+            }
+
+            @Override
+            public void managerEventInfo(@NotNull String message) {
+                log.info(message);
+                EventManager.get().post(new TorStatusEvent(message));
+            }
+
+            @Override
+            public void managerEventDebug(@NotNull String message) {
+                log.debug(message);
+                EventManager.get().post(new TorStatusEvent(message));
+            }
+
+            @Override
+            public void managerEventAddressInfo(@NotNull TorManagerEvent.AddressInfo info) {
+                if(info.isNull) {
+                    socksAddress = null;
+                } else {
+                    socksAddress = info.socksInfoToProxyAddress().iterator().next();
+                }
+            }
+        });
+
+        this.instance = new CallbackTorManager(torManager, uncaughtException -> {
+            log.error("Uncaught exception from CallbackTorManager", uncaughtException);
+        });
+    }
+
+    public static Tor getDefault() {
+        return Tor.tor;
+    }
+
+    public static void setDefault(Tor tor) {
+        Tor.tor = tor;
+    }
+
+    public CallbackTorManager getTorManager() {
+        return instance;
+    }
+
+    public Proxy getProxy() {
+        if(socksAddress == null) {
+            throw new IllegalStateException("Tor socks proxy is not yet instantiated");
+        }
+
+        return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(socksAddress.address.getValue(), socksAddress.port.getValue()));
+    }
+
+    public HostAndPort getProxyHostAndPort() {
+        return HostAndPort.fromParts(socksAddress.address.getValue(), socksAddress.port.getValue());
+    }
+
+    public static boolean isRunningExternally() {
+        return !PortUtil.isTcpPortAvailable(Port.invoke(9050));
+    }
+}

src/main/java/com/sparrowwallet/sparrow/net/TorServerAlreadyBoundException.java

@@ -1,11 +0,0 @@
-package com.sparrowwallet.sparrow.net;
-
-public class TorServerAlreadyBoundException extends TorServerException {
-    public TorServerAlreadyBoundException(Throwable cause) {
-        super(cause);
-    }
-
-    public TorServerAlreadyBoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

src/main/java/com/sparrowwallet/sparrow/net/TorServerException.java

@@ -5,6 +5,10 @@ public class TorServerException extends ServerException {
         super(cause);
     }
 
+    public TorServerException(String message) {
+        super(message);
+    }
+
     public TorServerException(String message, Throwable cause) {
         super(message, cause);
     }

src/main/java/com/sparrowwallet/sparrow/net/TorService.java

@@ -1,86 +1,85 @@
 package com.sparrowwallet.sparrow.net;
 
+import io.matthewnelson.kmp.tor.ext.callback.manager.CallbackTorManager;
+import io.matthewnelson.kmp.tor.manager.common.event.TorManagerEvent;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
-import net.freehaven.tor.control.TorControlError;
-import org.berndpruenster.netlayer.tor.*;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.Socket;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.LinkedHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * Service to start internal Tor (including a Tor proxy running on localhost:9050)
+ * Service to start internal Tor (including a Tor proxy running on localhost:9050, or another port if unavailable)
  *
  * This is a ScheduledService to take advantage of the retry on failure behaviour
  */
-public class TorService extends ScheduledService<NativeTor> {
+public class TorService extends ScheduledService<Tor> {
     private static final Logger log = LoggerFactory.getLogger(TorService.class);
 
-    public static final int PROXY_PORT = 9050;
-    public static final String TOR_DIR_PREFIX = "tor";
-    public static final String TOR_ADDRESS_SUFFIX = ".onion";
+    private final ReentrantLock startupLock = new ReentrantLock();
+    private final Condition startupCondition = startupLock.newCondition();
 
     @Override
-    protected Task<NativeTor> createTask() {
+    protected Task<Tor> createTask() {
         return new Task<>() {
-            protected NativeTor call() throws IOException, TorServerException {
-                if(Tor.getDefault() == null) {
-                    Path path = Files.createTempDirectory(TOR_DIR_PREFIX);
-                    File torInstallDir = path.toFile();
-                    torInstallDir.deleteOnExit();
-                    try {
-                        LinkedHashMap<String, String> torrcOptionsMap = new LinkedHashMap<>();
-                        torrcOptionsMap.put("SocksPort", Integer.toString(PROXY_PORT));
-                        torrcOptionsMap.put("HashedControlPassword", "16:D780432418F09B06609940000924317D3B9DF522A3191F8F4E597E9329");
-                        torrcOptionsMap.put("DisableNetwork", "0");
-                        Torrc override = new Torrc(torrcOptionsMap);
+            private Exception startupException;
 
-                        return new NativeTor(torInstallDir, Collections.emptyList(), override);
-                    } catch(TorCtlException e) {
-                        if(e.getCause() instanceof TorControlError) {
-                            if(e.getCause().getMessage().contains("Failed to bind")) {
-                                throw new TorServerAlreadyBoundException("Tor server already bound", e.getCause());
+            @Override
+            protected Tor call() throws Exception {
+                Tor tor = Tor.getDefault();
+                if(tor == null) {
+                    tor = new Tor();
+                    CallbackTorManager callbackTorManager = tor.getTorManager();
+                    callbackTorManager.addListener(new TorManagerEvent.Listener() {
+                        @Override
+                        public void managerEventAddressInfo(@NotNull TorManagerEvent.AddressInfo info) {
+                            if(!info.isNull) {
+                                try {
+                                    startupLock.lock();
+                                    startupCondition.signalAll();
+                                } finally {
+                                    startupLock.unlock();
+                                }
                             }
-                            log.error("Failed to start Tor", e);
-                            throw new TorServerException("Failed to start Tor", e.getCause());
-                        } else {
-                            log.error("Failed to start Tor", e);
-                            throw new TorServerException("Failed to start Tor", e);
                         }
+                    });
+                    callbackTorManager.start(throwable -> {
+                        if(throwable instanceof Exception exception) {
+                            startupException = exception;
+                        } else {
+                            startupException = new Exception(throwable);
+                        }
+                        log.error("Error", throwable);
+                        try {
+                            startupLock.lock();
+                            startupCondition.signalAll();
+                        } finally {
+                            startupLock.unlock();
+                        }
+                    }, success -> {
+                        log.info("Tor daemon started successfully");
+                    });
+
+                    try {
+                        startupLock.lock();
+                        if(!startupCondition.await(5, TimeUnit.MINUTES)) {
+                            throw new TorStartupException("Tor failed to start after 5 minutes, giving up");
+                        }
+
+                        if(startupException != null) {
+                            throw startupException;
+                        }
+                    } finally {
+                        startupLock.unlock();
                     }
                 }
 
-                return null;
+                return tor;
             }
         };
     }
-
-    public static Socket getControlSocket() {
-        Tor tor = Tor.getDefault();
-        if(tor != null) {
-            try {
-                Class<?> torClass = Class.forName("org.berndpruenster.netlayer.tor.Tor");
-                Field torControllerField = torClass.getDeclaredField("torController");
-                torControllerField.setAccessible(true);
-                TorController torController = (TorController)torControllerField.get(tor);
-
-                Class<?> torControllerClass = Class.forName("org.berndpruenster.netlayer.tor.TorController");
-                Field socketField = torControllerClass.getDeclaredField("socket");
-                socketField.setAccessible(true);
-                return (Socket)socketField.get(torController);
-            } catch(Exception e) {
-                log.error("Error retrieving Tor control socket", e);
-            }
-        }
-
-        return null;
-    }
 }

src/main/java/com/sparrowwallet/sparrow/net/TorStartupException.java

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.net;
+
+public class TorStartupException extends TorServerException {
+    public TorStartupException(Throwable cause) {
+        super(cause);
+    }
+
+    public TorStartupException(String message) {
+        super(message);
+    }
+
+    public TorStartupException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/com/sparrowwallet/sparrow/net/TorTcpOverTlsTransport.java

@@ -27,21 +27,15 @@ public class TorTcpOverTlsTransport extends TcpOverTlsTransport {
 
     @Override
     protected void createSocket() throws IOException {
-        TorTcpTransport torTcpTransport = new TorTcpTransport(server);
+        TorTcpTransport torTcpTransport = new TorTcpTransport(server) {
+            @Override
+            protected int getDefaultPort() {
+                return Protocol.SSL.getDefaultPort();
+            }
+        };
         torTcpTransport.createSocket();
         socket = torTcpTransport.socket;
 
-        try {
-            Field socketField = socket.getClass().getDeclaredField("socket");
-            socketField.setAccessible(true);
-            Socket innerSocket = (Socket)socketField.get(socket);
-            Field connectedField = innerSocket.getClass().getSuperclass().getDeclaredField("connected");
-            connectedField.setAccessible(true);
-            connectedField.set(innerSocket, true);
-        } catch(Exception e) {
-            log.error("Could not set socket connected status", e);
-        }
-
         socket = sslSocketFactory.createSocket(socket, server.getHost(), server.getPortOrDefault(Protocol.SSL.getDefaultPort()), true);
         startHandshake((SSLSocket)socket);
     }

src/main/java/com/sparrowwallet/sparrow/net/TorTcpTransport.java

@@ -2,14 +2,12 @@ package com.sparrowwallet.sparrow.net;
 
 import com.google.common.net.HostAndPort;
 import com.sparrowwallet.sparrow.AppServices;
-import org.berndpruenster.netlayer.tor.*;
 
 import java.io.*;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 
 public class TorTcpTransport extends TcpTransport {
-    public static final String TOR_DIR_PREFIX = "tor";
-
     public TorTcpTransport(HostAndPort server) {
         super(server);
     }
@@ -24,6 +22,7 @@ public class TorTcpTransport extends TcpTransport {
             throw new IllegalStateException("Can't create Tor socket, Tor is not running");
         }
 
-        socket = new TorSocket(server.getHost(), server.getPortOrDefault(Protocol.TCP.getDefaultPort()), "sparrow");
+        socket = new Socket(Tor.getDefault().getProxy());
+        socket.connect(new InetSocketAddress(server.getHost(), server.getPortOrDefault(getDefaultPort())));
     }
 }

src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java

@@ -125,6 +125,9 @@ public class BitcoindClient {
         }
 
         ListWalletDirResult listWalletDirResult = getBitcoindService().listWalletDir();
+        if(listWalletDirResult == null) {
+            throw new RuntimeException("Wallet support must be enabled in Bitcoin Core");
+        }
         boolean exists = listWalletDirResult.wallets().stream().anyMatch(walletDirResult -> walletDirResult.name().equals(CORE_WALLET_NAME));
         legacyWalletExists = listWalletDirResult.wallets().stream().anyMatch(walletDirResult -> walletDirResult.name().equals(Bwt.DEFAULT_CORE_WALLET));
 
@@ -539,7 +542,7 @@ public class BitcoindClient {
             try {
                 if(syncing) {
                     BlockchainInfo blockchainInfo = getBitcoindService().getBlockchainInfo();
-                    if(blockchainInfo.initialblockdownload()) {
+                    if(blockchainInfo.initialblockdownload() && !isEmptyBlockchain(blockchainInfo)) {
                         int percent = blockchainInfo.getProgressPercent();
                         Date tipDate = blockchainInfo.getTip();
                         Platform.runLater(() -> EventManager.get().post(new CormorantSyncStatusEvent("Syncing" + (percent < 100 ? " (" + percent + "%)" : ""), percent, tipDate)));
@@ -615,6 +618,10 @@ public class BitcoindClient {
         return scanningWallets;
     }
 
+    private boolean isEmptyBlockchain(BlockchainInfo blockchainInfo) {
+        return blockchainInfo.blocks() == 0 && blockchainInfo.getProgressPercent() == 100;
+    }
+
     private record ScanDate(Date rescanSince, Integer range, boolean forceRescan) {
         public Object getTimestamp() {
             return rescanSince == null ? "now" : rescanSince.getTime() / 1000;

src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindTransport.java

@@ -16,6 +16,7 @@ import java.net.Proxy;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Base64;
@@ -75,7 +76,7 @@ public class BitcoindTransport implements Transport {
 
         connection.setDoOutput(true);
 
-        log.trace("> " + request);
+        log.debug("> " + request);
 
         try(OutputStream os = connection.getOutputStream()) {
             byte[] jsonBytes = request.getBytes(StandardCharsets.UTF_8);
@@ -101,7 +102,7 @@ public class BitcoindTransport implements Transport {
         }
 
         String response = res.toString();
-        log.trace("< " + response);
+        log.debug("< " + response);
 
         return response;
     }
@@ -127,11 +128,11 @@ public class BitcoindTransport implements Transport {
     }
 
     private static File getCookieDir(File bitcoindDir) {
-        if(Network.get() == Network.TESTNET && !bitcoindDir.getName().contains("testnet")) {
+        if(Network.get() == Network.TESTNET && Files.exists(Path.of(bitcoindDir.getAbsolutePath(), "testnet3", COOKIE_FILENAME))) {
             return new File(bitcoindDir, "testnet3");
-        } else if(Network.get() == Network.REGTEST && !bitcoindDir.getName().contains("regtest")) {
+        } else if(Network.get() == Network.REGTEST && Files.exists(Path.of(bitcoindDir.getAbsolutePath(), "regtest", COOKIE_FILENAME))) {
             return new File(bitcoindDir, "regtest");
-        } else if(Network.get() == Network.SIGNET && !bitcoindDir.getName().contains("signet")) {
+        } else if(Network.get() == Network.SIGNET && Files.exists(Path.of(bitcoindDir.getAbsolutePath(), "signet", COOKIE_FILENAME))) {
             return new File(bitcoindDir, "signet");
         }
 

src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/VerboseBlockHeader.java

@@ -13,7 +13,7 @@ public record VerboseBlockHeader(String hash, int confirmations, int height, int
                                  String bits, double difficulty, String chainwork, int nTx, String previousblockhash) {
     public ElectrumBlockHeader getBlockHeader() {
         BigInteger nBits = new BigInteger(bits, 16);
-        BlockHeader blockHeader = new BlockHeader(version, Sha256Hash.wrap(previousblockhash), Sha256Hash.wrap(merkleroot), null, time, nBits.longValue(), nonce);
+        BlockHeader blockHeader = new BlockHeader(version, previousblockhash == null ? Sha256Hash.ZERO_HASH : Sha256Hash.wrap(previousblockhash), Sha256Hash.wrap(merkleroot), null, time, nBits.longValue(), nonce);
         return new ElectrumBlockHeader(height, Utils.bytesToHex(blockHeader.bitcoinSerialize()));
     }
 }

src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java

@@ -28,8 +28,6 @@ import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-import javafx.util.StringConverter;
-import org.berndpruenster.netlayer.tor.Tor;
 import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -494,20 +492,6 @@ public class ServerPreferencesController extends PreferencesDetailController {
             torService.cancel();
             testResults.appendText("\nTor failed to start");
             showConnectionFailure(workerStateEvent.getSource().getException());
-
-            Throwable exception = workerStateEvent.getSource().getException();
-            if(Config.get().getServerType() == ServerType.ELECTRUM_SERVER &&
-                    exception instanceof TorServerAlreadyBoundException &&
-                    useProxyOriginal == null && !useProxy.isSelected() &&
-                    (proxyHost.getText().isEmpty() || proxyHost.getText().equals("localhost") || proxyHost.getText().equals("127.0.0.1")) &&
-                    (proxyPort.getText().isEmpty() || proxyPort.getText().equals("9050"))) {
-                useProxy.setSelected(true);
-                proxyHost.setText("localhost");
-                proxyPort.setText("9050");
-                useProxyOriginal = false;
-                testResults.appendText("\n\nAssuming Tor proxy is running on port 9050 and trying again...");
-                startElectrumConnection();
-            }
         });
 
         torService.start();
@@ -658,8 +642,6 @@ public class ServerPreferencesController extends PreferencesDetailController {
             reason = tlsServerException.getMessage() + "\n\n" + reason;
         } else if(exception instanceof ProxyServerException) {
             reason += ". Check if the proxy server is running.";
-        } else if(exception instanceof TorServerAlreadyBoundException) {
-            reason += "\nIs a Tor proxy already running on port " + TorService.PROXY_PORT + "?";
         } else if(reason != null && (reason.contains("Check if Bitcoin Core is running") || reason.contains("Could not connect to Bitcoin Core RPC"))) {
             reason += "\n\nSee https://sparrowwallet.com/docs/connect-node.html";
         } else if(reason != null && (reason.startsWith("Cannot connect to hidden service"))) {

src/main/java/com/sparrowwallet/sparrow/soroban/CounterpartyController.java

@@ -294,20 +294,10 @@ public class CounterpartyController extends SorobanController {
         sorobanProgressLabel.setText("Creating mix transaction...");
 
         Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        Wallet counterpartyWallet;
-        if(counterpartyCahootsWallet.getAccount() == StandardAccount.WHIRLPOOL_POSTMIX.getAccountNumber() && cahootsType == CahootsType.STOWAWAY
-                && !counterpartyCahootsWallet.getWallet().isMasterWallet()) {
-            //Counterparty cannot participate in Stowaway using Postmix wallet, switch to master wallet
-            counterpartyWallet = counterpartyCahootsWallet.getWallet().getMasterWallet();
-            counterpartyCahootsWallet = soroban.getCahootsWallet(counterpartyWallet, 1);
-        } else {
-            counterpartyWallet = wallet;
-        }
-
-        Map<BlockTransactionHashIndex, WalletNode> walletUtxos = counterpartyWallet.getWalletUtxos();
+        Map<BlockTransactionHashIndex, WalletNode> walletUtxos = wallet.getWalletUtxos();
         for(Map.Entry<BlockTransactionHashIndex, WalletNode> entry : walletUtxos.entrySet()) {
             if(entry.getKey().getStatus() != Status.FROZEN) {
-                counterpartyCahootsWallet.addUtxo(entry.getValue(), counterpartyWallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
+                counterpartyCahootsWallet.addUtxo(entry.getValue(), wallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
             }
         }
 
@@ -331,7 +321,7 @@ public class CounterpartyController extends SorobanController {
                                             Transaction transaction = getTransaction(cahoots);
                                             if(transaction != null) {
                                                 transactionProperty.set(transaction);
-                                                updateTransactionDiagram(transactionDiagram, counterpartyWallet, null, transaction);
+                                                updateTransactionDiagram(transactionDiagram, wallet, null, transaction);
                                                 next();
                                             }
                                         } catch(PSBTParseException e) {

src/main/java/com/sparrowwallet/sparrow/soroban/Soroban.java

@@ -59,7 +59,7 @@ public class Soroban {
             ScriptType scriptType = wallet.getScriptType();
             int purpose = scriptType.getDefaultDerivation().get(0).num();
             List<String> words = keystore.getSeed().getMnemonicCode();
-            String passphrase = keystore.getSeed().getPassphrase().asString();
+            String passphrase = keystore.getSeed().getPassphrase() == null ? "" : keystore.getSeed().getPassphrase().asString();
             byte[] seed = hdWalletFactory.computeSeedFromWords(words);
             hdWallet = new HD_Wallet(purpose, new ArrayList<>(words), sorobanServer.getParams(), seed, passphrase);
             bip47Account = wallet.isMasterWallet() ? wallet.getAccountIndex() : wallet.getMasterWallet().getAccountIndex();

src/main/java/com/sparrowwallet/sparrow/soroban/SparrowCahootsWallet.java

@@ -34,6 +34,12 @@ public class SparrowCahootsWallet extends SimpleCahootsWallet {
         this.bip47Account = bip47Account;
         bip84w.getAccount(account).getReceive().setAddrIdx(wallet.getFreshNode(KeyPurpose.RECEIVE).getIndex());
         bip84w.getAccount(account).getChange().setAddrIdx(wallet.getFreshNode(KeyPurpose.CHANGE).getIndex());
+
+        if(!wallet.isMasterWallet() && account != 0) {
+            Wallet masterWallet = wallet.getMasterWallet();
+            bip84w.getAccount(0).getReceive().setAddrIdx(masterWallet.getFreshNode(KeyPurpose.RECEIVE).getIndex());
+            bip84w.getAccount(0).getChange().setAddrIdx(masterWallet.getFreshNode(KeyPurpose.CHANGE).getIndex());
+        }
     }
 
     public void addUtxo(WalletNode node, BlockTransaction blockTransaction, int index) {
@@ -84,15 +90,23 @@ public class SparrowCahootsWallet extends SimpleCahootsWallet {
     public Pair<Integer, Integer> fetchReceiveIndex(int account) throws Exception {
         if(account == StandardAccount.WHIRLPOOL_POSTMIX.getAccountNumber()) {
             // force change chain
-            return Pair.of(wallet.getFreshNode(KeyPurpose.CHANGE).getIndex(), 1);
+            return Pair.of(getWallet(account).getFreshNode(KeyPurpose.CHANGE).getIndex(), 1);
         }
 
-        return Pair.of(wallet.getFreshNode(KeyPurpose.RECEIVE).getIndex(), 0);
+        return Pair.of(getWallet(account).getFreshNode(KeyPurpose.RECEIVE).getIndex(), 0);
     }
 
     @Override
     public Pair<Integer, Integer> fetchChangeIndex(int account) throws Exception {
-        return Pair.of(wallet.getFreshNode(KeyPurpose.CHANGE).getIndex(), 1);
+        return Pair.of(getWallet(account).getFreshNode(KeyPurpose.CHANGE).getIndex(), 1);
+    }
+
+    private Wallet getWallet(int account) {
+        if(account != this.account && account == 0 && !wallet.isMasterWallet()) {
+            return wallet.getMasterWallet();
+        }
+
+        return wallet;
     }
 
     @Override

src/main/java/com/sparrowwallet/sparrow/terminal/preferences/ServerTestDialog.java

@@ -15,7 +15,6 @@ import com.sparrowwallet.sparrow.terminal.SparrowTerminal;
 import javafx.application.Platform;
 import javafx.scene.control.ButtonType;
 import javafx.util.Duration;
-import org.berndpruenster.netlayer.tor.Tor;
 
 import java.io.File;
 import java.text.DateFormat;
@@ -203,8 +202,6 @@ public class ServerTestDialog extends DialogWindow {
             reason = tlsServerException.getMessage() + "\n\n" + reason;
         } else if(exception instanceof ProxyServerException) {
             reason += ". Check if the proxy server is running.";
-        } else if(exception instanceof TorServerAlreadyBoundException) {
-            reason += "\nIs a Tor proxy already running on port " + TorService.PROXY_PORT + "?";
         } else if(reason != null && reason.contains("Check if Bitcoin Core is running")) {
             reason += "\n\nSee https://sparrowwallet.com/docs/connect-node.html";
         }

src/main/java/com/sparrowwallet/sparrow/terminal/wallet/MixPoolDialog.java

@@ -197,6 +197,7 @@ public class MixPoolDialog extends WalletDialog {
             tx0Previews = null;
             whirlpool.setScode(mixConfig.getScode());
             whirlpool.setTx0FeeTarget(tx0FeeTarget);
+            whirlpool.setMixFeeTarget(tx0FeeTarget);
 
             Whirlpool.Tx0PreviewsService tx0PreviewsService = new Whirlpool.Tx0PreviewsService(whirlpool, utxoEntries);
             tx0PreviewsService.setOnRunning(workerStateEvent -> {

src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java

@@ -864,7 +864,9 @@ public class HeadersController extends TransactionFormController implements Init
         //TODO: Remove once Cobo Vault has upgraded to UR2.0
         boolean addLegacyEncodingOption = headersForm.getSigningWallet().getKeystores().stream().anyMatch(keystore -> keystore.getWalletModel().equals(WalletModel.COBO_VAULT));
 
-        CryptoPSBT cryptoPSBT = new CryptoPSBT(headersForm.getPsbt().serialize());
+        //Don't include non witness utxo fields for segwit wallets when displaying the PSBT as a QR - it can add greatly to the time required for scanning
+        boolean includeNonWitnessUtxos = !Arrays.asList(ScriptType.WITNESS_TYPES).contains(headersForm.getSigningWallet().getScriptType());
+        CryptoPSBT cryptoPSBT = new CryptoPSBT(headersForm.getPsbt().serialize(true, includeNonWitnessUtxos));
         QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR(), addLegacyEncodingOption);
         qrDisplayDialog.show();
     }

src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java

@@ -35,6 +35,7 @@ import tornadofx.control.Field;
 
 import javax.smartcardio.CardException;
 import java.net.URL;
+import java.util.Base64;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
@@ -198,7 +199,9 @@ public class KeystoreController extends WalletFormController implements Initiali
             scanXpubQR.setVisible(!valid);
         });
 
-        setInputFieldsDisabled(keystore.getSource() != KeystoreSource.SW_WATCH && (!walletForm.getWallet().isMasterWallet() || !walletForm.getWallet().getChildWallets().isEmpty()));
+        if(keystore.getSource() != KeystoreSource.SW_WATCH && (!walletForm.getWallet().isMasterWallet() || !walletForm.getWallet().getChildWallets().isEmpty())) {
+            setInputFieldsDisabled(true);
+        }
     }
 
     private void setXpubContext(ExtendedKey extendedKey) {
@@ -476,7 +479,8 @@ public class KeystoreController extends WalletFormController implements Initiali
             Service<String> backupService = cardApi.getBackupService();
             backupService.setOnSucceeded(event -> {
                 String backup = backupService.getValue();
-                TextAreaDialog backupDialog = new TextAreaDialog(backup, false);
+                String filename = fingerprint.getText() + ".aes";
+                TextAreaDialog backupDialog = new TextAreaDialog(backup, false, filename, Base64.getDecoder().decode(backup));
                 backupDialog.setTitle("Backup Private Key");
                 backupDialog.getDialogPane().setHeaderText((requiresBackup ? "Please backup first by saving" : "Save") + " the following text in a safe place. It contains an encrypted copy of the card's private key, and can be decrypted using the backup key written on the back of the card.");
                 backupDialog.showAndWait();
@@ -513,6 +517,9 @@ public class KeystoreController extends WalletFormController implements Initiali
             QRScanDialog.Result result = optionalResult.get();
             if(result.extendedKey != null && result.extendedKey.getKey().isPubKeyOnly()) {
                 xpub.setText(result.extendedKey.getExtendedKey());
+                if(result.extendedKeyName != null) {
+                    label.setText(result.extendedKeyName);
+                }
             } else if(result.outputDescriptor != null && !result.outputDescriptor.getExtendedPublicKeys().isEmpty()) {
                 ExtendedKey extendedKey = result.outputDescriptor.getExtendedPublicKeys().iterator().next();
                 KeyDerivation keyDerivation = result.outputDescriptor.getKeyDerivation(extendedKey);

src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java

@@ -413,7 +413,11 @@ public class PaymentController extends WalletFormController implements Initializ
             try {
                 Wallet recipientBip47Wallet = getWalletForPayNym(payNym);
                 if(recipientBip47Wallet != null) {
+                    int index = sendController.getPayNymSendIndex(this);
                     WalletNode sendNode = recipientBip47Wallet.getFreshNode(KeyPurpose.SEND);
+                    for(int i = 0; i < index; i++) {
+                        sendNode = recipientBip47Wallet.getFreshNode(KeyPurpose.SEND, sendNode);
+                    }
                     ECKey pubKey = sendNode.getPubKey();
                     Address address = recipientBip47Wallet.getScriptType().getAddress(pubKey);
                     if(sendController.getPaymentTabs().getTabs().size() > 1 || (getRecipientValueSats() != null && getRecipientValueSats() > getRecipientDustThreshold(address)) || maxButton.isSelected()) {
@@ -433,6 +437,11 @@ public class PaymentController extends WalletFormController implements Initializ
         return masterWallet.getChildWallet(new PaymentCode(payNym.paymentCode().toString()), payNym.segwit() ? ScriptType.P2WPKH : ScriptType.P2PKH);
     }
 
+    boolean isSentToSamePayNym(PaymentController paymentController) {
+        return (this != paymentController && payNymProperty.get() != null && !payNymProperty.get().isCollaborativeSend()
+                && payNymProperty.get().paymentCode().equals(paymentController.payNymProperty.get().paymentCode()));
+    }
+
     private Long getRecipientValueSats() {
         return getRecipientValueSats(amountUnit.getSelectionModel().getSelectedItem());
     }

src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java

@@ -189,6 +189,9 @@ public class ReceiveController extends WalletFormController implements Initializ
 
     public void getNewAddress(ActionEvent event) {
         refreshAddress();
+        if(currentEntry != null) {
+            ensureSufficientGapLimit(currentEntry.getNode().getIndex());
+        }
     }
 
     public void refreshAddress() {
@@ -196,6 +199,17 @@ public class ReceiveController extends WalletFormController implements Initializ
         setNodeEntry(freshEntry);
     }
 
+    private void ensureSufficientGapLimit(int index) {
+        Wallet wallet = getWalletForm().getWallet();
+        Integer highestIndex = wallet.getNode(KeyPurpose.RECEIVE).getHighestUsedIndex();
+        int highestUsedIndex = highestIndex == null ? -1 : highestIndex;
+        int existingGapLimit = wallet.getGapLimit();
+        if(index > highestUsedIndex + existingGapLimit) {
+            wallet.setGapLimit(Math.max(wallet.getGapLimit(), index - highestUsedIndex));
+            EventManager.get().post(new WalletGapLimitChangedEvent(getWalletForm().getWalletId(), wallet, existingGapLimit));
+        }
+    }
+
     @SuppressWarnings("unchecked")
     public void displayAddress(ActionEvent event) {
         Wallet wallet = getWalletForm().getWallet();

src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java

@@ -542,6 +542,20 @@ public class SendController extends WalletFormController implements Initializabl
         }
     }
 
+    int getPayNymSendIndex(PaymentController paymentController) {
+        int index = 0;
+        for(Tab tab : paymentTabs.getTabs()) {
+            PaymentController controller = (PaymentController)tab.getUserData();
+            if(controller == paymentController) {
+                break;
+            } else if(controller.isSentToSamePayNym(paymentController)) {
+                index++;
+            }
+        }
+
+        return index;
+    }
+
     public void updateTransaction() {
         updateTransaction(null);
     }

src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java

@@ -730,6 +730,13 @@ public class SettingsController extends WalletFormController implements Initiali
         }
     }
 
+    @Subscribe
+    public void walletGapLimitChanged(WalletGapLimitChangedEvent event) {
+        if(walletForm.getWalletId().equals(event.getWalletId())) {
+            ((SettingsWalletForm)walletForm).gapLimitChanged(event.getGapLimit());
+        }
+    }
+
     @Subscribe
     public void existingWalletImported(ExistingWalletImportedEvent event) {
         if(event.getExistingWalletId().equals(getWalletForm().getWalletId())) {

src/main/java/com/sparrowwallet/sparrow/wallet/SettingsWalletForm.java

@@ -253,4 +253,8 @@ public class SettingsWalletForm extends WalletForm {
             masterWalletCopy.getChildWallets().add(childWallet.copy());
         }
     }
+
+    public void gapLimitChanged(int gapLimit) {
+        walletCopy.setGapLimit(gapLimit);
+    }
 }

src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java

@@ -604,7 +604,9 @@ public class WalletForm {
                 Optional<WalletNode> optPurposeNode = wallet.getPurposeNodes().stream().filter(node -> node.getKeyPurpose() == keyPurpose).findFirst();
                 if(optPurposeNode.isPresent()) {
                     WalletNode purposeNode = optPurposeNode.get();
-                    newNodes.addAll(purposeNode.fillToIndex(wallet, wallet.getLookAheadIndex(purposeNode)));
+                    purposeNode.fillToIndex(wallet, wallet.getLookAheadIndex(purposeNode));
+                    int previousLookAheadIndex = event.getPreviousLookAheadIndex(purposeNode);
+                    newNodes.addAll(purposeNode.getChildren().stream().filter(node -> node.getIndex() > previousLookAheadIndex).collect(Collectors.toList()));
                 }
             }
 

src/main/java/com/sparrowwallet/sparrow/whirlpool/Whirlpool.java

@@ -68,6 +68,7 @@ public class Whirlpool {
     private final ExpirablePoolSupplier poolSupplier;
     private final Tx0Service tx0Service;
     private Tx0FeeTarget tx0FeeTarget = Tx0FeeTarget.BLOCKS_4;
+    private Tx0FeeTarget mixFeeTarget = Tx0FeeTarget.BLOCKS_4;
     private HD_Wallet hdWallet;
     private String walletId;
     private String mixToWalletId;
@@ -149,7 +150,6 @@ public class Whirlpool {
     }
 
     private Tx0Config computeTx0Config() {
-        Tx0FeeTarget mixFeeTarget = Tx0FeeTarget.BLOCKS_4;
         return new Tx0Config(tx0ParamService, poolSupplier, tx0FeeTarget, mixFeeTarget, WhirlpoolAccount.BADBANK);
     }
 
@@ -163,7 +163,7 @@ public class Whirlpool {
             ScriptType scriptType = wallet.getScriptType();
             int purpose = scriptType.getDefaultDerivation().get(0).num();
             List<String> words = keystore.getSeed().getMnemonicCode();
-            String passphrase = keystore.getSeed().getPassphrase().asString();
+            String passphrase = keystore.getSeed().getPassphrase() == null ? "" : keystore.getSeed().getPassphrase().asString();
             HD_WalletFactoryGeneric hdWalletFactory = HD_WalletFactoryGeneric.getInstance();
             byte[] seed = hdWalletFactory.computeSeedFromWords(words);
             this.walletId = walletId;
@@ -488,6 +488,14 @@ public class Whirlpool {
         this.tx0FeeTarget = tx0FeeTarget;
     }
 
+    public Tx0FeeTarget getMixFeeTarget() {
+        return mixFeeTarget;
+    }
+
+    public void setMixFeeTarget(Tx0FeeTarget mixFeeTarget) {
+        this.mixFeeTarget = mixFeeTarget;
+    }
+
     public String getWalletId() {
         return walletId;
     }

src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolController.java

@@ -55,6 +55,9 @@ public class WhirlpoolController {
     @FXML
     private CopyableLabel premixFeeRate;
 
+    @FXML
+    private Label lowPremixFeeRate;
+
     @FXML
     private ComboBox<Pool> pool;
 
@@ -139,9 +142,12 @@ public class WhirlpoolController {
             tx0Previews = null;
             tx0PreviewProperty.set(null);
             Tx0FeeTarget tx0FeeTarget = FEE_TARGETS.get(newValue.intValue());
-            premixFeeRate.setText(SparrowMinerFeeSupplier.getFee(Integer.parseInt(tx0FeeTarget.getFeeTarget().getValue())) + " sats/vB");
+            premixFeeRate.setText(getFeeRate(tx0FeeTarget) + " sats/vB");
+            lowPremixFeeRate.setVisible(tx0FeeTarget == Tx0FeeTarget.MIN && getFeeRate(tx0FeeTarget) * 2 < getFeeRate(Tx0FeeTarget.BLOCKS_4));
         });
         premixPriority.setValue(1);
+        lowPremixFeeRate.managedProperty().bind(lowPremixFeeRate.visibleProperty());
+        lowPremixFeeRate.setVisible(false);
 
         if(mixConfig.getScode() != null) {
             step1.setVisible(false);
@@ -218,6 +224,10 @@ public class WhirlpoolController {
         });
     }
 
+    private int getFeeRate(Tx0FeeTarget tx0FeeTarget) {
+        return SparrowMinerFeeSupplier.getFee(Integer.parseInt(tx0FeeTarget.getFeeTarget().getValue()));
+    }
+
     public boolean next() {
         if(step1.isVisible()) {
             step1.setVisible(false);
@@ -318,6 +328,7 @@ public class WhirlpoolController {
             tx0Previews = null;
             whirlpool.setScode(mixConfig.getScode());
             whirlpool.setTx0FeeTarget(FEE_TARGETS.get(premixPriority.valueProperty().intValue()));
+            whirlpool.setMixFeeTarget(FEE_TARGETS.get(premixPriority.valueProperty().intValue()));
 
             Whirlpool.Tx0PreviewsService tx0PreviewsService = new Whirlpool.Tx0PreviewsService(whirlpool, utxoEntries);
             tx0PreviewsService.setOnRunning(workerStateEvent -> {

src/main/java/com/sparrowwallet/sparrow/whirlpool/dataSource/SparrowIndexHandler.java

@@ -4,6 +4,7 @@ import com.samourai.wallet.client.indexHandler.AbstractIndexHandler;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletGapLimitChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletMixConfigChangedEvent;
@@ -75,7 +76,15 @@ public class SparrowIndexHandler extends AbstractIndexHandler {
         int existingGapLimit = wallet.getGapLimit();
         if(index > highestUsedIndex + existingGapLimit) {
             wallet.setGapLimit(Math.max(wallet.getGapLimit(), index - highestUsedIndex));
-            EventManager.get().post(new WalletGapLimitChangedEvent(wallet));
+            EventManager.get().post(new WalletGapLimitChangedEvent(getWalletId(), wallet, existingGapLimit));
+        }
+    }
+
+    private String getWalletId() {
+        try {
+            return AppServices.get().getOpenWallets().get(wallet).getWalletId(wallet);
+        } catch(Exception e) {
+            return null;
         }
     }
 }

src/main/java/com/sparrowwallet/sparrow/whirlpool/tor/SparrowTorClientService.java

@@ -2,8 +2,10 @@ package com.sparrowwallet.sparrow.whirlpool.tor;
 
 import com.google.common.net.HostAndPort;
 import com.samourai.tor.client.TorClientService;
-import com.sparrowwallet.sparrow.net.TorService;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.net.Tor;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
+import io.matthewnelson.kmp.tor.controller.common.control.usecase.TorControlSignal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,13 +25,12 @@ public class SparrowTorClientService extends TorClientService {
     public void changeIdentity() {
         HostAndPort proxy = whirlpool.getTorProxy();
         if(proxy != null) {
-            Socket controlSocket = TorService.getControlSocket();
-            if(controlSocket != null) {
-                try {
-                    writeNewNym(controlSocket);
-                } catch(Exception e) {
-                    log.warn("Error sending NEWNYM to " + controlSocket, e);
-                }
+            if(AppServices.isTorRunning()) {
+                Tor.getDefault().getTorManager().signal(TorControlSignal.Signal.NewNym, throwable -> {
+                    log.warn("Failed to signal newnym");
+                }, successEvent -> {
+                    log.info("Signalled newnym for new Tor circuit");
+                });
             } else {
                 HostAndPort control = HostAndPort.fromParts(proxy.getHost(), proxy.getPort() + 1);
                 try(Socket socket = new Socket(control.getHost(), control.getPort())) {

src/main/java/module-info.java

@@ -19,7 +19,19 @@ open module com.sparrowwallet.sparrow {
     requires org.jetbrains.annotations;
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.annotation;
-    requires netlayer.jpms;
+    requires kotlin.stdlib;
+    requires kmp.tor.jvm;
+    requires kmp.tor.binary.extract.jvm;
+    requires kmp.tor.common.jvm;
+    requires kmp.tor.controller.common.jvm;
+    requires kmp.tor.manager.jvm;
+    requires kmp.tor.manager.common.jvm;
+    requires kmp.tor.ext.callback.manager.jvm;
+    requires kmp.tor.ext.callback.common.jvm;
+    requires kmp.tor.ext.callback.manager.common.jvm;
+    requires kmp.tor.ext.callback.controller.common.jvm;
+    requires parcelize.jvm;
+    requires kotlinx.coroutines.javafx;
     requires org.slf4j;
     requires com.google.gson;
     requires org.jdbi.v3.core;
@@ -31,7 +43,6 @@ open module com.sparrowwallet.sparrow {
     requires org.fxmisc.flowless;
     requires com.github.sarxos.webcam.capture;
     requires centerdevice.nsmenufx;
-    requires com.github.JesusMcCloud.jtorctl;
     requires com.beust.jcommander;
     requires org.slf4j.jul.to.slf4j;
     requires net.sourceforge.javacsv;

src/main/resources/com/sparrowwallet/sparrow/darktheme.css

@@ -1,10 +1,10 @@
 .root {
-    -fx-accent: #1e88cf;
+    -fx-accent: #166793;
     -fx-focus-color: -fx-accent;
-    -fx-base: #373e43;
-    -fx-control-inner-background: derive(-fx-base, 35%);
+    -fx-base: #1b1d1f;
+    -fx-control-inner-background: derive(-fx-base, 25%);
     -fx-control-inner-background-alt: -fx-control-inner-background ;
-    -fx-default-button: -fx-accent;
+    -fx-default-button: #1e88cf;
     -fx-box-border: ladder(-fx-color, black 20%, derive(-fx-color,40%) 30%);
 }
 
@@ -12,7 +12,7 @@
     -fx-text-fill: lightgray;
 }
 
-.text-field {
+.text-field, .text-area {
     -fx-prompt-text-fill: gray;
 }
 
@@ -40,7 +40,11 @@
 }
 
 .button:default {
-    -fx-base: -fx-accent ;
+    -fx-base: -fx-default-button;
+}
+
+.split-menu-button.default-button > .label {
+    -fx-text-fill: white;
 }
 
 .table-view, .tree-view {
@@ -54,12 +58,15 @@
 }
 
 .list-cell:even,
-.list-cell:odd,
-.table-row-cell:even,
-.table-row-cell:odd{
+.table-row-cell:even{
     -fx-control-inner-background: derive(-fx-base, 15%);
 }
 
+.list-cell:odd,
+.table-row-cell:odd{
+    -fx-control-inner-background: derive(-fx-base, 20%);
+}
+
 .list-cell:empty,
 .table-row-cell:empty {
     -fx-background-color: transparent;
@@ -67,10 +74,42 @@
 
 .list-cell,
 .table-row-cell{
-    -fx-border-color: transparent;
     -fx-table-cell-border-color:transparent;
 }
 
+.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
+.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected,
+.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell .tree-table-cell:selected {
+    -fx-background: -fx-selection-bar;
+    -fx-table-cell-border-color: derive(-fx-selection-bar, 20%);
+}
+
+.list-cell:filled:selected,
+.tree-table-row-cell:filled:selected,
+.tree-table-row-cell:filled > .tree-table-cell:selected {
+    -fx-background: derive(-fx-selection-bar-non-focused, -60%);
+    -fx-table-cell-border-color: -fx-inner-border;
+}
+
+.spreadsheet-cell {
+    -fx-background-color: -fx-table-cell-border-color, derive(-fx-base, 25%);
+    -fx-text-fill: -fx-text-inner-color;
+}
+
+VerticalHeader > Label{
+    -fx-background-color: derive(-fx-box-border, 50%), -fx-base;
+}
+
+HorizontalHeaderColumn > TableColumnHeader.column-header.table-column{
+    -fx-background-color: derive(-fx-box-border, 50%), -fx-base;
+}
+
+.root #grid .spreadsheet-cell:selected,
+.root #grid .spreadsheet-cell:focused:selected,
+.root #grid .spreadsheet-cell:focused:selected:hover {
+    -fx-background-color: rgb(159, 142, 0);
+}
+
 .status-bar {
     -fx-background-color: derive(-fx-color,-15%), -fx-body-color;
 }
@@ -95,6 +134,36 @@
     -fx-fill: #e06c75;
 }
 
+.root .list-menu {
+    -fx-background-color: #2284bb;
+}
+
+.root .list-item {
+    -fx-pref-width: 180;
+    -fx-background-color: #2284bb;
+}
+
+.root .list-item:hover {
+    -fx-background-color: linear-gradient(to right, #2284bb, derive(#388fc7, 10%));
+}
+
+.root .list-item:selected {
+    -fx-background-color: linear-gradient(to right, #2284bb, derive(#1479bb, -10%));
+}
+
+.root .list-item:disabled {
+    -fx-background-color: #626367;
+    -fx-border-color: #626367;
+}
+
+.root .wallet-subtabs > .tab-header-area .tab {
+    -fx-background-color: derive(#2284bb, 32%);
+}
+
+.root .wallet-subtabs > .tab-header-area .tab:selected {
+    -fx-background-color: #2284bb;
+}
+
 #inputsPie .default-color0.chart-pie {
     -fx-pie-color: #e06c75;
 }
@@ -157,6 +226,38 @@
     color-grey: #3e4451;
 }
 
+.root .progress-bar {
+    -fx-accent: derive(-fx-default-button, -15%);
+}
+
+.root .segment1 .progress-bar {
+    -fx-accent: derive(CHART_COLOR_3, -20%);
+}
+
+.root .segment2 .progress-bar {
+    -fx-accent: derive(CHART_COLOR_7, -20%);
+}
+
+.root .segment3 .progress-bar {
+    -fx-accent: derive(CHART_COLOR_5, -20%);
+}
+
+.root .segment4 .progress-bar {
+    -fx-accent: derive(CHART_COLOR_6, -20%);
+}
+
+.root .segment5 .progress-bar {
+    -fx-accent: derive(CHART_COLOR_2, -20%);
+}
+
+.root .segment6 .progress-bar {
+    -fx-accent: derive(CHART_COLOR_1, -20%);
+}
+
+.root .segment7 .progress-bar {
+    -fx-accent: derive(CHART_COLOR_8, -20%);
+}
+
 .root .readonly.text-input {
     -fx-text-fill: lightgray;
 }
@@ -221,4 +322,12 @@
 
 .root .progress-indicator.progress-timer.warn > .determinate-indicator > .indicator {
     -fx-background-color: -fx-box-border, radial-gradient(center 50% 50%, radius 50%, #e06c75 70%, derive(-fx-control-inner-background, -9%) 100%);
-}
+}
+
+.root .hyperlink {
+    -fx-text-fill: #229df5;
+}
+
+.root .hyperlink:visited {
+    -fx-text-fill: #229df5;
+}

src/main/resources/com/sparrowwallet/sparrow/grid.css

@@ -0,0 +1,5 @@
+#grid .spreadsheet-cell:selected,
+#grid .spreadsheet-cell:focused:selected,
+#grid .spreadsheet-cell:focused:selected:hover {
+    -fx-background-color: rgb(238, 210, 2);
+}

src/main/resources/com/sparrowwallet/sparrow/wallet/wallet.css

@@ -83,7 +83,7 @@
     -fx-text-fill: rgb(202, 18, 67);
 }
 
-.tree-table-row-cell:selected .coin-cell.negative-amount {
+.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected .coin-cell.negative-amount {
     -fx-text-fill: white;
 }
 

src/main/resources/com/sparrowwallet/sparrow/whirlpool/whirlpool.css

@@ -43,4 +43,8 @@
 
 .field-control {
     -fx-pref-width: 180px;
-}
+}
+
+.low-fee-warning {
+    -fx-text-fill: rgb(238, 210, 2);
+}

src/main/resources/com/sparrowwallet/sparrow/whirlpool/whirlpool.fxml

@@ -107,6 +107,17 @@
                     </padding>
                     <Label text="Premix Fee Rate:" styleClass="field-label" />
                     <CopyableLabel fx:id="premixFeeRate" />
+                    <Label fx:id="lowPremixFeeRate">
+                        <graphic>
+                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="EXCLAMATION_TRIANGLE" styleClass="low-fee-warning"/>
+                        </graphic>
+                        <padding>
+                            <Insets left="12" />
+                        </padding>
+                        <tooltip>
+                            <Tooltip text="A low fee rate may delay the first mix."/>
+                        </tooltip>
+                    </Label>
                 </HBox>
             </VBox>
             <VBox fx:id="step4" spacing="15">

src/main/resources/logback.xml

@@ -60,14 +60,6 @@
         </encoder>
     </appender>
 
-    <appender name="APPLICATION_TOR" class="com.sparrowwallet.drongo.ApplicationAppender">
-        <callback>com.sparrowwallet.sparrow.TorLogHandler</callback>
-    </appender>
-
-    <logger name="org.berndpruenster.netlayer.tor" level="debug" additivity="false">
-        <appender-ref ref="APPLICATION_TOR" />
-    </logger>
-
     <root level="warn">
         <appender-ref ref="FILE" />
         <appender-ref ref="STDOUT" />