compile bwt for older macos

Add mailmap file for Craig Raw addresses.

.github/workflows/package.yaml

@@ -9,18 +9,18 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
-      - name: Set up JDK 16.0.1
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17.0.2
+        uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: '16.0.1'
+          distribution: 'temurin'
+          java-version: '17.0.2'
       - name: Show Build Versions
         run: ./gradlew -v
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

.mailmap

@@ -0,0 +1,2 @@
+Craig Raw <craigraw@gmail.com> Craig Raw <craig@quirk.biz>
+Craig Raw <craigraw@gmail.com> craigraw <craigraw@gmail.com>

README.md

@@ -2,7 +2,7 @@
 
 Sparrow is a modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability.
 
-More information (and release binaries) can be found at https://sparrowwallet.com. Release binaries are also available directly from [Github](https://github.com/sparrowwallet/sparrow/releases).
+More information (and release binaries) can be found at https://sparrowwallet.com. Release binaries are also available directly from [GitHub](https://github.com/sparrowwallet/sparrow/releases).
 
 ![Sparrow Wallet](https://sparrowwallet.com/assets/images/control-your-sends.png)
 
@@ -16,26 +16,35 @@ or for those without SSH credentials:
 
 `git clone --recursive https://github.com/sparrowwallet/sparrow.git`
 
-In order to build, Sparrow requires Java 16 to be installed. 
-The release binaries are built with [AdoptOpenJdk 16.0.1+9 Hotspot](https://adoptopenjdk.net/archive.html?variant=openjdk16&jvmVariant=hotspot).
+In order to build, Sparrow requires Java 17 to be installed. 
+The release binaries are built with [Eclipse Temurin 17.0.2+8](https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.2%2B8).
 
-These binaries can be built from source using
+Other packages may also be necessary to build depending on the platform. On Debian/Ubuntu systems:
+
+`sudo apt install -y rpm fakeroot binutils`
+
+
+The Sparrow binaries can be built from source using
 
 `./gradlew jpackage`
 
+Note that to build the Windows installer, you will need to install [WiX](https://github.com/wixtoolset/wix3/releases).
+
 When updating to the latest HEAD
 
 `git pull --recurse-submodules`
 
 The release binaries are reproducible from v1.5.0 onwards (pre codesigning and installer packaging). More detailed [instructions on reproducing the binaries](docs/reproducible.md) are provided.
 
+> A video documention of your built process uploaded to [bitcoinbinary.org](https://bitcoinbinary.org/) is appreciated. Alternatively check the site if you wish to see if someone else already verified the provided binaries. 
+
 ## Running
 
-If you prefer to run Sparrow directly from source, it can be launched with
+If you prefer to run Sparrow directly from source, it can be launched from within the project directory with
 
 `./sparrow`
 
-Java 16 or higher must be installed. 
+Java 17 or higher must be installed. 
 
 ## Configuration
 
@@ -84,6 +93,12 @@ Please use the [Issues](https://github.com/sparrowwallet/sparrow/issues) tab abo
 
 Sparrow is licensed under the Apache 2 software licence.
 
+## GPG Key
+
+The Sparrow release binaries here and on [sparrowwallet.com](https://sparrowwallet.com/download/) are signed using [craigraw's GPG key](https://keybase.io/craigraw):  
+Fingerprint: D4D0D3202FC06849A257B38DE94618334C674B40  
+64-bit: E946 1833 4C67 4B40
+
 ## Credit
 
 ![Yourkit](https://www.yourkit.com/images/yklogo.png)

build.gradle

@@ -1,16 +1,22 @@
 plugins {
     id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.13'
     id 'extra-java-module-info'
-    id 'com.dua3.javafxgradle7plugin' version '0.0.9'
     id 'org.beryx.jlink' version '2.24.0'
 }
 
-def sparrowVersion = '1.5.0'
+def sparrowVersion = '1.6.5'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
     osName = "osx"
 }
+def targetName = ""
+def osArch = "x64"
+if(System.getProperty("os.arch") == "aarch64") {
+    osArch = "aarch64"
+    targetName = "-" + osArch
+}
 
 group "com.sparrowwallet"
 version "${sparrowVersion}"
@@ -29,7 +35,7 @@ tasks.withType(AbstractArchiveTask) {
 }
 
 javafx {
-    version = "16"
+    version = "18"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
 }
 
@@ -45,13 +51,13 @@ dependencies {
     }
     implementation('com.google.guava:guava:28.2-jre')
     implementation('com.google.code.gson:gson:2.8.6')
-    implementation('com.h2database:h2:1.4.201-SNAPSHOT')
+    implementation('com.h2database:h2:2.0.206')
     implementation('com.zaxxer:HikariCP:4.0.3')
     implementation('org.jdbi:jdbi3-core:3.20.0') {
         exclude group: 'org.slf4j'
     }
     implementation('org.jdbi:jdbi3-sqlobject:3.20.0')
-    implementation('org.flywaydb:flyway-core:7.10.5-SNAPSHOT')
+    implementation('org.flywaydb:flyway-core:7.10.7-SNAPSHOT')
     implementation('org.fxmisc.richtext:richtextfx:0.10.4')
     implementation('no.tornado:tornadofx-controls:1.0.4')
     implementation('com.google.zxing:javase:3.4.0') {
@@ -65,14 +71,15 @@ dependencies {
     implementation('com.github.arteam:simple-json-rpc-server:1.0') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet:hummingbird:1.6.2')
-    implementation('com.nativelibs4java:bridj:0.7-20140918-3') {
+    implementation('com.sparrowwallet:hummingbird:1.6.4')
+    implementation('co.nstant.in:cbor:0.9')
+    implementation("com.nativelibs4java:bridj${targetName}:0.7-20140918-3") {
         exclude group: 'com.google.android.tools', module: 'dx'
     }
-    implementation('com.github.sarxos:webcam-capture:0.3.13-SNAPSHOT') {
+    implementation("com.github.sarxos:webcam-capture${targetName}:0.3.13-SNAPSHOT") {
         exclude group: 'com.nativelibs4java', module: 'bridj'
     }
-    implementation("com.sparrowwallet:netlayer-jpms-${osName}:0.6.8") {
+    implementation("com.sparrowwallet:netlayer-jpms-${osName}${targetName}:0.6.8") {
         exclude group: 'org.jetbrains.kotlin'
     }
     implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20')
@@ -91,7 +98,12 @@ dependencies {
     implementation('org.slf4j:jul-to-slf4j:1.7.30') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.17-SNAPSHOT')
+    implementation('com.sparrowwallet.nightjar:nightjar:0.2.33')
+    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')
     testImplementation('junit:junit:4.12')
 }
 
@@ -112,17 +124,18 @@ compileJava {
 processResources {
     doLast {
         delete fileTree("$buildDir/resources/main/native").matching {
-            exclude "${osName}/**"
+            exclude "${osName}/${osArch}/**"
         }
     }
 }
 
 test {
-    jvmArgs '--add-opens=java.base/java.io=ALL-UNNAMED'
+    jvmArgs '--add-opens=java.base/java.io=com.google.gson'
 }
 
 run {
-    applicationDefaultJvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
+    applicationDefaultJvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError",
+                                 "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
                                  "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls",
                                  "--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls",
                                  "--add-opens=javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls",
@@ -142,7 +155,7 @@ run {
                                  "--add-opens=java.base/java.io=com.google.gson"]
 
     if(os.macOsX) {
-        applicationDefaultJvmArgs += ["-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
+        applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
                                       "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx"]
     }
 }
@@ -191,10 +204,11 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=logback.classic",
                    "--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=com.fasterxml.jackson.core",
+                   "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor"]
 
         if(os.macOsX) {
-            jvmArgs += "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"
+            jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"]
         }
     }
     addExtraDependencies("javafx")
@@ -204,14 +218,14 @@ jlink {
         appVersion = "${sparrowVersion}"
         skipInstaller = os.macOsX || properties.skipInstallers
         imageOptions = []
-        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/aopp.properties', '--license-file', 'LICENSE']
+        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--license-file', 'LICENSE']
         if(os.windows) {
-            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
+            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-menu-group', 'Sparrow', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
             imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
             installerType = "exe"
         }
         if(os.linux) {
-            installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-rpm-license-type', 'ASL 2.0']
+            installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-menu-group', 'Sparrow', '--linux-rpm-license-type', 'ASL 2.0']
             imageOptions += ['--icon', 'src/main/deploy/package/linux/Sparrow.png', '--resource-dir', 'src/main/deploy/package/linux/']
         }
         if(os.macOsX) {
@@ -321,12 +335,12 @@ extraJavaModuleInfo {
         requires('org.slf4j')
         requires('com.fasterxml.jackson.databind')
     }
-    module('bridj-0.7-20140918-3.jar', 'com.nativelibs4java.bridj', '0.7-20140918-3') {
+    module("bridj${targetName}-0.7-20140918-3.jar", 'com.nativelibs4java.bridj', '0.7-20140918-3') {
         exports('org.bridj')
         exports('org.bridj.cpp')
         requires('java.logging')
     }
-    module('webcam-capture-0.3.13-SNAPSHOT.jar', 'com.github.sarxos.webcam.capture', '0.3.13-SNAPSHOT') {
+    module("webcam-capture${targetName}-0.3.13-SNAPSHOT.jar", 'com.github.sarxos.webcam.capture', '0.3.13-SNAPSHOT') {
         exports('com.github.sarxos.webcam')
         exports('com.github.sarxos.webcam.ds.buildin')
         exports('com.github.sarxos.webcam.ds.buildin.natives')
@@ -354,7 +368,7 @@ extraJavaModuleInfo {
     module('json-simple-1.1.1.jar', 'json.simple', '1.1.1') {
         exports('org.json.simple')
     }
-    module('logback-classic-1.2.3.jar', 'logback.classic', '1.2.3') {
+    module('logback-classic-1.2.8.jar', 'logback.classic', '1.2.8') {
         exports('ch.qos.logback.classic')
         requires('org.slf4j')
         requires('logback.core')
@@ -431,6 +445,11 @@ extraJavaModuleInfo {
         requires('javafx.graphics')
         requires('javafx.controls')
     }
+    module('rxjavafx-2.2.2.jar', 'io.reactivex.rxjava2fx', '2.2.2') {
+        exports('io.reactivex.rxjavafx.schedulers')
+        requires('io.reactivex.rxjava2')
+        requires('javafx.graphics')
+    }
     module('wellbehavedfx-0.3.3.jar', 'org.fxmisc.wellbehaved', '0.3.3') {
         requires('javafx.base')
         requires('javafx.graphics')
@@ -440,8 +459,10 @@ extraJavaModuleInfo {
     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.2.jar', 'com.sparrowwallet.hummingbird', '1.6.2') {
+    module('hummingbird-1.6.3.jar', 'com.sparrowwallet.hummingbird', '1.6.3') {
         exports('com.sparrowwallet.hummingbird')
         exports('com.sparrowwallet.hummingbird.registry')
         requires('co.nstant.in.cbor')
@@ -449,7 +470,7 @@ extraJavaModuleInfo {
     module('cbor-0.9.jar', 'co.nstant.in.cbor', '0.9') {
         exports('co.nstant.in.cbor')
     }
-    module('nightjar-0.2.17-SNAPSHOT.jar', 'com.sparrowwallet.nightjar', '0.2.17-SNAPSHOT') {
+    module('nightjar-0.2.33.jar', 'com.sparrowwallet.nightjar', '0.2.33') {
         requires('com.google.common')
         requires('net.sourceforge.streamsupport')
         requires('org.slf4j')
@@ -459,6 +480,7 @@ extraJavaModuleInfo {
         requires('com.fasterxml.jackson.core')
         requires('logback.classic')
         requires('org.json')
+        requires('io.reactivex.rxjava2')
         exports('com.samourai.http.client')
         exports('com.samourai.tor.client')
         exports('com.samourai.wallet.api.backend')
@@ -466,6 +488,17 @@ extraJavaModuleInfo {
         exports('com.samourai.wallet.client.indexHandler')
         exports('com.samourai.wallet.hd')
         exports('com.samourai.wallet.util')
+        exports('com.samourai.wallet.bip47.rpc')
+        exports('com.samourai.wallet.bip47.rpc.java')
+        exports('com.samourai.wallet.cahoots')
+        exports('com.samourai.wallet.cahoots.psbt')
+        exports('com.samourai.wallet.cahoots.stonewallx2')
+        exports('com.samourai.soroban.cahoots')
+        exports('com.samourai.soroban.client')
+        exports('com.samourai.soroban.client.cahoots')
+        exports('com.samourai.soroban.client.meeting')
+        exports('com.samourai.soroban.client.rpc')
+        exports('com.samourai.wallet.send')
         exports('com.samourai.whirlpool.client.event')
         exports('com.samourai.whirlpool.client.wallet')
         exports('com.samourai.whirlpool.client.wallet.beans')
@@ -483,6 +516,7 @@ extraJavaModuleInfo {
         exports('com.samourai.whirlpool.protocol.rest')
         exports('com.samourai.whirlpool.client.tx0')
         exports('com.samourai.wallet.segwit.bech32')
+        exports('com.samourai.whirlpool.client.wallet.data.chain')
         exports('com.samourai.whirlpool.client.wallet.data.wallet')
         exports('com.samourai.whirlpool.client.wallet.data.minerFee')
         exports('com.samourai.whirlpool.client.wallet.data.walletState')
@@ -524,7 +558,7 @@ extraJavaModuleInfo {
     module('jcip-annotations-1.0.jar', 'net.jcip.annotations', '1.0') {
         exports('net.jcip.annotations')
     }
-    module("netlayer-jpms-${osName}-0.6.8.jar", 'netlayer.jpms', '0.6.8') {
+    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')
@@ -549,18 +583,15 @@ extraJavaModuleInfo {
         requires('org.slf4j')
     }
     module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
-    module('logback-core-1.2.3.jar', 'logback.core', '1.2.3') {
+    module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {
         requires('java.xml')
     }
-    module('kotlin-stdlib-common-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.common', '1.5.20') {
-        exports('kotlin.jvm')
-        exports('kotlin.collections')
-    }
     module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') {
         exports('com.beust.jcommander')
     }
     module('junit-4.12.jar', 'junit', '4.12') {
         exports('org.junit')
+        requires('org.hamcrest.core')
     }
     module('hamcrest-core-1.3.jar', 'org.hamcrest.core', '1.3')
 }

buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java

@@ -59,7 +59,7 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
         String originalJarName = originalJar.getName();
 
         //Recreate jackson jars as open, non-synthetic modules
-        if (isModule(originalJar) && !originalJarName.contains("jackson")) {
+        if ((isModule(originalJar) && !originalJarName.contains("jackson")) || originalJarName.startsWith("javafx-")) {
             outputs.file(originalJar);
         } else if (moduleInfo.containsKey(originalJarName)) {
             addModuleDescriptor(originalJar, getModuleJar(outputs, originalJar), moduleInfo.get(originalJarName));
@@ -67,6 +67,8 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
             outputs.file(originalJar);
         } else if (automaticModules.containsKey(originalJarName)) {
             addAutomaticModuleName(originalJar,  getModuleJar(outputs, originalJar), automaticModules.get(originalJarName));
+        } else if(originalJarName.startsWith("kotlin-stdlib-common")) {
+            //ignore
         } else {
             throw new RuntimeException("Not a module and no mapping defined: " + originalJarName);
         }

docs/reproducible.md

@@ -12,32 +12,30 @@ Work on resolving both of these issues is ongoing.
 #### Install Java
 
 Because Sparrow bundles a Java runtime in the release binaries, it is essential to have the same version of Java installed when creating the release.
-For v1.5.0 and later, this is AdoptOpenJdk jdk-16.0.1+9 Hotspot. 
-It is available for all supported platforms from the [AdoptOpenJdk site](https://adoptopenjdk.net/archive.html?variant=openjdk16&jvmVariant=hotspot).
+For v1.6.4 and later, this is Eclipse Temurin 17.0.2+8. 
+It is available for all supported platforms from [Eclipse Temurin 17.0.2+8](https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.2%2B8).
 
 For reference, the downloads are as follows:
-- [Linux x64](https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz)
-- [MacOS x64](https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.tar.gz)
-- [Windows x64](https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_windows_hotspot_16.0.1_9.zip)
+- [Linux x64](https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz)
+- [MacOS x64](https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz)
+- [MacOS aarch64](https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz)
+- [Windows x64](https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_windows_hotspot_17.0.2_8.zip)
 
 It is also possible to install via a package manager on *nix systems. For example, on Debian/Ubuntu systems:
 ```shell
 sudo apt-get install -y wget apt-transport-https gnupg
-wget https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
-gpg --no-default-keyring --keyring ./adoptopenjdk-keyring.gpg --import public
-gpg --no-default-keyring --keyring ./adoptopenjdk-keyring.gpg --export --output adoptopenjdk-archive-keyring.gpg
-rm adoptopenjdk-keyring.gpg
-sudo mv adoptopenjdk-archive-keyring.gpg /usr/share/keyrings
-echo "deb [signed-by=/usr/share/keyrings/adoptopenjdk-archive-keyring.gpg] https://adoptopenjdk.jfrog.io/adoptopenjdk/deb $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/adoptopenjdk.list
+wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add -
+echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | sudo tee /etc/apt/sources.list.d/adoptium.list
 sudo apt update -y
-sudo apt-get install -y adoptopenjdk-16-hotspot=16.0.1+9-3
+sudo apt-get install -y temurin-17-jdk=17.0.2+8
+sudo update-alternatives --config java
 ```
 
 A alternative option for all platforms is to use the [sdkman.io](https://sdkman.io/) package manager ([Git Bash for Windows](https://git-scm.com/download/win) is a good choice on that platform).
 See the installation [instructions here](https://sdkman.io/install).
 Once installed, run
 ```shell
-sdk install java 16.0.1.hs-adpt
+sdk install java 17.0.2-tem
 ```
 
 #### Other requirements
@@ -51,7 +49,7 @@ sudo apt install -y rpm fakeroot binutils
 
 The project can cloned for a specific release tag as follows:
 ```shell
-GIT_TAG="1.5.0"
+GIT_TAG="1.6.5"
 git clone --recursive --branch "${GIT_TAG}" git@github.com:sparrowwallet/sparrow.git
 ```
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

sparrow

@@ -1,5 +1,6 @@
 #!/usr/bin/env sh
 
+cd `dirname $0`
 args="$*"
 args="${args%"${args##*[![:space:]]}"}"
 

src/main/deploy/aopp.properties

@@ -1,2 +0,0 @@
-mime-type=x-scheme-handler/aopp
-description=Verify Address Ownership URI

src/main/deploy/package/linux/Sparrow.desktop

@@ -6,4 +6,4 @@ Icon=/opt/sparrow/lib/Sparrow.png
 Terminal=false
 Type=Application
 Categories=Unknown
-MimeType=application/psbt;application/bitcoin-transaction;x-scheme-handler/bitcoin;x-scheme-handler/aopp
+MimeType=application/psbt;application/bitcoin-transaction;x-scheme-handler/bitcoin

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

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.5.0</string>
+  <string>1.6.5</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -45,14 +45,6 @@
             <string>bitcoin</string>
           </array>
       </dict>
-      <dict>
-          <key>CFBundleURLName</key>
-          <string>com.sparrowwallet.sparrow.aopp</string>
-          <key>CFBundleURLSchemes</key>
-          <array>
-            <string>aopp</string>
-          </array>
-      </dict>
   </array>
   <key>UTImportedTypeDeclarations</key>
   <array>

src/main/deploy/package/windows/main.wxs

@@ -77,16 +77,6 @@
 
     <DirectoryRef Id="TARGETDIR">
         <Component Id="RegistryEntries" Guid="{206C911C-56EF-44B8-9257-5FD214427965}">
-            <RegistryKey Root="HKCR" Key="aopp" Action="createAndRemoveOnUninstall">
-                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
-                <RegistryValue Type="string" Value="URL:Address Ownership Proof Protocol"/>
-                <RegistryKey Key="DefaultIcon">
-                    <RegistryValue Type="string" Value="$(var.JpAppName).exe" />
-                </RegistryKey>
-                <RegistryKey Key="shell\open\command">
-                    <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
-                </RegistryKey>
-            </RegistryKey>
             <RegistryKey Root="HKCR" Key="bitcoin" Action="createAndRemoveOnUninstall">
                 <RegistryValue Type="string" Name="URL Protocol" Value=""/>
                 <RegistryValue Type="string" Value="URL:Bitcoin Payment URL"/>

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

@@ -2,7 +2,6 @@ package com.sparrowwallet.sparrow;
 
 import com.google.common.eventbus.Subscribe;
 import com.google.common.net.HostAndPort;
-import com.samourai.whirlpool.client.wallet.WhirlpoolEventService;
 import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.BlockHeader;
@@ -10,13 +9,17 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
 import com.sparrowwallet.sparrow.control.TextUtils;
 import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
+import com.sparrowwallet.sparrow.paynym.PayNymService;
+import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -24,6 +27,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
@@ -48,6 +52,7 @@ import org.slf4j.LoggerFactory;
 import java.awt.*;
 import java.awt.desktop.OpenFilesHandler;
 import java.awt.desktop.OpenURIHandler;
+import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.IOException;
 import java.net.*;
@@ -65,23 +70,33 @@ public class AppServices {
 
     private static final int SERVER_PING_PERIOD_SECS = 60;
     private static final int PUBLIC_SERVER_RETRY_PERIOD_SECS = 3;
-    private static final int ENUMERATE_HW_PERIOD_SECS = 30;
+    public static final int ENUMERATE_HW_PERIOD_SECS = 30;
     private static final int RATES_PERIOD_SECS = 5 * 60;
     private static final int VERSION_CHECK_PERIOD_HOURS = 24;
     private static final ExchangeSource DEFAULT_EXCHANGE_SOURCE = ExchangeSource.COINGECKO;
     private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
     private static final String TOR_DEFAULT_PROXY_CIRCUIT_ID = "default";
 
+    public static final List<Integer> TARGET_BLOCKS_RANGE = List.of(1, 2, 3, 4, 5, 10, 25, 50);
+    public static final List<Long> FEE_RATES_RANGE = List.of(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L, 1024L);
+    public static final double FALLBACK_FEE_RATE = 20000d / 1000;
+
     private static AppServices INSTANCE;
 
     private final WhirlpoolServices whirlpoolServices = new WhirlpoolServices();
 
+    private final SorobanServices sorobanServices = new SorobanServices();
+
+    private static PayNymService payNymService;
+
     private final MainApp application;
 
     private final Map<Window, List<WalletTabData>> walletWindows = new LinkedHashMap<>();
 
     private TrayManager trayManager;
 
+    private static Image windowIcon;
+
     private static final BooleanProperty onlineProperty = new SimpleBooleanProperty(false);
 
     private ExchangeSource.RatesService ratesService;
@@ -94,13 +109,15 @@ public class AppServices {
 
     private TorService torService;
 
+    private ScheduledService<Void> preventSleepService;
+
     private static Integer currentBlockHeight;
 
     private static BlockHeader latestBlockHeader;
 
     private static Map<Integer, Double> targetBlockFeeRates;
 
-    private static final Map<Date, Set<MempoolRateSize>> mempoolHistogram = new TreeMap<>();
+    private static final TreeMap<Date, Set<MempoolRateSize>> mempoolHistogram = new TreeMap<>();
 
     private static Double minimumRelayFeeRate;
 
@@ -148,6 +165,7 @@ public class AppServices {
         this.application = application;
         EventManager.get().register(this);
         EventManager.get().register(whirlpoolServices);
+        EventManager.get().register(sorobanServices);
     }
 
     public void start() {
@@ -156,6 +174,7 @@ public class AppServices {
         ratesService = createRatesService(config.getExchangeSource(), config.getFiatCurrency());
         versionCheckService = createVersionCheckService();
         torService = createTorService();
+        preventSleepService = createPreventSleepService();
 
         onlineProperty.addListener(onlineServicesListener);
 
@@ -183,6 +202,10 @@ public class AppServices {
         if(config.isCheckNewVersions() && Network.get() == Network.MAINNET) {
             restartService(versionCheckService);
         }
+
+        if(config.isPreventSleep()) {
+            restartService(preventSleepService);
+        }
     }
 
     private void restartService(ScheduledService<?> service) {
@@ -212,6 +235,11 @@ public class AppServices {
             versionCheckService.cancel();
         }
 
+        if(payNymService != null) {
+            PayNymService.ShutdownService shutdownService = new PayNymService.ShutdownService(payNymService);
+            shutdownService.start();
+        }
+
         if(Tor.getDefault() != null) {
             Tor.getDefault().shutdown();
         }
@@ -264,9 +292,12 @@ public class AppServices {
                                     "\n\nThis may indicate a man-in-the-middle attack!" +
                                     "\n\nDo you still want to proceed?", ButtonType.NO, ButtonType.YES);
                             if(optButton.isPresent() && optButton.get() == ButtonType.YES) {
-                                crtFile.delete();
-                                Platform.runLater(() -> restartService(connectionService));
-                                return;
+                                if(crtFile.delete()) {
+                                    Platform.runLater(() -> restartService(connectionService));
+                                    return;
+                                } else {
+                                    AppServices.showErrorDialog("Could not delete certificate", "The certificate file at " + crtFile.getAbsolutePath() + " could not be deleted.\n\nPlease delete this file manually.");
+                                }
                             }
                         }
                     }
@@ -327,7 +358,7 @@ public class AppServices {
 
     private Hwi.ScheduledEnumerateService createDeviceEnumerateService() {
         Hwi.ScheduledEnumerateService enumerateService = new Hwi.ScheduledEnumerateService(null);
-        enumerateService.setPeriod(Duration.seconds(ENUMERATE_HW_PERIOD_SECS));
+        enumerateService.setPeriod(Duration.seconds(Config.get().getEnumerateHwPeriod()));
         enumerateService.setOnSucceeded(workerStateEvent -> {
             List<Device> devices = enumerateService.getValue();
 
@@ -382,6 +413,39 @@ public class AppServices {
         return torService;
     }
 
+    private ScheduledService<Void> createPreventSleepService() {
+        ScheduledService<Void> preventSleepService = new ScheduledService<Void>() {
+            @Override
+            protected Task<Void> createTask() {
+                return new Task<>() {
+                    protected Void call() {
+                        try {
+                            Robot robot = new Robot();
+                            robot.keyRelease(KeyEvent.VK_F16);
+                        } catch(Exception e) {
+                            log.debug("Error preventing sleep", e);
+                        }
+
+                        return null;
+                    }
+                };
+            }
+        };
+
+        preventSleepService.setPeriod(Duration.minutes(1));
+        return preventSleepService;
+    }
+
+    public void setPreventSleep(boolean preventSleep) {
+        if(preventSleepService != null) {
+            if(preventSleep) {
+                restartService(preventSleepService);
+            } else {
+                preventSleepService.cancel();
+            }
+        }
+    }
+
     public static boolean isTorRunning() {
         return Tor.getDefault() != null;
     }
@@ -430,6 +494,30 @@ public class AppServices {
         return get().whirlpoolServices;
     }
 
+    public static SorobanServices getSorobanServices() {
+        return get().sorobanServices;
+    }
+
+    public static PayNymService getPayNymService() {
+        if(payNymService == null) {
+            HostAndPort torProxy = getTorProxy();
+            payNymService = new PayNymService(torProxy);
+        } else {
+            HostAndPort torProxy = getTorProxy();
+            if(!Objects.equals(payNymService.getTorProxy(), torProxy)) {
+                payNymService.setTorProxy(getTorProxy());
+            }
+        }
+
+        return payNymService;
+    }
+
+    public static HostAndPort getTorProxy() {
+        return AppServices.isTorRunning() ?
+                HostAndPort.fromParts("localhost", TorService.PROXY_PORT) :
+                (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer()));
+    }
+
     public static AppController newAppWindow(Stage stage) {
         try {
             FXMLLoader appLoader = new FXMLLoader(AppServices.class.getResource("app.fxml"));
@@ -441,9 +529,9 @@ public class AppServices {
 
             stage.setTitle("Sparrow");
             stage.setMinWidth(650);
-            stage.setMinHeight(730);
+            stage.setMinHeight(708);
             stage.setScene(scene);
-            stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow-large.png")));
+            stage.getIcons().add(getWindowIcon());
 
             appController.initializeView();
             stage.show();
@@ -454,6 +542,14 @@ public class AppServices {
         }
     }
 
+    private static Image getWindowIcon() {
+        if(windowIcon == null) {
+            windowIcon = new Image(MainApp.class.getResourceAsStream("/image/sparrow-icon.png"));
+        }
+
+        return windowIcon;
+    }
+
     public static boolean isReducedWindowHeight(Node node) {
         return (node.getScene() != null && node.getScene().getWindow().getHeight() < 768);
     }
@@ -494,6 +590,18 @@ public class AppServices {
         return getOpenWallets().entrySet().stream().filter(entry -> entry.getValue().getWalletId(entry.getKey()).equals(walletId)).map(Map.Entry::getKey).findFirst().orElse(null);
     }
 
+    public WalletTransaction getCreatedTransaction(Set<BlockTransactionHashIndex> utxos) {
+        for(List<WalletTabData> walletTabDataList : walletWindows.values()) {
+            for(WalletTabData walletTabData : walletTabDataList) {
+                if(walletTabData.getWalletForm().getCreatedWalletTransaction() != null && utxos.equals(walletTabData.getWalletForm().getCreatedWalletTransaction().getSelectedUtxos().keySet())) {
+                    return walletTabData.getWalletForm().getCreatedWalletTransaction();
+                }
+            }
+        }
+
+        return null;
+    }
+
     public Window getWindowForWallet(String walletId) {
         Optional<Window> optWindow = walletWindows.entrySet().stream().filter(entry -> entry.getValue().stream().anyMatch(walletTabData -> walletTabData.getWalletForm().getWalletId().equals(walletId))).map(Map.Entry::getKey).findFirst();
         return optWindow.orElse(null);
@@ -528,11 +636,22 @@ public class AppServices {
         return latestBlockHeader;
     }
 
+    public static Double getDefaultFeeRate() {
+        int defaultTarget = TARGET_BLOCKS_RANGE.get((TARGET_BLOCKS_RANGE.size() / 2) - 1);
+        return getTargetBlockFeeRates() == null ? FALLBACK_FEE_RATE : getTargetBlockFeeRates().get(defaultTarget);
+    }
+
+    public static Double getMinimumFeeRate() {
+        Optional<Double> optMinFeeRate = getTargetBlockFeeRates().values().stream().min(Double::compareTo);
+        Double minRate = optMinFeeRate.orElse(FALLBACK_FEE_RATE);
+        return Math.max(minRate, Transaction.DUST_RELAY_TX_FEE);
+    }
+
     public static Map<Integer, Double> getTargetBlockFeeRates() {
         return targetBlockFeeRates;
     }
 
-    public static Map<Date, Set<MempoolRateSize>> getMempoolHistogram() {
+    public static TreeMap<Date, Set<MempoolRateSize>> getMempoolHistogram() {
         return mempoolHistogram;
     }
 
@@ -543,6 +662,9 @@ public class AppServices {
         }
 
         mempoolHistogram.put(Date.from(dateMinute.atZone(ZoneId.systemDefault()).toInstant()), rateSizes);
+
+        Date yesterday = Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant());
+        mempoolHistogram.keySet().removeIf(date -> date.before(yesterday));
     }
 
     public static Double getMinimumRelayFeeRate() {
@@ -568,8 +690,18 @@ public class AppServices {
         payjoinURIs.put(bitcoinURI.getAddress(), bitcoinURI);
     }
 
+    public static void clearPayjoinURI(Address address) {
+        payjoinURIs.remove(address);
+    }
+
     public static void clearTransactionHistoryCache(Wallet wallet) {
         ElectrumServer.clearRetrievedScriptHashes(wallet);
+
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isNested()) {
+                AppServices.clearTransactionHistoryCache(childWallet);
+            }
+        }
     }
 
     public static boolean isWalletFile(File file) {
@@ -581,15 +713,22 @@ public class AppServices {
     }
 
     public static Optional<ButtonType> showErrorDialog(String title, String content, ButtonType... buttons) {
-        return showAlertDialog(title, content, Alert.AlertType.ERROR, buttons);
+        return showAlertDialog(title, content == null ? "See log file (Help menu)" : content, Alert.AlertType.ERROR, buttons);
     }
 
     public static Optional<ButtonType> showAlertDialog(String title, String content, Alert.AlertType alertType, ButtonType... buttons) {
+        return showAlertDialog(title, content, alertType, null, buttons);
+    }
+
+    public static Optional<ButtonType> showAlertDialog(String title, String content, Alert.AlertType alertType, Node graphic, ButtonType... buttons) {
         Alert alert = new Alert(alertType, content, buttons);
         setStageIcon(alert.getDialogPane().getScene().getWindow());
         alert.getDialogPane().getScene().getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         alert.setTitle(title);
         alert.setHeaderText(title);
+        if(graphic != null) {
+            alert.setGraphic(graphic);
+        }
 
         Pattern linkPattern = Pattern.compile("\\[(http.+)]");
         Matcher matcher = linkPattern.matcher(content);
@@ -609,8 +748,9 @@ public class AppServices {
         }
 
         String[] lines = content.split("\r\n|\r|\n");
-        if(lines.length > 3) {
-            alert.getDialogPane().setPrefHeight(200 + lines.length * 20);
+        if(lines.length > 3 || org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+            double numLines = Arrays.stream(lines).mapToDouble(line -> Math.ceil(TextUtils.computeTextWidth(Font.getDefault(), line, 0) / 300)).sum();
+            alert.getDialogPane().setPrefHeight(200 + numLines * 20);
         }
 
         moveToActiveWindowScreen(alert);
@@ -619,7 +759,7 @@ public class AppServices {
 
     public static void setStageIcon(Window window) {
         Stage stage = (Stage)window;
-        stage.getIcons().add(new Image(AppServices.class.getResourceAsStream("/image/sparrow-large.png")));
+        stage.getIcons().add(getWindowIcon());
 
         if(stage.getScene() != null && Config.get().getTheme() == Theme.DARK) {
             stage.getScene().getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
@@ -654,7 +794,9 @@ public class AppServices {
 
     public static void moveToWindowScreen(Window currentWindow, Window newWindow, double newWindowWidth, double newWindowHeight) {
         Screen currentScreen = Screen.getScreens().stream().filter(screen -> screen.getVisualBounds().contains(currentWindow.getX(), currentWindow.getY())).findFirst().orElse(null);
-        if(currentScreen != null && !Screen.getPrimary().getVisualBounds().contains(currentWindow.getX(), currentWindow.getY()) && !currentScreen.getVisualBounds().contains(newWindow.getX(), newWindow.getY())) {
+        if(currentScreen != null
+                && ((!Double.isNaN(newWindow.getX()) && !Double.isNaN(newWindow.getY())) || !Screen.getPrimary().getVisualBounds().contains(currentWindow.getX(), currentWindow.getY()))
+                && !currentScreen.getVisualBounds().contains(newWindow.getX(), newWindow.getY())) {
             double x = currentWindow.getX() + (currentWindow.getWidth() / 2) - (newWindowWidth / 2);
             double y = currentWindow.getY() + (currentWindow.getHeight() / 2.2) - (newWindowHeight / 2);
             newWindow.setX(x);
@@ -717,8 +859,6 @@ public class AppServices {
         Platform.runLater(() -> {
             if("bitcoin".equals(uri.getScheme())) {
                 openBitcoinUri(uri);
-            } else if("aopp".equals(uri.getScheme())) {
-                openAddressOwnershipProof(uri);
             }
         });
     }
@@ -753,20 +893,6 @@ public class AppServices {
         }
     }
 
-    public static void openAddressOwnershipProof(URI uri) {
-        try {
-            Aopp aopp = new Aopp(uri);
-            Wallet wallet = selectWallet(aopp.getScriptType(), "send proof of address");
-
-            if(wallet != null) {
-                EventManager.get().post(new ReceiveActionEvent(wallet));
-                Platform.runLater(() -> EventManager.get().post(new ReceiveProofEvent(wallet, aopp)));
-            }
-        } catch(Exception e) {
-            showErrorDialog("Not a valid AOPP URI", e.getMessage());
-        }
-    }
-
     private static Wallet selectWallet(ScriptType scriptType, String actionDescription) {
         Wallet wallet = null;
         List<Wallet> wallets = get().getOpenWallets().keySet().stream().filter(w -> scriptType == null || w.getScriptType() == scriptType).collect(Collectors.toList());
@@ -801,8 +927,9 @@ public class AppServices {
         System.setProperty(Network.BLOCK_HEIGHT_PROPERTY, Integer.toString(currentBlockHeight));
         targetBlockFeeRates = event.getTargetBlockFeeRates();
         addMempoolRateSizes(event.getMempoolRateSizes());
-        minimumRelayFeeRate = event.getMinimumRelayFeeRate();
+        minimumRelayFeeRate = Math.max(event.getMinimumRelayFeeRate(), Transaction.DEFAULT_MIN_RELAY_FEE);
         latestBlockHeader = event.getBlockHeader();
+        Config.get().addRecentServer();
     }
 
     @Subscribe

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

@@ -4,6 +4,9 @@ import com.beust.jcommander.Parameter;
 import com.sparrowwallet.drongo.Network;
 import org.slf4j.event.Level;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Args {
     @Parameter(names = { "--dir", "-d" }, description = "Path to Sparrow home folder")
     public String dir;
@@ -16,4 +19,23 @@ public class Args {
 
     @Parameter(names = { "--help", "-h" }, description = "Show usage", help = true)
     public boolean help;
+
+    public List<String> toParams() {
+        List<String> params = new ArrayList<>();
+
+        if(dir != null) {
+            params.add("-d");
+            params.add(dir);
+        }
+        if(network != null) {
+            params.add("-n");
+            params.add(network.toString());
+        }
+        if(level != null) {
+            params.add("-l");
+            params.add(level.toString());
+        }
+
+        return params;
+    }
 }

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

@@ -8,7 +8,6 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
-import com.sparrowwallet.sparrow.net.Bwt;
 import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
@@ -31,7 +30,7 @@ import java.util.stream.Collectors;
 public class MainApp extends Application {
     public static final String APP_ID = "com.sparrowwallet.sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.5.0";
+    public static final String APP_VERSION = "1.6.5";
     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";
@@ -70,7 +69,6 @@ public class MainApp extends Application {
             if(optionalMode.isPresent()) {
                 mode = optionalMode.get();
                 Config.get().setMode(mode);
-                Config.get().setCoreWallet(Bwt.DEFAULT_CORE_WALLET);
 
                 if(mode.equals(Mode.ONLINE)) {
                     PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER, true);
@@ -78,16 +76,14 @@ public class MainApp extends Application {
                     createNewWallet = optNewWallet.isPresent() && optNewWallet.get();
                 } else if(Network.get() == Network.MAINNET) {
                     Config.get().setServerType(ServerType.PUBLIC_ELECTRUM_SERVER);
-                    Config.get().setPublicElectrumServer(PublicElectrumServer.values()[new Random().nextInt(PublicElectrumServer.values().length)].getUrl());
+                    List<PublicElectrumServer> servers = PublicElectrumServer.getServers();
+                    Config.get().setPublicElectrumServer(servers.get(new Random().nextInt(servers.size())).getUrl());
                 }
             }
         }
 
         if(Config.get().getServerType() == null && Config.get().getCoreServer() == null && Config.get().getElectrumServer() != null) {
             Config.get().setServerType(ServerType.ELECTRUM_SERVER);
-        } else if(Config.get().getServerType() == ServerType.BITCOIN_CORE && Config.get().getCoreWallet() == null) {
-            Config.get().setCoreMultiWallet(Boolean.TRUE);
-            Config.get().setCoreWallet("");
         }
 
         if(Config.get().getHdCapture() == null && Platform.getCurrent() == Platform.OSX) {

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

@@ -2,11 +2,16 @@ 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/AddAccountDialog.java

@@ -0,0 +1,113 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.KeystoreSource;
+import com.sparrowwallet.drongo.wallet.StandardAccount;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.net.ServerType;
+import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
+import javafx.collections.FXCollections;
+import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
+import javafx.util.StringConverter;
+import org.controlsfx.glyphfont.Glyph;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AddAccountDialog extends Dialog<List<StandardAccount>> {
+    private final ComboBox<StandardAccount> standardAccountCombo;
+    private boolean discoverAccounts = false;
+
+    public AddAccountDialog(Wallet wallet) {
+        final DialogPane dialogPane = getDialogPane();
+        setTitle("Add Account");
+        dialogPane.setHeaderText("Choose an account to add:");
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
+        dialogPane.setPrefWidth(380);
+        dialogPane.setPrefHeight(200);
+        AppServices.moveToActiveWindowScreen(this);
+
+        Glyph key = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SORT_NUMERIC_DOWN);
+        key.setFontSize(50);
+        dialogPane.setGraphic(key);
+
+        final VBox content = new VBox(10);
+        content.setPrefHeight(50);
+
+        standardAccountCombo = new ComboBox<>();
+        standardAccountCombo.setMaxWidth(Double.MAX_VALUE);
+
+        List<Integer> existingIndexes = new ArrayList<>();
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        existingIndexes.add(masterWallet.getAccountIndex());
+        for(Wallet childWallet : masterWallet.getChildWallets()) {
+            if(!childWallet.isNested()) {
+                existingIndexes.add(childWallet.getAccountIndex());
+            }
+        }
+
+        List<StandardAccount> availableAccounts = new ArrayList<>();
+        for(StandardAccount standardAccount : StandardAccount.values()) {
+            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(standardAccount)) {
+                availableAccounts.add(standardAccount);
+            }
+        }
+
+        if(WhirlpoolServices.canWalletMix(masterWallet) && !masterWallet.isWhirlpoolMasterWallet()) {
+            availableAccounts.add(StandardAccount.WHIRLPOOL_PREMIX);
+        }
+
+        final ButtonType discoverButtonType = new javafx.scene.control.ButtonType("Discover", ButtonBar.ButtonData.LEFT);
+        if(!availableAccounts.isEmpty() && Config.get().getServerType() != ServerType.BITCOIN_CORE &&
+                (masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.SW_SEED)
+                        || (masterWallet.getKeystores().size() == 1 && masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.HW_USB)))) {
+            dialogPane.getButtonTypes().add(discoverButtonType);
+            Button discoverButton = (Button)dialogPane.lookupButton(discoverButtonType);
+            discoverButton.disableProperty().bind(AppServices.onlineProperty().not());
+            discoverButton.setOnAction(event -> {
+                discoverAccounts = true;
+            });
+        }
+
+        standardAccountCombo.setItems(FXCollections.observableList(availableAccounts));
+        standardAccountCombo.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(StandardAccount account) {
+                if(account == null) {
+                    return "None Available";
+                }
+
+                if(StandardAccount.WHIRLPOOL_ACCOUNTS.contains(account)) {
+                    return "Whirlpool Accounts";
+                }
+
+                return account.getName();
+            }
+
+            @Override
+            public StandardAccount fromString(String string) {
+                return null;
+            }
+        });
+
+        if(standardAccountCombo.getItems().isEmpty()) {
+            Button okButton = (Button) dialogPane.lookupButton(ButtonType.OK);
+            okButton.setDisable(true);
+        } else {
+            standardAccountCombo.getSelectionModel().select(0);
+        }
+        content.getChildren().add(standardAccountCombo);
+
+        dialogPane.setContent(content);
+        setResultConverter(dialogButton -> dialogButton == ButtonType.OK ? List.of(standardAccountCombo.getValue()) : (dialogButton == discoverButtonType ? availableAccounts : null));
+    }
+
+    public boolean isDiscoverAccounts() {
+        return discoverAccounts;
+    }
+}

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

@@ -1,16 +1,23 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.wallet.Status;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletUtxoStatusChangedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.NodeEntry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
 import javafx.geometry.Pos;
 import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 
+import java.util.Collections;
+
 public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
     public AddressCell() {
         super();
@@ -35,10 +42,13 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
                 setText(address.toString());
                 setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), new NodeEntry(utxoEntry.getWallet(), utxoEntry.getNode())));
                 Tooltip tooltip = new Tooltip();
-                tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate()));
+                tooltip.setShowDelay(Duration.millis(250));
+                tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate(), addressStatus.isDustAttack()));
                 setTooltip(tooltip);
 
-                if(addressStatus.isDuplicate()) {
+                if(addressStatus.isDustAttack()) {
+                    setGraphic(getDustAttackHyperlink(utxoEntry));
+                } else if(addressStatus.isDuplicate()) {
                     setGraphic(getDuplicateGlyph());
                 } else {
                     setGraphic(null);
@@ -47,8 +57,9 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
         }
     }
 
-    private String getTooltipText(UtxoEntry utxoEntry, boolean duplicate) {
-        return utxoEntry.getNode().getDerivationPath().replace("m", "..") + (duplicate ? " (Duplicate address)" : "");
+    private String getTooltipText(UtxoEntry utxoEntry, boolean duplicate, boolean dustAttack) {
+        return (utxoEntry.getNode().getWallet().isNested() ? utxoEntry.getNode().getWallet().getDisplayName() + " " : "" ) +
+                utxoEntry.getNode().toString() + (duplicate ? " (Duplicate address)" : (dustAttack ? " (Possible dust attack)" : ""));
     }
 
     public static Glyph getDuplicateGlyph() {
@@ -57,4 +68,22 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
         duplicateGlyph.setFontSize(12);
         return duplicateGlyph;
     }
+
+    public static Hyperlink getDustAttackHyperlink(UtxoEntry utxoEntry) {
+        Glyph dustAttackGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
+        dustAttackGlyph.getStyleClass().add("dust-attack-warning");
+        dustAttackGlyph.setFontSize(12);
+
+        Hyperlink hyperlink = new Hyperlink(utxoEntry.getHashIndex().getStatus() == Status.FROZEN ? "" : "Freeze?", dustAttackGlyph);
+        hyperlink.getStyleClass().add("freeze-dust-utxo");
+        hyperlink.setOnAction(event -> {
+            if(utxoEntry.getHashIndex().getStatus() != Status.FROZEN) {
+                hyperlink.setText("");
+                utxoEntry.getHashIndex().setStatus(Status.FROZEN);
+                EventManager.get().post(new WalletUtxoStatusChangedEvent(utxoEntry.getWallet(), Collections.singletonList(utxoEntry.getHashIndex())));
+            }
+        });
+
+        return hyperlink;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.ReceiveActionEvent;
 import com.sparrowwallet.sparrow.event.ReceiveToEvent;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.NodeEntry;
 import javafx.application.Platform;
@@ -68,21 +69,23 @@ public class AddressTreeTable extends CoinTreeTable {
             }
         }
 
-        setOnMouseClicked(mouseEvent -> {
-            if(mouseEvent.getButton().equals(MouseButton.PRIMARY)){
-                if(mouseEvent.getClickCount() == 2) {
-                    TreeItem<Entry> treeItem = getSelectionModel().getSelectedItem();
-                    if(treeItem != null && treeItem.getChildren().isEmpty()) {
-                        Entry entry = getSelectionModel().getSelectedItem().getValue();
-                        if(entry instanceof NodeEntry) {
-                            NodeEntry nodeEntry = (NodeEntry)entry;
-                            EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                            Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+        if(!rootEntry.getWallet().isWhirlpoolChildWallet()) {
+            setOnMouseClicked(mouseEvent -> {
+                if(mouseEvent.getButton().equals(MouseButton.PRIMARY)){
+                    if(mouseEvent.getClickCount() == 2) {
+                        TreeItem<Entry> treeItem = getSelectionModel().getSelectedItem();
+                        if(treeItem != null && treeItem.getChildren().isEmpty()) {
+                            Entry entry = getSelectionModel().getSelectedItem().getValue();
+                            if(entry instanceof NodeEntry) {
+                                NodeEntry nodeEntry = (NodeEntry)entry;
+                                EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                                Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                            }
                         }
                     }
                 }
-            }
-        });
+            });
+        }
 
         rootEntry.getChildren().addListener((ListChangeListener<Entry>) c -> {
             this.refresh();
@@ -104,7 +107,7 @@ public class AddressTreeTable extends CoinTreeTable {
     }
 
     public void updateHistory(List<WalletNode> updatedNodes) {
-        //We only ever add child nodes - never remove in order to keep a full sequence
+        //We only ever add child nodes - never remove in order to keep a full sequence (unless hide empty used addresses is set)
         NodeEntry rootEntry = (NodeEntry)getRoot().getValue();
 
         for(WalletNode updatedNode : updatedNodes) {
@@ -112,9 +115,25 @@ public class AddressTreeTable extends CoinTreeTable {
             if(optEntry.isPresent()) {
                 NodeEntry existingEntry = (NodeEntry)optEntry.get();
                 existingEntry.refreshChildren();
+
+                if(Config.get().isHideEmptyUsedAddresses() && existingEntry.getValue() == 0L) {
+                    rootEntry.getChildren().remove(existingEntry);
+                }
             } else {
                 NodeEntry nodeEntry = new NodeEntry(rootEntry.getWallet(), updatedNode);
-                rootEntry.getChildren().add(nodeEntry);
+
+                if(Config.get().isHideEmptyUsedAddresses()) {
+                    int index = 0;
+                    for( ; index < rootEntry.getChildren().size(); index++) {
+                        NodeEntry existingEntry = (NodeEntry)rootEntry.getChildren().get(index);
+                        if(nodeEntry.compareTo(existingEntry) < 0) {
+                             break;
+                        }
+                    }
+                    rootEntry.getChildren().add(index, nodeEntry);
+                } else {
+                    rootEntry.getChildren().add(nodeEntry);
+                }
             }
         }
 

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

@@ -0,0 +1,44 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.scene.Node;
+import javafx.util.Duration;
+
+public class AnimationUtil {
+    public static Timeline getSlowFadeOut(Node node, Duration duration, double fromValue, int numIncrements) {
+        Timeline fadeTimeline = new Timeline();
+        Duration incrementDuration = duration.divide(numIncrements);
+        for(int i = 0; i < numIncrements; i++) {
+            double percent = ((double)numIncrements - i - 1) / numIncrements;
+            double opacity = percent * fromValue;
+            fadeTimeline.getKeyFrames().add(new KeyFrame(incrementDuration.multiply(i+1), event -> node.setOpacity(opacity)));
+        }
+
+        return fadeTimeline;
+    }
+
+    public static Timeline getPulse(Node node, Duration duration, double fromValue, double toValue, int numIncrements) {
+        Timeline pulseTimeline = getFade(node, duration, fromValue, toValue, numIncrements);
+
+        pulseTimeline.setCycleCount(Animation.INDEFINITE);
+        pulseTimeline.setAutoReverse(true);
+
+        return pulseTimeline;
+    }
+
+    public static Timeline getFade(Node node, Duration duration, double fromValue, double toValue, int numIncrements) {
+        Timeline fadeTimeline = new Timeline();
+        Duration incrementDuration = duration.divide(numIncrements);
+        for(int i = 0; i < numIncrements; i++) {
+            double percent = ((double) numIncrements - i - 1) / numIncrements; //From 99% to 0%
+            double opacity = (percent * (fromValue - toValue)) + toValue;
+            fadeTimeline.getKeyFrames().add(new KeyFrame(incrementDuration.multiply(i+1), event -> node.setOpacity(opacity)));
+        }
+
+        return fadeTimeline;
+    }
+
+    public record AnimatedNode (Node node, Timeline timeline) {}
+}

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

@@ -1,20 +1,26 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.google.common.collect.Lists;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.TransactionEntry;
 import com.sparrowwallet.sparrow.wallet.WalletTransactionsEntry;
 import javafx.beans.NamedArg;
 import javafx.scene.Node;
 import javafx.scene.chart.*;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class BalanceChart extends LineChart<Number, Number> {
+    private static final int MAX_VALUES = 500;
+
     private XYChart.Series<Number, Number> balanceSeries;
 
     private TransactionEntry selectedEntry;
@@ -37,7 +43,7 @@ public class BalanceChart extends LineChart<Number, Number> {
         setVisible(!walletTransactionsEntry.getChildren().isEmpty());
         balanceSeries.getData().clear();
 
-        List<Data<Number, Number>> balanceDataList = walletTransactionsEntry.getChildren().stream()
+        List<Data<Number, Number>> balanceDataList = getTransactionEntries(walletTransactionsEntry)
                 .map(entry -> (TransactionEntry)entry)
                 .filter(txEntry -> txEntry.getBlockTransaction().getHeight() > 0)
                 .map(txEntry -> new XYChart.Data<>((Number)txEntry.getBlockTransaction().getDate().getTime(), (Number)txEntry.getBalance(), txEntry))
@@ -74,6 +80,24 @@ public class BalanceChart extends LineChart<Number, Number> {
         }
     }
 
+    private Stream<Entry> getTransactionEntries(WalletTransactionsEntry walletTransactionsEntry) {
+        int total = walletTransactionsEntry.getChildren().size();
+        if(walletTransactionsEntry.getChildren().size() <= MAX_VALUES) {
+            return walletTransactionsEntry.getChildren().stream();
+        }
+
+        int bucketSize = total / MAX_VALUES;
+        List<List<Entry>> buckets = Lists.partition(walletTransactionsEntry.getChildren(), bucketSize);
+        List<Entry> reducedEntries = new ArrayList<>(MAX_VALUES);
+        for(List<Entry> bucket : buckets) {
+            long max = bucket.stream().mapToLong(entry -> Math.abs(entry.getValue())).max().orElse(0);
+            Entry bucketEntry = bucket.stream().filter(entry -> entry.getValue() == max || entry.getValue() == -max).findFirst().orElseThrow();
+            reducedEntries.add(bucketEntry);
+        }
+
+        return reducedEntries.stream();
+    }
+
     public void select(TransactionEntry transactionEntry) {
         Set<Node> selectedSymbols = lookupAll(".chart-line-symbol.selected");
         for(Node selectedSymbol : selectedSymbols) {

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.wallet.SendController;
+import com.sparrowwallet.sparrow.AppServices;
 import javafx.beans.NamedArg;
 import javafx.scene.Node;
 import javafx.scene.chart.Axis;
@@ -28,7 +28,7 @@ public class BlockTargetFeeRatesChart extends LineChart<String, Number> {
 
         for(Iterator<Integer> targetBlocksIter = targetBlocksFeeRates.keySet().iterator(); targetBlocksIter.hasNext(); ) {
             Integer targetBlocks = targetBlocksIter.next();
-            if(SendController.TARGET_BLOCKS_RANGE.contains(targetBlocks)) {
+            if(AppServices.TARGET_BLOCKS_RANGE.contains(targetBlocks)) {
                 String category = targetBlocks + (targetBlocksIter.hasNext() ? "" : "+");
                 XYChart.Data<String, Number> data = new XYChart.Data<>(category, targetBlocksFeeRates.get(targetBlocks));
                 feeRateSeries.getData().add(data);

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

@@ -10,6 +10,7 @@ import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.layout.Region;
+import javafx.util.Duration;
 import org.controlsfx.tools.Platform;
 
 import java.text.DecimalFormat;
@@ -24,6 +25,7 @@ class CoinCell extends TreeTableCell<Entry, Number> {
     public CoinCell() {
         super();
         tooltip = new Tooltip();
+        tooltip.setShowDelay(Duration.millis(500));
         getStyleClass().add("coin-cell");
         if(Platform.getCurrent() == Platform.OSX) {
             getStyleClass().add("number-field");

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

@@ -6,6 +6,7 @@ import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
@@ -15,7 +16,7 @@ import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
-public class CoinLabel extends CopyableLabel {
+public class CoinLabel extends Label {
     public static final DecimalFormat BTC_FORMAT = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
 
     private final LongProperty valueProperty = new SimpleLongProperty(-1);
@@ -28,7 +29,6 @@ public class CoinLabel extends CopyableLabel {
 
     public CoinLabel(String text) {
         super(text);
-        BTC_FORMAT.setMaximumFractionDigits(8);
         valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue, Config.get().getBitcoinUnit()));
         tooltip = new Tooltip();
         contextMenu = new CoinContextMenu();
@@ -77,7 +77,7 @@ public class CoinLabel extends CopyableLabel {
 
     private class CoinContextMenu extends ContextMenu {
         public CoinContextMenu() {
-            MenuItem copySatsValue = new MenuItem("Copy Value in Satoshis");
+            MenuItem copySatsValue = new MenuItem("Copy Value in sats");
             copySatsValue.setOnAction(AE -> {
                 hide();
                 ClipboardContent content = new ClipboardContent();

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

@@ -4,8 +4,8 @@ import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletDataChangedEvent;
-import com.sparrowwallet.sparrow.event.WalletHistoryClearedEvent;
 import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
@@ -86,13 +86,12 @@ public class CoinTreeTable extends TreeTableView<Entry> {
                 if(optDate.isPresent()) {
                     Storage storage = AppServices.get().getOpenWallets().get(wallet);
                     Wallet pastWallet = wallet.copy();
-                    storage.backupTempWallet();
                     wallet.setBirthDate(optDate.get());
                     //Trigger background save of birthdate
                     EventManager.get().post(new WalletDataChangedEvent(wallet));
                     //Trigger full wallet rescan
                     wallet.clearHistory();
-                    EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet, storage.getWalletId(wallet)));
+                    EventManager.get().post(new WalletAddressesChangedEvent(wallet, pastWallet, storage.getWalletId(wallet)));
                 }
             });
             if(wallet.getBirthDate() == null) {

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

@@ -0,0 +1,71 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.ComboBox;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import org.controlsfx.control.textfield.CustomTextField;
+
+public class ComboBoxTextField extends CustomTextField {
+    private final ObjectProperty<ComboBox<?>> comboProperty = new SimpleObjectProperty<>();
+
+    private boolean initialized;
+    private boolean comboShowing;
+
+    public ComboBoxTextField() {
+        super();
+        getStyleClass().add("combo-text-field");
+        setupComboButtonField(super.rightProperty());
+
+        disabledProperty().addListener((observable, oldValue, newValue) -> {
+            if(comboProperty.isNotNull().get()) {
+                comboProperty.get().setVisible(!newValue);
+            }
+        });
+    }
+
+    private void setupComboButtonField(ObjectProperty<Node> rightProperty) {
+        Region showComboButton = new Region();
+        showComboButton.getStyleClass().addAll("graphic"); //$NON-NLS-1$
+        StackPane showComboButtonPane = new StackPane(showComboButton);
+        showComboButtonPane.getStyleClass().addAll("combo-button"); //$NON-NLS-1$
+        showComboButtonPane.setCursor(Cursor.DEFAULT);
+        showComboButtonPane.setOnMouseReleased(e -> {
+            if(comboProperty.isNotNull().get()) {
+                if(comboShowing) {
+                    comboProperty.get().hide();
+                } else {
+                    comboProperty.get().show();
+                }
+
+                comboShowing = !comboShowing;
+
+                if(!initialized) {
+                    comboProperty.get().valueProperty().addListener((observable, oldValue, newValue) -> {
+                        comboShowing = false;
+                        Platform.runLater(() -> comboProperty.get().getSelectionModel().clearSelection());
+                    });
+                    initialized = true;
+                }
+            }
+        });
+
+        rightProperty.set(showComboButtonPane);
+    }
+
+    public ComboBox<?> getComboProperty() {
+        return comboProperty.get();
+    }
+
+    public ObjectProperty<ComboBox<?>> walletComboProperty() {
+        return comboProperty;
+    }
+
+    public void setComboProperty(ComboBox<?> comboProperty) {
+        this.comboProperty.set(comboProperty);
+    }
+}

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

@@ -86,10 +86,10 @@ public class ConfirmationProgressIndicator extends StackPane {
                     upTickLineTimeline.getKeyFrames().add(upTickLineFrame);
                     sequence.getChildren().add(upTickLineTimeline);
 
-                    FadeTransition groupFadeOut = new FadeTransition(Duration.minutes(10), confirmationGroup);
-                    groupFadeOut.setFromValue(1);
-                    groupFadeOut.setToValue(0);
+                    Timeline groupFadeOut = AnimationUtil.getSlowFadeOut(confirmationGroup, Duration.minutes(10), 1.0, 10);
                     sequence.getChildren().add(groupFadeOut);
+
+                    confirmationsProperty().unbind();
                 }
 
                 sequence.play();

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

@@ -0,0 +1,94 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.sparrow.io.Config;
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleLongProperty;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.Tooltip;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+
+import java.util.Locale;
+
+public class CopyableCoinLabel extends CopyableLabel {
+    private final LongProperty valueProperty = new SimpleLongProperty(-1);
+    private final Tooltip tooltip;
+    private final CoinContextMenu contextMenu;
+
+    public CopyableCoinLabel() {
+        this("Unknown");
+    }
+
+    public CopyableCoinLabel(String text) {
+        super(text);
+        valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue, Config.get().getBitcoinUnit()));
+        tooltip = new Tooltip();
+        contextMenu = new CoinContextMenu();
+    }
+
+    public final LongProperty valueProperty() {
+        return valueProperty;
+    }
+
+    public final long getValue() {
+        return valueProperty.get();
+    }
+
+    public final void setValue(long value) {
+        this.valueProperty.set(value);
+    }
+
+    public void refresh() {
+        refresh(Config.get().getBitcoinUnit());
+    }
+
+    public void refresh(BitcoinUnit bitcoinUnit) {
+        setValueAsText(getValue(), bitcoinUnit);
+    }
+
+    private void setValueAsText(Long value, BitcoinUnit bitcoinUnit) {
+        setTooltip(tooltip);
+        setContextMenu(contextMenu);
+
+        String satsValue = String.format(Locale.ENGLISH, "%,d", value) + " sats";
+        String btcValue = CoinLabel.getBTCFormat().format(value.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN) + " BTC";
+
+        BitcoinUnit unit = bitcoinUnit;
+        if(unit == null || unit.equals(BitcoinUnit.AUTO)) {
+            unit = (value >= BitcoinUnit.getAutoThreshold() ? BitcoinUnit.BTC : BitcoinUnit.SATOSHIS);
+        }
+
+        if(unit.equals(BitcoinUnit.BTC)) {
+            tooltip.setText(satsValue);
+            setText(btcValue);
+        } else {
+            tooltip.setText(btcValue);
+            setText(satsValue);
+        }
+    }
+
+    private class CoinContextMenu extends ContextMenu {
+        public CoinContextMenu() {
+            MenuItem copySatsValue = new MenuItem("Copy Value in sats");
+            copySatsValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(Long.toString(getValue()));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            MenuItem copyBtcValue = new MenuItem("Copy Value in BTC");
+            copyBtcValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(CoinLabel.getBTCFormat().format((double)getValue() / Transaction.SATOSHIS_PER_BITCOIN));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            getItems().addAll(copySatsValue, copyBtcValue);
+        }
+    }
+}

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

@@ -1,13 +1,19 @@
 package com.sparrowwallet.sparrow.control;
 
 import javafx.animation.FadeTransition;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.event.EventHandler;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.util.Duration;
@@ -16,10 +22,36 @@ import org.controlsfx.control.textfield.CustomTextField;
 public class CopyableTextField extends CustomTextField {
     private static final Duration FADE_DURATION = Duration.millis(350);
 
+    private final ChangeListener<String> selectionListener = (textObservable, textOldValue, textNewValue) -> {
+        if(!textNewValue.isEmpty()) {
+            deselect();
+        }
+    };
+
+    private final EventHandler<MouseEvent> copyHandler = event -> {
+        ClipboardContent content = new ClipboardContent();
+        content.putString(getCopyText());
+        Clipboard.getSystemClipboard().setContent(content);
+
+        Tooltip tooltip = new Tooltip("Copied!");
+        tooltip.show(this, event.getScreenX(), event.getScreenY());
+        Timeline timeline = new Timeline(new KeyFrame(Duration.seconds(1), e -> tooltip.hide()));
+        timeline.play();
+    };
+
     public CopyableTextField() {
         super();
         getStyleClass().add("copyable-text-field");
         setupCopyButtonField(super.rightProperty());
+        editableProperty().addListener((observable, oldValue, editable) -> {
+            if(!editable) {
+                setOnMouseClicked(copyHandler);
+                selectedTextProperty().addListener(selectionListener);
+            } else {
+                setOnMouseClicked(null);
+                selectedTextProperty().removeListener(selectionListener);
+            }
+        });
     }
 
     private void setupCopyButtonField(ObjectProperty<Node> rightProperty) {
@@ -31,7 +63,7 @@ public class CopyableTextField extends CustomTextField {
         copyButtonPane.setCursor(Cursor.DEFAULT);
         copyButtonPane.setOnMouseReleased(e -> {
             ClipboardContent content = new ClipboardContent();
-            content.putString(getText());
+            content.putString(getCopyText());
             Clipboard.getSystemClipboard().setContent(content);
         });
 
@@ -61,4 +93,8 @@ public class CopyableTextField extends CustomTextField {
             }
         });
     }
+
+    protected String getCopyText() {
+        return getText();
+    }
 }

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

@@ -7,6 +7,7 @@ import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.util.Duration;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -35,13 +36,18 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
                 UtxoEntry utxoEntry = (UtxoEntry)entry;
                 if(utxoEntry.getHashIndex().getHeight() <= 0) {
                     setText("Unconfirmed " + (utxoEntry.getHashIndex().getHeight() < 0 ? "Parent " : "") + (utxoEntry.getWallet().isWhirlpoolMixWallet() ? "(Not yet mixable)" : (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)")));
-                } else {
+                    setContextMenu(null);
+                } else if(utxoEntry.getHashIndex().getDate() != null) {
                     String date = DATE_FORMAT.format(utxoEntry.getHashIndex().getDate());
                     setText(date);
                     setContextMenu(new DateContextMenu(date, utxoEntry.getHashIndex()));
+                } else {
+                    setText("Unknown");
+                    setContextMenu(null);
                 }
 
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 int height = utxoEntry.getHashIndex().getHeight();
                 tooltip.setText(height > 0 ? Integer.toString(height) : "Mempool");
                 setTooltip(tooltip);

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

@@ -17,6 +17,10 @@ public class DateLabel extends CopyableLabel {
     }
 
     public static String getShortDateFormat(Date date) {
+        if(date == null) {
+            return "Unknown";
+        }
+
         Date now = new Date();
         long elapsed = (now.getTime() - date.getTime()) / 1000;
 

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
@@ -79,7 +80,7 @@ public class DescriptorArea extends CodeArea {
             copyOutputDescriptor.setOnAction(AE -> {
                 hide();
                 ClipboardContent content = new ClipboardContent();
-                content.putString(OutputDescriptor.getOutputDescriptor(wallet).toString(true));
+                content.putString(OutputDescriptor.getOutputDescriptor(wallet, KeyPurpose.DEFAULT_PURPOSES, null).toString(true));
                 Clipboard.getSystemClipboard().setContent(content);
             });
             getItems().add(copyOutputDescriptor);

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

@@ -0,0 +1,73 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.lowagie.text.*;
+import com.lowagie.text.Font;
+import com.lowagie.text.Image;
+import com.lowagie.text.pdf.PdfWriter;
+import com.sparrowwallet.hummingbird.UR;
+import com.sparrowwallet.hummingbird.UREncoder;
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.event.ActionEvent;
+import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.*;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class DescriptorQRDisplayDialog extends QRDisplayDialog {
+    private static final Logger log = LoggerFactory.getLogger(DescriptorQRDisplayDialog.class);
+
+    public DescriptorQRDisplayDialog(String walletName, String outputDescriptor, UR ur) {
+        super(ur);
+
+        DialogPane dialogPane = getDialogPane();
+        final ButtonType pdfButtonType = new javafx.scene.control.ButtonType("Save PDF...", ButtonBar.ButtonData.HELP_2);
+        dialogPane.getButtonTypes().add(pdfButtonType);
+
+        Button pdfButton = (Button)dialogPane.lookupButton(pdfButtonType);
+        pdfButton.addEventFilter(ActionEvent.ACTION, event -> {
+            savePdf(walletName, outputDescriptor, ur);
+            event.consume();
+        });
+    }
+
+    private void savePdf(String walletName, String outputDescriptor, UR ur) {
+        Stage window = new Stage();
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Save PDF");
+        fileChooser.setInitialFileName(walletName + ".pdf");
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            try(Document document = new Document()) {
+                document.setMargins(36, 36, 48, 36);
+                PdfWriter.getInstance(document, new FileOutputStream(file));
+                document.open();
+
+                Font titleFont = FontFactory.getFont(FontFactory.HELVETICA_BOLD, 16, Color.BLACK);
+                Chunk title = new Chunk("Output descriptor for " + walletName, titleFont);
+                document.add(title);
+
+                UREncoder urEncoder = new UREncoder(ur, 2000, 10, 0);
+                String fragment = urEncoder.nextPart();
+                if(urEncoder.isSinglePart()) {
+                    Image image = Image.getInstance(SwingFXUtils.fromFXImage(getQrCode(fragment), null), Color.WHITE);
+                    document.add(image);
+                }
+
+                Font descriptorFont = FontFactory.getFont(FontFactory.COURIER, 14, Color.BLACK);
+                Paragraph descriptor = new Paragraph(outputDescriptor, descriptorFont);
+                document.add(descriptor);
+            } catch(Exception e) {
+                log.error("Error creating descriptor PDF", e);
+                AppServices.showErrorDialog("Error creating PDF", e.getMessage());
+            }
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.StandardAccount;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.KeystoresDiscoveredEvent;
+import com.sparrowwallet.sparrow.io.Device;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class DeviceKeystoreDiscoverDialog extends DeviceDialog<Map<StandardAccount, Keystore>> {
+    private final Wallet masterWallet;
+    private final List<StandardAccount> availableAccounts;
+
+    public DeviceKeystoreDiscoverDialog(List<String> operationFingerprints, Wallet masterWallet, List<StandardAccount> availableAccounts) {
+        super(operationFingerprints);
+        this.masterWallet = masterWallet;
+        this.availableAccounts = availableAccounts;
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+        setResultConverter(dialogButton -> dialogButton.getButtonData().isCancelButton() ? null : Collections.emptyMap());
+    }
+
+    @Override
+    protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
+        return new DevicePane(masterWallet, availableAccounts, device, defaultDevice);
+    }
+
+    @Subscribe
+    public void keystoresDiscovered(KeystoresDiscoveredEvent event) {
+        setResult(event.getDiscoveredKeystores());
+    }
+}

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

@@ -10,12 +10,14 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
+import com.sparrowwallet.drongo.wallet.StandardAccount;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.Device;
 import com.sparrowwallet.sparrow.io.Hwi;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.geometry.Insets;
@@ -24,7 +26,6 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -33,8 +34,7 @@ import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class DevicePane extends TitledDescriptionPane {
@@ -46,29 +46,32 @@ public class DevicePane extends TitledDescriptionPane {
     private final OutputDescriptor outputDescriptor;
     private final KeyDerivation keyDerivation;
     private final String message;
+    private final List<StandardAccount> availableAccounts;
     private final Device device;
 
     private CustomPasswordField pinField;
     private Button unlockButton;
     private Button enterPinButton;
     private Button setPassphraseButton;
-    private SplitMenuButton importButton;
+    private ButtonBase importButton;
     private Button signButton;
     private Button displayAddressButton;
     private Button signMessageButton;
+    private Button discoverKeystoresButton;
 
     private final SimpleStringProperty passphrase = new SimpleStringProperty("");
 
     private boolean defaultDevice;
 
-    public DevicePane(Wallet wallet, Device device, boolean defaultDevice) {
+    public DevicePane(Wallet wallet, Device device, boolean defaultDevice, KeyDerivation requiredDerivation) {
         super(device.getModel().toDisplayString(), "", "", "image/" + device.getType() + ".png");
         this.deviceOperation = DeviceOperation.IMPORT;
         this.wallet = wallet;
         this.psbt = null;
         this.outputDescriptor = null;
-        this.keyDerivation = null;
+        this.keyDerivation = requiredDerivation;
         this.message = null;
+        this.availableAccounts = null;
         this.device = device;
         this.defaultDevice = defaultDevice;
 
@@ -91,6 +94,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.outputDescriptor = null;
         this.keyDerivation = null;
         this.message = null;
+        this.availableAccounts = null;
         this.device = device;
         this.defaultDevice = defaultDevice;
 
@@ -113,6 +117,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.outputDescriptor = outputDescriptor;
         this.keyDerivation = null;
         this.message = null;
+        this.availableAccounts = null;
         this.device = device;
         this.defaultDevice = defaultDevice;
 
@@ -135,6 +140,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.outputDescriptor = null;
         this.keyDerivation = keyDerivation;
         this.message = message;
+        this.availableAccounts = null;
         this.device = device;
         this.defaultDevice = defaultDevice;
 
@@ -149,6 +155,29 @@ public class DevicePane extends TitledDescriptionPane {
         buttonBox.getChildren().addAll(setPassphraseButton, signMessageButton);
     }
 
+    public DevicePane(Wallet wallet, List<StandardAccount> availableAccounts, Device device, boolean defaultDevice) {
+        super(device.getModel().toDisplayString(), "", "", "image/" + device.getType() + ".png");
+        this.deviceOperation = DeviceOperation.DISCOVER_KEYSTORES;
+        this.wallet = wallet;
+        this.psbt = null;
+        this.outputDescriptor = null;
+        this.keyDerivation = null;
+        this.message = null;
+        this.device = device;
+        this.defaultDevice = defaultDevice;
+        this.availableAccounts = availableAccounts;
+
+        setDefaultStatus();
+        showHideLink.setVisible(false);
+
+        createSetPassphraseButton();
+        createDiscoverKeystoresButton();
+
+        initialise(device);
+
+        buttonBox.getChildren().addAll(setPassphraseButton, discoverKeystoresButton);
+    }
+
     private void initialise(Device device) {
         if(device.isNeedsPinSent()) {
             unlockButton.setDefaultButton(defaultDevice);
@@ -199,35 +228,39 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private void createImportButton() {
-        importButton = new SplitMenuButton();
+        importButton = keyDerivation == null ? new SplitMenuButton() : new Button();
         importButton.setAlignment(Pos.CENTER_RIGHT);
         importButton.setText("Import Keystore");
         importButton.setOnAction(event -> {
             importButton.setDisable(true);
-            importKeystore(wallet.getScriptType() == null ? ScriptType.P2WPKH.getDefaultDerivation() : wallet.getScriptType().getDefaultDerivation());
+            List<ChildNumber> defaultDerivation = wallet.getScriptType() == null ? ScriptType.P2WPKH.getDefaultDerivation() : wallet.getScriptType().getDefaultDerivation();
+            importKeystore(keyDerivation == null ? defaultDerivation : keyDerivation.getDerivation());
         });
-        if(wallet.getScriptType() == null) {
-            ScriptType[] scriptTypes = new ScriptType[] {ScriptType.P2WPKH, ScriptType.P2SH_P2WPKH, ScriptType.P2PKH};
-            for(ScriptType scriptType : scriptTypes) {
-                MenuItem item = new MenuItem(scriptType.getDescription());
-                final List<ChildNumber> derivation = scriptType.getDefaultDerivation();
-                item.setOnAction(event -> {
-                    importButton.setDisable(true);
-                    importKeystore(derivation);
-                });
-                importButton.getItems().add(item);
-            }
-        } else {
-            String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
-            int scriptAccountsLength = ScriptType.P2SH.equals(wallet.getScriptType()) ? 1 : accounts.length;
-            for(int i = 0; i < scriptAccountsLength; i++) {
-                MenuItem item = new MenuItem(accounts[i]);
-                final List<ChildNumber> derivation = wallet.getScriptType().getDefaultDerivation(i);
-                item.setOnAction(event -> {
-                    importButton.setDisable(true);
-                    importKeystore(derivation);
-                });
-                importButton.getItems().add(item);
+
+        if(importButton instanceof SplitMenuButton importMenuButton) {
+            if(wallet.getScriptType() == null) {
+                ScriptType[] scriptTypes = new ScriptType[] {ScriptType.P2WPKH, ScriptType.P2SH_P2WPKH, ScriptType.P2PKH};
+                for(ScriptType scriptType : scriptTypes) {
+                    MenuItem item = new MenuItem(scriptType.getDescription());
+                    final List<ChildNumber> derivation = scriptType.getDefaultDerivation();
+                    item.setOnAction(event -> {
+                        importMenuButton.setDisable(true);
+                        importKeystore(derivation);
+                    });
+                    importMenuButton.getItems().add(item);
+                }
+            } else {
+                String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
+                int scriptAccountsLength = ScriptType.P2SH.equals(wallet.getScriptType()) ? 1 : accounts.length;
+                for(int i = 0; i < scriptAccountsLength; i++) {
+                    MenuItem item = new MenuItem(accounts[i]);
+                    final List<ChildNumber> derivation = wallet.getScriptType().getDefaultDerivation(i);
+                    item.setOnAction(event -> {
+                        importMenuButton.setDisable(true);
+                        importKeystore(derivation);
+                    });
+                    importMenuButton.getItems().add(item);
+                }
             }
         }
         importButton.managedProperty().bind(importButton.visibleProperty());
@@ -277,6 +310,17 @@ public class DevicePane extends TitledDescriptionPane {
         }
     }
 
+    private void createDiscoverKeystoresButton() {
+        discoverKeystoresButton = new Button("Discover");
+        discoverKeystoresButton.setAlignment(Pos.CENTER_RIGHT);
+        discoverKeystoresButton.setOnAction(event -> {
+            discoverKeystoresButton.setDisable(true);
+            discoverKeystores();
+        });
+        discoverKeystoresButton.managedProperty().bind(discoverKeystoresButton.visibleProperty());
+        discoverKeystoresButton.setVisible(false);
+    }
+
     private void unlock(Device device) {
         if(device.getModel().requiresPinPrompt()) {
             promptPin();
@@ -287,7 +331,7 @@ public class DevicePane extends TitledDescriptionPane {
         VBox vBox = new VBox();
         vBox.setMaxHeight(120);
         vBox.setSpacing(42);
-        pinField = (CustomPasswordField)TextFields.createClearablePasswordField();
+        pinField = new ViewPasswordField();
         Platform.runLater(() -> pinField.requestFocus());
         enterPinButton = new Button("Enter PIN");
         enterPinButton.setDefaultButton(true);
@@ -327,7 +371,7 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private Node getPassphraseEntry() {
-        CustomPasswordField passphraseField = (CustomPasswordField)TextFields.createClearablePasswordField();
+        CustomPasswordField passphraseField = new ViewPasswordField();
         passphrase.bind(passphraseField.textProperty());
         HBox.setHgrow(passphraseField, Priority.ALWAYS);
         passphraseField.setOnAction(event -> {
@@ -430,7 +474,9 @@ public class DevicePane extends TitledDescriptionPane {
                     setExpanded(true);
                 } else {
                     showOperationButton();
-                    setContent(getTogglePassphraseOn());
+                    if(!deviceOperation.equals(DeviceOperation.IMPORT)) {
+                        setContent(getTogglePassphraseOn());
+                    }
                 }
             } else {
                 setError("Incorrect PIN", null);
@@ -578,7 +624,7 @@ public class DevicePane extends TitledDescriptionPane {
         });
         signPSBTService.setOnFailed(workerStateEvent -> {
             setError("Signing Error", signPSBTService.getException().getMessage());
-            log.error("Signing Error: " + signPSBTService.getException().getMessage());
+            log.error("Signing Error: " + signPSBTService.getException().getMessage(), signPSBTService.getException());
             signButton.setDisable(false);
         });
         setDescription("Signing...");
@@ -614,6 +660,63 @@ public class DevicePane extends TitledDescriptionPane {
         signMessageService.start();
     }
 
+    private void discoverKeystores() {
+        if(wallet.getKeystores().size() != 1) {
+            setError("Could not discover keystores", "Only single signature wallets are supported for keystore discovery");
+            return;
+        }
+
+        String masterFingerprint = wallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint();
+
+        Wallet copyWallet = wallet.copy();
+        Map<StandardAccount, String> accountDerivationPaths = new LinkedHashMap<>();
+        for(StandardAccount availableAccount : availableAccounts) {
+            Wallet availableWallet = copyWallet.addChildWallet(availableAccount);
+            Keystore availableKeystore = availableWallet.getKeystores().get(0);
+            String derivationPath = availableKeystore.getKeyDerivation().getDerivationPath();
+            accountDerivationPaths.put(availableAccount, derivationPath);
+        }
+
+        Map<StandardAccount, Keystore> importedKeystores = new LinkedHashMap<>();
+        Hwi.GetXpubsService getXpubsService = new Hwi.GetXpubsService(device, passphrase.get(), accountDerivationPaths);
+        getXpubsService.setOnSucceeded(workerStateEvent -> {
+            Map<StandardAccount, String> accountXpubs = getXpubsService.getValue();
+
+            for(Map.Entry<StandardAccount, String> entry : accountXpubs.entrySet()) {
+                try {
+                    Keystore keystore = new Keystore();
+                    keystore.setLabel(device.getModel().toDisplayString());
+                    keystore.setSource(KeystoreSource.HW_USB);
+                    keystore.setWalletModel(device.getModel());
+                    keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, accountDerivationPaths.get(entry.getKey())));
+                    keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(entry.getValue()));
+                    importedKeystores.put(entry.getKey(), keystore);
+                } catch(Exception e) {
+                    setError("Could not retrieve xpub", e.getMessage());
+                }
+            }
+
+            ElectrumServer.AccountDiscoveryService accountDiscoveryService = new ElectrumServer.AccountDiscoveryService(wallet, importedKeystores);
+            accountDiscoveryService.setOnSucceeded(event -> {
+                importedKeystores.keySet().retainAll(accountDiscoveryService.getValue());
+                EventManager.get().post(new KeystoresDiscoveredEvent(importedKeystores));
+            });
+            accountDiscoveryService.setOnFailed(event -> {
+                log.error("Failed to discover accounts", event.getSource().getException());
+                setError("Failed to discover accounts", event.getSource().getException().getMessage());
+                discoverKeystoresButton.setDisable(false);
+            });
+            accountDiscoveryService.start();
+        });
+        getXpubsService.setOnFailed(workerStateEvent -> {
+            setError("Could not retrieve xpub", getXpubsService.getException().getMessage());
+            discoverKeystoresButton.setDisable(false);
+        });
+        setDescription("Discovering...");
+        showHideLink.setVisible(false);
+        getXpubsService.start();
+    }
+
     private void showOperationButton() {
         if(deviceOperation.equals(DeviceOperation.IMPORT)) {
             if(defaultDevice) {
@@ -622,7 +725,8 @@ public class DevicePane extends TitledDescriptionPane {
             importButton.setVisible(true);
             showHideLink.setText("Show derivation...");
             showHideLink.setVisible(true);
-            setContent(getDerivationEntry(wallet.getScriptType() == null ? ScriptType.P2WPKH.getDefaultDerivation() : wallet.getScriptType().getDefaultDerivation()));
+            List<ChildNumber> defaultDerivation = wallet.getScriptType() == null ? ScriptType.P2WPKH.getDefaultDerivation() : wallet.getScriptType().getDefaultDerivation();
+            setContent(getDerivationEntry(keyDerivation == null ? defaultDerivation : keyDerivation.getDerivation()));
         } else if(deviceOperation.equals(DeviceOperation.SIGN)) {
             signButton.setDefaultButton(defaultDevice);
             signButton.setVisible(true);
@@ -635,6 +739,10 @@ public class DevicePane extends TitledDescriptionPane {
             signMessageButton.setDefaultButton(defaultDevice);
             signMessageButton.setVisible(true);
             showHideLink.setVisible(false);
+        } else if(deviceOperation.equals(DeviceOperation.DISCOVER_KEYSTORES)) {
+            discoverKeystoresButton.setDefaultButton(defaultDevice);
+            discoverKeystoresButton.setVisible(true);
+            showHideLink.setVisible(false);
         }
     }
 
@@ -642,6 +750,7 @@ public class DevicePane extends TitledDescriptionPane {
         TextField derivationField = new TextField();
         derivationField.setPromptText("Derivation path");
         derivationField.setText(KeyDerivation.writePath(derivation));
+        derivationField.setDisable(keyDerivation != null);
         HBox.setHgrow(derivationField, Priority.ALWAYS);
 
         ValidationSupport validationSupport = new ValidationSupport();
@@ -651,7 +760,8 @@ public class DevicePane extends TitledDescriptionPane {
                 (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid derivation", !KeyDerivation.isValid(newValue))
         ));
 
-        Button importDerivationButton = new Button("Import");
+        Button importDerivationButton = new Button("Import Custom Derivation");
+        importDerivationButton.setDisable(true);
         importDerivationButton.setOnAction(event -> {
             showHideLink.setVisible(true);
             setExpanded(false);
@@ -660,7 +770,8 @@ public class DevicePane extends TitledDescriptionPane {
         });
 
         derivationField.textProperty().addListener((observable, oldValue, newValue) -> {
-            importDerivationButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue));
+            importButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || !KeyDerivation.parsePath(newValue).equals(derivation));
+            importDerivationButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || KeyDerivation.parsePath(newValue).equals(derivation));
         });
 
         HBox contentBox = new HBox();
@@ -679,6 +790,6 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     public enum DeviceOperation {
-        IMPORT, SIGN, DISPLAY_ADDRESS, SIGN_MESSAGE;
+        IMPORT, SIGN, DISPLAY_ADDRESS, SIGN_MESSAGE, DISCOVER_KEYSTORES;
     }
 }

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

@@ -3,15 +3,13 @@ package com.sparrowwallet.sparrow.control;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
-import com.sparrowwallet.drongo.protocol.ScriptType;
-import com.sparrowwallet.drongo.protocol.Transaction;
-import com.sparrowwallet.drongo.protocol.TransactionInput;
-import com.sparrowwallet.drongo.protocol.TransactionOutput;
+import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
 import com.sparrowwallet.sparrow.wallet.*;
 import javafx.application.Platform;
 import javafx.geometry.Pos;
@@ -19,6 +17,7 @@ import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.HBox;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
@@ -69,10 +68,18 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 }
 
                 Tooltip tooltip = new Tooltip();
-                tooltip.setText(transactionEntry.getBlockTransaction().getHash().toString());
+                tooltip.setShowDelay(Duration.millis(250));
+                tooltip.setText(getTooltip(transactionEntry));
                 setTooltip(tooltip);
 
+                if(transactionEntry.getBlockTransaction().getHeight() <= 0) {
+                    tooltip.setOnShowing(event -> {
+                        tooltip.setText(getTooltip(transactionEntry));
+                    });
+                }
+
                 HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                 Button viewTransactionButton = new Button("");
                 viewTransactionButton.setGraphic(getViewTransactionGlyph());
                 viewTransactionButton.setOnAction(event -> {
@@ -106,20 +113,25 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 setText(address.toString());
                 setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry));
                 Tooltip tooltip = new Tooltip();
-                tooltip.setText(nodeEntry.getNode().getDerivationPath().replace("m", ".."));
+                tooltip.setShowDelay(Duration.millis(250));
+                tooltip.setText(nodeEntry.getNode().toString());
                 setTooltip(tooltip);
                 getStyleClass().add("address-cell");
 
                 HBox actionBox = new HBox();
-                Button receiveButton = new Button("");
-                receiveButton.setGraphic(getReceiveGlyph());
-                receiveButton.setOnAction(event -> {
-                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
-                });
-                actionBox.getChildren().add(receiveButton);
+                actionBox.getStyleClass().add("cell-actions");
 
-                if(canSignMessage(nodeEntry.getWallet())) {
+                if(!nodeEntry.getNode().getWallet().isBip47()) {
+                    Button receiveButton = new Button("");
+                    receiveButton.setGraphic(getReceiveGlyph());
+                    receiveButton.setOnAction(event -> {
+                        EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                        Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                    });
+                    actionBox.getChildren().add(receiveButton);
+                }
+
+                if(canSignMessage(nodeEntry.getNode())) {
                     Button signMessageButton = new Button("");
                     signMessageButton.setGraphic(getSignMessageGlyph());
                     signMessageButton.setOnAction(event -> {
@@ -139,12 +151,14 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
             } else if(entry instanceof HashIndexEntry) {
                 HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;
                 setText(hashIndexEntry.getDescription());
-                setContextMenu(new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
+                setContextMenu(getTreeTableView().getStyleClass().contains("bip47") ? null : new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(hashIndexEntry.getHashIndex().toString());
                 setTooltip(tooltip);
 
                 HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                 Button viewTransactionButton = new Button("");
                 viewTransactionButton.setGraphic(getViewTransactionGlyph());
                 viewTransactionButton.setOnAction(event -> {
@@ -161,7 +175,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                     actionBox.getChildren().add(spendUtxoButton);
                 }
 
-                setGraphic(actionBox);
+                setGraphic(getTreeTableView().getStyleClass().contains("bip47") ? null : actionBox);
             }
         }
     }
@@ -192,14 +206,16 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
                 .collect(Collectors.toList());
 
-        long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
+        long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum() - consolidationOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
         Transaction tx = blockTransaction.getTransaction();
         double vSize = tx.getVirtualSize();
         int inputSize = tx.getInputs().get(0).getLength() + (tx.getInputs().get(0).hasWitness() ? tx.getInputs().get(0).getWitness().getLength() / Transaction.WITNESS_SCALE_FACTOR : 0);
         List<BlockTransactionHashIndex> walletUtxos = new ArrayList<>(transactionEntry.getWallet().getWalletUtxos().keySet());
+        //Remove any UTXOs created by the transaction that is to be replaced
+        walletUtxos.removeIf(utxo -> ourOutputs.stream().anyMatch(output -> output.getHash().equals(utxo.getHash()) && output.getIndex() == utxo.getIndex()));
         Collections.shuffle(walletUtxos);
         while((double)changeTotal / vSize < getMaxFeeRate() && !walletUtxos.isEmpty()) {
-            //If there is insufficent change output, include another random UTXO so the fee can be increased
+            //If there is insufficient change output, include another random UTXO so the fee can be increased
             BlockTransactionHashIndex utxo = walletUtxos.remove(0);
             utxos.add(utxo);
             changeTotal += utxo.getValue();
@@ -209,6 +225,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         List<TransactionOutput> externalOutputs = new ArrayList<>(blockTransaction.getTransaction().getOutputs());
         externalOutputs.removeAll(ourOutputs);
         externalOutputs.addAll(consolidationOutputs);
+        final long rbfChange = changeTotal;
         List<Payment> payments = externalOutputs.stream().map(txOutput -> {
             try {
                 String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
@@ -225,20 +242,37 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                     label += (label.isEmpty() ? "" : " ") + "(Replaced By Fee)";
                 }
 
-                return new Payment(txOutput.getScript().getToAddresses()[0], label, txOutput.getValue(), false);
+                if(txOutput.getScript().getToAddress() != null) {
+                    //Disable change creation by enabling max payment when there is only one output and no additional UTXOs included
+                    return new Payment(txOutput.getScript().getToAddress(), label, txOutput.getValue(), blockTransaction.getTransaction().getOutputs().size() == 1 && rbfChange == 0);
+                }
+
+                return null;
             } catch(Exception e) {
                 log.error("Error creating RBF payment", e);
                 return null;
             }
         }).filter(Objects::nonNull).collect(Collectors.toList());
 
+        List<byte[]> opReturns = externalOutputs.stream().map(txOutput -> {
+            List<ScriptChunk> scriptChunks = txOutput.getScript().getChunks();
+            if(scriptChunks.size() != 2 || scriptChunks.get(0).getOpcode() != ScriptOpCodes.OP_RETURN) {
+                return null;
+            }
+            if(scriptChunks.get(1).getData() != null) {
+                return scriptChunks.get(1).getData();
+            }
+
+            return null;
+        }).filter(Objects::nonNull).collect(Collectors.toList());
+
         if(payments.isEmpty()) {
             AppServices.showErrorDialog("Replace By Fee Error", "Error creating RBF transaction, check log for details");
             return;
         }
 
         EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), utxos));
-        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, blockTransaction.getFee(), true)));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, opReturns.isEmpty() ? null : opReturns, blockTransaction.getFee(), true)));
     }
 
     private static Double getMaxFeeRate() {
@@ -267,15 +301,17 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         WalletNode freshNode = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE);
         String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
         label += (label.isEmpty() ? "" : " ") + "(CPFP)";
-        Payment payment = new Payment(transactionEntry.getWallet().getAddress(freshNode), label, utxo.getValue(), true);
+        Payment payment = new Payment(freshNode.getAddress(), label, utxo.getValue(), true);
 
         EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), List.of(utxo)));
-        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), List.of(utxo), List.of(payment), blockTransaction.getFee(), false)));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), List.of(utxo), List.of(payment), null, blockTransaction.getFee(), false)));
     }
 
-    private static boolean canSignMessage(Wallet wallet) {
+    private static boolean canSignMessage(WalletNode walletNode) {
+        Wallet wallet = walletNode.getWallet();
         return wallet.getKeystores().size() == 1 && wallet.getScriptType() != ScriptType.P2TR &&
-                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB);
+                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB) &&
+                (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
     }
 
     private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
@@ -326,6 +362,30 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), utxos));
     }
 
+    private String getTooltip(TransactionEntry transactionEntry) {
+        String tooltip = transactionEntry.getBlockTransaction().getHash().toString();
+        if(transactionEntry.getBlockTransaction().getHeight() <= 0) {
+            if(!AppServices.getMempoolHistogram().isEmpty()) {
+                Set<MempoolRateSize> rateSizes = AppServices.getMempoolHistogram().get(AppServices.getMempoolHistogram().lastKey());
+                double vSize = transactionEntry.getBlockTransaction().getTransaction().getVirtualSize();
+                double feeRate = transactionEntry.getBlockTransaction().getFee() / vSize;
+                long vSizefromTip = rateSizes.stream().filter(rateSize -> rateSize.getFee() > feeRate).mapToLong(MempoolRateSize::getVSize).sum();
+                String amount = vSizefromTip + " vB";
+                if(vSizefromTip > 1000 * 1000) {
+                    amount = String.format("%.2f", (double)vSizefromTip / (1000 * 1000)) + " MvB";
+                } else if(vSizefromTip > 1000) {
+                    amount = String.format("%.2f", (double)vSizefromTip / 1000) + " kvB";
+                }
+
+                tooltip += "\nFee rate: " + String.format("%.2f", feeRate) + " sats/vB (" + amount + " from tip)";
+            }
+
+            tooltip += "\nRBF: " + (transactionEntry.getBlockTransaction().getTransaction().isReplaceByFee() ? "Enabled" : "Disabled");
+        }
+
+        return tooltip;
+    }
+
     private static Glyph getViewTransactionGlyph() {
         Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
         searchGlyph.setFontSize(12);
@@ -464,16 +524,18 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
 
     public static class AddressContextMenu extends ContextMenu {
         public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry) {
-            MenuItem receiveToAddress = new MenuItem("Receive To");
-            receiveToAddress.setGraphic(getReceiveGlyph());
-            receiveToAddress.setOnAction(event -> {
-                hide();
-                EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
-            });
-            getItems().add(receiveToAddress);
+            if(nodeEntry == null || !nodeEntry.getWallet().isBip47()) {
+                MenuItem receiveToAddress = new MenuItem("Receive To");
+                receiveToAddress.setGraphic(getReceiveGlyph());
+                receiveToAddress.setOnAction(event -> {
+                    hide();
+                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                });
+                getItems().add(receiveToAddress);
+            }
 
-            if(nodeEntry != null && canSignMessage(nodeEntry.getWallet())) {
+            if(nodeEntry != null && canSignMessage(nodeEntry.getNode())) {
                 MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
                 signVerifyMessage.setGraphic(getSignMessageGlyph());
                 signVerifyMessage.setOnAction(AE -> {

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

@@ -42,12 +42,14 @@ public abstract class FileImportPane extends TitledDescriptionPane {
     protected ButtonBase importButton;
     private final SimpleStringProperty password = new SimpleStringProperty("");
     private final boolean scannable;
+    private final boolean fileFormatAvailable;
     protected List<Wallet> wallets;
 
-    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl, boolean scannable) {
+    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl, boolean scannable, boolean fileFormatAvailable) {
         super(title, description, content, imageUrl);
         this.importer = importer;
         this.scannable = scannable;
+        this.fileFormatAvailable = fileFormatAvailable;
 
         buttonBox.getChildren().clear();
         buttonBox.getChildren().add(createButton());
@@ -55,7 +57,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
 
     @Override
     protected Control createButton() {
-        if(scannable) {
+        if(scannable && fileFormatAvailable) {
             ToggleButton scanButton = new ToggleButton("Scan...");
             Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
             cameraGlyph.setFontSize(12);
@@ -76,6 +78,16 @@ public abstract class FileImportPane extends TitledDescriptionPane {
             SegmentedButton segmentedButton = new SegmentedButton();
             segmentedButton.getButtons().addAll(scanButton, fileButton);
             return segmentedButton;
+        } else if(scannable) {
+            importButton = new Button("Scan...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            importButton.setGraphic(cameraGlyph);
+            importButton.setAlignment(Pos.CENTER_RIGHT);
+            importButton.setOnAction(event -> {
+                importQR();
+            });
+            return importButton;
         } else {
             importButton = new Button("Import File...");
             importButton.setAlignment(Pos.CENTER_RIGHT);
@@ -146,6 +158,15 @@ public abstract class FileImportPane extends TitledDescriptionPane {
                 try {
                     importFile(importer.getName(), null, null);
                 } catch(ImportException e) {
+                    log.error("Error importing QR", e);
+                    setError("Import Error", e.getMessage());
+                }
+            } else if(result.outputDescriptor != null) {
+                wallets = List.of(result.outputDescriptor.toKeystoreWallet(null));
+                try {
+                    importFile(importer.getName(), null, null);
+                } catch(ImportException e) {
+                    log.error("Error importing QR", e);
                     setError("Import Error", e.getMessage());
                 }
             } else if(result.payload != null) {
@@ -165,6 +186,9 @@ public abstract class FileImportPane extends TitledDescriptionPane {
             } else if(result.exception != null) {
                 log.error("Error importing QR", result.exception);
                 setError("Import Error", result.exception.getMessage());
+            } else {
+                setError("Import Error", null);
+                setExpanded(true);
             }
         }
     }
@@ -190,7 +214,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
     protected abstract void importFile(String fileName, InputStream inputStream, String password) throws ImportException;
 
     private Node getPasswordEntry(File file) {
-        CustomPasswordField passwordField = (CustomPasswordField) TextFields.createClearablePasswordField();
+        CustomPasswordField passwordField = new ViewPasswordField();
         passwordField.setPromptText("Wallet password");
         password.bind(passwordField.textProperty());
         HBox.setHgrow(passwordField, Priority.ALWAYS);

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
@@ -12,11 +13,13 @@ import java.io.*;
 public class FileKeystoreImportPane extends FileImportPane {
     protected final Wallet wallet;
     private final KeystoreFileImport importer;
+    private final KeyDerivation requiredDerivation;
 
-    public FileKeystoreImportPane(Wallet wallet, KeystoreFileImport importer) {
-        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
+    public FileKeystoreImportPane(Wallet wallet, KeystoreFileImport importer, KeyDerivation requiredDerivation) {
+        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(getAccount(wallet, requiredDerivation)), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
         this.wallet = wallet;
         this.importer = importer;
+        this.requiredDerivation = requiredDerivation;
     }
 
     protected void importFile(String fileName, InputStream inputStream, String password) throws ImportException {
@@ -25,6 +28,23 @@ public class FileKeystoreImportPane extends FileImportPane {
             keystore = importer.getKeystore(wallet.getScriptType(), inputStream, password);
         }
 
-        EventManager.get().post(new KeystoreImportEvent(keystore));
+        if(requiredDerivation != null && !requiredDerivation.getDerivation().equals(keystore.getKeyDerivation().getDerivation())) {
+            setError("Incorrect derivation", "This account requires a derivation of " + requiredDerivation.getDerivationPath() + ", but the imported keystore has a derivation of " + keystore.getKeyDerivation().getDerivationPath() + ".");
+        } else {
+            EventManager.get().post(new KeystoreImportEvent(keystore));
+        }
+    }
+
+    private static int getAccount(Wallet wallet, KeyDerivation requiredDerivation) {
+        if(wallet == null || requiredDerivation == null) {
+            return 0;
+        }
+
+        int account = wallet.getScriptType().getAccount(requiredDerivation.getDerivationPath());
+        if(account < 0) {
+            account = 0;
+        }
+
+        return account;
     }
 }

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

@@ -12,7 +12,7 @@ public class FileWalletImportPane extends FileImportPane {
     private final WalletImport importer;
 
     public FileWalletImportPane(WalletImport importer) {
-        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable());
+        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable(), true);
         this.importer = importer;
     }
 

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

@@ -22,6 +22,7 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
+import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +40,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
     private byte[] fileBytes;
 
     public FileWalletKeystoreImportPane(KeystoreFileImport importer) {
-        super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
+        super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
         this.importer = importer;
     }
 
@@ -97,13 +98,29 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
 
     private Node getScriptTypeEntry(List<ScriptType> scriptTypes) {
         Label label = new Label("Script Type:");
+
+        HBox fieldBox = new HBox(5);
+        fieldBox.setAlignment(Pos.CENTER_RIGHT);
         ComboBox<ScriptType> scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(scriptTypes));
         if(scriptTypes.contains(ScriptType.P2WPKH)) {
             scriptTypeComboBox.setValue(ScriptType.P2WPKH);
         }
+        scriptTypeComboBox.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(ScriptType scriptType) {
+                return scriptType == null ? "" : scriptType.getDescription();
+            }
+
+            @Override
+            public ScriptType fromString(String string) {
+                return null;
+            }
+        });
+        scriptTypeComboBox.setMaxWidth(170);
 
         HelpLabel helpLabel = new HelpLabel();
         helpLabel.setHelpText("P2WPKH is a Native Segwit type and is usually the best choice for new wallets.\nP2SH-P2WPKH is a Wrapped Segwit type and is a reasonable choice for the widest compatibility.\nP2PKH is a Legacy type and should be avoided for new wallets.\nFor existing wallets, be sure to choose the type that matches the wallet you are importing.");
+        fieldBox.getChildren().addAll(scriptTypeComboBox, helpLabel);
 
         Region region = new Region();
         HBox.setHgrow(region, Priority.SOMETIMES);
@@ -130,7 +147,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
         HBox contentBox = new HBox();
         contentBox.setAlignment(Pos.CENTER_RIGHT);
         contentBox.setSpacing(20);
-        contentBox.getChildren().addAll(label, scriptTypeComboBox, helpLabel, region, importFileButton);
+        contentBox.getChildren().addAll(label, fieldBox, region, importFileButton);
         contentBox.setPadding(new Insets(10, 30, 10, 30));
         contentBox.setPrefHeight(60);
 

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

@@ -21,6 +21,7 @@ public class HelpLabel extends Label {
         tooltip.textProperty().bind(helpTextProperty());
         tooltip.graphicProperty().bind(helpGraphicProperty());
         tooltip.setShowDuration(Duration.seconds(15));
+        tooltip.setShowDelay(Duration.millis(500));
         getStyleClass().add("help-label");
 
         Platform.runLater(() -> setTooltip(tooltip));

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

@@ -0,0 +1,83 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.beans.NamedArg;
+import javafx.scene.control.Spinner;
+import javafx.scene.control.SpinnerValueFactory;
+import javafx.util.converter.IntegerStringConverter;
+
+public class IntegerSpinner extends Spinner<Integer> {
+    public IntegerSpinner() {
+        super();
+        setupEditor();
+    }
+
+    public IntegerSpinner(@NamedArg("min") int min,
+                          @NamedArg("max") int max,
+                          @NamedArg("initialValue") int initialValue) {
+        super(min, max, initialValue);
+        setupEditor();
+    }
+
+    public IntegerSpinner(@NamedArg("min") int min,
+                          @NamedArg("max") int max,
+                          @NamedArg("initialValue") int initialValue,
+                          @NamedArg("amountToStepBy") int amountToStepBy) {
+        super(min, max, initialValue, amountToStepBy);
+        setupEditor();
+    }
+
+    private void setupEditor() {
+        getEditor().focusedProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null && !newValue) {
+                commitValue();
+            }
+        });
+        getEditor().textProperty().addListener((observable, oldValue, newValue) -> {
+            if(!newValue.matches("\\d*")) {
+                getEditor().setText(newValue.replaceAll("[^\\d]", ""));
+            }
+        });
+    }
+
+    public static class ValueFactory extends SpinnerValueFactory.IntegerSpinnerValueFactory {
+        public ValueFactory(@NamedArg("min") int min,
+                            @NamedArg("max") int max) {
+            super(min, max);
+            setupConverter(min);
+        }
+
+        public ValueFactory(@NamedArg("min") int min,
+                            @NamedArg("max") int max,
+                            @NamedArg("initialValue") int initialValue) {
+            super(min, max, initialValue);
+            setupConverter(initialValue);
+        }
+
+        public ValueFactory(@NamedArg("min") int min,
+                            @NamedArg("max") int max,
+                            @NamedArg("initialValue") int initialValue,
+                            @NamedArg("amountToStepBy") int amountToStepBy) {
+            super(min, max, initialValue, amountToStepBy);
+            setupConverter(initialValue);
+        }
+
+        private void setupConverter(Integer defaultValue) {
+            setConverter(new IntegerStringConverter() {
+                @Override
+                public Integer fromString(String value) {
+                    if(value == null) {
+                        return null;
+                    }
+
+                    value = value.trim();
+
+                    if(value.length() < 1) {
+                        return defaultValue;
+                    }
+
+                    return Integer.valueOf(value);
+                }
+            });
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ import javafx.application.Platform;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.DialogPane;
+import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.control.textfield.TextFields;
@@ -20,11 +21,15 @@ public class KeystorePassphraseDialog extends Dialog<String> {
     }
 
     public KeystorePassphraseDialog(String walletName, Keystore keystore) {
-        this.passphrase = (CustomPasswordField) TextFields.createClearablePasswordField();
+        this(walletName, keystore, false);
+    }
+
+    public KeystorePassphraseDialog(String walletName, Keystore keystore, boolean confirm) {
+        this.passphrase = new ViewPasswordField();
 
         final DialogPane dialogPane = getDialogPane();
-        setTitle("Keystore Passphrase" + (walletName != null ? " - " + walletName : ""));
-        dialogPane.setHeaderText("Please enter the passphrase for keystore: \n" + keystore.getLabel());
+        setTitle("Keystore Passphrase" + (walletName != null ? " for " + walletName : ""));
+        dialogPane.setHeaderText((confirm ? "Re-enter" : "Enter") + " the BIP39 passphrase\n" + (confirm ? "to confirm:" : "for keystore: " + keystore.getLabel()));
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
@@ -40,6 +45,13 @@ public class KeystorePassphraseDialog extends Dialog<String> {
         content.setPrefHeight(50);
         content.getChildren().add(passphrase);
 
+        Glyph warnGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
+        warnGlyph.getStyleClass().add("warn-icon");
+        warnGlyph.setFontSize(12);
+        Label warnLabel = new Label("A BIP39 passphrase is not a wallet password!", warnGlyph);
+        warnLabel.setGraphicTextGap(5);
+        content.getChildren().add(warnLabel);
+
         dialogPane.setContent(content);
         Platform.runLater(passphrase::requestFocus);
 

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

@@ -92,18 +92,15 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
             });
             getItems().add(copyLabel);
 
-            Object content = Clipboard.getSystemClipboard().getContent(DataFormat.PLAIN_TEXT);
-            if(content instanceof String) {
-                MenuItem pasteLabel = new MenuItem("Paste Label");
-                pasteLabel.setOnAction(AE -> {
-                    hide();
-                    Object currentContent = Clipboard.getSystemClipboard().getContent(DataFormat.PLAIN_TEXT);
-                    if(currentContent instanceof String) {
-                        entry.labelProperty().set((String)currentContent);
-                    }
-                });
-                getItems().add(pasteLabel);
-            }
+            MenuItem pasteLabel = new MenuItem("Paste Label");
+            pasteLabel.setOnAction(AE -> {
+                hide();
+                Object currentContent = Clipboard.getSystemClipboard().getContent(DataFormat.PLAIN_TEXT);
+                if(currentContent instanceof String) {
+                    entry.labelProperty().set((String)currentContent);
+                }
+            });
+            getItems().add(pasteLabel);
         }
     }
 }

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

@@ -1,8 +1,8 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.net.MempoolRateSize;
-import com.sparrowwallet.sparrow.wallet.SendController;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
 import javafx.collections.FXCollections;
@@ -79,9 +79,9 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
         });
 
         long previousFeeRate = 0;
-        for(Long feeRate : SendController.FEE_RATES_RANGE) {
+        for(Long feeRate : AppServices.FEE_RATES_RANGE) {
             XYChart.Series<String, Number> series = new XYChart.Series<>();
-            series.setName(feeRate + "+ vB");
+            series.setName(feeRate + "+ sats/vB");
             long seriesTotalVSize = 0;
 
             for(Date date : periodRateSizes.keySet()) {

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

@@ -89,13 +89,12 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
      * @param buttons The dialog buttons to display. If one contains the text "sign" it will trigger the signing process
      */
     public MessageSignDialog(Wallet wallet, WalletNode walletNode, String title, String msg, ButtonType... buttons) {
+        if(walletNode != null) {
+            checkWalletSigning(walletNode.getWallet());
+        }
+
         if(wallet != null) {
-            if(wallet.getKeystores().size() != 1) {
-                throw new IllegalArgumentException("Cannot sign messages using a wallet with multiple keystores - a single key is required");
-            }
-            if(!wallet.getKeystores().get(0).hasPrivateKey() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB) {
-                throw new IllegalArgumentException("Cannot sign messages using a wallet without a seed or USB keystore");
-            }
+            checkWalletSigning(wallet);
         }
 
         this.wallet = wallet;
@@ -103,6 +102,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
 
         final DialogPane dialogPane = getDialogPane();
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         dialogPane.setHeaderText(title == null ? (wallet == null ? "Verify Message" : "Sign/Verify Message") : title);
 
@@ -120,6 +120,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         Form form = new Form();
         Fieldset fieldset = new Fieldset();
         fieldset.setText("");
+        fieldset.setSpacing(10);
 
         Field addressField = new Field();
         addressField.setText("Address:");
@@ -129,7 +130,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         addressField.getInputs().add(address);
 
         if(walletNode != null) {
-            address.setText(wallet.getAddress(walletNode).toString());
+            address.setText(walletNode.getAddress().toString());
         }
 
         Field messageField = new Field();
@@ -262,6 +263,15 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         });
     }
 
+    private void checkWalletSigning(Wallet wallet) {
+        if(wallet.getKeystores().size() != 1) {
+            throw new IllegalArgumentException("Cannot sign messages using a wallet with multiple keystores - a single key is required");
+        }
+        if(!wallet.getKeystores().get(0).hasPrivateKey() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB) {
+            throw new IllegalArgumentException("Cannot sign messages using a wallet without private keys or a USB keystore");
+        }
+    }
+
     private Address getAddress()throws InvalidAddressException {
         return Address.fromString(address.getText());
     }
@@ -299,20 +309,21 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             return;
         }
 
-        if(wallet.containsPrivateKeys()) {
-            if(wallet.isEncrypted()) {
+        //Note we can expect a single keystore due to the check in the constructor
+        Wallet signingWallet = walletNode.getWallet();
+        if(signingWallet.getKeystores().get(0).hasPrivateKey()) {
+            if(signingWallet.isEncrypted()) {
                 EventManager.get().post(new RequestOpenWalletsEvent());
             } else {
-                signUnencryptedKeystore(wallet);
+                signUnencryptedKeystore(signingWallet);
             }
-        } else if(wallet.containsSource(KeystoreSource.HW_USB)) {
-            signUsbKeystore(wallet);
+        } else if(signingWallet.containsSource(KeystoreSource.HW_USB)) {
+            signUsbKeystore(signingWallet);
         }
     }
 
     private void signUnencryptedKeystore(Wallet decryptedWallet) {
         try {
-            //Note we can expect a single keystore due to the check above
             Keystore keystore = decryptedWallet.getKeystores().get(0);
             ECKey privKey = keystore.getKey(walletNode);
             ScriptType scriptType = electrumSignatureFormat ? ScriptType.P2PKH : decryptedWallet.getScriptType();
@@ -402,7 +413,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
         Optional<SecureString> password = dlg.showAndWait();
         if(password.isPresent()) {
-            Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(wallet.copy(), password.get());
+            Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(walletNode.getWallet().copy(), password.get());
             decryptWalletService.setOnSucceeded(workerStateEvent -> {
                 EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Done"));
                 Wallet decryptedWallet = decryptWalletService.getValue();

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

@@ -10,11 +10,16 @@ import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolException;
+import javafx.animation.Timeline;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.tools.Platform;
 
 public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
+    private static final int ERROR_DISPLAY_MILLIS = 5 * 60 * 1000;
+
     public MixStatusCell() {
         super();
         setAlignment(Pos.CENTER_RIGHT);
@@ -40,20 +45,15 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
                 setContextMenu(null);
             }
 
-            if(mixStatus.getMixProgress() != null) {
-                Tooltip tooltip = new Tooltip();
-                tooltip.setText("Pool: " + mixStatus.getMixProgress().getPoolId().replace("btc", " BTC"));
-                setTooltip(tooltip);
-            }
-
             if(mixStatus.getNextMixUtxo() != null) {
                 setMixSuccess(mixStatus.getNextMixUtxo());
             } else if(mixStatus.getMixFailReason() != null) {
-                setMixFail(mixStatus.getMixFailReason());
+                setMixFail(mixStatus.getMixFailReason(), mixStatus.getMixError(), mixStatus.getMixErrorTimestamp());
             } else if(mixStatus.getMixProgress() != null) {
-                setMixProgress(mixStatus.getMixProgress());
+                setMixProgress(mixStatus.getUtxoEntry(), mixStatus.getMixProgress());
             } else {
                 setGraphic(null);
+                setTooltip(null);
             }
         }
     }
@@ -67,27 +67,72 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
         setTooltip(tt);
     }
 
-    private void setMixFail(MixFailReason mixFailReason) {
+    private void setMixFail(MixFailReason mixFailReason, String mixError, Long mixErrorTimestamp) {
         if(mixFailReason != MixFailReason.CANCEL) {
-            setGraphic(getFailGlyph());
+            long elapsed = mixErrorTimestamp == null ? 0L : System.currentTimeMillis() - mixErrorTimestamp;
+            if(elapsed >= ERROR_DISPLAY_MILLIS) {
+                //Old error, don't set again.
+                return;
+            }
+
+            Glyph failGlyph = getFailGlyph();
+            setGraphic(failGlyph);
             Tooltip tt = new Tooltip();
-            tt.setText(mixFailReason.getMessage());
+            tt.setText(mixFailReason.getMessage() + (mixError == null ? "" : ": " + mixError) +
+                    "\nMix failures are generally caused by peers disconnecting during a mix." +
+                    "\nMake sure your internet connection is stable and the computer is configured to prevent sleeping." +
+                    "\nTo prevent sleeping, use the " + getPlatformSleepConfig() + " or enable the function in the Tools menu.");
             setTooltip(tt);
+
+            Duration fadeDuration = Duration.millis(ERROR_DISPLAY_MILLIS - elapsed);
+            double fadeFromValue = 1.0 - ((double)elapsed / ERROR_DISPLAY_MILLIS);
+            Timeline timeline = AnimationUtil.getSlowFadeOut(failGlyph, fadeDuration, fadeFromValue, 10);
+            timeline.setOnFinished(event -> {
+                setTooltip(null);
+            });
+            timeline.play();
         } else {
             setGraphic(null);
+            setTooltip(null);
         }
     }
 
-    private void setMixProgress(MixProgress mixProgress) {
+    private String getPlatformSleepConfig() {
+        Platform platform = Platform.getCurrent();
+        if(platform == Platform.OSX) {
+            return "OSX System Preferences";
+        } else if(platform == Platform.WINDOWS) {
+            return "Windows Control Panel";
+        }
+
+        return "system power settings";
+    }
+
+    private void setMixProgress(UtxoEntry utxoEntry, MixProgress mixProgress) {
         if(mixProgress.getMixStep() != MixStep.FAIL) {
             ProgressIndicator progressIndicator = getProgressIndicator();
             progressIndicator.setProgress(mixProgress.getMixStep().getProgressPercent() == 100 ? -1 : mixProgress.getMixStep().getProgressPercent() / 100.0);
             setGraphic(progressIndicator);
             Tooltip tt = new Tooltip();
-            tt.setText(mixProgress.getMixStep().getMessage().substring(0, 1).toUpperCase() + mixProgress.getMixStep().getMessage().substring(1));
+            String status = mixProgress.getMixStep().getMessage().substring(0, 1).toUpperCase() + mixProgress.getMixStep().getMessage().substring(1);
+            tt.setText(status);
             setTooltip(tt);
+
+            if(mixProgress.getMixStep() == MixStep.REGISTERED_INPUT) {
+                tt.setOnShowing(event -> {
+                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
+                    Whirlpool.RegisteredInputsService registeredInputsService = new Whirlpool.RegisteredInputsService(whirlpool, mixProgress.getPoolId());
+                    registeredInputsService.setOnSucceeded(eventStateHandler -> {
+                        if(registeredInputsService.getValue() != null) {
+                            tt.setText(status + " (1 of " + registeredInputsService.getValue() + ")");
+                        }
+                    });
+                    registeredInputsService.start();
+                });
+            }
         } else {
             setGraphic(null);
+            setTooltip(null);
         }
     }
 

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

@@ -0,0 +1,60 @@
+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;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.TilePane;
+import javafx.scene.layout.VBox;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
+    public MnemonicKeystoreDisplayPane(Keystore keystore) {
+        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() ? "Passphrase entered" : "No passphrase", "", "image/" + WalletModel.SEED.getType() + ".png");
+        showHideLink.setVisible(false);
+        buttonBox.getChildren().clear();
+
+        showWordList(keystore.getSeed());
+    }
+
+    protected Node getMnemonicWordsEntry(int numWords) {
+        VBox vBox = new VBox();
+        vBox.setSpacing(10);
+
+        wordsPane = new TilePane();
+        wordsPane.setPrefRows(numWords / 3);
+        wordsPane.setHgap(10);
+        wordsPane.setVgap(10);
+        wordsPane.setOrientation(Orientation.VERTICAL);
+
+        List<String> words = new ArrayList<>();
+        for(int i = 0; i < numWords; i++) {
+            words.add("");
+        }
+
+        ObservableList<String> wordEntryList = FXCollections.observableArrayList(words);
+        wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
+        List<WordEntry> wordEntries = new ArrayList<>(numWords);
+        for(int i = 0; i < numWords; i++) {
+            wordEntries.add(new WordEntry(i, wordEntryList));
+        }
+        for(int i = 0; i < numWords - 1; i++) {
+            wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
+            wordEntries.get(i).setNextField(wordEntries.get(i + 1).getEditor());
+        }
+        wordsPane.getChildren().addAll(wordEntries);
+
+        vBox.getChildren().add(wordsPane);
+
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().add(vBox);
+        return stackPane;
+    }
+}

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

@@ -3,30 +3,22 @@ package com.sparrowwallet.sparrow.control;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
 import com.sparrowwallet.drongo.protocol.ScriptType;
-import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
-import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
-import com.sparrowwallet.sparrow.io.*;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
+import com.sparrowwallet.sparrow.io.ImportException;
+import com.sparrowwallet.sparrow.io.KeystoreMnemonicImport;
 import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.input.Clipboard;
-import javafx.scene.layout.*;
-import javafx.util.Callback;
-import org.controlsfx.control.textfield.AutoCompletionBinding;
-import org.controlsfx.control.textfield.CustomTextField;
-import org.controlsfx.control.textfield.TextFields;
-import org.controlsfx.glyphfont.Glyph;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
 import org.controlsfx.tools.Borders;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -35,33 +27,24 @@ import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
-public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
+public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
     protected final Wallet wallet;
     private final KeystoreMnemonicImport importer;
 
-    private SplitMenuButton enterMnemonicButton;
     private SplitMenuButton importButton;
 
-    private TilePane wordsPane;
     private Button generateButton;
-    private Label validLabel;
-    private Label invalidLabel;
     private Button calculateButton;
     private Button backButton;
     private Button nextButton;
     private Button confirmButton;
     private List<String> generatedMnemonicCode;
 
-    private SimpleListProperty<String> wordEntriesProperty;
-    private final SimpleStringProperty passphraseProperty = new SimpleStringProperty();
-    private IntegerProperty defaultWordSizeProperty;
-
     public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer) {
-        super(importer.getName(), "Seed import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        super(importer.getName(), "Create or enter seed", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
         this.wallet = wallet;
         this.importer = importer;
 
@@ -69,46 +52,6 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
         buttonBox.getChildren().add(importButton);
     }
 
-    public MnemonicKeystoreImportPane(Keystore keystore) {
-        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() ? "Passphrase entered" : "No passphrase", "", "image/" + WalletModel.SEED.getType() + ".png");
-        this.wallet = null;
-        this.importer = null;
-        showHideLink.setVisible(false);
-        buttonBox.getChildren().clear();
-
-        showWordList(keystore.getSeed());
-    }
-
-    @Override
-    protected Control createButton() {
-        createEnterMnemonicButton();
-        return enterMnemonicButton;
-    }
-
-    private void createEnterMnemonicButton() {
-        enterMnemonicButton = new SplitMenuButton();
-        enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT);
-        enterMnemonicButton.setText("Enter 24 Words");
-        defaultWordSizeProperty = new SimpleIntegerProperty(24);
-        defaultWordSizeProperty.addListener((observable, oldValue, newValue) -> {
-            enterMnemonicButton.setText("Enter " + newValue + " Words");
-        });
-        enterMnemonicButton.setOnAction(event -> {
-            enterMnemonic(defaultWordSizeProperty.get());
-        });
-        int[] numberWords = new int[] {24, 21, 18, 15, 12};
-        for(int i = 0; i < numberWords.length; i++) {
-            MenuItem item = new MenuItem("Enter " + numberWords[i] + " Words");
-            final int words = numberWords[i];
-            item.setOnAction(event -> {
-                defaultWordSizeProperty.set(words);
-                enterMnemonic(words);
-            });
-            enterMnemonicButton.getItems().add(item);
-        }
-        enterMnemonicButton.managedProperty().bind(enterMnemonicButton.visibleProperty());
-    }
-
     private void createImportButton() {
         importButton = new SplitMenuButton();
         importButton.setAlignment(Pos.CENTER_RIGHT);
@@ -134,156 +77,81 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
         importButton.setVisible(false);
     }
 
-    private void enterMnemonic(int numWords) {
+    protected void enterMnemonic(int numWords) {
         generatedMnemonicCode = null;
-        setDescription("Enter mnemonic word list");
-        showHideLink.setVisible(false);
-        setContent(getMnemonicWordsEntry(numWords, false));
-        setExpanded(true);
+        super.enterMnemonic(numWords);
     }
 
-    private Node getMnemonicWordsEntry(int numWords, boolean displayWordsOnly) {
-        VBox vBox = new VBox();
-        vBox.setSpacing(10);
+    protected List<Node> createLeftButtons() {
+        generateButton = new Button("Generate New");
+        generateButton.setOnAction(event -> {
+            generateNew();
+        });
+        generateButton.managedProperty().bind(generateButton.visibleProperty());
+        generateButton.setTooltip(new Tooltip("Generate a unique set of words that provide the seed for your wallet"));
 
-        wordsPane = new TilePane();
-        wordsPane.setPrefRows(numWords/3);
-        wordsPane.setHgap(10);
-        wordsPane.setVgap(10);
-        wordsPane.setOrientation(Orientation.VERTICAL);
+        return List.of(generateButton);
+    }
 
-        List<String> words = new ArrayList<>();
-        for(int i = 0; i < numWords; i++) {
-            words.add("");
-        }
+    protected List<Node> createRightButtons() {
+        confirmButton = new Button("Re-enter Words...");
+        confirmButton.setOnAction(event -> {
+            confirmBackup();
+        });
+        confirmButton.managedProperty().bind(confirmButton.visibleProperty());
+        confirmButton.setVisible(false);
+        confirmButton.setDefaultButton(true);
+        confirmButton.setTooltip(new Tooltip("Re-enter the generated word list to confirm your backup is correct"));
 
-        ObservableList<String> wordEntryList = FXCollections.observableArrayList(words);
-        wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
-        List<WordEntry> wordEntries = new ArrayList<>(numWords);
-        for(int i = 0; i < numWords; i++) {
-            wordEntries.add(new WordEntry(i, wordEntryList));
-        }
-        for(int i = 0; i < numWords - 1; i++) {
-            wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
-            wordEntries.get(i).setNextField(wordEntries.get(i + 1).getEditor());
-        }
-        wordsPane.getChildren().addAll(wordEntries);
+        calculateButton = new Button("Create Keystore");
+        calculateButton.setDisable(true);
+        calculateButton.setDefaultButton(true);
+        calculateButton.setOnAction(event -> {
+            prepareImport();
+        });
+        calculateButton.managedProperty().bind(calculateButton.visibleProperty());
+        calculateButton.setTooltip(new Tooltip("Create the keystore from the provided word list"));
 
-        vBox.getChildren().add(wordsPane);
+        backButton = new Button("Back");
+        backButton.setOnAction(event -> {
+            displayMnemonicCode();
+        });
+        backButton.managedProperty().bind(backButton.visibleProperty());
+        backButton.setTooltip(new Tooltip("Go back to the generated word list"));
+        backButton.setVisible(false);
 
-        if(!displayWordsOnly) {
-            PassphraseEntry passphraseEntry = new PassphraseEntry();
-            wordEntries.get(wordEntries.size() - 1).setNextField(passphraseEntry.getEditor());
-            passphraseEntry.setPadding(new Insets(0, 26, 10, 10));
-            vBox.getChildren().add(passphraseEntry);
+        nextButton = new Button("Confirm Backup...");
+        nextButton.setOnAction(event -> {
+            confirmRecord();
+        });
+        nextButton.managedProperty().bind(nextButton.visibleProperty());
+        nextButton.setTooltip(new Tooltip("Confirm you have recorded the generated word list"));
+        nextButton.setVisible(false);
+        nextButton.setDefaultButton(true);
 
-            AnchorPane buttonPane = new AnchorPane();
-            buttonPane.setPadding(new Insets(0, 26, 0, 10));
+        return List.of(backButton, nextButton, confirmButton, calculateButton);
+    }
 
-            generateButton = new Button("Generate New");
-            generateButton.setOnAction(event -> {
-                generateNew();
-            });
-            generateButton.managedProperty().bind(generateButton.visibleProperty());
-            generateButton.setTooltip(new Tooltip("Generate a unique set of words that provide the seed for your wallet"));
-            buttonPane.getChildren().add(generateButton);
-            AnchorPane.setLeftAnchor(generateButton, 0.0);
-
-            validLabel = new Label("Valid checksum", getValidGlyph());
-            validLabel.setContentDisplay(ContentDisplay.LEFT);
-            validLabel.setGraphicTextGap(5.0);
-            validLabel.managedProperty().bind(validLabel.visibleProperty());
-            validLabel.setVisible(false);
-            buttonPane.getChildren().add(validLabel);
-            AnchorPane.setTopAnchor(validLabel, 5.0);
-            AnchorPane.setLeftAnchor(validLabel, 0.0);
-
-            invalidLabel = new Label("Invalid checksum", getInvalidGlyph());
-            invalidLabel.setContentDisplay(ContentDisplay.LEFT);
-            invalidLabel.setGraphicTextGap(5.0);
-            invalidLabel.managedProperty().bind(invalidLabel.visibleProperty());
-            invalidLabel.setVisible(false);
-            buttonPane.getChildren().add(invalidLabel);
-            AnchorPane.setTopAnchor(invalidLabel, 5.0);
-            AnchorPane.setLeftAnchor(invalidLabel, 0.0);
-
-            confirmButton = new Button("Re-enter Words...");
-            confirmButton.setOnAction(event -> {
-                confirmBackup();
-            });
-            confirmButton.managedProperty().bind(confirmButton.visibleProperty());
-            confirmButton.setVisible(false);
-            confirmButton.setDefaultButton(true);
-            confirmButton.setTooltip(new Tooltip("Re-enter the generated word list to confirm your backup is correct"));
-
-            calculateButton = new Button("Create Keystore");
-            calculateButton.setDisable(true);
-            calculateButton.setDefaultButton(true);
-            calculateButton.setOnAction(event -> {
-                prepareImport();
-            });
-            calculateButton.managedProperty().bind(calculateButton.visibleProperty());
-            calculateButton.setTooltip(new Tooltip("Create the keystore from the provided word list"));
-
-            backButton = new Button("Back");
-            backButton.setOnAction(event -> {
-                displayMnemonicCode();
-            });
-            backButton.managedProperty().bind(backButton.visibleProperty());
-            backButton.setTooltip(new Tooltip("Go back to the generated word list"));
-            backButton.setVisible(false);
-
-            nextButton = new Button("Confirm Backup...");
-            nextButton.setOnAction(event -> {
-                confirmRecord();
-            });
-            nextButton.managedProperty().bind(nextButton.visibleProperty());
-            nextButton.setTooltip(new Tooltip("Confirm you have recorded the generated word list"));
-            nextButton.setVisible(false);
-            nextButton.setDefaultButton(true);
-
-            wordEntriesProperty.addListener((ListChangeListener<String>) c -> {
-                boolean empty = true;
-                boolean validWords = true;
-                boolean validChecksum = false;
-                for(String word : wordEntryList) {
-                    if(!word.isEmpty()) {
-                        empty = false;
-                    }
-
-                    if(!WordEntry.isValid(word)) {
-                        validWords = false;
-                    }
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        if(!empty && validWords) {
+            try {
+                importer.getKeystore(wallet.getScriptType().getDefaultDerivation(), wordEntriesProperty.get(), passphraseProperty.get());
+                validChecksum = true;
+            } catch(ImportException e) {
+                if(e.getCause() instanceof MnemonicException.MnemonicTypeException) {
+                    invalidLabel.setText("Unsupported Electrum seed");
+                    invalidLabel.setTooltip(new Tooltip("Seeds created in Electrum do not follow the BIP39 standard. Import the Electrum wallet file directly."));
+                } else {
+                    invalidLabel.setText("Invalid checksum");
+                    invalidLabel.setTooltip(null);
                 }
-
-                if(!empty && validWords) {
-                    try {
-                        importer.getKeystore(wallet.getScriptType().getDefaultDerivation(), wordEntriesProperty.get(), passphraseProperty.get());
-                        validChecksum = true;
-                    } catch(ImportException e) {
-                        //ignore
-                    }
-                }
-
-                generateButton.setVisible(empty && generatedMnemonicCode == null);
-                calculateButton.setDisable(!validChecksum);
-                validLabel.setVisible(validChecksum);
-                invalidLabel.setVisible(!validChecksum && !empty);
-            });
-
-            HBox rightBox = new HBox();
-            rightBox.setSpacing(10);
-            rightBox.getChildren().addAll(backButton, nextButton, confirmButton, calculateButton);
-
-            buttonPane.getChildren().add(rightBox);
-            AnchorPane.setRightAnchor(rightBox, 0.0);
-
-            vBox.getChildren().add(buttonPane);
+            }
         }
 
-        StackPane stackPane = new StackPane();
-        stackPane.getChildren().add(vBox);
-        return stackPane;
+        generateButton.setVisible(empty && generatedMnemonicCode == null);
+        calculateButton.setDisable(!validChecksum);
+        validLabel.setVisible(validChecksum);
+        invalidLabel.setVisible(!validChecksum && !empty);
     }
 
     private void generateNew() {
@@ -355,7 +223,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
     private void confirmBackup() {
         setDescription("Confirm backup by re-entering words");
         showHideLink.setVisible(false);
-        setContent(getMnemonicWordsEntry(wordEntriesProperty.get().size(), false));
+        setContent(getMnemonicWordsEntry(wordEntriesProperty.get().size()));
         setExpanded(true);
         backButton.setVisible(true);
         generateButton.setVisible(false);
@@ -384,6 +252,14 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
         try {
             Keystore keystore = importer.getKeystore(derivation, wordEntriesProperty.get(), passphraseProperty.get());
             if(!dryrun) {
+                if(passphraseProperty.get() != null && !passphraseProperty.get().isEmpty()) {
+                    KeystorePassphraseDialog keystorePassphraseDialog = new KeystorePassphraseDialog(null, keystore, true);
+                    Optional<String> optPassphrase = keystorePassphraseDialog.showAndWait();
+                    if(optPassphrase.isEmpty() || !optPassphrase.get().equals(passphraseProperty.get())) {
+                        throw new ImportException("Re-entered passphrase did not match");
+                    }
+                }
+
                 EventManager.get().post(new KeystoreImportEvent(keystore));
             }
             return true;
@@ -394,151 +270,12 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
             } else if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
                 errorMessage = e.getCause().getMessage();
             }
-            setError("Import Error", errorMessage);
+            setError("Import Error", errorMessage + ".");
             importButton.setDisable(false);
             return false;
         }
     }
 
-    private static class WordEntry extends HBox {
-        private static List<String> wordList;
-        private final TextField wordField;
-        private WordEntry nextEntry;
-        private TextField nextField;
-
-        public WordEntry(int wordNumber, ObservableList<String> wordEntryList) {
-            super();
-            setAlignment(Pos.CENTER_RIGHT);
-
-            setSpacing(10);
-            Label label = new Label((wordNumber+1) + ".");
-            label.setPrefWidth(22);
-            label.setAlignment(Pos.CENTER_RIGHT);
-            wordField = new TextField() {
-                @Override
-                public void paste() {
-                    Clipboard clipboard = Clipboard.getSystemClipboard();
-                    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) {
-                            if(entry.nextField != null) {
-                                entry.nextField.requestFocus();
-                            }
-
-                            entry.wordField.setText(word);
-                            entry = entry.nextEntry;
-                            if(entry == null) {
-                                break;
-                            }
-                        }
-                    } else {
-                        super.paste();
-                    }
-                }
-            };
-            wordField.setMaxWidth(100);
-            TextFormatter<?> formatter = new TextFormatter<>((TextFormatter.Change change) -> {
-                String text = change.getText();
-                // if text was added, fix the text to fit the requirements
-                if(!text.isEmpty()) {
-                    String newText = text.replace(" ", "").toLowerCase();
-                    int carretPos = change.getCaretPosition() - text.length() + newText.length();
-                    change.setText(newText);
-                    // fix caret position based on difference in originally added text and fixed text
-                    change.selectRange(carretPos, carretPos);
-                }
-                return change;
-            });
-            wordField.setTextFormatter(formatter);
-
-            wordList = Bip39MnemonicCode.INSTANCE.getWordList();
-            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList));
-            autoCompletionBinding.setDelay(50);
-            autoCompletionBinding.setOnAutoCompleted(event -> {
-                if(nextField != null) {
-                    nextField.requestFocus();
-                }
-            });
-
-            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))
-            ));
-
-            wordField.textProperty().addListener((observable, oldValue, newValue) -> {
-                wordEntryList.set(wordNumber, newValue);
-            });
-
-            this.getChildren().addAll(label, wordField);
-        }
-
-        public TextField getEditor() {
-            return wordField;
-        }
-
-        public void setNextEntry(WordEntry nextEntry) {
-            this.nextEntry = nextEntry;
-        }
-
-        public void setNextField(TextField field) {
-            this.nextField = field;
-        }
-
-        public static boolean isValid(String word) {
-            return wordList.contains(word);
-        }
-    }
-
-    private static class WordlistSuggestionProvider implements Callback<AutoCompletionBinding.ISuggestionRequest, Collection<String>> {
-        private final List<String> wordList;
-
-        public WordlistSuggestionProvider(List<String> wordList) {
-            this.wordList = wordList;
-        }
-
-        @Override
-        public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
-            List<String> suggestions = new ArrayList<>();
-            if(!request.getUserText().isEmpty()) {
-                for(String word : wordList) {
-                    if(word.startsWith(request.getUserText())) {
-                        suggestions.add(word);
-                    }
-                }
-            }
-
-            return suggestions;
-        }
-    }
-
-    private class PassphraseEntry extends HBox {
-        private final CustomTextField passphraseField;
-
-        public PassphraseEntry() {
-            super();
-
-            setAlignment(Pos.CENTER_LEFT);
-            setSpacing(10);
-            Label passphraseLabel = new Label("Passphrase:");
-            passphraseField = (CustomTextField) TextFields.createClearableTextField();
-            passphraseProperty.bind(passphraseField.textProperty());
-            passphraseField.setPromptText("Leave blank for none");
-
-            HelpLabel helpLabel = new HelpLabel();
-            helpLabel.setStyle("-fx-padding: 0 0 0 0");
-            helpLabel.setHelpText("A passphrase provides optional added security - it is not stored so it must be remembered!");
-
-            getChildren().addAll(passphraseLabel, passphraseField, helpLabel);
-        }
-
-        public TextField getEditor() {
-            return passphraseField;
-        }
-    }
-
     private Node getDerivationEntry(List<ChildNumber> derivation) {
         TextField derivationField = new TextField();
         derivationField.setPromptText("Derivation path");
@@ -576,30 +313,4 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
 
         return contentBox;
     }
-
-    private void showWordList(DeterministicSeed seed) {
-        List<String> words = seed.getMnemonicCode();
-        setContent(getMnemonicWordsEntry(words.size(), true));
-        setExpanded(true);
-
-        for (int i = 0; i < wordsPane.getChildren().size(); i++) {
-            WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
-            wordEntry.getEditor().setText(words.get(i));
-            wordEntry.getEditor().setEditable(false);
-        }
-    }
-
-    public static Glyph getValidGlyph() {
-        Glyph validGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
-        validGlyph.getStyleClass().add("valid-checksum");
-        validGlyph.setFontSize(12);
-        return validGlyph;
-    }
-
-    public static Glyph getInvalidGlyph() {
-        Glyph invalidGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
-        invalidGlyph.getStyleClass().add("invalid-checksum");
-        invalidGlyph.setFontSize(12);
-        return invalidGlyph;
-    }
 }

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

@@ -0,0 +1,384 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import javafx.application.Platform;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.input.Clipboard;
+import javafx.scene.layout.*;
+import javafx.util.Callback;
+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;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+
+public class MnemonicKeystorePane extends TitledDescriptionPane {
+    private static final Logger log = LoggerFactory.getLogger(MnemonicKeystorePane.class);
+
+    protected SplitMenuButton enterMnemonicButton;
+    protected TilePane wordsPane;
+    protected Label validLabel;
+    protected Label invalidLabel;
+
+    protected SimpleListProperty<String> wordEntriesProperty;
+    protected final SimpleStringProperty passphraseProperty = new SimpleStringProperty();
+    protected IntegerProperty defaultWordSizeProperty;
+
+    public MnemonicKeystorePane(String title, String description, String content, String imageUrl) {
+        super(title, description, content, imageUrl);
+    }
+
+    @Override
+    protected Control createButton() {
+        createEnterMnemonicButton();
+        return enterMnemonicButton;
+    }
+
+    private void createEnterMnemonicButton() {
+        enterMnemonicButton = new SplitMenuButton();
+        enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT);
+        enterMnemonicButton.setText("Use 24 Words");
+        defaultWordSizeProperty = new SimpleIntegerProperty(24);
+        defaultWordSizeProperty.addListener((observable, oldValue, newValue) -> {
+            enterMnemonicButton.setText("Use " + newValue + " Words");
+        });
+        enterMnemonicButton.setOnAction(event -> {
+            enterMnemonic(defaultWordSizeProperty.get());
+        });
+        int[] numberWords = new int[] {24, 21, 18, 15, 12};
+        for(int i = 0; i < numberWords.length; i++) {
+            MenuItem item = new MenuItem("Use " + numberWords[i] + " Words");
+            final int words = numberWords[i];
+            item.setOnAction(event -> {
+                defaultWordSizeProperty.set(words);
+                enterMnemonic(words);
+            });
+            enterMnemonicButton.getItems().add(item);
+        }
+        enterMnemonicButton.getItems().add(new SeparatorMenuItem());
+        MenuItem scanItem = new MenuItem("Scan QR...");
+        scanItem.setOnAction(event -> {
+            scanQR();
+        });
+        enterMnemonicButton.getItems().add(scanItem);
+        enterMnemonicButton.managedProperty().bind(enterMnemonicButton.visibleProperty());
+    }
+
+    protected void scanQR() {
+        QRScanDialog qrScanDialog = new QRScanDialog();
+        Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
+        if(optionalResult.isPresent()) {
+            QRScanDialog.Result result = optionalResult.get();
+            if(result.seed != null) {
+                showWordList(result.seed);
+                Platform.runLater(() -> validLabel.requestFocus());
+            } else if(result.exception != null) {
+                log.error("Error scanning QR", result.exception);
+                showErrorDialog("Error scanning QR", result.exception.getMessage());
+            } else {
+                AppServices.showErrorDialog("Invalid QR Code", "Cannot parse QR code into a seed.");
+            }
+        }
+    }
+
+    protected void showWordList(DeterministicSeed seed) {
+        List<String> words = seed.getMnemonicCode();
+        setContent(getMnemonicWordsEntry(words.size()));
+        setExpanded(true);
+
+        for(int i = 0; i < wordsPane.getChildren().size(); i++) {
+            WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
+            wordEntry.getEditor().setText(words.get(i));
+            wordEntry.getEditor().setEditable(false);
+        }
+    }
+
+    protected void enterMnemonic(int numWords) {
+        setDescription("Generate new or enter existing");
+        showHideLink.setVisible(false);
+        setContent(getMnemonicWordsEntry(numWords));
+        setExpanded(true);
+    }
+
+    protected Node getMnemonicWordsEntry(int numWords) {
+        VBox vBox = new VBox();
+        vBox.setSpacing(10);
+
+        wordsPane = new TilePane();
+        wordsPane.setPrefRows(numWords/3);
+        wordsPane.setHgap(10);
+        wordsPane.setVgap(10);
+        wordsPane.setOrientation(Orientation.VERTICAL);
+
+        List<String> words = new ArrayList<>();
+        for(int i = 0; i < numWords; i++) {
+            words.add("");
+        }
+
+        ObservableList<String> wordEntryList = FXCollections.observableArrayList(words);
+        wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
+        List<WordEntry> wordEntries = new ArrayList<>(numWords);
+        for(int i = 0; i < numWords; i++) {
+            wordEntries.add(new WordEntry(i, wordEntryList));
+        }
+        for(int i = 0; i < numWords - 1; i++) {
+            wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
+            wordEntries.get(i).setNextField(wordEntries.get(i + 1).getEditor());
+        }
+        wordsPane.getChildren().addAll(wordEntries);
+
+        vBox.getChildren().add(wordsPane);
+
+        PassphraseEntry passphraseEntry = new PassphraseEntry();
+        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));
+
+        HBox leftBox = new HBox(10);
+        leftBox.getChildren().addAll(createLeftButtons());
+
+        buttonPane.getChildren().add(leftBox);
+        AnchorPane.setLeftAnchor(leftBox, 0.0);
+
+        validLabel = new Label("Valid checksum", getValidGlyph());
+        validLabel.setContentDisplay(ContentDisplay.LEFT);
+        validLabel.setGraphicTextGap(5.0);
+        validLabel.managedProperty().bind(validLabel.visibleProperty());
+        validLabel.setVisible(false);
+        buttonPane.getChildren().add(validLabel);
+        AnchorPane.setTopAnchor(validLabel, 5.0);
+        AnchorPane.setLeftAnchor(validLabel, 0.0);
+
+        invalidLabel = new Label("Invalid checksum", getInvalidGlyph());
+        invalidLabel.setContentDisplay(ContentDisplay.LEFT);
+        invalidLabel.setGraphicTextGap(5.0);
+        invalidLabel.managedProperty().bind(invalidLabel.visibleProperty());
+        invalidLabel.setVisible(false);
+        buttonPane.getChildren().add(invalidLabel);
+        AnchorPane.setTopAnchor(invalidLabel, 5.0);
+        AnchorPane.setLeftAnchor(invalidLabel, 0.0);
+
+        wordEntriesProperty.addListener((ListChangeListener<String>) c -> {
+            boolean empty = true;
+            boolean validWords = true;
+            boolean validChecksum = false;
+            for(String word : wordEntryList) {
+                if(!word.isEmpty()) {
+                    empty = false;
+                }
+
+                if(!WordEntry.isValid(word)) {
+                    validWords = false;
+                }
+            }
+
+            onWordChange(empty, validWords, validChecksum);
+        });
+
+        HBox rightBox = new HBox();
+        rightBox.setSpacing(10);
+        rightBox.getChildren().addAll(createRightButtons());
+
+        buttonPane.getChildren().add(rightBox);
+        AnchorPane.setRightAnchor(rightBox, 0.0);
+
+        vBox.getChildren().add(buttonPane);
+
+        Platform.runLater(() -> wordEntries.get(0).getEditor().requestFocus());
+
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().add(vBox);
+        return stackPane;
+    }
+
+    protected List<Node> createLeftButtons() {
+        return Collections.emptyList();
+    }
+
+    protected List<Node> createRightButtons() {
+        return Collections.emptyList();
+    }
+
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        //nothing by default
+    }
+
+    protected static class WordEntry extends HBox {
+        private static List<String> wordList;
+        private final TextField wordField;
+        private WordEntry nextEntry;
+        private TextField nextField;
+
+        public WordEntry(int wordNumber, ObservableList<String> wordEntryList) {
+            super();
+            setAlignment(Pos.CENTER_RIGHT);
+
+            setSpacing(10);
+            Label label = new Label((wordNumber+1) + ".");
+            label.setPrefWidth(22);
+            label.setAlignment(Pos.CENTER_RIGHT);
+            wordField = new TextField() {
+                @Override
+                public void paste() {
+                    Clipboard clipboard = Clipboard.getSystemClipboard();
+                    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) {
+                            if(entry.nextField != null) {
+                                entry.nextField.requestFocus();
+                            }
+
+                            entry.wordField.setText(word);
+                            entry = entry.nextEntry;
+                            if(entry == null) {
+                                break;
+                            }
+                        }
+                    } else {
+                        super.paste();
+                    }
+                }
+            };
+            wordField.setMaxWidth(100);
+            TextFormatter<?> formatter = new TextFormatter<>((TextFormatter.Change change) -> {
+                String text = change.getText();
+                // if text was added, fix the text to fit the requirements
+                if(!text.isEmpty()) {
+                    String newText = text.replace(" ", "").toLowerCase();
+                    int carretPos = change.getCaretPosition() - text.length() + newText.length();
+                    change.setText(newText);
+                    // fix caret position based on difference in originally added text and fixed text
+                    change.selectRange(carretPos, carretPos);
+                }
+                return change;
+            });
+            wordField.setTextFormatter(formatter);
+
+            wordList = Bip39MnemonicCode.INSTANCE.getWordList();
+            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList));
+            autoCompletionBinding.setDelay(50);
+            autoCompletionBinding.setOnAutoCompleted(event -> {
+                if(nextField != null) {
+                    nextField.requestFocus();
+                }
+            });
+
+            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))
+            ));
+
+            wordField.textProperty().addListener((observable, oldValue, newValue) -> {
+                wordEntryList.set(wordNumber, newValue);
+            });
+
+            this.getChildren().addAll(label, wordField);
+        }
+
+        public TextField getEditor() {
+            return wordField;
+        }
+
+        public void setNextEntry(WordEntry nextEntry) {
+            this.nextEntry = nextEntry;
+        }
+
+        public void setNextField(TextField field) {
+            this.nextField = field;
+        }
+
+        public static boolean isValid(String word) {
+            return wordList.contains(word);
+        }
+    }
+
+    protected static class WordlistSuggestionProvider implements Callback<AutoCompletionBinding.ISuggestionRequest, Collection<String>> {
+        private final List<String> wordList;
+
+        public WordlistSuggestionProvider(List<String> wordList) {
+            this.wordList = wordList;
+        }
+
+        @Override
+        public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
+            List<String> suggestions = new ArrayList<>();
+            if(!request.getUserText().isEmpty()) {
+                for(String word : wordList) {
+                    if(word.startsWith(request.getUserText())) {
+                        suggestions.add(word);
+                    }
+                }
+            }
+
+            return suggestions;
+        }
+    }
+
+    protected class PassphraseEntry extends HBox {
+        private final CustomTextField passphraseField;
+
+        public PassphraseEntry() {
+            super();
+
+            setAlignment(Pos.CENTER_LEFT);
+            setSpacing(10);
+            Label passphraseLabel = new Label("Passphrase:");
+            passphraseField = (CustomTextField) TextFields.createClearableTextField();
+            passphraseProperty.bind(passphraseField.textProperty());
+            passphraseField.setPromptText("Leave blank for none");
+
+            HelpLabel helpLabel = new HelpLabel();
+            helpLabel.setStyle("-fx-padding: 0 0 0 0");
+            helpLabel.setHelpText("A passphrase provides optional added security - it is not stored so it must be remembered!");
+
+            getChildren().addAll(passphraseLabel, passphraseField, helpLabel);
+        }
+
+        public TextField getEditor() {
+            return passphraseField;
+        }
+    }
+
+    public static Glyph getValidGlyph() {
+        Glyph validGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
+        validGlyph.getStyleClass().add("success");
+        validGlyph.setFontSize(12);
+        return validGlyph;
+    }
+
+    public static Glyph getInvalidGlyph() {
+        Glyph invalidGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+        invalidGlyph.getStyleClass().add("failure");
+        invalidGlyph.setFontSize(12);
+        return invalidGlyph;
+    }
+}

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

@@ -0,0 +1,220 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.policy.Policy;
+import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletImportEvent;
+import com.sparrowwallet.sparrow.io.ImportException;
+import com.sparrowwallet.sparrow.io.KeystoreMnemonicImport;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
+import javafx.collections.FXCollections;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.util.StringConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
+    private static final Logger log = LoggerFactory.getLogger(MnemonicWalletKeystoreImportPane.class);
+
+    private final KeystoreMnemonicImport importer;
+
+    private Button discoverButton;
+    private Button importButton;
+
+    public MnemonicWalletKeystoreImportPane(KeystoreMnemonicImport importer) {
+        super(importer.getName(), "Seed import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        this.importer = importer;
+    }
+
+    @Override
+    protected void enterMnemonic(int numWords) {
+        super.enterMnemonic(numWords);
+        setDescription("Enter word list");
+    }
+
+    @Override
+    protected List<Node> createRightButtons() {
+        discoverButton = new Button("Discover Wallet");
+        discoverButton.setDisable(true);
+        discoverButton.setDefaultButton(true);
+        discoverButton.managedProperty().bind(discoverButton.visibleProperty());
+        discoverButton.setOnAction(event -> {
+            discoverWallet();
+        });
+        discoverButton.managedProperty().bind(discoverButton.visibleProperty());
+        discoverButton.setTooltip(new Tooltip("Look for existing transactions from the provided word list"));
+        discoverButton.visibleProperty().bind(AppServices.onlineProperty());
+
+        importButton = new Button("Import Wallet");
+        importButton.setDisable(true);
+        importButton.managedProperty().bind(importButton.visibleProperty());
+        importButton.visibleProperty().bind(discoverButton.visibleProperty().not());
+        importButton.setOnAction(event -> {
+            setContent(getScriptTypeEntry());
+            setExpanded(true);
+        });
+
+        return List.of(discoverButton, importButton);
+    }
+
+    @Override
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        if(!empty && validWords) {
+            try {
+                importer.getKeystore(ScriptType.P2WPKH.getDefaultDerivation(), wordEntriesProperty.get(), passphraseProperty.get());
+                validChecksum = true;
+            } catch(ImportException e) {
+                if(e.getCause() instanceof MnemonicException.MnemonicTypeException) {
+                    invalidLabel.setText("Unsupported Electrum seed");
+                    invalidLabel.setTooltip(new Tooltip("Seeds created in Electrum do not follow the BIP39 standard. Import the Electrum wallet file directly."));
+                } else {
+                    invalidLabel.setText("Invalid checksum");
+                    invalidLabel.setTooltip(null);
+                }
+            }
+        }
+
+        discoverButton.setDisable(!validChecksum || !AppServices.isConnected());
+        importButton.setDisable(!validChecksum);
+        validLabel.setVisible(validChecksum);
+        invalidLabel.setVisible(!validChecksum && !empty);
+    }
+
+    private void discoverWallet() {
+        discoverButton.setDisable(true);
+        discoverButton.setMaxHeight(discoverButton.getHeight());
+        ProgressIndicator progressIndicator = new ProgressIndicator(0);
+        progressIndicator.getStyleClass().add("button-progress");
+        discoverButton.setGraphic(progressIndicator);
+        List<Wallet> wallets = new ArrayList<>();
+
+        List<List<ChildNumber>> derivations = ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE).stream().map(ScriptType::getDefaultDerivation).collect(Collectors.toList());
+        derivations.add(List.of(new ChildNumber(0, true)));
+
+        for(ScriptType scriptType : ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE)) {
+            for(List<ChildNumber> derivation : derivations) {
+                try {
+                    Wallet wallet = getWallet(scriptType, derivation);
+                    wallets.add(wallet);
+                } catch(ImportException e) {
+                    String errorMessage = e.getMessage();
+                    if(e.getCause() instanceof MnemonicException.MnemonicChecksumException) {
+                        errorMessage = "Invalid word list - checksum incorrect";
+                    } else if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                        errorMessage = e.getCause().getMessage();
+                    }
+                    setError("Import Error", errorMessage + ".");
+                    discoverButton.setDisable(!AppServices.isConnected());
+                }
+            }
+        }
+
+        ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(wallets);
+        progressIndicator.progressProperty().bind(walletDiscoveryService.progressProperty());
+        walletDiscoveryService.setOnSucceeded(successEvent -> {
+            discoverButton.setGraphic(null);
+            Optional<Wallet> optWallet = walletDiscoveryService.getValue();
+            if(optWallet.isPresent()) {
+                EventManager.get().post(new WalletImportEvent(optWallet.get()));
+            } else {
+                discoverButton.setDisable(false);
+                Optional<ButtonType> optButtonType = AppServices.showErrorDialog("No existing wallet found", "Could not find a wallet with existing transactions using this mnemonic. Import this wallet anyway?", ButtonType.NO, ButtonType.YES);
+                if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
+                    setContent(getScriptTypeEntry());
+                    setExpanded(true);
+                }
+            }
+        });
+        walletDiscoveryService.setOnFailed(failedEvent -> {
+            discoverButton.setGraphic(null);
+            log.error("Failed to discover wallets", failedEvent.getSource().getException());
+            setError("Failed to discover wallets", failedEvent.getSource().getException().getMessage());
+        });
+        walletDiscoveryService.start();
+    }
+
+    private Wallet getWallet(ScriptType scriptType, List<ChildNumber> derivation) throws ImportException {
+        Wallet wallet = new Wallet("");
+        wallet.setPolicyType(PolicyType.SINGLE);
+        wallet.setScriptType(scriptType);
+        Keystore keystore = importer.getKeystore(derivation, wordEntriesProperty.get(), passphraseProperty.get());
+        wallet.getKeystores().add(keystore);
+        wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, scriptType, wallet.getKeystores(), 1));
+        return wallet;
+    }
+
+    private Node getScriptTypeEntry() {
+        Label label = new Label("Script Type:");
+
+        HBox fieldBox = new HBox(5);
+        fieldBox.setAlignment(Pos.CENTER_RIGHT);
+        ComboBox<ScriptType> scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE)));
+        if(scriptTypeComboBox.getItems().contains(ScriptType.P2WPKH)) {
+            scriptTypeComboBox.setValue(ScriptType.P2WPKH);
+        }
+        scriptTypeComboBox.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(ScriptType scriptType) {
+                return scriptType == null ? "" : scriptType.getDescription();
+            }
+
+            @Override
+            public ScriptType fromString(String string) {
+                return null;
+            }
+        });
+        scriptTypeComboBox.setMaxWidth(170);
+
+        HelpLabel helpLabel = new HelpLabel();
+        helpLabel.setHelpText("P2WPKH is a Native Segwit type and is usually the best choice for new wallets.\nP2SH-P2WPKH is a Wrapped Segwit type and is a reasonable choice for the widest compatibility.\nP2PKH is a Legacy type and should be avoided for new wallets.\nFor existing wallets, be sure to choose the type that matches the wallet you are importing.");
+        fieldBox.getChildren().addAll(scriptTypeComboBox, helpLabel);
+
+        Region region = new Region();
+        HBox.setHgrow(region, Priority.SOMETIMES);
+
+        Button importMnemonicButton = new Button("Import");
+        importMnemonicButton.setOnAction(event -> {
+            showHideLink.setVisible(true);
+            setExpanded(false);
+            try {
+                ScriptType scriptType = scriptTypeComboBox.getValue();
+                Wallet wallet = getWallet(scriptType, scriptType.getDefaultDerivation());
+                EventManager.get().post(new WalletImportEvent(wallet));
+            } catch(ImportException e) {
+                log.error("Error importing mnemonic", e);
+                String errorMessage = e.getMessage();
+                if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                    errorMessage = e.getCause().getMessage();
+                }
+                setError("Import Error", errorMessage);
+                importButton.setDisable(false);
+            }
+        });
+
+        HBox contentBox = new HBox();
+        contentBox.setAlignment(Pos.CENTER_RIGHT);
+        contentBox.setSpacing(20);
+        contentBox.getChildren().addAll(label, fieldBox, region, importMnemonicButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPrefHeight(60);
+
+        return contentBox;
+    }
+}

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

@@ -0,0 +1,139 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.bip47.PaymentCode;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.paynym.PayNymService;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import javafx.scene.image.Image;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.shape.Circle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PayNymAvatar extends StackPane {
+    private static final Logger log = LoggerFactory.getLogger(PayNymAvatar.class);
+
+    private final ObjectProperty<PaymentCode> paymentCodeProperty = new SimpleObjectProperty<>(null);
+
+    private static final Map<String, Image> paymentCodeCache = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<String, Object> paymentCodeLoading = Collections.synchronizedMap(new HashMap<>());
+
+    public PayNymAvatar() {
+        super();
+
+        paymentCodeProperty.addListener((observable, oldValue, paymentCode) -> {
+            if(paymentCode == null) {
+                getChildren().clear();
+            } else if(Config.get().isUsePayNym() && (oldValue == null || !oldValue.toString().equals(paymentCode.toString()))) {
+                String cacheId = getCacheId(paymentCode, getPrefWidth());
+                if(paymentCodeCache.containsKey(cacheId)) {
+                    setImage(paymentCodeCache.get(cacheId));
+                } else if(AppServices.isConnected()) {
+                    PayNymAvatarService payNymAvatarService = new PayNymAvatarService(paymentCode, getPrefWidth());
+                    payNymAvatarService.setOnRunning(runningEvent -> {
+                        getChildren().clear();
+                    });
+                    payNymAvatarService.setOnSucceeded(successEvent -> {
+                        setImage(payNymAvatarService.getValue());
+                    });
+                    payNymAvatarService.setOnFailed(failedEvent -> {
+                        log.debug("Error loading PayNym avatar", failedEvent.getSource().getException());
+                    });
+                    payNymAvatarService.start();
+                }
+            }
+        });
+    }
+
+    private void setImage(Image image) {
+        getChildren().clear();
+        Circle circle = new Circle(getPrefWidth() / 2,getPrefHeight() / 2,getPrefWidth() / 2);
+        circle.setFill(new ImagePattern(image));
+        getChildren().add(circle);
+    }
+
+    public PaymentCode getPaymentCode() {
+        return paymentCodeProperty.get();
+    }
+
+    public ObjectProperty<PaymentCode> paymentCodeProperty() {
+        return paymentCodeProperty;
+    }
+
+    public void setPaymentCode(PaymentCode paymentCode) {
+        this.paymentCodeProperty.set(paymentCode);
+    }
+
+    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
+        setPaymentCode(PaymentCode.fromString(paymentCode.toString()));
+    }
+
+    public void clearPaymentCode() {
+        this.paymentCodeProperty.set(null);
+    }
+
+    private static String getCacheId(PaymentCode paymentCode, double width) {
+        return paymentCode.toString();
+    }
+
+    private static class PayNymAvatarService extends Service<Image> {
+        private final PaymentCode paymentCode;
+        private final double width;
+
+        public PayNymAvatarService(PaymentCode paymentCode, double width) {
+            this.paymentCode = paymentCode;
+            this.width = width;
+        }
+
+        @Override
+        protected Task<Image> createTask() {
+            return new Task<>() {
+                @Override
+                protected Image call() throws Exception {
+                    String paymentCodeStr = paymentCode.toString();
+                    String cacheId = getCacheId(paymentCode, width);
+
+                    Object lock = paymentCodeLoading.get(cacheId);
+                    if(lock != null) {
+                        synchronized(lock) {
+                            if(paymentCodeCache.containsKey(cacheId)) {
+                                return paymentCodeCache.get(cacheId);
+                            }
+                        }
+                    } else {
+                        lock = new Object();
+                        paymentCodeLoading.put(cacheId, lock);
+                    }
+
+                    synchronized(lock) {
+                        Proxy proxy = AppServices.getProxy();
+                        String url = PayNymService.getHostUrl(proxy != null) + "/" + paymentCodeStr + "/avatar";
+
+                        try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream())) {
+                            Image image = new Image(is, 150, 150, true, false);
+                            paymentCodeCache.put(cacheId, image);
+                            return image;
+                        } catch(Exception e) {
+                            log.debug("Error loading PayNym avatar", e);
+                            throw e;
+                        } finally {
+                            lock.notifyAll();
+                        }
+                    }
+                }
+            };
+        }
+    }
+}

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

@@ -0,0 +1,133 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletLabelChangedEvent;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.paynym.PayNym;
+import com.sparrowwallet.sparrow.paynym.PayNymController;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import org.controlsfx.glyphfont.Glyph;
+
+import java.util.Optional;
+
+public class PayNymCell extends ListCell<PayNym> {
+    private final PayNymController payNymController;
+    private final boolean contact;
+
+    public PayNymCell(PayNymController payNymController, boolean contact) {
+        super();
+        setAlignment(Pos.CENTER_LEFT);
+        setContentDisplay(ContentDisplay.LEFT);
+        getStyleClass().add("paynym-cell");
+        setPrefHeight(50);
+        this.payNymController = payNymController;
+        this.contact = contact;
+    }
+
+    @Override
+    protected void updateItem(PayNym payNym, boolean empty) {
+        super.updateItem(payNym, empty);
+
+        getStyleClass().remove("unlinked");
+
+        if(empty || payNym == null) {
+            setText(null);
+            setGraphic(null);
+        } else {
+            BorderPane pane = new BorderPane();
+            pane.setPadding(new Insets(5, 5,5, 5));
+
+            PayNymAvatar payNymAvatar = new PayNymAvatar();
+            payNymAvatar.setPrefWidth(30);
+            payNymAvatar.setPrefHeight(30);
+            payNymAvatar.setPaymentCode(payNym.paymentCode());
+
+            HBox labelBox = new HBox();
+            labelBox.setAlignment(Pos.CENTER);
+            Label label = new Label(payNym.nymName(), payNymAvatar);
+            label.setGraphicTextGap(10);
+            labelBox.getChildren().add(label);
+            pane.setLeft(labelBox);
+
+            if(getListView().getUserData() == Boolean.TRUE || (!contact && payNymController != null && payNymController.isFollowing(payNym) == Boolean.FALSE)) {
+                HBox hBox = new HBox();
+                hBox.setAlignment(Pos.CENTER);
+                Button button = new Button("Add Contact");
+                hBox.getChildren().add(button);
+                pane.setRight(hBox);
+                button.setOnAction(event -> {
+                    button.setDisable(true);
+                    payNymController.followPayNym(payNym.paymentCode());
+                });
+            } else if(contact && payNymController != null) {
+                HBox hBox = new HBox();
+                hBox.setAlignment(Pos.CENTER);
+                pane.setRight(hBox);
+
+                if(payNymController.isLinked(payNym)) {
+                    Label linkedLabel = new Label("Linked", getLinkGlyph());
+                    linkedLabel.setTooltip(new Tooltip("You can send non-collaboratively to this contact."));
+                    hBox.getChildren().add(linkedLabel);
+                } else {
+                    Button linkButton = new Button("Link Contact", getLinkGlyph());
+                    linkButton.setTooltip(new Tooltip("Create a transaction that will enable you to send non-collaboratively to this contact."));
+                    hBox.getChildren().add(linkButton);
+                    linkButton.setOnAction(event -> {
+                        linkButton.setDisable(true);
+                        payNymController.linkPayNym(payNym);
+                    });
+
+                    if(payNymController.isSelectLinkedOnly()) {
+                        getStyleClass().add("unlinked");
+                    }
+                }
+            }
+
+            setText(null);
+            setGraphic(pane);
+
+            if(contact && payNymController != null && payNymController.isLinked(payNym)) {
+                setContextMenu(new PayNymCellContextMenu(payNym));
+            } else {
+                setContextMenu(null);
+            }
+        }
+    }
+
+    public static Glyph getLinkGlyph() {
+        Glyph failGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LINK);
+        failGlyph.setFontSize(12);
+        return failGlyph;
+    }
+
+    private class PayNymCellContextMenu extends ContextMenu {
+        public PayNymCellContextMenu(PayNym payNym) {
+            MenuItem rename = new MenuItem("Rename Contact...");
+            rename.setOnAction(event -> {
+                WalletLabelDialog walletLabelDialog = new WalletLabelDialog(payNym.nymName(), "Contact");
+                Optional<String> optLabel = walletLabelDialog.showAndWait();
+                if(optLabel.isPresent()) {
+                    int index = getListView().getItems().indexOf(payNym);
+                    for(Wallet childWallet : payNymController.getMasterWallet().getChildWallets()) {
+                        if(childWallet.isBip47()
+                                && childWallet.getKeystores().get(0).getExternalPaymentCode().equals(payNym.paymentCode())
+                                && (childWallet.getLabel() == null || childWallet.getLabel().startsWith(payNym.nymName()))) {
+                            childWallet.setLabel(optLabel.get() + " " + childWallet.getScriptType().getName());
+                            EventManager.get().post(new WalletLabelChangedEvent(childWallet));
+                        }
+                    }
+
+                    payNymController.updateFollowing();
+                    getListView().getSelectionModel().select(index);
+                }
+            });
+
+            getItems().add(rename);
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.bip47.PaymentCode;
+
+public class PaymentCodeTextField extends CopyableTextField {
+    private String paymentCodeStr;
+
+    public void setPaymentCode(PaymentCode paymentCode) {
+        this.paymentCodeStr = paymentCode.toString();
+        setPaymentCodeString();
+    }
+
+    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
+        this.paymentCodeStr = paymentCode.toString();
+        setPaymentCodeString();
+    }
+
+    private void setPaymentCodeString() {
+        String abbrevPcode = paymentCodeStr.substring(0, 12) + "..." + paymentCodeStr.substring(paymentCodeStr.length() - 5);
+        setText(abbrevPcode);
+    }
+
+    @Override
+    protected String getCopyText() {
+        return paymentCodeStr;
+    }
+}

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

@@ -0,0 +1,345 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.io.Files;
+import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.address.InvalidAddressException;
+import com.sparrowwallet.drongo.crypto.DumpedPrivateKey;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.protocol.*;
+import com.sparrowwallet.drongo.psbt.PSBT;
+import com.sparrowwallet.drongo.psbt.PSBTInput;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import javafx.util.StringConverter;
+import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import tornadofx.control.Field;
+import tornadofx.control.Fieldset;
+import tornadofx.control.Form;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static com.sparrowwallet.drongo.protocol.ScriptType.P2TR;
+
+public class PrivateKeySweepDialog extends Dialog<Transaction> {
+    private static final Logger log = LoggerFactory.getLogger(PrivateKeySweepDialog.class);
+
+    private final TextArea key;
+    private final ComboBox<ScriptType> keyScriptType;
+    private final CopyableLabel keyAddress;
+    private final ComboBoxTextField toAddress;
+    private final ComboBox<Wallet> toWallet;
+
+    public PrivateKeySweepDialog(Wallet wallet) {
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.setHeaderText("Sweep Private Key");
+
+        Image image = new Image("image/seed.png", 50, 50, false, false);
+        if(!image.isError()) {
+            ImageView imageView = new ImageView();
+            imageView.setSmooth(false);
+            imageView.setImage(image);
+            dialogPane.setGraphic(imageView);
+        }
+
+        Form form = new Form();
+        Fieldset fieldset = new Fieldset();
+        fieldset.setText("");
+        fieldset.setSpacing(10);
+
+        Field keyField = new Field();
+        keyField.setText("Private Key:");
+        key = new TextArea();
+        key.setWrapText(true);
+        key.setPromptText("Wallet Import Format (WIF)");
+        key.setPrefRowCount(2);
+        key.getStyleClass().add("fixed-width");
+        HBox keyBox = new HBox(5);
+        VBox keyButtonBox = new VBox(5);
+        Button scanKey = new Button("", getGlyph(FontAwesome5.Glyph.CAMERA));
+        scanKey.setOnAction(event -> scanPrivateKey());
+        Button readKey = new Button("", getGlyph(FontAwesome5.Glyph.FILE_IMPORT));
+        readKey.setOnAction(event -> readPrivateKey());
+        keyButtonBox.getChildren().addAll(scanKey, readKey);
+        keyBox.getChildren().addAll(key, keyButtonBox);
+        HBox.setHgrow(key, Priority.ALWAYS);
+        keyField.getInputs().add(keyBox);
+
+        Field keyScriptTypeField = new Field();
+        keyScriptTypeField.setText("Script Type:");
+        keyScriptType = new ComboBox<>();
+        keyScriptType.setItems(FXCollections.observableList(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE)));
+        keyScriptTypeField.getInputs().add(keyScriptType);
+
+        keyScriptType.setConverter(new StringConverter<ScriptType>() {
+            @Override
+            public String toString(ScriptType scriptType) {
+                return scriptType == null ? "" : scriptType.getDescription();
+            }
+
+            @Override
+            public ScriptType fromString(String string) {
+                return null;
+            }
+        });
+
+        Field addressField = new Field();
+        addressField.setText("Address:");
+        keyAddress = new CopyableLabel();
+        keyAddress.getStyleClass().add("fixed-width");
+        addressField.getInputs().add(keyAddress);
+
+        Field toAddressField = new Field();
+        toAddressField.setText("Sweep to:");
+        toAddress = new ComboBoxTextField();
+        toAddress.getStyleClass().add("fixed-width");
+        toWallet = new ComboBox<>();
+        toWallet.setItems(FXCollections.observableList(AppServices.get().getOpenWallets().keySet().stream()
+                .filter(w -> !w.isWhirlpoolChildWallet() && !w.isBip47()).collect(Collectors.toList())));
+        toAddress.setComboProperty(toWallet);
+        toWallet.prefWidthProperty().bind(toAddress.widthProperty());
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().addAll(toWallet, toAddress);
+        toAddressField.getInputs().add(stackPane);
+
+        fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField);
+        form.getChildren().add(fieldset);
+        dialogPane.setContent(form);
+
+        ButtonType createButtonType = new javafx.scene.control.ButtonType("Create Transaction", ButtonBar.ButtonData.APPLY);
+        ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+
+        dialogPane.getButtonTypes().addAll(cancelButtonType, createButtonType);
+
+        Button createButton = (Button) dialogPane.lookupButton(createButtonType);
+        createButton.setDefaultButton(true);
+        createButton.setDisable(true);
+        createButton.addEventFilter(ActionEvent.ACTION, event -> {
+            createTransaction();
+            event.consume();
+        });
+
+        key.textProperty().addListener((observable, oldValue, newValue) -> {
+            boolean isValidKey = isValidKey();
+            createButton.setDisable(!isValidKey || !isValidToAddress());
+            if(isValidKey) {
+                setFromAddress();
+            }
+        });
+
+        keyScriptType.valueProperty().addListener((observable, oldValue, newValue) -> {
+            if(isValidKey()) {
+                setFromAddress();
+            }
+        });
+
+        toAddress.textProperty().addListener((observable, oldValue, newValue) -> {
+            createButton.setDisable(!isValidKey() || !isValidToAddress());
+        });
+
+        toWallet.valueProperty().addListener((observable, oldValue, selectedWallet) -> {
+            if(selectedWallet != null) {
+                toAddress.setText(selectedWallet.getFreshNode(KeyPurpose.RECEIVE).getAddress().toString());
+            }
+        });
+
+        keyScriptType.setValue(ScriptType.P2PKH);
+        if(wallet != null) {
+            toAddress.setText(wallet.getFreshNode(KeyPurpose.RECEIVE).getAddress().toString());
+        }
+
+        AppServices.onEscapePressed(dialogPane.getScene(), () -> setResult(null));
+        AppServices.moveToActiveWindowScreen(this);
+        setResultConverter(dialogButton -> null);
+        dialogPane.setPrefWidth(680);
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        Platform.runLater(() -> {
+            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+            validationSupport.registerValidator(key, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid private Key", !key.getText().isEmpty() && !isValidKey()));
+            validationSupport.registerValidator(toAddress, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid address", !toAddress.getText().isEmpty() && !isValidToAddress()));
+        });
+    }
+
+    private boolean isValidKey() {
+        try {
+            DumpedPrivateKey privateKey = getPrivateKey();
+            return true;
+        } catch(Exception e) {
+            return false;
+        }
+    }
+
+    private DumpedPrivateKey getPrivateKey() {
+        return DumpedPrivateKey.fromBase58(key.getText());
+    }
+
+    private boolean isValidToAddress() {
+        try {
+            Address address = getToAddress();
+            return true;
+        } catch (InvalidAddressException e) {
+            return false;
+        }
+    }
+
+    private Address getToAddress() throws InvalidAddressException {
+        return Address.fromString(toAddress.getText());
+    }
+
+    private void setFromAddress() {
+        DumpedPrivateKey privateKey = getPrivateKey();
+        ScriptType scriptType = keyScriptType.getValue();
+        Address address = scriptType.getAddress(privateKey.getKey());
+        keyAddress.setText(address.toString());
+    }
+
+    private void scanPrivateKey() {
+        QRScanDialog qrScanDialog = new QRScanDialog();
+        Optional<QRScanDialog.Result> result = qrScanDialog.showAndWait();
+        if(result.isPresent() && result.get().payload != null) {
+            key.setText(result.get().payload);
+        }
+    }
+
+    private void readPrivateKey() {
+        Stage window = new Stage();
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Open Private Key File");
+
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showOpenDialog(window);
+        if(file != null) {
+            if(file.length() > 1024) {
+                AppServices.showErrorDialog("Invalid private key file", "This file does not contain a valid private key.");
+                return;
+            }
+
+            try {
+                key.setText(Files.asCharSource(file, StandardCharsets.UTF_8).read().trim());
+            } catch(IOException e) {
+                AppServices.showErrorDialog("Error reading private key file", e.getMessage());
+            }
+        }
+    }
+
+    private void createTransaction() {
+        try {
+            DumpedPrivateKey privateKey = getPrivateKey();
+            ScriptType scriptType = keyScriptType.getValue();
+            Address fromAddress = scriptType.getAddress(privateKey.getKey());
+            Address destAddress = getToAddress();
+
+            ElectrumServer.AddressUtxosService addressUtxosService = new ElectrumServer.AddressUtxosService(fromAddress);
+            addressUtxosService.setOnSucceeded(successEvent -> {
+                createTransaction(privateKey.getKey(), scriptType, addressUtxosService.getValue(), destAddress);
+            });
+            addressUtxosService.setOnFailed(failedEvent -> {
+                log.error("Error retrieving outputs for address " + fromAddress, failedEvent.getSource().getException());
+                AppServices.showErrorDialog("Error retrieving outputs for address", failedEvent.getSource().getException().getMessage());
+            });
+            addressUtxosService.start();
+        } catch(Exception e) {
+            log.error("Error creating sweep transaction", e);
+        }
+    }
+
+    private void createTransaction(ECKey privKey, ScriptType scriptType, List<TransactionOutput> txOutputs, Address destAddress) {
+        ECKey pubKey = ECKey.fromPublicOnly(privKey);
+
+        Transaction noFeeTransaction = new Transaction();
+        long total = 0;
+        for(TransactionOutput txOutput : txOutputs) {
+            scriptType.addSpendingInput(noFeeTransaction, txOutput, pubKey, TransactionSignature.dummy(scriptType == P2TR ? TransactionSignature.Type.SCHNORR : TransactionSignature.Type.ECDSA));
+            total += txOutput.getValue();
+        }
+
+        TransactionOutput sweepOutput = new TransactionOutput(noFeeTransaction, total, destAddress.getOutputScript());
+        noFeeTransaction.addOutput(sweepOutput);
+
+        Double feeRate = AppServices.getDefaultFeeRate();
+        long fee = (long)Math.ceil(noFeeTransaction.getVirtualSize() * feeRate);
+        if(feeRate == Transaction.DEFAULT_MIN_RELAY_FEE) {
+            fee++;
+        }
+
+        long dustThreshold = destAddress.getScriptType().getDustThreshold(sweepOutput, Transaction.DUST_RELAY_TX_FEE);
+        if(total - fee <= dustThreshold) {
+            AppServices.showErrorDialog("Insufficient funds", "The unspent outputs for this private key contain insufficient funds to spend (" + total + " sats).");
+            return;
+        }
+
+        Transaction transaction = new Transaction();
+        transaction.setVersion(2);
+        transaction.setLocktime(AppServices.getCurrentBlockHeight() == null ? 0 : AppServices.getCurrentBlockHeight());
+        for(TransactionInput txInput : noFeeTransaction.getInputs()) {
+            transaction.addInput(txInput);
+        }
+        transaction.addOutput(new TransactionOutput(transaction, total - fee, destAddress.getOutputScript()));
+
+        PSBT psbt = new PSBT(transaction);
+        for(int i = 0; i < txOutputs.size(); i++) {
+            TransactionOutput utxoOutput = txOutputs.get(i);
+            TransactionInput txInput = transaction.getInputs().get(i);
+            PSBTInput psbtInput = psbt.getPsbtInputs().get(i);
+            psbtInput.setWitnessUtxo(utxoOutput);
+
+            if(ScriptType.P2SH.isScriptType(utxoOutput.getScript())) {
+                psbtInput.setRedeemScript(txInput.getScriptSig().getFirstNestedScript());
+            }
+
+            if(txInput.getWitness() != null) {
+                psbtInput.setWitnessScript(txInput.getWitness().getWitnessScript());
+            }
+
+            if(!psbtInput.sign(scriptType.getOutputKey(privKey))) {
+                AppServices.showErrorDialog("Failed to sign", "Failed to sign for transaction output " + utxoOutput.getHash() + ":" + utxoOutput.getIndex());
+                return;
+            }
+
+            TransactionSignature signature = psbtInput.isTaproot() ? psbtInput.getTapKeyPathSignature() : psbtInput.getPartialSignature(pubKey);
+
+            Transaction finalizeTransaction = new Transaction();
+            TransactionInput finalizedTxInput = scriptType.addSpendingInput(finalizeTransaction, utxoOutput, pubKey, signature);
+            psbtInput.setFinalScriptSig(finalizedTxInput.getScriptSig());
+            psbtInput.setFinalScriptWitness(finalizedTxInput.getWitness());
+        }
+
+        setResult(psbt.extractTransaction());
+    }
+
+    public Glyph getGlyph(FontAwesome5.Glyph glyphEnum) {
+        Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphEnum);
+        glyph.setFontSize(12);
+        return glyph;
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.control.ProgressIndicator;
+import javafx.util.Duration;
+
+public class ProgressTimer extends ProgressIndicator {
+    private final IntegerProperty secondsProperty = new SimpleIntegerProperty(60);
+
+    private Timeline timeline;
+
+    public ProgressTimer() {
+        super(0);
+        getStyleClass().add("progress-timer");
+    }
+
+    public void start() {
+        start(e -> {});
+    }
+
+    public void start(EventHandler<ActionEvent> onFinished) {
+        getStyleClass().remove("warn");
+        timeline = new Timeline(
+                new KeyFrame(Duration.ZERO, new KeyValue(progressProperty(), 0)),
+                new KeyFrame(Duration.seconds(getSeconds() * 0.8), e -> getStyleClass().add("warn")),
+                new KeyFrame(Duration.seconds(getSeconds()), onFinished, new KeyValue(progressProperty(), 1)));
+        timeline.setCycleCount(1);
+        timeline.play();
+    }
+
+    public void stop() {
+        if(timeline != null) {
+            timeline.stop();
+        }
+    }
+
+    public int getSeconds() {
+        return secondsProperty.get();
+    }
+
+    public IntegerProperty secondsProperty() {
+        return secondsProperty;
+    }
+
+    public void setSeconds(int secondsProperty) {
+        this.secondsProperty.set(secondsProperty);
+    }
+}

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

@@ -137,7 +137,7 @@ public class QRDisplayDialog extends Dialog<UR> {
         }
     }
 
-    private Image getQrCode(String fragment) {
+    protected Image getQrCode(String fragment) {
         try {
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
             BitMatrix qrMatrix = qrCodeWriter.encode(fragment, BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT);

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

@@ -16,7 +16,8 @@ import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
-import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.SeedQR;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.hummingbird.LegacyURDecoder;
 import com.sparrowwallet.hummingbird.registry.*;
@@ -255,6 +256,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 BitcoinURI bitcoinURI;
                 Address address;
                 ExtendedKey extendedKey;
+                DeterministicSeed seed;
                 try {
                     extendedKey = ExtendedKey.fromDescriptor(qrtext);
                     result = new Result(extendedKey);
@@ -332,6 +334,22 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     //Ignore, not parseable as base43 decoded bytes
                 }
 
+                try {
+                    seed = SeedQR.getSeed(qrtext);
+                    result = new Result(seed);
+                    return;
+                } catch(Exception e) {
+                    //Ignore, not parseable as a SeedQR
+                }
+
+                try {
+                    seed = SeedQR.getSeed(qrResult.getRawBytes());
+                    result = new Result(seed);
+                    return;
+                } catch(Exception e) {
+                    //Ignore, not parseable as a CompactSeedQR
+                }
+
                 result = new Result(qrtext);
             }
         }
@@ -399,6 +417,14 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     CryptoAccount cryptoAccount = (CryptoAccount)ur.decodeFromRegistry();
                     List<Wallet> wallets = getWallets(cryptoAccount);
                     return new Result(wallets);
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_SEED)) {
+                    CryptoSeed cryptoSeed = (CryptoSeed)ur.decodeFromRegistry();
+                    DeterministicSeed seed = getSeed(cryptoSeed);
+                    return new Result(seed);
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_BIP39)) {
+                    CryptoBip39 cryptoBip39 = (CryptoBip39)ur.decodeFromRegistry();
+                    DeterministicSeed seed = getSeed(cryptoBip39);
+                    return new Result(seed);
                 } else {
                     log.error("Unsupported UR type " + urRegistryType);
                     return new Result(new URException("UR type " + urRegistryType + " is not supported"));
@@ -479,18 +505,8 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             List<Wallet> wallets = new ArrayList<>();
             String masterFingerprint = Utils.bytesToHex(cryptoAccount.getMasterFingerprint());
             for(CryptoOutput cryptoOutput : cryptoAccount.getOutputDescriptors()) {
-                Wallet wallet = new Wallet();
                 OutputDescriptor outputDescriptor = getOutputDescriptor(cryptoOutput);
-                if(outputDescriptor.isMultisig()) {
-                    throw new IllegalStateException("Multisig output descriptors are unsupported in CryptoAccount");
-                }
-
-                ExtendedKey extendedKey = outputDescriptor.getSingletonExtendedPublicKey();
-                wallet.setScriptType(outputDescriptor.getScriptType());
-                Keystore keystore = new Keystore();
-                keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, KeyDerivation.writePath(outputDescriptor.getKeyDerivation(extendedKey).getDerivation())));
-                keystore.setExtendedPublicKey(extendedKey);
-                wallet.getKeystores().add(keystore);
+                Wallet wallet = outputDescriptor.toKeystoreWallet(masterFingerprint);
                 wallets.add(wallet);
             }
 
@@ -499,7 +515,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
         private ScriptType getScriptType(List<ScriptExpression> scriptExpressions) {
             List<ScriptExpression> expressions = new ArrayList<>(scriptExpressions);
-            if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG) {
+            if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG
+                    || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG
+                    || expressions.get(expressions.size() - 1) == ScriptExpression.COSIGNER) {
                 expressions.remove(expressions.size() - 1);
             }
 
@@ -515,6 +533,8 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 return ScriptType.P2SH_P2WSH;
             } else if(List.of(ScriptExpression.WITNESS_SCRIPT_HASH).equals(expressions)) {
                 return ScriptType.P2WSH;
+            } else if(List.of(ScriptExpression.TAPROOT).equals(expressions)) {
+                return ScriptType.P2TR;
             }
 
             throw new IllegalArgumentException("Unknown script of " + expressions);
@@ -527,6 +547,14 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
             return null;
         }
+
+        private DeterministicSeed getSeed(CryptoSeed cryptoSeed) {
+            return new DeterministicSeed(cryptoSeed.getSeed(), null, cryptoSeed.getBirthdate() == null ? System.currentTimeMillis() : cryptoSeed.getBirthdate().getTime());
+        }
+
+        private DeterministicSeed getSeed(CryptoBip39 cryptoBip39) {
+            return new DeterministicSeed(cryptoBip39.getWords(), null, System.currentTimeMillis(), DeterministicSeed.Type.BIP39);
+        }
     }
 
     private class QRScanListener implements WebcamListener {
@@ -630,6 +658,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
         public final ExtendedKey extendedKey;
         public final OutputDescriptor outputDescriptor;
         public final List<Wallet> wallets;
+        public final DeterministicSeed seed;
         public final String payload;
         public final Throwable exception;
 
@@ -640,6 +669,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -651,6 +681,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -662,6 +693,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -673,6 +705,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -684,6 +717,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = extendedKey;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -695,6 +729,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = outputDescriptor;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -706,6 +741,19 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = null;
             this.wallets = wallets;
+            this.seed = null;
+            this.payload = null;
+            this.exception = null;
+        }
+
+        public Result(DeterministicSeed seed) {
+            this.transaction = null;
+            this.psbt = null;
+            this.uri = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.seed = seed;
             this.payload = null;
             this.exception = null;
         }
@@ -717,6 +765,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = payload;
             this.exception = null;
         }
@@ -728,6 +777,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.extendedKey = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = exception;
         }

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

@@ -0,0 +1,251 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.wallet.*;
+import javafx.application.Platform;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.ListChangeListener;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.VBox;
+import org.controlsfx.control.textfield.TextFields;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import tornadofx.control.Field;
+import tornadofx.control.Fieldset;
+import tornadofx.control.Form;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SearchWalletDialog extends Dialog<Entry> {
+    private static final Logger log = LoggerFactory.getLogger(SearchWalletDialog.class);
+
+    private final List<WalletForm> walletForms;
+    private final TextField search;
+    private final CoinTreeTable results;
+
+    public SearchWalletDialog(List<WalletForm> walletForms) {
+        this.walletForms = walletForms;
+
+        if(walletForms.isEmpty()) {
+            throw new IllegalArgumentException("No wallets selected to search");
+        }
+
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("search.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.setHeaderText("Search Wallet");
+
+        Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
+        if(!image.isError()) {
+            ImageView imageView = new ImageView();
+            imageView.setSmooth(false);
+            imageView.setImage(image);
+            dialogPane.setGraphic(imageView);
+        }
+
+        VBox vBox = new VBox();
+        vBox.setSpacing(20);
+
+        Form form = new Form();
+        Fieldset fieldset = new Fieldset();
+        fieldset.setText("");
+        fieldset.setSpacing(10);
+
+        Field searchField = new Field();
+        searchField.setText("Search:");
+        search = TextFields.createClearableTextField();
+        search.setPromptText("Label, address, value or transaction ID");
+        searchField.getInputs().add(search);
+
+        fieldset.getChildren().addAll(searchField);
+        form.getChildren().add(fieldset);
+
+        boolean showWallet = walletForms.size() > 1 || walletForms.stream().anyMatch(walletForm -> !walletForm.getNestedWalletForms().isEmpty());
+
+        results = new CoinTreeTable();
+        results.setShowRoot(false);
+        results.setPrefWidth(showWallet ? 950 : 850);
+        results.setBitcoinUnit(walletForms.iterator().next().getWallet());
+        results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
+        results.setPlaceholder(new Label("No results"));
+
+        if(showWallet) {
+            TreeTableColumn<Entry, String> walletColumn = new TreeTableColumn<>("Wallet");
+            walletColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
+                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getDisplayName());
+            });
+            results.getColumns().add(walletColumn);
+        }
+
+        TreeTableColumn<Entry, String> typeColumn = new TreeTableColumn<>("Type");
+        typeColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
+            return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getEntryType());
+        });
+        results.getColumns().add(typeColumn);
+
+        TreeTableColumn<Entry, Entry> entryCol = new TreeTableColumn<>("Date / Address / Output");
+        entryCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Entry> param) -> {
+            return new ReadOnlyObjectWrapper<>(param.getValue().getValue());
+        });
+        entryCol.setCellFactory(p -> new SearchEntryCell());
+        String address = walletForms.iterator().next().getNodeEntry(KeyPurpose.RECEIVE).getAddress().toString();
+        entryCol.setMinWidth(TextUtils.computeTextWidth(AppServices.getMonospaceFont(), address, 0.0));
+        results.getColumns().add(entryCol);
+
+        TreeTableColumn<Entry, String> labelCol = new TreeTableColumn<>("Label");
+        labelCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
+            return param.getValue().getValue().labelProperty();
+        });
+        labelCol.setCellFactory(p -> new SearchLabelCell());
+        results.getColumns().add(labelCol);
+
+        TreeTableColumn<Entry, Number> amountCol = new TreeTableColumn<>("Value");
+        amountCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
+            return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getValue());
+        });
+        amountCol.setCellFactory(p -> new CoinCell());
+        results.getColumns().add(amountCol);
+
+        vBox.getChildren().addAll(form, results);
+        dialogPane.setContent(vBox);
+
+        ButtonType showButtonType = new javafx.scene.control.ButtonType("Show", ButtonBar.ButtonData.APPLY);
+        ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+
+        dialogPane.getButtonTypes().addAll(cancelButtonType, showButtonType);
+
+        Button showButton = (Button) dialogPane.lookupButton(showButtonType);
+        showButton.setDefaultButton(true);
+        showButton.setDisable(true);
+
+        setResultConverter(buttonType -> buttonType == showButtonType ? results.getSelectionModel().getSelectedItem().getValue() : null);
+
+        results.getSelectionModel().getSelectedIndices().addListener((ListChangeListener<Integer>) c -> {
+            showButton.setDisable(results.getSelectionModel().getSelectedCells().isEmpty()
+                    || walletForms.stream().map(WalletForm::getWallet).noneMatch(wallet -> wallet == results.getSelectionModel().getSelectedItem().getValue().getWallet()));
+        });
+
+        search.textProperty().addListener((observable, oldValue, newValue) -> {
+            searchWallet(newValue.toLowerCase());
+        });
+
+        setResizable(true);
+
+        Platform.runLater(search::requestFocus);
+    }
+
+    private void searchWallet(String searchText) {
+        List<Entry> matchingEntries = new ArrayList<>();
+
+        if(!searchText.isEmpty()) {
+            Long searchValue = null;
+
+            try {
+                searchValue = Math.abs(Long.parseLong(searchText));
+            } catch(NumberFormatException e) {
+                //ignore
+            }
+
+            for(WalletForm walletForm : walletForms) {
+                WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
+                for(Entry entry : walletTransactionsEntry.getChildren()) {
+                    if(entry instanceof TransactionEntry transactionEntry) {
+                        if(transactionEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
+                                (transactionEntry.getLabel() != null && transactionEntry.getLabel().toLowerCase().contains(searchText)) ||
+                                (transactionEntry.getValue() != null && searchValue != null && Math.abs(transactionEntry.getValue()) == searchValue)) {
+                            matchingEntries.add(entry);
+                        }
+                    }
+                }
+
+                for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
+                    NodeEntry purposeEntry = walletForm.getNodeEntry(keyPurpose);
+                    for(Entry entry : purposeEntry.getChildren()) {
+                        if(entry instanceof NodeEntry nodeEntry) {
+                            if(nodeEntry.getAddress().toString().contains(searchText) ||
+                                    (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase().contains(searchText)) ||
+                                    (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
+                                matchingEntries.add(entry);
+                            }
+                        }
+                    }
+                }
+
+                for(WalletForm nestedWalletForm : walletForm.getNestedWalletForms()) {
+                    for(KeyPurpose keyPurpose : nestedWalletForm.getWallet().getWalletKeyPurposes()) {
+                        NodeEntry purposeEntry = nestedWalletForm.getNodeEntry(keyPurpose);
+                        for(Entry entry : purposeEntry.getChildren()) {
+                            if(entry instanceof NodeEntry nodeEntry) {
+                                if(nodeEntry.getAddress().toString().contains(searchText) ||
+                                        (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase().contains(searchText)) ||
+                                        (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
+                                    matchingEntries.add(entry);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                WalletUtxosEntry walletUtxosEntry = walletForm.getWalletUtxosEntry();
+                for(Entry entry : walletUtxosEntry.getChildren()) {
+                    if(entry instanceof HashIndexEntry hashIndexEntry) {
+                        if(hashIndexEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
+                                (hashIndexEntry.getLabel() != null && hashIndexEntry.getLabel().toLowerCase().contains(searchText)) ||
+                                (hashIndexEntry.getValue() != null && searchValue != null && Math.abs(hashIndexEntry.getValue()) == searchValue)) {
+                            matchingEntries.add(entry);
+                        }
+                    }
+                }
+            }
+        }
+
+        SearchWalletEntry rootEntry = new SearchWalletEntry(walletForms.iterator().next().getWallet(), matchingEntries);
+        RecursiveTreeItem<Entry> rootItem = new RecursiveTreeItem<>(rootEntry, Entry::getChildren);
+        results.setRoot(rootItem);
+    }
+
+    private static class SearchWalletEntry extends Entry {
+        public SearchWalletEntry(Wallet wallet, List<Entry> entries) {
+            super(wallet, wallet.getName(), entries);
+        }
+
+        @Override
+        public Long getValue() {
+            return 0L;
+        }
+
+        @Override
+        public String getEntryType() {
+            return "Search Wallet Results";
+        }
+
+        @Override
+        public Function getWalletFunction() {
+            return null;
+        }
+    }
+
+    private static class SearchEntryCell extends EntryCell {
+        @Override
+        protected void updateItem(Entry entry, boolean empty) {
+            super.updateItem(entry, empty);
+            setContextMenu(null);
+        }
+    }
+
+    private static class SearchLabelCell extends LabelCell {
+        @Override
+        public void updateItem(String label, boolean empty) {
+            super.updateItem(label, empty);
+            setContextMenu(null);
+        }
+    }
+}

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

@@ -33,7 +33,7 @@ public class SeedDisplayDialog extends Dialog<Void> {
         Accordion keystoreAccordion = new Accordion();
         scrollPane.setContent(keystoreAccordion);
 
-        MnemonicKeystoreImportPane keystorePane = new MnemonicKeystoreImportPane(decryptedKeystore);
+        MnemonicKeystoreDisplayPane keystorePane = new MnemonicKeystoreDisplayPane(decryptedKeystore);
         keystorePane.setAnimated(false);
         keystoreAccordion.getPanes().add(keystorePane);
 

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

@@ -14,6 +14,7 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.Clipboard;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
 import javafx.util.StringConverter;
@@ -47,7 +48,19 @@ public class SendToManyDialog extends Dialog<List<Payment>> {
         List<Payment> initialPayments = IntStream.range(0, 100).mapToObj(i -> new Payment(null, null, -1, false)).collect(Collectors.toList());
         Grid grid = getGrid(initialPayments);
 
-        spreadsheetView = new SpreadsheetView(grid);
+        spreadsheetView = new SpreadsheetView(grid) {
+            @Override
+            public void pasteClipboard() {
+                final Clipboard clipboard = Clipboard.getSystemClipboard();
+                if(clipboard.hasString()) {
+                    final TablePosition<?,?> tp = getSelectionModel().getFocusedCell();
+                    SpreadsheetCell cell = getGrid().getRows().get(tp.getRow()).get(tp.getColumn());
+                    getGrid().setCellValue(cell.getRow(), cell.getColumn(), cell.getCellType().convertValue(clipboard.getString()));
+                } else {
+                    super.pasteClipboard();
+                }
+            }
+        };
         spreadsheetView.getColumns().get(0).setPrefWidth(400);
         spreadsheetView.getColumns().get(1).setPrefWidth(150);
         spreadsheetView.getColumns().get(2).setPrefWidth(247);

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.sparrow.AppServices;
+import javafx.beans.property.*;
 import javafx.concurrent.Worker;
 import javafx.scene.control.DialogPane;
 import javafx.scene.image.Image;
@@ -22,4 +23,117 @@ public class ServiceProgressDialog extends ProgressDialog {
         Image image = new Image(imagePath);
         dialogPane.setGraphic(new ImageView(image));
     }
+
+    public static class ProxyWorker implements Worker<Boolean> {
+        private final ObjectProperty<State> state = new SimpleObjectProperty<>(this, "state", State.READY);
+        private final StringProperty message = new SimpleStringProperty(this, "message", "");
+        private final DoubleProperty progress = new SimpleDoubleProperty(this, "progress", -1);
+
+        public void start() {
+            state.set(State.SCHEDULED);
+        }
+
+        public void end() {
+            state.set(State.SUCCEEDED);
+        }
+
+        @Override
+        public State getState() {
+            return state.get();
+        }
+
+        @Override
+        public ReadOnlyObjectProperty<State> stateProperty() {
+            return state;
+        }
+
+        @Override
+        public Boolean getValue() {
+            return Boolean.TRUE;
+        }
+
+        @Override
+        public ReadOnlyObjectProperty<Boolean> valueProperty() {
+            return null;
+        }
+
+        @Override
+        public Throwable getException() {
+            return null;
+        }
+
+        @Override
+        public ReadOnlyObjectProperty<Throwable> exceptionProperty() {
+            return null;
+        }
+
+        @Override
+        public double getWorkDone() {
+            return 0;
+        }
+
+        @Override
+        public ReadOnlyDoubleProperty workDoneProperty() {
+            return null;
+        }
+
+        @Override
+        public double getTotalWork() {
+            return 0;
+        }
+
+        @Override
+        public ReadOnlyDoubleProperty totalWorkProperty() {
+            return null;
+        }
+
+        @Override
+        public double getProgress() {
+            return progress.get();
+        }
+
+        @Override
+        public ReadOnlyDoubleProperty progressProperty() {
+            return progress;
+        }
+
+        @Override
+        public boolean isRunning() {
+            return false;
+        }
+
+        @Override
+        public ReadOnlyBooleanProperty runningProperty() {
+            return null;
+        }
+
+        @Override
+        public String getMessage() {
+            return message.get();
+        }
+
+        public void setMessage(String strMessage) {
+            message.set(strMessage);
+        }
+
+        @Override
+        public ReadOnlyStringProperty messageProperty() {
+            return message;
+        }
+
+        @Override
+        public String getTitle() {
+            return null;
+        }
+
+        @Override
+        public ReadOnlyStringProperty titleProperty() {
+            return null;
+        }
+
+        @Override
+        public boolean cancel() {
+            return false;
+        }
+    }
 }

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

@@ -34,4 +34,18 @@ public class TextUtils {
         helper.setText(DEFAULT_TEXT);
         return d;
     }
+
+    public static double computeTextHeight(Font font, String text) {
+        helper.setText(text);
+        helper.setFont(font);
+
+        helper.setWrappingWidth(0.0D);
+        helper.setLineSpacing(0.0D);
+        double d = Math.ceil(helper.getLayoutBounds().getHeight());
+
+        helper.setWrappingWidth(DEFAULT_WRAPPING_WIDTH);
+        helper.setLineSpacing(DEFAULT_LINE_SPACING);
+        helper.setText(DEFAULT_TEXT);
+        return d;
+    }
 }

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

@@ -165,8 +165,9 @@ public class TransactionHexArea extends CodeArea {
                     for(int j = 0; j < witness.getPushes().size(); j++) {
                         byte[] push = witness.getPushes().get(j);
                         VarInt witnessLen = new VarInt(push.length);
+                        boolean isSignature = isSignature(push);
                         cursor = addSegment(segments, cursor, witnessLen.getSizeInBytes() * 2, i, j, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "length"));
-                        cursor = addSegment(segments, cursor, (int) witnessLen.value * 2, i, j, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "data"));
+                        cursor = addSegment(segments, cursor, (int) witnessLen.value * 2, i, j, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "data" + (isSignature ? "-signature" : "")));
                     }
                 }
             }
@@ -204,6 +205,19 @@ public class TransactionHexArea extends CodeArea {
         return "other";
     }
 
+    private boolean isSignature(byte[] data) {
+        if(data.length >= 64) {
+            try {
+                TransactionSignature.decodeFromBitcoin(data, false);
+                return true;
+            } catch(Exception e) {
+                //ignore, not a signature
+            }
+        }
+
+        return false;
+    }
+
     private String describeTransactionPart(Collection<String> styles) {
         String style = "";
         Integer index = null;
@@ -238,7 +252,7 @@ public class TransactionHexArea extends CodeArea {
             case "output-pubkeyscript" -> "Output #" + index + " scriptPubKey";
             case "witness-count" -> "Input #" + index + " witness count";
             case "witness-length" -> "Input #" + index + " witness #" + witnessIndex + " length";
-            case "witness-data" -> "Input #" + index + " witness #" + witnessIndex + " data";
+            case "witness-data", "witness-data-signature" -> "Input #" + index + " witness #" + witnessIndex + " data";
             case "locktime" -> "Locktime";
             default -> "";
         };

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

@@ -71,7 +71,7 @@ public class TransactionsTreeTable extends CoinTreeTable {
         }
     }
 
-    public void updateHistory(List<WalletNode> updatedNodes) {
+    public void updateHistory() {
         //Transaction entries should have already been updated using WalletTransactionsEntry.updateHistory, so only a resort required
         sort();
     }

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

@@ -27,13 +27,16 @@ public class UsbStatusButton extends MenuButton {
     public void setDevices(List<Device> devices) {
         for(Device device : devices) {
             MenuItem deviceItem = new MenuItem(device.getModel().toDisplayString());
-            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.KEEPKEY)) {
+            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02)) {
                 deviceItem = new Menu(device.getModel().toDisplayString());
-                MenuItem toggleItem = new MenuItem("Toggle Passphrase " + (device.isNeedsPassphraseSent() ? "Off" : "On"));
+                MenuItem toggleItem = new MenuItem("Toggle Passphrase" + (!device.getModel().externalPassphraseEntry() ? "" : (device.isNeedsPassphraseSent() ? " Off" : " On")));
                 toggleItem.setOnAction(event -> {
                     Hwi.TogglePassphraseService togglePassphraseService = new Hwi.TogglePassphraseService(device);
                     togglePassphraseService.setOnSucceeded(event1 -> {
                         EventManager.get().post(new RequestOpenWalletsEvent());
+                        if(!device.getModel().externalPassphraseEntry()) {
+                            AppServices.showAlertDialog("Reconnect device", "Reconnect your " + device.getModel().toDisplayString() + " to reset the passphrase.", Alert.AlertType.INFORMATION);
+                        }
                     });
                     togglePassphraseService.setOnFailed(event1 -> {
                         AppServices.showErrorDialog("Error toggling passphrase", event1.getSource().getException().getMessage());

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

@@ -9,14 +9,18 @@ import com.sparrowwallet.sparrow.wallet.WalletUtxosEntry;
 import javafx.beans.NamedArg;
 import javafx.scene.Node;
 import javafx.scene.chart.*;
+import javafx.scene.control.Tooltip;
+import javafx.util.Duration;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class UtxosChart extends BarChart<String, Number> {
-    private static final int MAX_BARS = 8;
+    private static final int MAX_BARS = 10;
     private static final String OTHER_CATEGORY = "Other";
+    private static final int TOOLTIP_SHOW_DELAY = 50;
 
     private List<Entry> selectedEntries;
     private int totalUtxos;
@@ -53,18 +57,21 @@ public class UtxosChart extends BarChart<String, Number> {
 
         for(int i = 0; i < utxoDataList.size(); i++) {
             XYChart.Data<String, Number> newData = utxoDataList.get(i);
+            newData.setXValue((i+1) + ". " + newData.getXValue());
             if(i < utxoSeries.getData().size()) {
                 XYChart.Data<String, Number> existingData = utxoSeries.getData().get(i);
                 if(!newData.getXValue().equals(existingData.getXValue()) || !newData.getYValue().equals(existingData.getYValue()) || (newData.getExtraValue() instanceof Entry && !newData.getExtraValue().equals(existingData.getExtraValue()))) {
                     utxoSeries.getData().set(i, newData);
+                    installTooltip(newData);
                 }
             } else {
                 utxoSeries.getData().add(newData);
+                installTooltip(newData);
             }
         }
 
         if(utxoSeries.getData().size() > utxoDataList.size()) {
-            utxoSeries.getData().remove(Math.max(0, utxoDataList.size() - 1), utxoSeries.getData().size());
+            utxoSeries.getData().remove(utxoDataList.size(), utxoSeries.getData().size());
         }
 
         if(selectedEntries != null) {
@@ -74,12 +81,21 @@ public class UtxosChart extends BarChart<String, Number> {
 
     private String getCategoryName(Entry entry) {
         if(entry.getLabel() != null && !entry.getLabel().isEmpty()) {
-            return entry.getLabel().length() > 15 ? entry.getLabel().substring(0, 15) + "..." + "\n" + ((UtxoEntry)entry).getDescription() : entry.getLabel() + "\n" + ((UtxoEntry)entry).getDescription();
+            return entry.getLabel() + "\n" + ((UtxoEntry)entry).getDescription();
         }
 
         return ((UtxoEntry)entry).getDescription();
     }
 
+    private void installTooltip(XYChart.Data<String, Number> item) {
+        Tooltip.uninstall(item.getNode(), null);
+
+        String satsValue = String.format(Locale.ENGLISH, "%,d", item.getYValue());
+        Tooltip tooltip = new Tooltip(item.getXValue() + "\n" + satsValue + " sats");
+        tooltip.setShowDelay(Duration.millis(TOOLTIP_SHOW_DELAY));
+        Tooltip.install(item.getNode(), tooltip);
+    }
+
     public void select(List<Entry> entries) {
         Set<Node> selectedBars = lookupAll(".chart-bar.selected");
         for(Node selectedBar : selectedBars) {

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

@@ -4,6 +4,7 @@ import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.wallet.*;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumnBase;
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
 
@@ -24,6 +25,7 @@ public class UtxosTreeTable extends CoinTreeTable {
         });
         dateCol.setCellFactory(p -> new DateCell());
         dateCol.setSortable(true);
+        dateCol.setComparator(dateCol.getComparator().reversed());
         getColumns().add(dateCol);
 
         TreeTableColumn<Entry, Entry> outputCol = new TreeTableColumn<>("Output");
@@ -35,7 +37,12 @@ public class UtxosTreeTable extends CoinTreeTable {
         outputCol.setComparator((o1, o2) -> {
             UtxoEntry entry1 = (UtxoEntry)o1;
             UtxoEntry entry2 = (UtxoEntry)o2;
-            return entry1.getDescription().compareTo(entry2.getDescription());
+            int hashCompare = entry1.getHashIndex().getHash().toString().compareTo(entry2.getHashIndex().getHash().toString());
+            if(hashCompare != 0) {
+                return hashCompare;
+            }
+
+            return (int)(entry1.getHashIndex().getIndex() - entry2.getHashIndex().getIndex());
         });
         getColumns().add(outputCol);
 
@@ -99,7 +106,7 @@ public class UtxosTreeTable extends CoinTreeTable {
         }
     }
 
-    public void updateHistory(List<WalletNode> updatedNodes) {
+    public void updateHistory() {
         //Utxo entries should have already been updated, so only a resort required
         if(!getRoot().getChildren().isEmpty()) {
             sort();

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

@@ -0,0 +1,28 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Skin;
+import org.controlsfx.control.textfield.CustomPasswordField;
+
+public class ViewPasswordField extends CustomPasswordField {
+    public ViewPasswordField() {
+        super();
+        getStyleClass().add("view-password-text-field");
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new ViewPasswordFieldSkin(this) {
+            @Override
+            public ObjectProperty<Node> leftProperty() {
+                return ViewPasswordField.this.leftProperty();
+            }
+
+            @Override
+            public ObjectProperty<Node> rightProperty() {
+                return ViewPasswordField.this.rightProperty();
+            }
+        };
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.sparrowwallet.sparrow.control;
+
+import impl.org.controlsfx.skin.CustomTextFieldSkin;
+import javafx.animation.FadeTransition;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.scene.Cursor;
+import javafx.scene.control.PasswordField;
+import javafx.scene.layout.*;
+import javafx.util.Duration;
+import org.controlsfx.control.textfield.CustomPasswordField;
+
+public abstract class ViewPasswordFieldSkin extends CustomTextFieldSkin {
+    private static final Duration FADE_DURATION = Duration.millis(350);
+    public static final char BULLET = '\u25CF';
+
+    private boolean mask = true;
+
+    public ViewPasswordFieldSkin(CustomPasswordField textField) {
+        super(textField);
+
+        Region viewPasswordButton = new Region();
+        viewPasswordButton.getStyleClass().addAll("graphic");
+        StackPane viewPasswordButtonPane = new StackPane(viewPasswordButton);
+        viewPasswordButtonPane.getStyleClass().addAll("view-password-button");
+        viewPasswordButtonPane.setOpacity(0.0);
+        viewPasswordButtonPane.setCursor(Cursor.DEFAULT);
+
+        viewPasswordButtonPane.setOnMouseReleased(e -> {
+            if(mask) {
+                viewPasswordButtonPane.getStyleClass().remove("view-password-button");
+                viewPasswordButtonPane.getStyleClass().addAll("hide-password-button");
+                mask = false;
+            } else {
+                viewPasswordButtonPane.getStyleClass().remove("hide-password-button");
+                viewPasswordButtonPane.getStyleClass().addAll("view-password-button");
+                mask = true;
+            }
+            textField.setText(textField.getText());
+            textField.end();
+        });
+
+        textField.rightProperty().set(viewPasswordButtonPane);
+
+        final FadeTransition fader = new FadeTransition(FADE_DURATION, viewPasswordButtonPane);
+        fader.setCycleCount(1);
+
+        textField.textProperty().addListener(new InvalidationListener() {
+            @Override
+            public void invalidated(Observable arg0) {
+                String text = textField.getText();
+                boolean isTextEmpty = text == null || text.isEmpty();
+                boolean isButtonVisible = fader.getNode().getOpacity() > 0;
+
+                if (isTextEmpty && isButtonVisible) {
+                    setButtonVisible(false);
+                } else if (!isTextEmpty && !isButtonVisible) {
+                    setButtonVisible(true);
+                }
+            }
+
+            private void setButtonVisible( boolean visible ) {
+                fader.setFromValue(visible? 0.0: 1.0);
+                fader.setToValue(visible? 1.0: 0.0);
+                fader.play();
+            }
+        });
+    }
+
+    @Override
+    protected String maskText(String txt) {
+        if(getSkinnable() instanceof PasswordField && mask) {
+            int n = txt.length();
+            StringBuilder passwordBuilder = new StringBuilder(n);
+            for (int i = 0; i < n; i++) {
+                passwordBuilder.append(BULLET);
+            }
+            return passwordBuilder.toString();
+        } else {
+            return txt;
+        }
+    }
+}

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

@@ -42,9 +42,9 @@ public class WalletExportDialog extends Dialog<Wallet> {
 
         List<WalletExport> exporters;
         if(wallet.getPolicyType() == PolicyType.SINGLE) {
-            exporters = List.of(new Electrum(), new SpecterDesktop(), new Sparrow());
+            exporters = List.of(new Electrum(), new Descriptor(), new SpecterDesktop(), new Sparrow());
         } else if(wallet.getPolicyType() == PolicyType.MULTI) {
-            exporters = List.of(new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new KeystoneMultisig(), new PassportMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new SpecterDIY(), new Sparrow());
+            exporters = List.of(new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new KeystoneMultisig(), new Descriptor(), new PassportMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new SpecterDIY(), new Sparrow());
         } else {
             throw new UnsupportedOperationException("Cannot export wallet with policy type " + wallet.getPolicyType());
         }

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

@@ -31,6 +31,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         });
 
         final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         StackPane stackPane = new StackPane();
@@ -40,7 +41,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         stackPane.getChildren().add(anchorPane);
 
         ScrollPane scrollPane = new ScrollPane();
-        scrollPane.setPrefHeight(420);
+        scrollPane.setPrefHeight(520);
         scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         anchorPane.getChildren().add(scrollPane);
         scrollPane.setFitToWidth(true);
@@ -48,19 +49,23 @@ public class WalletImportDialog extends Dialog<Wallet> {
         AnchorPane.setRightAnchor(scrollPane, 0.0);
 
         importAccordion = new Accordion();
-        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SpecterDIY());
+        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new GordianSeedTool(), new SeedSigner(), new SpecterDIY());
         for(KeystoreFileImport importer : keystoreImporters) {
             FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
             importAccordion.getPanes().add(importPane);
         }
 
-        List<WalletImport> walletImporters = List.of(new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new KeystoneMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow());
+        List<WalletImport> walletImporters = List.of(new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow());
         for(WalletImport importer : walletImporters) {
             FileWalletImportPane importPane = new FileWalletImportPane(importer);
             importAccordion.getPanes().add(importPane);
         }
 
         importAccordion.getPanes().sort(Comparator.comparing(o -> ((TitledDescriptionPane) o).getTitle()));
+
+        MnemonicWalletKeystoreImportPane mnemonicImportPane = new MnemonicWalletKeystoreImportPane(new Bip39());
+        importAccordion.getPanes().add(0, mnemonicImportPane);
+
         scrollPane.setContent(importAccordion);
 
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
@@ -75,7 +80,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         });
 
         dialogPane.setPrefWidth(500);
-        dialogPane.setPrefHeight(500);
+        dialogPane.setPrefHeight(600);
         AppServices.moveToActiveWindowScreen(this);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);
@@ -95,7 +100,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
             List<Device> devices = enumerateService.getValue();
             importAccordion.getPanes().removeIf(titledPane -> titledPane instanceof DevicePane);
             for(Device device : devices) {
-                DevicePane devicePane = new DevicePane(new Wallet(), device, devices.size() == 1);
+                DevicePane devicePane = new DevicePane(new Wallet(), device, devices.size() == 1, null);
                 importAccordion.getPanes().add(0, devicePane);
             }
             Platform.runLater(() -> EventManager.get().post(new UsbDeviceEvent(devices)));

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

@@ -0,0 +1,73 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
+import org.controlsfx.control.textfield.CustomTextField;
+import org.controlsfx.control.textfield.TextFields;
+import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+
+public class WalletLabelDialog extends Dialog<String> {
+    private static final int MAX_LABEL_LENGTH = 25;
+
+    private final CustomTextField label;
+
+    public WalletLabelDialog(String initialName) {
+        this(initialName, "Account");
+    }
+
+    public WalletLabelDialog(String initialName, String walletType) {
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        setTitle(walletType + " Name");
+        dialogPane.setHeaderText("Enter a name for this " + walletType.toLowerCase() + ":");
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
+        dialogPane.setPrefWidth(400);
+        dialogPane.setPrefHeight(200);
+        AppServices.moveToActiveWindowScreen(this);
+
+        Glyph wallet = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.WALLET);
+        wallet.setFontSize(50);
+        dialogPane.setGraphic(wallet);
+
+        final VBox content = new VBox(20);
+        label = (CustomTextField) TextFields.createClearableTextField();
+        label.setText(initialName);
+        label.setTextFormatter(new TextFormatter<>((change) -> {
+            change.setText(change.getText().replaceAll("[\\\\/:*?\"<>|]", "_"));
+            return change;
+        }));
+        content.getChildren().add(label);
+
+        dialogPane.setContent(content);
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        Platform.runLater(() -> {
+            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+            validationSupport.registerValidator(label, Validator.combine(
+                    Validator.createEmptyValidator(walletType + " name is required"),
+                    (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Label too long", newValue != null && newValue.length() > MAX_LABEL_LENGTH)
+            ));
+        });
+
+        final ButtonType okButtonType = new javafx.scene.control.ButtonType("Rename " + walletType, ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(okButtonType);
+        Button okButton = (Button)dialogPane.lookupButton(okButtonType);
+        BooleanBinding isInvalid = Bindings.createBooleanBinding(() -> label.getText().length() == 0 || label.getText().length() > MAX_LABEL_LENGTH, label.textProperty());
+        okButton.disableProperty().bind(isInvalid);
+
+        label.setPromptText(walletType + " Name");
+        Platform.runLater(label::requestFocus);
+        setResultConverter(dialogButton -> dialogButton == okButtonType ? label.getText() : null);
+    }
+}

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

@@ -8,7 +8,6 @@ import javafx.beans.binding.BooleanBinding;
 import javafx.scene.control.*;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -31,8 +30,8 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
 
     public WalletPasswordDialog(String walletName, PasswordRequirement requirement, boolean suggestChangePassword) {
         this.requirement = requirement;
-        this.password = (CustomPasswordField)TextFields.createClearablePasswordField();
-        this.passwordConfirm = (CustomPasswordField)TextFields.createClearablePasswordField();
+        this.password = new ViewPasswordField();
+        this.passwordConfirm = new ViewPasswordField();
         this.backupExisting = new CheckBox("Backup existing wallet first");
         this.changePassword = new CheckBox("Change password");
         this.deleteBackups = new CheckBox("Delete any backups");
@@ -131,10 +130,10 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
     }
 
     public enum PasswordRequirement {
-        LOAD("Please enter the wallet password:", "Unlock"),
+        LOAD("Enter the wallet password:", "Unlock"),
         UPDATE_NEW("Add a password to the wallet?\nLeave empty for no password:", "No Password"),
         UPDATE_EMPTY("This wallet has no password.\nAdd a password to the wallet?\nLeave empty for no password:", "No Password"),
-        UPDATE_SET("Please re-enter the wallet password:", "Verify Password"),
+        UPDATE_SET("Re-enter the wallet password:", "Verify Password"),
         UPDATE_CHANGE("Enter the new wallet password.\nLeave empty for no password:", "No Password");
 
         private final String description;

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

@@ -15,9 +15,12 @@ import javafx.concurrent.Task;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
 
+import java.awt.*;
+import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 public class WebcamService extends ScheduledService<Image> {
@@ -89,16 +92,20 @@ public class WebcamService extends ScheduledService<Image> {
                         opening.set(false);
                     }
 
-                    BufferedImage bimg = cam.getImage();
-                    if(bimg == null) {
+                    BufferedImage originalImage = cam.getImage();
+                    if(originalImage == null) {
                         return null;
                     }
 
-                    Image image = SwingFXUtils.toFXImage(bimg, null);
+                    CroppedDimension cropped = getCroppedDimension(originalImage);
+                    BufferedImage croppedImage = originalImage.getSubimage(cropped.x, cropped.y, cropped.length, cropped.length);
+                    BufferedImage framedImage = getFramedImage(originalImage, cropped);
+
+                    Image image = SwingFXUtils.toFXImage(framedImage, null);
                     updateValue(image);
 
                     if(System.currentTimeMillis() > (lastQrSampleTime + QR_SAMPLE_PERIOD_MILLIS)) {
-                        readQR(bimg);
+                        readQR(originalImage, croppedImage);
                         lastQrSampleTime = System.currentTimeMillis();
                     }
 
@@ -125,18 +132,49 @@ public class WebcamService extends ScheduledService<Image> {
         return super.cancel();
     }
 
-    private void readQR(BufferedImage bufferedImage) {
+    private void readQR(BufferedImage wideImage, BufferedImage croppedImage) {
+        Result result = readQR(wideImage);
+        if(result == null) {
+            result = readQR(croppedImage);
+        }
+
+        if(result != null) {
+            resultProperty.set(result);
+        }
+    }
+
+    private Result readQR(BufferedImage bufferedImage) {
         LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage);
         BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
 
         try {
-            Result result = qrReader.decode(bitmap);
-            resultProperty.set(result);
+            return qrReader.decode(bitmap, Map.of(DecodeHintType.TRY_HARDER, Boolean.TRUE));
         } catch(ReaderException e) {
             // fall thru, it means there is no QR code in image
+            return null;
         }
     }
 
+    private BufferedImage getFramedImage(BufferedImage image, CroppedDimension cropped) {
+        BufferedImage clone = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = (Graphics2D)clone.getGraphics();
+        g2d.drawImage(image, 0, 0, null);
+        float[] dash1 = {10.0f};
+        g2d.setColor(Color.BLACK);
+        g2d.setStroke(new BasicStroke(resolution == WebcamResolution.HD ? 3.0f : 1.5f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f));
+        g2d.draw(new RoundRectangle2D.Double(cropped.x, cropped.y, cropped.length, cropped.length, 10, 10));
+        g2d.dispose();
+        return clone;
+    }
+
+    private CroppedDimension getCroppedDimension(BufferedImage bufferedImage) {
+        int dimension = Math.min(bufferedImage.getWidth(), bufferedImage.getHeight());
+        int squareSize = dimension / 2;
+        int x = (bufferedImage.getWidth() - squareSize) / 2;
+        int y = (bufferedImage.getHeight() - squareSize) / 2;
+        return new CroppedDimension(x, y, squareSize);
+    }
+
     public Result getResult() {
         return resultProperty.get();
     }
@@ -172,4 +210,16 @@ public class WebcamService extends ScheduledService<Image> {
     public BooleanProperty openingProperty() {
         return opening;
     }
+
+    private static class CroppedDimension {
+        public int x;
+        public int y;
+        public int length;
+
+        public CroppedDimension(int x, int y, int length) {
+            this.x = x;
+            this.y = y;
+            this.length = length;
+        }
+    }
 }

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

@@ -1,27 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.io.Storage;
-
-public class ChildWalletAddedEvent extends WalletChangedEvent {
-    private final Storage storage;
-    private final Wallet childWallet;
-
-    public ChildWalletAddedEvent(Storage storage, Wallet masterWallet, Wallet childWallet) {
-        super(masterWallet);
-        this.storage = storage;
-        this.childWallet = childWallet;
-    }
-
-    public Storage getStorage() {
-        return storage;
-    }
-
-    public Wallet getChildWallet() {
-        return childWallet;
-    }
-
-    public String getMasterWalletId() {
-        return storage.getWalletId(getWallet());
-    }
-}

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

@@ -0,0 +1,35 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.io.Storage;
+
+import java.util.List;
+
+public class ChildWalletsAddedEvent extends WalletChangedEvent {
+    private final Storage storage;
+    private final List<Wallet> childWallets;
+
+    public ChildWalletsAddedEvent(Storage storage, Wallet masterWallet, Wallet childWallet) {
+        super(masterWallet);
+        this.storage = storage;
+        this.childWallets = List.of(childWallet);
+    }
+
+    public ChildWalletsAddedEvent(Storage storage, Wallet masterWallet, List<Wallet> childWallets) {
+        super(masterWallet);
+        this.storage = storage;
+        this.childWallets = childWallets;
+    }
+
+    public Storage getStorage() {
+        return storage;
+    }
+
+    public List<Wallet> getChildWallets() {
+        return childWallets;
+    }
+
+    public String getMasterWalletId() {
+        return storage.getWalletId(getWallet());
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.wallet.Function;
+
+public class FunctionActionEvent {
+    private final Function function;
+    private final Wallet wallet;
+
+    public FunctionActionEvent(Function function, Wallet wallet) {
+        this.function = function;
+        this.wallet = wallet;
+    }
+
+    public Function getFunction() {
+        return function;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public boolean selectFunction() {
+        return true;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.StandardAccount;
+
+import java.util.Map;
+
+public class KeystoresDiscoveredEvent {
+    private final Map<StandardAccount, Keystore> discoveredKeystores;
+
+    public KeystoresDiscoveredEvent(Map<StandardAccount, Keystore> discoveredKeystores) {
+        this.discoveredKeystores = discoveredKeystores;
+    }
+
+    public Map<StandardAccount, Keystore> getDiscoveredKeystores() {
+        return discoveredKeystores;
+    }
+}

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

@@ -7,7 +7,9 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.control.CoinLabel;
 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.TransactionHashIndexEntry;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,12 +62,21 @@ public class NewWalletTransactionsEvent {
         return String.format(Locale.ENGLISH, "%,d", value) + " sats";
     }
 
-    public List<BlockTransaction> getWhirlpoolMixTransactions() {
+    public List<BlockTransaction> getUnspentConfirmingWhirlpoolMixTransactions() {
         List<BlockTransaction> mixTransactions = new ArrayList<>();
         if(wallet.isWhirlpoolMixWallet()) {
-            return transactionEntries.stream().filter(txEntry -> txEntry.getValue() == 0).map(TransactionEntry::getBlockTransaction).collect(Collectors.toList());
+            return transactionEntries.stream()
+                    .filter(txEntry -> txEntry.getValue() == 0 && txEntry.isConfirming() && !allOutputsSpent(txEntry))
+                    .map(TransactionEntry::getBlockTransaction).collect(Collectors.toList());
         }
 
         return mixTransactions;
     }
+
+    private boolean allOutputsSpent(TransactionEntry txEntry) {
+        return txEntry.getChildren().stream()
+                .map(refEntry -> ((TransactionHashIndexEntry)refEntry))
+                .filter(txRefEntry -> txRefEntry.getType() == HashIndexEntry.Type.OUTPUT)
+                .allMatch(txRefEntry -> txRefEntry.getHashIndex().isSpent());
+    }
 }

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

@@ -1,20 +1,15 @@
 package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.wallet.Function;
 import com.sparrowwallet.sparrow.wallet.NodeEntry;
 
-public class ReceiveActionEvent {
-    private final Wallet wallet;
-
+public class ReceiveActionEvent extends FunctionActionEvent {
     public ReceiveActionEvent(NodeEntry receiveEntry) {
-        this.wallet = receiveEntry.getWallet();
+        super(Function.RECEIVE, receiveEntry.getWallet());
     }
 
     public ReceiveActionEvent(Wallet wallet) {
-        this.wallet = wallet;
-    }
-
-    public Wallet getWallet() {
-        return wallet;
+        super(Function.RECEIVE, wallet);
     }
 }

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

@@ -1,22 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.net.Aopp;
-
-public class ReceiveProofEvent {
-    private final Wallet wallet;
-    private final Aopp aopp;
-
-    public ReceiveProofEvent(Wallet wallet, Aopp aopp) {
-        this.wallet = wallet;
-        this.aopp = aopp;
-    }
-
-    public Wallet getWallet() {
-        return wallet;
-    }
-
-    public Aopp getAopp() {
-        return aopp;
-    }
-}

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

@@ -0,0 +1,20 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.wallet.Entry;
+
+public class SelectEntryEvent {
+    private final Entry entry;
+
+    public SelectEntryEvent(Entry entry) {
+        this.entry = entry;
+    }
+
+    public Entry getEntry() {
+        return entry;
+    }
+
+    public Wallet getWallet() {
+        return entry.getWallet();
+    }
+}

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

@@ -2,23 +2,24 @@ package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.wallet.Function;
 
 import java.util.List;
 
-public class SendActionEvent {
-    private final Wallet wallet;
+public class SendActionEvent extends FunctionActionEvent {
     private final List<BlockTransactionHashIndex> utxos;
 
     public SendActionEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
-        this.wallet = wallet;
+        super(Function.SEND, wallet);
         this.utxos = utxos;
     }
 
-    public Wallet getWallet() {
-        return wallet;
-    }
-
     public List<BlockTransactionHashIndex> getUtxos() {
         return utxos;
     }
+
+    @Override
+    public boolean selectFunction() {
+        return !getUtxos().isEmpty();
+    }
 }

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

@@ -20,6 +20,6 @@ public class SettingsChangedEvent {
     }
 
     public enum Type {
-        POLICY, SCRIPT_TYPE, MUTLISIG_THRESHOLD, MULTISIG_TOTAL, KEYSTORE_LABEL, KEYSTORE_FINGERPRINT, KEYSTORE_DERIVATION, KEYSTORE_XPUB, GAP_LIMIT, BIRTH_DATE;
+        POLICY, SCRIPT_TYPE, MUTLISIG_THRESHOLD, MULTISIG_TOTAL, KEYSTORE_LABEL, KEYSTORE_FINGERPRINT, KEYSTORE_DERIVATION, KEYSTORE_XPUB, GAP_LIMIT, BIRTH_DATE, WATCH_LAST;
     }
 }

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

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class SorobanInitiatedEvent {
+    private Wallet wallet;
+
+    public SorobanInitiatedEvent(Wallet wallet) {
+        this.wallet = wallet;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.event;
 
 import com.samourai.whirlpool.client.whirlpool.beans.Pool;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.Payment;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -11,30 +12,47 @@ public class SpendUtxoEvent {
     private final Wallet wallet;
     private final List<BlockTransactionHashIndex> utxos;
     private final List<Payment> payments;
+    private final List<byte[]> opReturns;
     private final Long fee;
     private final boolean includeSpentMempoolOutputs;
     private final Pool pool;
+    private final PaymentCode paymentCode;
 
     public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
-        this(wallet, utxos, null, null, false);
+        this(wallet, utxos, null, null, null, false);
     }
 
-    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, Long fee, boolean includeSpentMempoolOutputs) {
+    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, boolean includeSpentMempoolOutputs) {
         this.wallet = wallet;
         this.utxos = utxos;
         this.payments = payments;
+        this.opReturns = opReturns;
         this.fee = fee;
         this.includeSpentMempoolOutputs = includeSpentMempoolOutputs;
         this.pool = null;
+        this.paymentCode = null;
     }
 
-    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, Long fee, Pool pool) {
+    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, Pool pool) {
         this.wallet = wallet;
         this.utxos = utxos;
         this.payments = payments;
+        this.opReturns = opReturns;
         this.fee = fee;
         this.includeSpentMempoolOutputs = false;
         this.pool = pool;
+        this.paymentCode = null;
+    }
+
+    public SpendUtxoEvent(Wallet wallet, List<Payment> payments, List<byte[]> opReturns, PaymentCode paymentCode) {
+        this.wallet = wallet;
+        this.utxos = null;
+        this.payments = payments;
+        this.opReturns = opReturns;
+        this.fee = null;
+        this.includeSpentMempoolOutputs = false;
+        this.pool = null;
+        this.paymentCode = paymentCode;
     }
 
     public Wallet getWallet() {
@@ -49,6 +67,10 @@ public class SpendUtxoEvent {
         return payments;
     }
 
+    public List<byte[]> getOpReturns() {
+        return opReturns;
+    }
+
     public Long getFee() {
         return fee;
     }
@@ -60,4 +82,8 @@ public class SpendUtxoEvent {
     public Pool getPool() {
         return pool;
     }
+
+    public PaymentCode getPaymentCode() {
+        return paymentCode;
+    }
 }

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

@@ -1,17 +1,29 @@
 package com.sparrowwallet.sparrow.event;
 
+import javafx.scene.Node;
+
 public class StatusEvent {
     public static final int DEFAULT_SHOW_DURATION_SECS = 20;
 
     private final String status;
+    private final Node graphic;
     private final int showDuration;
 
     public StatusEvent(String status) {
-        this(status, DEFAULT_SHOW_DURATION_SECS);
+        this(status, null, DEFAULT_SHOW_DURATION_SECS);
+    }
+
+    public StatusEvent(String status, Node graphic) {
+        this(status, graphic, DEFAULT_SHOW_DURATION_SECS);
     }
 
     public StatusEvent(String status, int showDuration) {
+        this(status, null, showDuration);
+    }
+
+    public StatusEvent(String status, Node graphic, int showDuration) {
         this.status = status;
+        this.graphic = graphic;
         this.showDuration = showDuration;
     }
 
@@ -19,6 +31,10 @@ public class StatusEvent {
         return status;
     }
 
+    public Node getGraphic() {
+        return graphic;
+    }
+
     public int getShowDuration() {
         return showDuration;
     }

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

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+
+public class TransactionFetchFailedEvent extends TransactionReferencesFailedEvent {
+    public TransactionFetchFailedEvent(Transaction transaction, Throwable exception) {
+        super(transaction, exception);
+    }
+
+    public TransactionFetchFailedEvent(Transaction transaction, Throwable exception, int pageStart, int pageEnd) {
+        super(transaction, exception, pageStart, pageEnd);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.event;
 
+import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.sparrow.transaction.TransactionView;
 import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
@@ -7,10 +8,19 @@ import javafx.stage.Window;
 
 public class ViewTransactionEvent {
     private final Window window;
+    private final Transaction transaction;
     private final BlockTransaction blockTransaction;
     private final TransactionView initialView;
     private final Integer initialIndex;
 
+    public ViewTransactionEvent(Window window, Transaction transaction) {
+        this.window = window;
+        this.transaction = transaction;
+        this.blockTransaction = null;
+        this.initialView = TransactionView.HEADERS;
+        this.initialIndex = null;
+    }
+
     public ViewTransactionEvent(Window window, BlockTransaction blockTransaction) {
         this(window, blockTransaction, TransactionView.HEADERS, null);
     }
@@ -21,6 +31,7 @@ public class ViewTransactionEvent {
 
     public ViewTransactionEvent(Window window, BlockTransaction blockTransaction, TransactionView initialView, Integer initialIndex) {
         this.window = window;
+        this.transaction = blockTransaction.getTransaction();
         this.blockTransaction = blockTransaction;
         this.initialView = initialView;
         this.initialIndex = initialIndex;
@@ -30,6 +41,10 @@ public class ViewTransactionEvent {
         return window;
     }
 
+    public Transaction getTransaction() {
+        return transaction;
+    }
+
     public BlockTransaction getBlockTransaction() {
         return blockTransaction;
     }

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

@@ -15,4 +15,20 @@ public class WalletChangedEvent {
     public Wallet getWallet() {
         return wallet;
     }
+
+    public boolean fromThisOrNested(Wallet targetWallet) {
+        if(wallet.equals(targetWallet)) {
+            return true;
+        }
+
+        return wallet.isNested() && targetWallet.getChildWallets().contains(wallet);
+    }
+
+    public boolean toThisOrNested(Wallet targetWallet) {
+        if(wallet.equals(targetWallet)) {
+            return true;
+        }
+
+        return targetWallet.isNested() && wallet.getChildWallets().contains(targetWallet);
+    }
 }

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

@@ -0,0 +1,9 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WalletDeletedEvent extends WalletChangedEvent {
+    public WalletDeletedEvent(Wallet wallet) {
+        super(wallet);
+    }
+}

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

@@ -3,25 +3,37 @@ package com.sparrowwallet.sparrow.event;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.wallet.Entry;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * This event is fired when a wallet entry (transaction, txi or txo) label is changed.
  */
 public class WalletEntryLabelsChangedEvent extends WalletChangedEvent {
-    private final List<Entry> entries;
+    //Contains the changed entry mapped to the entry that changed it, if changed recursively (otherwise null)
+    private final Map<Entry, Entry> entrySourceMap;
 
     public WalletEntryLabelsChangedEvent(Wallet wallet, Entry entry) {
-        super(wallet);
-        this.entries = List.of(entry);
+        this(wallet, List.of(entry));
     }
 
     public WalletEntryLabelsChangedEvent(Wallet wallet, List<Entry> entries) {
         super(wallet);
-        this.entries = entries;
+        this.entrySourceMap = new LinkedHashMap<>();
+        for(Entry entry : entries) {
+            entrySourceMap.put(entry, null);
+        }
     }
 
-    public List<Entry> getEntries() {
-        return entries;
+    public WalletEntryLabelsChangedEvent(Wallet wallet, Map<Entry, Entry> entrySourceMap) {
+        super(wallet);
+        this.entrySourceMap = entrySourceMap;
+    }
+
+    public Collection<Entry> getEntries() {
+        return entrySourceMap.keySet();
+    }
+
+    public Entry getSource(Entry entry) {
+        return entrySourceMap.get(entry);
     }
 }

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

@@ -0,0 +1,17 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+/**
+ * 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) {
+        super(wallet);
+    }
+
+    public int getGapLimit() {
+        return getWallet().getGapLimit();
+    }
+}

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

@@ -5,7 +5,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.io.Storage;
 
-import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -16,11 +16,13 @@ import java.util.stream.Collectors;
 public class WalletHistoryChangedEvent extends WalletChangedEvent {
     private final Storage storage;
     private final List<WalletNode> historyChangedNodes;
+    private final List<WalletNode> nestedHistoryChangedNodes;
 
-    public WalletHistoryChangedEvent(Wallet wallet, Storage storage, List<WalletNode> historyChangedNodes) {
+    public WalletHistoryChangedEvent(Wallet wallet, Storage storage, List<WalletNode> historyChangedNodes, List<WalletNode> nestedHistoryChangedNodes) {
         super(wallet);
         this.storage = storage;
         this.historyChangedNodes = historyChangedNodes;
+        this.nestedHistoryChangedNodes = nestedHistoryChangedNodes;
     }
 
     public String getWalletId() {
@@ -31,6 +33,17 @@ public class WalletHistoryChangedEvent extends WalletChangedEvent {
         return historyChangedNodes;
     }
 
+    public List<WalletNode> getNestedHistoryChangedNodes() {
+        return nestedHistoryChangedNodes;
+    }
+
+    public List<WalletNode> getAllHistoryChangedNodes() {
+        List<WalletNode> allHistoryChangedNodes = new ArrayList<>(historyChangedNodes.size() + nestedHistoryChangedNodes.size());
+        allHistoryChangedNodes.addAll(historyChangedNodes);
+        allHistoryChangedNodes.addAll(nestedHistoryChangedNodes);
+        return allHistoryChangedNodes;
+    }
+
     public List<WalletNode> getReceiveNodes() {
         return getWallet().getNode(KeyPurpose.RECEIVE).getChildren().stream().filter(historyChangedNodes::contains).collect(Collectors.toList());
     }