fix access issue with macos show/hide windowing commands

* [feature/1630] Add QR code button on signed transaction screen

* [feature/1630] Button positioning improvements

* [feature/1630] Added owner to qrDisplayDialog

.github/workflows/package.yaml

@@ -10,16 +10,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2022, ubuntu-20.04, macos-12]
+        os: [windows-2022, ubuntu-20.04, ubuntu-22.04-arm, macos-13, macos-14]
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Set up JDK 18.0.1
+      - name: Set up JDK 22.0.2
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '18.0.1'
+          java-version: '22.0.2'
       - name: Show Build Versions
         run: ./gradlew -v
       - name: Build with Gradle
@@ -33,7 +33,7 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Sparrow Build - ${{ runner.os }}
+          name: Sparrow Build - ${{ runner.os }} ${{ runner.arch }}
           path: |
             build/jpackage/*
             !build/jpackage/Sparrow/
@@ -50,7 +50,7 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         uses: actions/upload-artifact@v4
         with:
-          name: Sparrow Build - ${{ runner.os }} Headless
+          name: Sparrow Build - ${{ runner.os }} ${{ runner.arch }} Headless
           path: |
             build/jpackage/*
             !build/jpackage/Sparrow/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "drongo"]
 	path = drongo
 	url = ../../sparrowwallet/drongo.git
+[submodule "lark"]
+	path = lark
+	url = ../../sparrowwallet/lark.git

README.md

@@ -16,8 +16,8 @@ or for those without SSH credentials:
 
 `git clone --recursive https://github.com/sparrowwallet/sparrow.git`
 
-In order to build, Sparrow requires Java 18 or higher to be installed. 
-The release binaries are built with [Eclipse Temurin 18.0.1+10](https://github.com/adoptium/temurin18-binaries/releases/tag/jdk-18.0.1%2B10).
+In order to build, Sparrow requires Java 22 or higher to be installed. 
+The release binaries are built with [Eclipse Temurin 22.0.2+9](https://github.com/adoptium/temurin22-binaries/releases/tag/jdk-22.0.2%2B9).
 
 Other packages may also be necessary to build depending on the platform. On Debian/Ubuntu systems:
 
@@ -44,7 +44,7 @@ If you prefer to run Sparrow directly from source, it can be launched from withi
 
 `./sparrow`
 
-Java 18 or higher must be installed. 
+Java 22 or higher must be installed. 
 
 ## Configuration
 
@@ -64,10 +64,12 @@ Usage: sparrow [options]
       Possible Values: [ERROR, WARN, INFO, DEBUG, TRACE]      
     --network, -n
       Network to use
-      Possible Values: [mainnet, testnet, regtest, signet]
+      Possible Values: [mainnet, testnet, regtest, signet, testnet4]
 ```
 
-As a fallback, the network (mainnet, testnet, regtest or signet) can also be set using an environment variable `SPARROW_NETWORK`. For example:
+Note that testnet currently refers to testnet3.
+
+As a fallback, the network (mainnet, testnet, testnet4, regtest or signet) can also be set using an environment variable `SPARROW_NETWORK`. For example:
 
 `export SPARROW_NETWORK=testnet`
 
@@ -83,7 +85,7 @@ When not explicitly configured using the command line argument above, Sparrow st
 | Linux    | ~/.sparrow |
 | Windows  | %APPDATA%/Sparrow |
 
-Testnet, regtest and signet configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
+Testnet3, testnet4, regtest and signet configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
 
 ## Reporting Issues
 

build.gradle

@@ -1,13 +1,11 @@
-import java.awt.GraphicsEnvironment
-
 plugins {
     id 'application'
-    id 'extra-java-module-info'
     id 'org-openjfx-javafxplugin'
-    id 'org.beryx.jlink' version '3.0.1'
+    id 'org.beryx.jlink' version '3.1.1'
+    id 'org.gradlex.extra-java-module-info' version '1.9'
 }
 
-def sparrowVersion = '1.9.0'
+def sparrowVersion = '2.1.3'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -41,10 +39,7 @@ version "${sparrowVersion}"
 
 repositories {
     mavenCentral()
-    maven { url 'https://oss.sonatype.org/content/groups/public' }
-    maven { url 'https://mymavenrepo.com/repo/29EACwkkGcoOKnbx3bxN/' }
-    maven { url 'https://jitpack.io' }
-    maven { url 'https://maven.ecs.soton.ac.uk/content/groups/maven.openimaj.org/' }
+    maven { url 'https://code.sparrowwallet.com/api/packages/sparrowwallet/maven' }
 }
 
 tasks.withType(AbstractArchiveTask) {
@@ -53,7 +48,7 @@ tasks.withType(AbstractArchiveTask) {
 }
 
 javafx {
-    version = "18"
+    version = headless ? "18" : "23.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
 }
 
@@ -64,6 +59,7 @@ java {
 dependencies {
     //Any changes to the dependencies must be reflected in the module definitions below!
     implementation(project(':drongo'))
+    implementation(project(':lark'))
     implementation('com.google.guava:guava:33.0.0-jre')
     implementation('com.google.code.gson:gson:2.9.1')
     implementation('com.h2database:h2:2.1.214')
@@ -76,13 +72,13 @@ dependencies {
     implementation('org.jdbi:jdbi3-sqlobject:3.20.0') {
         exclude group: 'org.slf4j'
     }
-    implementation('org.flywaydb:flyway-core:7.10.7-SNAPSHOT')
+    implementation('org.flywaydb:flyway-core:9.22.3')
     implementation('org.fxmisc.richtext:richtextfx:0.10.4')
     implementation('no.tornado:tornadofx-controls:1.0.4')
     implementation('com.google.zxing:javase:3.4.0') {
         exclude group: 'com.beust', module: 'jcommander'
     }
-    implementation('com.beust:jcommander:1.81')
+    implementation('org.jcommander:jcommander:2.0')
     implementation('com.github.arteam:simple-json-rpc-core:1.3')
     implementation('com.github.arteam:simple-json-rpc-client:1.3') {
         exclude group: 'com.github.arteam', module: 'simple-json-rpc-core'
@@ -90,7 +86,8 @@ dependencies {
     implementation('com.github.arteam:simple-json-rpc-server:1.3') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet:hummingbird:1.7.3')
+    implementation('com.fasterxml.jackson.core:jackson-databind:2.17.2')
+    implementation('com.sparrowwallet:hummingbird:1.7.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'
@@ -98,15 +95,27 @@ dependencies {
     implementation("com.github.sarxos:webcam-capture${targetName}:0.3.13-SNAPSHOT") {
         exclude group: 'com.nativelibs4java', module: 'bridj'
     }
-    implementation "io.matthewnelson.kotlin-components:kmp-tor:${vTor}-${vKmpTor}"
-    if(kmpOs == "linux" && kmpArch == "arm64") {
-        implementation("com.sparrowwallet.kmp-tor-binary:kmp-tor-binary-${kmpOs}${kmpArch}-jvm:${vTor}")
-    } else {
-        implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-${kmpOs}${kmpArch}:${vTor}")
+    implementation("io.matthewnelson.kotlin-components:kmp-tor:${vTor}-${vKmpTor}") {
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
+    }
+    if(kmpOs == "linux" && kmpArch == "arm64") {
+        implementation("com.sparrowwallet.kmp-tor-binary:kmp-tor-binary-${kmpOs}${kmpArch}-jvm:${vTor}") {
+            exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
+        }
+    } else {
+        implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-${kmpOs}${kmpArch}:${vTor}") {
+            exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
+        }
+    }
+    implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-extract:${vTor}") {
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
+    }
+    implementation("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-manager:${vKmpTor}") {
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
+    }
+    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.7.1') {
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
     }
-    implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-extract:${vTor}")
-    implementation("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-manager:${vKmpTor}")
-    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.7.1')
     implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
     implementation('org.controlsfx:controlsfx:11.1.0' ) {
         exclude group: 'org.openjfx', module: 'javafx-base'
@@ -124,16 +133,16 @@ dependencies {
         exclude group: 'org.slf4j'
     }
     implementation('com.sparrowwallet.bokmakierie:bokmakierie:1.0')
-    implementation('org.eclipse.jetty:jetty-client:9.4.54.v20240208')
+    implementation('com.sparrowwallet:tern:1.0.6')
     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('org.apache.commons:commons-compress:1.25.0')
+    implementation('org.apache.commons:commons-compress:1.27.1')
     implementation('net.sourceforge.streamsupport:streamsupport:1.7.0')
     implementation('com.github.librepdf:openpdf:1.3.30')
-    implementation('com.googlecode.lanterna:lanterna:3.1.1')
+    implementation('com.googlecode.lanterna:lanterna:3.1.3')
     implementation('net.coobird:thumbnailator:0.4.18')
-    implementation('com.github.hervegirod:fxsvgimage:1.0b2')
+    implementation('com.github.hervegirod:fxsvgimage:1.1')
     implementation('com.sparrowwallet:toucan:0.9.0')
     implementation('com.jcraft:jzlib:1.1.3')
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0')
@@ -160,7 +169,7 @@ processResources {
 
 test {
     useJUnitPlatform()
-    jvmArgs = ["--add-opens=java.base/java.io=ALL-UNNAMED", "--add-opens=java.base/java.io=com.google.gson"]
+    jvmArgs = ["--add-opens=java.base/java.io=ALL-UNNAMED", "--add-opens=java.base/java.io=com.google.gson", "--add-reads=org.flywaydb.core=java.desktop"]
 }
 
 application {
@@ -180,6 +189,7 @@ application {
                                  "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx",
+                                 "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx",
                                  "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
@@ -188,7 +198,8 @@ application {
                                  "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
                                  "--add-opens=java.base/java.io=com.google.gson",
                                  "--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow",
-                                 "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
+                                 "--add-reads=kotlin.stdlib=kotlinx.coroutines.core",
+                                 "--add-reads=org.flywaydb.core=java.desktop"]
 
     if(os.macOsX) {
         applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
@@ -209,12 +220,10 @@ jlink {
         requires 'jdk.crypto.cryptoki'
         requires 'java.management'
         requires 'io.leangen.geantyref'
-        uses 'org.flywaydb.core.extensibility.FlywayExtension'
-        uses 'org.flywaydb.core.internal.database.DatabaseType'
         uses 'org.eclipse.jetty.http.HttpFieldPreEncoder'
     }
 
-    options = ['--strip-native-commands', '--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*']
+    options = ['--strip-native-commands', '--strip-java-debug-attributes', '--compress', 'zip-6', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*']
     launcher {
         name = 'sparrow'
         jvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
@@ -229,6 +238,7 @@ jlink {
                    "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx",
+                   "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx",
                    "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
@@ -248,7 +258,8 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor",
                    "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.pg",
                    "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.provider",
-                   "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
+                   "--add-reads=kotlin.stdlib=kotlinx.coroutines.core",
+                   "--add-reads=org.flywaydb.core=java.desktop"]
 
         if(os.windows) {
             jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
@@ -271,11 +282,11 @@ jlink {
         if(os.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"
+            installerType = "msi"
         }
         if(os.linux) {
             if(headless) {
-                installerOptions = ['--license-file', 'LICENSE']
+                installerOptions = ['--license-file', 'LICENSE', '--resource-dir', "src/main/deploy/package/linux-headless/${osArch}"]
             } else {
                 installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-menu-group', 'Sparrow']
             }
@@ -288,11 +299,20 @@ jlink {
             installerType = "dmg"
         }
     }
+    if(os.linux) {
+        jpackageImage {
+            dependsOn('prepareModulesDir', 'copyUdevRules')
+        }
+    }
 }
 
-tasks.jlink.finalizedBy "addUserWritePermission"
+if(os.linux) {
+    tasks.jlink.finalizedBy('addUserWritePermission', 'copyUdevRules')
+} else {
+    tasks.jlink.finalizedBy('addUserWritePermission')
+}
 
-task addUserWritePermission(type: Exec) {
+tasks.register('addUserWritePermission', Exec) {
     if(os.windows) {
         commandLine 'icacls', "$buildDir\\image\\legal", '/grant', 'Users:(OI)(CI)F', '/T'
     } else {
@@ -300,20 +320,27 @@ task addUserWritePermission(type: Exec) {
     }
 }
 
-task removeGroupWritePermission(type: Exec) {
+tasks.register('copyUdevRules', Copy) {
+    from('lark/src/main/resources/udev')
+    into(layout.buildDirectory.dir('image/conf/udev'))
+    include('*')
+}
+
+tasks.register('removeGroupWritePermission', Exec) {
     commandLine 'chmod', '-R', 'g-w', "$buildDir/jpackage/Sparrow"
 }
 
-task packageZipDistribution(type: Zip) {
+tasks.register('packageZipDistribution', Zip) {
     archiveFileName = "Sparrow-${sparrowVersion}.zip"
     destinationDirectory = file("$buildDir/jpackage")
+    preserveFileTimestamps = os.macOsX
     from("$buildDir/jpackage/") {
         include "Sparrow/**"
         include "Sparrow.app/**"
     }
 }
 
-task packageTarDistribution(type: Tar) {
+tasks.register('packageTarDistribution', Tar) {
     dependsOn removeGroupWritePermission
     archiveFileName = "sparrow-${sparrowVersion}-${releaseArch}.tar.gz"
     destinationDirectory = file("$buildDir/jpackage")
@@ -324,60 +351,11 @@ task packageTarDistribution(type: Tar) {
 }
 
 extraJavaModuleInfo {
-    module('jackson-core-2.13.2.jar', 'com.fasterxml.jackson.core', '2.13.2') {
-        exports('com.fasterxml.jackson.core')
-        exports('com.fasterxml.jackson.core.async')
-        exports('com.fasterxml.jackson.core.base')
-        exports('com.fasterxml.jackson.core.exc')
-        exports('com.fasterxml.jackson.core.filter')
-        exports('com.fasterxml.jackson.core.format')
-        exports('com.fasterxml.jackson.core.io')
-        exports('com.fasterxml.jackson.core.json')
-        exports('com.fasterxml.jackson.core.json.async')
-        exports('com.fasterxml.jackson.core.sym')
-        exports('com.fasterxml.jackson.core.type')
-        exports('com.fasterxml.jackson.core.util')
-        uses('com.fasterxml.jackson.core.ObjectCodec')
-    }
-    module('jackson-annotations-2.13.2.jar', 'com.fasterxml.jackson.annotation', '2.13.2') {
-        requires('com.fasterxml.jackson.core')
-        exports('com.fasterxml.jackson.annotation')
-    }
-    module('jackson-databind-2.13.2.jar', 'com.fasterxml.jackson.databind', '2.13.2') {
-        requires('java.desktop')
-        requires('java.logging')
-        requires('com.fasterxml.jackson.annotation')
-        requires('com.fasterxml.jackson.core')
-        requires('java.sql')
-        requires('java.xml')
-        exports('com.fasterxml.jackson.databind')
-        exports('com.fasterxml.jackson.databind.annotation')
-        exports('com.fasterxml.jackson.databind.cfg')
-        exports('com.fasterxml.jackson.databind.deser')
-        exports('com.fasterxml.jackson.databind.deser.impl')
-        exports('com.fasterxml.jackson.databind.deser.std')
-        exports('com.fasterxml.jackson.databind.exc')
-        exports('com.fasterxml.jackson.databind.ext')
-        exports('com.fasterxml.jackson.databind.introspect')
-        exports('com.fasterxml.jackson.databind.json')
-        exports('com.fasterxml.jackson.databind.jsonFormatVisitors')
-        exports('com.fasterxml.jackson.databind.jsonschema')
-        exports('com.fasterxml.jackson.databind.jsontype')
-        exports('com.fasterxml.jackson.databind.jsontype.impl')
-        exports('com.fasterxml.jackson.databind.module')
-        exports('com.fasterxml.jackson.databind.node')
-        exports('com.fasterxml.jackson.databind.ser')
-        exports('com.fasterxml.jackson.databind.ser.impl')
-        exports('com.fasterxml.jackson.databind.ser.std')
-        exports('com.fasterxml.jackson.databind.type')
-        exports('com.fasterxml.jackson.databind.util')
-        uses('com.fasterxml.jackson.databind.Module')
-    }
-    module('tornadofx-controls-1.0.4.jar', 'tornadofx.controls', '1.0.4') {
+    module('no.tornado:tornadofx-controls', 'tornadofx.controls') {
         exports('tornadofx.control')
         requires('javafx.controls')
     }
-    module('simple-json-rpc-core-1.3.jar', 'simple.json.rpc.core', '1.3') {
+    module('com.github.arteam:simple-json-rpc-core', 'simple.json.rpc.core') {
         exports('com.github.arteam.simplejsonrpc.core.annotation')
         exports('com.github.arteam.simplejsonrpc.core.domain')
         requires('com.fasterxml.jackson.core')
@@ -385,7 +363,7 @@ extraJavaModuleInfo {
         requires('com.fasterxml.jackson.databind')
         requires('org.jetbrains.annotations')
     }
-    module('simple-json-rpc-client-1.3.jar', 'simple.json.rpc.client', '1.3') {
+    module('com.github.arteam:simple-json-rpc-client', 'simple.json.rpc.client') {
         exports('com.github.arteam.simplejsonrpc.client')
         exports('com.github.arteam.simplejsonrpc.client.builder')
         exports('com.github.arteam.simplejsonrpc.client.exception')
@@ -393,19 +371,19 @@ extraJavaModuleInfo {
         requires('com.fasterxml.jackson.databind')
         requires('simple.json.rpc.core')
     }
-    module('simple-json-rpc-server-1.3.jar', 'simple.json.rpc.server', '1.3') {
+    module('com.github.arteam:simple-json-rpc-server', 'simple.json.rpc.server') {
         exports('com.github.arteam.simplejsonrpc.server')
         requires('simple.json.rpc.core')
         requires('com.google.common')
         requires('org.slf4j')
         requires('com.fasterxml.jackson.databind')
     }
-    module("bridj${targetName}-0.7-20140918-3.jar", 'com.nativelibs4java.bridj', '0.7-20140918-3') {
+    module("com.nativelibs4java:bridj${targetName}", 'com.nativelibs4java.bridj') {
         exports('org.bridj')
         exports('org.bridj.cpp')
         requires('java.logging')
     }
-    module("webcam-capture${targetName}-0.3.13-SNAPSHOT.jar", 'com.github.sarxos.webcam.capture', '0.3.13-SNAPSHOT') {
+    module("com.github.sarxos:webcam-capture${targetName}", 'com.github.sarxos.webcam.capture') {
         exports('com.github.sarxos.webcam')
         exports('com.github.sarxos.webcam.ds.buildin')
         exports('com.github.sarxos.webcam.ds.buildin.natives')
@@ -413,26 +391,19 @@ extraJavaModuleInfo {
         requires('com.nativelibs4java.bridj')
         requires('org.slf4j')
     }
-    module('centerdevice-nsmenufx-2.1.7.jar', 'centerdevice.nsmenufx', '2.1.7') {
+    module('de.codecentric.centerdevice:centerdevice-nsmenufx', 'centerdevice.nsmenufx') {
         exports('de.codecentric.centerdevice')
         requires('javafx.base')
         requires('javafx.controls')
         requires('javafx.graphics')
     }
-    module('javacsv-2.0.jar', 'net.sourceforge.javacsv', '2.0') {
+    module('net.sourceforge.javacsv:javacsv', 'net.sourceforge.javacsv') {
         exports('com.csvreader')
     }
-    module('jeromq-0.5.0.jar', 'jeromq', '0.5.0') {
-        exports('org.zeromq')
-    }
-    module('json-simple-1.1.1.jar', 'json.simple', '1.1.1') {
-        exports('org.json.simple')
-        exports('org.json.simple.parser')
-    }
-    module('listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar', 'com.google.guava.listenablefuture', '9999.0-empty-to-avoid-conflict-with-guava')
-    module('jsr305-3.0.2.jar', 'com.google.code.findbugs.jsr305', '3.0.2')
+    module('com.google.guava:listenablefuture|empty-to-avoid-conflict-with-guava', 'com.google.guava.listenablefuture')
+    module('com.google.code.findbugs:jsr305', 'com.google.code.findbugs.jsr305')
     module('j2objc-annotations-2.8.jar', 'com.google.j2objc.j2objc.annotations', '2.8')
-    module('jdbi3-core-3.20.0.jar', 'org.jdbi.v3.core', '3.20.0') {
+    module('org.jdbi:jdbi3-core', 'org.jdbi.v3.core') {
         exports('org.jdbi.v3.core')
         exports('org.jdbi.v3.core.mapper')
         exports('org.jdbi.v3.core.statement')
@@ -444,10 +415,10 @@ extraJavaModuleInfo {
         requires('org.slf4j')
         requires('com.github.benmanes.caffeine')
     }
-    module('geantyref-1.3.11.jar', 'io.leangen.geantyref', '1.3.11') {
+    module('io.leangen.geantyref:geantyref', 'io.leangen.geantyref') {
         exports('io.leangen.geantyref')
     }
-    module('richtextfx-0.10.4.jar', 'org.fxmisc.richtext', '0.10.4') {
+    module('org.fxmisc.richtext:richtextfx', 'org.fxmisc.richtext') {
         exports('org.fxmisc.richtext')
         exports('org.fxmisc.richtext.event')
         exports('org.fxmisc.richtext.model')
@@ -459,20 +430,20 @@ extraJavaModuleInfo {
         requires('org.fxmisc.undo.undofx')
         requires('org.fxmisc.wellbehaved')
     }
-    module('undofx-2.1.0.jar', 'org.fxmisc.undo.undofx', '2.1.0') {
+    module('org.fxmisc.undo:undofx', 'org.fxmisc.undo.undofx') {
         requires('javafx.base')
         requires('javafx.controls')
         requires('javafx.graphics')
         requires('org.reactfx.reactfx')
     }
-    module('flowless-0.6.1.jar', 'org.fxmisc.flowless', '0.6.1') {
+    module('org.fxmisc.flowless:flowless', 'org.fxmisc.flowless') {
         exports('org.fxmisc.flowless')
         requires('javafx.base')
         requires('javafx.controls')
         requires('javafx.graphics')
         requires('org.reactfx.reactfx')
     }
-    module('reactfx-2.0-M5.jar', 'org.reactfx.reactfx', '2.0-M5') {
+    module('org.reactfx:reactfx', 'org.reactfx.reactfx') {
         exports('org.reactfx')
         exports('org.reactfx.value')
         exports('org.reactfx.collection')
@@ -481,70 +452,42 @@ extraJavaModuleInfo {
         requires('javafx.graphics')
         requires('javafx.controls')
     }
-    module('rxjavafx-2.2.2.jar', 'io.reactivex.rxjava2fx', '2.2.2') {
+    module('io.reactivex.rxjava2:rxjavafx', 'io.reactivex.rxjava2fx') {
         exports('io.reactivex.rxjavafx.schedulers')
         requires('io.reactivex.rxjava2')
         requires('javafx.graphics')
     }
-    module('wellbehavedfx-0.3.3.jar', 'org.fxmisc.wellbehaved', '0.3.3') {
+    module('org.flywaydb:flyway-core', 'org.flywaydb.core') {
+        exports('org.flywaydb.core')
+        exports('org.flywaydb.core.api')
+        exports('org.flywaydb.core.api.exception')
+        exports('org.flywaydb.core.api.configuration')
+        uses('org.flywaydb.core.extensibility.Plugin')
+        requires('java.sql')
+    }
+    module('org.fxmisc.wellbehaved:wellbehavedfx', 'org.fxmisc.wellbehaved') {
         requires('javafx.base')
         requires('javafx.graphics')
     }
-    module('jai-imageio-core-1.4.0.jar', 'com.github.jai.imageio.jai.imageio.core', '1.4.0')
-    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')
+    module('com.github.jai-imageio:jai-imageio-core', 'com.github.jai.imageio.jai.imageio.core') {
+        requires('java.desktop')
     }
-    module('cbor-0.9.jar', 'co.nstant.in.cbor', '0.9') {
+    module('co.nstant.in:cbor', 'co.nstant.in.cbor') {
         exports('co.nstant.in.cbor')
         exports('co.nstant.in.cbor.model')
         exports('co.nstant.in.cbor.builder')
     }
-    module('commons-codec-1.10.jar', 'commons.codec', '1.10') {
-        exports('org.apache.commons.codec')
-    }
-    module('logback-core-1.2.13.jar', 'ch.qos.logback.core', '1.2.13') {
-        exports('ch.qos.logback.core')
-    }
-    module('jackson-datatype-jsr310-2.13.2.jar', 'jackson-datatype-jsr310', '2.13.2') {
-        exports('com.fasterxml.jackson.datatype.jsr310')
-    }
-    module('json-20240205.jar', 'org.json', '20240205') {
-        exports('org.json')
-    }
-    module('scrypt-1.4.0.jar', 'scrypt', '1.4.0') {
-        exports('com.lambdaworks.codec')
-        exports('com.lambdaworks.crypto')
-    }
-    module('okio-1.6.0.jar', 'com.squareup.okio', '1.6.0') {
-        exports('okio')
-    }
-    module('java-jwt-3.8.1.jar', 'com.auth0.jwt', '3.8.1') {
-        exports('com.auth0.jwt')
-    }
-    module('streamsupport-1.7.0.jar', 'net.sourceforge.streamsupport', '1.7.0') {
+    module('net.sourceforge.streamsupport:streamsupport', 'net.sourceforge.streamsupport') {
         requires('jdk.unsupported')
         exports('java8.util')
         exports('java8.util.function')
         exports('java8.util.stream')
     }
-    module('commons-text-1.2.jar', 'org.apache.commons.text', '1.2') {
-        exports('org.apache.commons.text')
-    }
-    module('jcip-annotations-1.0.jar', 'net.jcip.annotations', '1.0') {
-        exports('net.jcip.annotations')
-    }
-    module('thumbnailator-0.4.18.jar', 'net.coobird.thumbnailator', '0.4.18') {
+    module('net.coobird:thumbnailator', 'net.coobird.thumbnailator') {
         exports('net.coobird.thumbnailator')
         requires('java.desktop')
     }
-    module('fxsvgimage-1.0b2.jar', 'com.github.hervegirod', '1.0b2') {
-        exports('org.girod.javafx.svgimage')
-        requires('javafx.graphics')
-        requires('java.xml')
-    }
-    module("kmp-tor-jvm-${vKmpTor}.jar", 'kmp.tor.jvm', "${vTor}-${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-jvm", 'kmp.tor.jvm') {
         exports('io.matthewnelson.kmp.tor')
         requires('kmp.tor.binary.extract.jvm')
         requires('kmp.tor.manager.jvm')
@@ -555,24 +498,24 @@ extraJavaModuleInfo {
         requires('java.management')
     }
     if(kmpOs == "linux" && kmpArch == "arm64") {
-        module("kmp-tor-binary-${kmpOs}${kmpArch}-jvm-${vTor}.jar", "kmp.tor.binary.${kmpOs}${kmpArch}", "${vTor}") {
+        module("com.sparrowwallet.kmp-tor-binary:kmp-tor-binary-${kmpOs}${kmpArch}-jvm", "kmp.tor.binary.${kmpOs}${kmpArch}") {
             exports("io.matthewnelson.kmp.tor.resource.${kmpOs}.${kmpArch}")
             exports("kmptor.${kmpOs}.${kmpArch}")
         }
     } else {
-        module("kmp-tor-binary-${kmpOs}${kmpArch}-jvm-${vTor}.jar", "kmp.tor.binary.${kmpOs}${kmpArch}", "${vTor}") {
+        module("io.matthewnelson.kotlin-components:kmp-tor-binary-${kmpOs}${kmpArch}-jvm", "kmp.tor.binary.${kmpOs}${kmpArch}") {
             exports("io.matthewnelson.kmp.tor.binary.${kmpOs}.${kmpArch}")
             exports("kmptor.${kmpOs}.${kmpArch}")
         }
     }
-    module("kmp-tor-binary-extract-jvm-${vTor}.jar", 'kmp.tor.binary.extract.jvm', "${vTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-binary-extract-jvm", 'kmp.tor.binary.extract.jvm') {
         exports('io.matthewnelson.kmp.tor.binary.extract')
         exports('io.matthewnelson.kmp.tor.binary.extract.internal')
         requires('kotlin.stdlib')
         requires("kmp.tor.binary.${kmpOs}${kmpArch}")
         requires('kmp.tor.binary.geoip.jvm')
     }
-    module("kmp-tor-manager-jvm-${vKmpTor}.jar", 'kmp.tor.manager.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-manager-jvm", 'kmp.tor.manager.jvm') {
         exports('io.matthewnelson.kmp.tor.manager')
         exports('io.matthewnelson.kmp.tor.manager.util')
         requires('kmp.tor.controller.common.jvm')
@@ -583,7 +526,7 @@ extraJavaModuleInfo {
         requires('kmp.tor.controller.jvm')
         requires('kmp.tor.common.jvm')
     }
-    module("kmp-tor-manager-common-jvm-${vKmpTor}.jar", 'kmp.tor.manager.common.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-manager-common-jvm", 'kmp.tor.manager.common.jvm') {
         exports('io.matthewnelson.kmp.tor.manager.common')
         exports('io.matthewnelson.kmp.tor.manager.common.event')
         exports('io.matthewnelson.kmp.tor.manager.common.state')
@@ -591,7 +534,7 @@ extraJavaModuleInfo {
         requires('kmp.tor.common.jvm')
         requires('kotlin.stdlib')
     }
-    module("kmp-tor-controller-common-jvm-${vKmpTor}.jar", 'kmp.tor.controller.common.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-controller-common-jvm", 'kmp.tor.controller.common.jvm') {
         exports('io.matthewnelson.kmp.tor.controller.common.config')
         exports('io.matthewnelson.kmp.tor.controller.common.file')
         exports('io.matthewnelson.kmp.tor.controller.common.control')
@@ -602,12 +545,12 @@ extraJavaModuleInfo {
         requires('kotlin.stdlib')
         requires('kotlinx.atomicfu')
     }
-    module("kmp-tor-common-jvm-${vKmpTor}.jar", 'kmp.tor.common.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-common-jvm", 'kmp.tor.common.jvm') {
         exports('io.matthewnelson.kmp.tor.common.address')
         requires('parcelize.jvm')
         requires('kotlin.stdlib')
     }
-    module("kmp-tor-controller-jvm-${vKmpTor}.jar", 'kmp.tor.controller.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-controller-jvm", 'kmp.tor.controller.jvm') {
         exports('io.matthewnelson.kmp.tor.controller.internal.controller')
         requires('kmp.tor.common.jvm')
         requires('kmp.tor.controller.common.jvm')
@@ -617,10 +560,10 @@ extraJavaModuleInfo {
         requires('encoding.core.jvm')
         requires('encoding.base16.jvm')
     }
-    module("kmp-tor-ext-callback-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.common.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-common-jvm", 'kmp.tor.ext.callback.common.jvm') {
         exports('io.matthewnelson.kmp.tor.ext.callback.common')
     }
-    module("kmp-tor-ext-callback-manager-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.manager.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-manager-jvm", 'kmp.tor.ext.callback.manager.jvm') {
         exports('io.matthewnelson.kmp.tor.ext.callback.manager')
         requires('kmp.tor.manager.jvm')
         requires('kmp.tor.ext.callback.common.jvm')
@@ -631,15 +574,15 @@ extraJavaModuleInfo {
         requires('kotlin.stdlib')
         requires('kotlinx.coroutines.core')
     }
-    module("kmp-tor-ext-callback-manager-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.manager.common.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-manager-common-jvm", 'kmp.tor.ext.callback.manager.common.jvm') {
         exports('io.matthewnelson.kmp.tor.ext.callback.manager.common')
         requires('kmp.tor.ext.callback.controller.common.jvm')
     }
-    module("kmp-tor-ext-callback-controller-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.controller.common.jvm', "${vKmpTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-controller-common-jvm", 'kmp.tor.ext.callback.controller.common.jvm') {
         exports('io.matthewnelson.kmp.tor.ext.callback.controller.common.control')
         exports('io.matthewnelson.kmp.tor.ext.callback.controller.common.control.usecase')
     }
-    module("kmp-tor-binary-geoip-jvm-${vTor}.jar", 'kmp.tor.binary.geoip.jvm', "${vTor}") {
+    module("io.matthewnelson.kotlin-components:kmp-tor-binary-geoip-jvm", 'kmp.tor.binary.geoip.jvm') {
         exports('io.matthewnelson.kmp.tor.binary.geoip')
         exports('kmptor')
     }
@@ -657,11 +600,18 @@ extraJavaModuleInfo {
     module("parcelize-jvm-0.1.2.jar", 'parcelize.jvm', "0.1.2") {
         exports('io.matthewnelson.component.parcelize')
     }
-    module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
-    module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') {
+    module('org.jcommander:jcommander', 'org.jcommander') {
         exports('com.beust.jcommander')
     }
-    module('jzlib-1.1.3.jar', 'com.jcraft.jzlib', '1.1.3') {
+    module('com.sparrowwallet:hid4java', 'org.hid4java') {
+        requires('com.sun.jna')
+        exports('org.hid4java')
+        exports('org.hid4java.jna')
+    }
+    module('com.sparrowwallet:usb4java', 'org.usb4java') {
+        exports('org.usb4java')
+    }
+    module('com.jcraft:jzlib', 'com.jcraft.jzlib') {
         exports('com.jcraft.jzlib')
     }
 }

buildSrc/build.gradle

@@ -5,7 +5,6 @@ plugins {
 dependencies {
     implementation 'com.google.gradle:osdetector-gradle-plugin:1.7.3'
     implementation 'org.javamodularity:moduleplugin:1.8.14'
-    implementation 'org.ow2.asm:asm:9.6'
 }
 
 repositories {
@@ -17,11 +16,6 @@ repositories {
 
 gradlePlugin {
     plugins {
-        // here we register our plugin with an ID
-        register("extra-java-module-info") {
-            id = "extra-java-module-info"
-            implementationClass = "org.gradle.sample.transform.javamodules.ExtraModuleInfoPlugin"
-        }
         register("org-openjfx-javafxplugin") {
             id = "org-openjfx-javafxplugin"
             implementationClass = "org.openjfx.gradle.JavaFXPlugin"

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

@@ -1,54 +0,0 @@
-package org.gradle.sample.transform.javamodules;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.attributes.Attribute;
-import org.gradle.api.plugins.JavaPlugin;
-
-/**
- * Entry point of our plugin that should be applied in the root project.
- */
-public class ExtraModuleInfoPlugin implements Plugin<Project> {
-
-    @Override
-    public void apply(Project project) {
-        // register the plugin extension as 'extraJavaModuleInfo {}' configuration block
-        ExtraModuleInfoPluginExtension extension = project.getObjects().newInstance(ExtraModuleInfoPluginExtension.class);
-        project.getExtensions().add(ExtraModuleInfoPluginExtension.class, "extraJavaModuleInfo", extension);
-
-        // setup the transform for all projects in the build
-        project.getPlugins().withType(JavaPlugin.class).configureEach(javaPlugin -> configureTransform(project, extension));
-    }
-
-    private void configureTransform(Project project, ExtraModuleInfoPluginExtension extension) {
-        Attribute<String> artifactType = Attribute.of("artifactType", String.class);
-        Attribute<Boolean> javaModule = Attribute.of("javaModule", Boolean.class);
-
-        // compile and runtime classpath express that they only accept modules by requesting the javaModule=true attribute
-        project.getConfigurations().matching(this::isResolvingJavaPluginConfiguration).all(
-                c -> c.getAttributes().attribute(javaModule, true));
-
-        // all Jars have a javaModule=false attribute by default; the transform also recognizes modules and returns them without modification
-        project.getDependencies().getArtifactTypes().getByName("jar").getAttributes().attribute(javaModule, false);
-
-        // register the transform for Jars and "javaModule=false -> javaModule=true"; the plugin extension object fills the input parameter
-        project.getDependencies().registerTransform(ExtraModuleInfoTransform.class, t -> {
-            t.parameters(p -> {
-                p.setModuleInfo(extension.getModuleInfo());
-                p.setAutomaticModules(extension.getAutomaticModules());
-            });
-            t.getFrom().attribute(artifactType, "jar").attribute(javaModule, false);
-            t.getTo().attribute(artifactType, "jar").attribute(javaModule, true);
-        });
-    }
-
-    private boolean isResolvingJavaPluginConfiguration(Configuration configuration) {
-        if (!configuration.isCanBeResolved()) {
-            return false;
-        }
-        return configuration.getName().endsWith(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME.substring(1))
-                || configuration.getName().endsWith(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME.substring(1))
-                || configuration.getName().endsWith(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME.substring(1));
-    }
-}

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

@@ -1,52 +0,0 @@
-package org.gradle.sample.transform.javamodules;
-
-
-import org.gradle.api.Action;
-
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A data class to collect all the module information we want to add.
- * Here the class is used as extension that can be configured in the build script
- * and as input to the ExtraModuleInfoTransform that add the information to Jars.
- */
-public class ExtraModuleInfoPluginExtension {
-
-    private final Map<String, ModuleInfo> moduleInfo = new HashMap<>();
-    private final Map<String, String> automaticModules = new HashMap<>();
-
-    /**
-     * Add full module information for a given Jar file.
-     */
-    public void module(String jarName, String moduleName, String moduleVersion) {
-        module(jarName, moduleName, moduleVersion, null);
-    }
-
-    /**
-     * Add full module information, including exported packages and dependencies, for a given Jar file.
-     */
-    public void module(String jarName, String moduleName, String moduleVersion, @Nullable Action<? super ModuleInfo> conf) {
-        ModuleInfo moduleInfo = new ModuleInfo(moduleName, moduleVersion);
-        if (conf != null) {
-            conf.execute(moduleInfo);
-        }
-        this.moduleInfo.put(jarName, moduleInfo);
-    }
-
-    /**
-     * Add only an automatic module name to a given jar file.
-     */
-    public void automaticModule(String jarName, String moduleName) {
-        automaticModules.put(jarName, moduleName);
-    }
-
-    protected Map<String, ModuleInfo> getModuleInfo() {
-        return moduleInfo;
-    }
-
-    protected Map<String, String> getAutomaticModules() {
-        return automaticModules;
-    }
-}

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

@@ -1,176 +0,0 @@
-package org.gradle.sample.transform.javamodules;
-
-import org.gradle.api.artifacts.transform.InputArtifact;
-import org.gradle.api.artifacts.transform.TransformAction;
-import org.gradle.api.artifacts.transform.TransformOutputs;
-import org.gradle.api.artifacts.transform.TransformParameters;
-import org.gradle.api.file.FileSystemLocation;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.tasks.Input;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.ModuleVisitor;
-import org.objectweb.asm.Opcodes;
-
-import java.io.*;
-import java.util.Collections;
-import java.util.Map;
-import java.util.jar.*;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-
-/**
- * An artifact transform that applies additional information to Jars without module information.
- * The transformation fails the build if a Jar does not contain information and no extra information
- * was defined for it. This way we make sure that all Jars are turned into modules.
- */
-abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraModuleInfoTransform.Parameter> {
-
-    public static class Parameter implements TransformParameters, Serializable {
-        private Map<String, ModuleInfo> moduleInfo = Collections.emptyMap();
-        private Map<String, String> automaticModules = Collections.emptyMap();
-
-        @Input
-        public Map<String, ModuleInfo> getModuleInfo() {
-            return moduleInfo;
-        }
-
-        @Input
-        public Map<String, String> getAutomaticModules() {
-            return automaticModules;
-        }
-
-        public void setModuleInfo(Map<String, ModuleInfo> moduleInfo) {
-            this.moduleInfo = moduleInfo;
-        }
-
-        public void setAutomaticModules(Map<String, String> automaticModules) {
-            this.automaticModules = automaticModules;
-        }
-    }
-
-    @InputArtifact
-    protected abstract Provider<FileSystemLocation> getInputArtifact();
-
-    @Override
-    public void transform(TransformOutputs outputs) {
-        Map<String, ModuleInfo> moduleInfo = getParameters().moduleInfo;
-        Map<String, String> automaticModules = getParameters().automaticModules;
-        File originalJar = getInputArtifact().get().getAsFile();
-        String originalJarName = originalJar.getName();
-
-        //Recreate jackson jars as open, non-synthetic modules
-        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));
-        } else if (isAutoModule(originalJar)) {
-            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);
-        }
-    }
-
-    private boolean isModule(File jar) {
-        Pattern moduleInfoClassMrjarPath = Pattern.compile("META-INF/versions/\\d+/module-info.class");
-        try (JarInputStream inputStream =  new JarInputStream(new FileInputStream(jar))) {
-            boolean isMultiReleaseJar = containsMultiReleaseJarEntry(inputStream);
-            ZipEntry next = inputStream.getNextEntry();
-            while (next != null) {
-                if ("module-info.class".equals(next.getName())) {
-                    return true;
-                }
-                if (isMultiReleaseJar && moduleInfoClassMrjarPath.matcher(next.getName()).matches()) {
-                    return true;
-                }
-                next = inputStream.getNextEntry();
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return false;
-    }
-
-    private boolean containsMultiReleaseJarEntry(JarInputStream jarStream) {
-        Manifest manifest = jarStream.getManifest();
-        return manifest != null && Boolean.parseBoolean(manifest.getMainAttributes().getValue("Multi-Release"));
-    }
-
-    private boolean isAutoModule(File jar) {
-        try (JarInputStream inputStream = new JarInputStream(new FileInputStream(jar))) {
-            return inputStream.getManifest().getMainAttributes().getValue("Automatic-Module-Name") != null;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private File getModuleJar(TransformOutputs outputs, File originalJar) {
-        return outputs.file(originalJar.getName().substring(0, originalJar.getName().lastIndexOf('.')) + "-module.jar");
-    }
-
-    private static void addAutomaticModuleName(File originalJar, File moduleJar, String moduleName) {
-        try (JarInputStream inputStream = new JarInputStream(new FileInputStream(originalJar))) {
-            Manifest manifest = inputStream.getManifest();
-            manifest.getMainAttributes().put(new Attributes.Name("Automatic-Module-Name"), moduleName);
-            try (JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(moduleJar), inputStream.getManifest())) {
-                copyEntries(inputStream, outputStream);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static void addModuleDescriptor(File originalJar, File moduleJar, ModuleInfo moduleInfo) {
-        try (JarInputStream inputStream = new JarInputStream(new FileInputStream(originalJar))) {
-            Manifest manifest = inputStream.getManifest();
-            if(manifest == null) {
-                manifest = new Manifest();
-            }
-            try (JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(moduleJar), manifest)) {
-                copyEntries(inputStream, outputStream);
-                outputStream.putNextEntry(new JarEntry("module-info.class"));
-                outputStream.write(addModuleInfo(moduleInfo));
-                outputStream.closeEntry();
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static void copyEntries(JarInputStream inputStream, JarOutputStream outputStream) throws IOException {
-        JarEntry jarEntry = inputStream.getNextJarEntry();
-        while (jarEntry != null) {
-            if(!jarEntry.getName().equals("module-info.class")) {
-                outputStream.putNextEntry(jarEntry);
-                outputStream.write(inputStream.readAllBytes());
-                outputStream.closeEntry();
-            }
-            jarEntry = inputStream.getNextJarEntry();
-        }
-    }
-
-    private static byte[] addModuleInfo(ModuleInfo moduleInfo) {
-        ClassWriter classWriter = new ClassWriter(0);
-        classWriter.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null, null);
-        ModuleVisitor moduleVisitor = classWriter.visitModule(moduleInfo.getModuleName(), Opcodes.ACC_OPEN, moduleInfo.getModuleVersion());
-        for (String packageName : moduleInfo.getExports()) {
-            moduleVisitor.visitExport(packageName.replace('.', '/'), 0);
-        }
-        moduleVisitor.visitRequire("java.base", 0, null);
-        for (String requireName : moduleInfo.getRequires()) {
-            moduleVisitor.visitRequire(requireName, 0, null);
-        }
-        for (String requireName : moduleInfo.getRequiresTransitive()) {
-            moduleVisitor.visitRequire(requireName, Opcodes.ACC_TRANSITIVE, null);
-        }
-        for (String usesName : moduleInfo.getUses()) {
-            moduleVisitor.visitUse(usesName.replace('.', '/'));
-        }
-        moduleVisitor.visitEnd();
-        classWriter.visitEnd();
-        return classWriter.toByteArray();
-    }
-}

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

@@ -1,62 +0,0 @@
-package org.gradle.sample.transform.javamodules;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Data class to hold the information that should be added as module-info.class to an existing Jar file.
- */
-public class ModuleInfo implements Serializable {
-    private String moduleName;
-    private String moduleVersion;
-    private List<String> exports = new ArrayList<>();
-    private List<String> requires = new ArrayList<>();
-    private List<String> requiresTransitive = new ArrayList<>();
-    private List<String> uses = new ArrayList<>();
-
-    ModuleInfo(String moduleName, String moduleVersion) {
-        this.moduleName = moduleName;
-        this.moduleVersion = moduleVersion;
-    }
-
-    public void exports(String exports) {
-        this.exports.add(exports);
-    }
-
-    public void requires(String requires) {
-        this.requires.add(requires);
-    }
-
-    public void requiresTransitive(String requiresTransitive) {
-        this.requiresTransitive.add(requiresTransitive);
-    }
-
-    public void uses(String uses) {
-        this.uses.add(uses);
-    }
-
-    public String getModuleName() {
-        return moduleName;
-    }
-
-    protected String getModuleVersion() {
-        return moduleVersion;
-    }
-
-    protected List<String> getExports() {
-        return exports;
-    }
-
-    protected List<String> getRequires() {
-        return requires;
-    }
-
-    protected List<String> getRequiresTransitive() {
-        return requiresTransitive;
-    }
-
-    protected List<String> getUses() {
-        return uses;
-    }
-}

docs/reproducible.md

@@ -12,17 +12,18 @@ 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.6.6 and later, this is Eclipse Temurin 18.0.1+10.
+For v1.6.6 to v1.9.1, this was Eclipse Temurin 18.0.1+10. For v2.0.0 and later, Eclipse Temurin 22.0.2+9 is used.
 
 #### Java from Adoptium github repo
 
-It is available for all supported platforms from [Eclipse Temurin 18.0.1+10](https://github.com/adoptium/temurin18-binaries/releases/tag/jdk-18.0.1%2B10).
+It is available for all supported platforms from [Eclipse Temurin 22.0.2+9](https://github.com/adoptium/temurin22-binaries/releases/tag/jdk-22.0.2%2B9).
 
 For reference, the downloads are as follows:
-- [Linux x64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_linux_hotspot_18.0.1_10.tar.gz)
-- [MacOS x64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_mac_hotspot_18.0.1_10.tar.gz)
-- [MacOS aarch64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.1_10.tar.gz)
-- [Windows x64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_windows_hotspot_18.0.1_10.zip)
+- [Linux x64](https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_linux_hotspot_22.0.2_9.tar.gz)
+- [Linux aarch64](https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.2_9.tar.gz)
+- [MacOS x64](https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_mac_hotspot_22.0.2_9.tar.gz)
+- [MacOS aarch64](https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_aarch64_mac_hotspot_22.0.2_9.tar.gz)
+- [Windows x64](https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.zip)
 
 #### Java from Adoptium deb repo
 
@@ -57,7 +58,7 @@ echo "deb [signed-by=/usr/share/keyrings/adoptium.asc] https://packages.adoptium
 Update cache, install the desired temurin version and configure java to be linked to this same version:
 ```
 sudo apt update -y
-sudo apt-get install -y temurin-18-jdk=18.0.1+10
+sudo apt-get install -y temurin-22-jdk=22.0.2+9
 sudo update-alternatives --config java
 ```
 
@@ -67,7 +68,7 @@ A alternative option for all platforms is to use the [sdkman.io](https://sdkman.
 See the installation [instructions here](https://sdkman.io/install).
 Once installed, run
 ```shell
-sdk install java 18.0.1-tem
+sdk install java 22.0.2-tem
 ```
 
 ### Other requirements
@@ -82,7 +83,7 @@ sudo apt install -y rpm fakeroot binutils
 First, assign a temporary variable in your shell for the specific release you want to build. For the current one specify:
 
 ```shell
-GIT_TAG="1.8.6"
+GIT_TAG="2.0.0"
 ```
 
 The project can then be initially cloned as follows:

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,3 +1,4 @@
 rootProject.name = 'sparrow'
 include 'drongo'
+include 'lark'
 

src/main/deploy/package/linux-headless/aarch64/control

@@ -0,0 +1,9 @@
+Package: sparrow
+Version: 2.1.3-1
+Section: utils
+Maintainer: Craig Raw <mail@sparrowwallet.com>
+Priority: optional
+Architecture: arm64
+Provides: sparrow
+Description: Sparrow
+Depends: libc6, zlib1g

src/main/deploy/package/linux-headless/x64/control

@@ -0,0 +1,9 @@
+Package: sparrow
+Version: 2.1.3-1
+Section: utils
+Maintainer: Craig Raw <mail@sparrowwallet.com>
+Priority: optional
+Architecture: amd64
+Provides: sparrow
+Description: Sparrow
+Depends: libc6, zlib1g

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

@@ -8,3 +8,4 @@ Type=Application
 Categories=Finance;Network;
 MimeType=application/psbt;application/bitcoin-transaction;application/pgp-signature;x-scheme-handler/bitcoin;x-scheme-handler/auth47;x-scheme-handler/lightning
 StartupWMClass=Sparrow
+SingleMainWindow=true

src/main/deploy/package/linux/postinst

@@ -0,0 +1,49 @@
+#!/bin/sh
+# postinst script for sparrow
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+package_type=deb
+
+
+case "$1" in
+    configure)
+        xdg-desktop-menu install /opt/sparrow/lib/sparrow-Sparrow.desktop
+        xdg-mime install /opt/sparrow/lib/sparrow-Sparrow-MimeInfo.xml
+        install -D -m 644 /opt/sparrow/lib/runtime/conf/udev/*.rules /etc/udev/rules.d
+        if ! getent group plugdev > /dev/null; then
+            groupadd plugdev
+        fi
+        if ! groups "${SUDO_USER:-$(whoami)}" | grep -q plugdev; then
+            usermod -aG plugdev "${SUDO_USER:-$(whoami)}"
+        fi
+        if [ -w /sys/devices ] && [ -w /sys/kernel/uevent_seqnum ] && [ -x /bin/udevadm ]; then
+            /bin/udevadm control --reload
+            /bin/udevadm trigger
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+exit 0

src/main/deploy/package/linux/sparrow.spec

@@ -0,0 +1,259 @@
+Summary: Sparrow
+Name: sparrow
+Version: 2.1.3
+Release: 1
+License: ASL 2.0
+Vendor: Unknown
+
+%if "x" != "x"
+URL: 
+%endif
+
+%if "x/opt" != "x"
+Prefix: /opt
+%endif
+
+Provides: sparrow
+
+%if "xutils" != "x"
+Group: utils
+%endif
+
+Autoprov: 0
+Autoreq: 0
+%if "xxdg-utils" != "x" || "x" != "x"
+Requires: xdg-utils 
+%endif
+
+#comment line below to enable effective jar compression
+#it could easily get your package size from 40 to 15Mb but
+#build time will substantially increase and it may require unpack200/system java to install
+%define __jar_repack %{nil}
+
+# on RHEL we got unwanted improved debugging enhancements
+%define _build_id_links none
+
+%define package_filelist %{_builddir}/%{name}.files
+%define app_filelist %{_builddir}/%{name}.app.files
+%define filesystem_filelist %{_builddir}/%{name}.filesystem.files
+
+%define default_filesystem / /opt /usr /usr/bin /usr/lib /usr/local /usr/local/bin /usr/local/lib
+
+%description
+Sparrow
+
+%global __os_install_post %{nil}
+
+%prep
+
+%build
+
+%install
+rm -rf %{buildroot}
+install -d -m 755 %{buildroot}/opt/sparrow
+cp -r %{_sourcedir}/opt/sparrow/* %{buildroot}/opt/sparrow
+if [ "$(echo %{_sourcedir}/lib/systemd/system/*.service)" != '%{_sourcedir}/lib/systemd/system/*.service' ]; then
+  install -d -m 755 %{buildroot}/lib/systemd/system
+  cp %{_sourcedir}/lib/systemd/system/*.service %{buildroot}/lib/systemd/system
+fi
+%if "x%{_rpmdir}/../../LICENSE" != "x"
+  %define license_install_file %{_defaultlicensedir}/%{name}-%{version}/%{basename:%{_rpmdir}/../../LICENSE}
+  install -d -m 755 "%{buildroot}%{dirname:%{license_install_file}}"
+  install -m 644 "%{_rpmdir}/../../LICENSE" "%{buildroot}%{license_install_file}"
+%endif
+(cd %{buildroot} && find . -path ./lib/systemd -prune -o -type d -print) | sed -e 's/^\.//' -e '/^$/d' | sort > %{app_filelist}
+{ rpm -ql filesystem || echo %{default_filesystem}; } | sort > %{filesystem_filelist}
+comm -23 %{app_filelist} %{filesystem_filelist} > %{package_filelist}
+sed -i -e 's/.*/%dir "&"/' %{package_filelist}
+(cd %{buildroot} && find . -not -type d) | sed -e 's/^\.//' -e 's/.*/"&"/' >> %{package_filelist}
+%if "x%{_rpmdir}/../../LICENSE" != "x"
+  sed -i -e 's|"%{license_install_file}"||' -e '/^$/d' %{package_filelist}
+%endif
+
+%files -f %{package_filelist}
+%if "x%{_rpmdir}/../../LICENSE" != "x"
+  %license "%{license_install_file}"
+%endif
+
+%post
+package_type=rpm
+xdg-desktop-menu install /opt/sparrow/lib/sparrow-Sparrow.desktop
+xdg-mime install /opt/sparrow/lib/sparrow-Sparrow-MimeInfo.xml
+install -D -m 644 /opt/sparrow/lib/runtime/conf/udev/*.rules /etc/udev/rules.d
+if ! getent group plugdev > /dev/null; then
+    groupadd plugdev
+fi
+if ! groups "${SUDO_USER:-$(whoami)}" | grep -q plugdev; then
+    usermod -aG plugdev "${SUDO_USER:-$(whoami)}"
+fi
+if [ -w /sys/devices ] && [ -w /sys/kernel/uevent_seqnum ] && [ -x /bin/udevadm ]; then
+    /bin/udevadm control --reload
+    /bin/udevadm trigger
+fi
+
+%pre
+package_type=rpm
+file_belongs_to_single_package ()
+{
+  if [ ! -e "$1" ]; then
+    false
+  elif [ "$package_type" = rpm ]; then
+    test `rpm -q --whatprovides "$1" | wc -l` = 1
+  elif [ "$package_type" = deb ]; then
+    test `dpkg -S "$1" | wc -l` = 1
+  else
+    exit 1
+  fi
+}
+
+
+do_if_file_belongs_to_single_package ()
+{
+  local file="$1"
+  shift
+
+  if file_belongs_to_single_package "$file"; then
+    "$@"
+  fi
+}
+
+if [ "$1" -gt 1 ]; then
+  :; 
+fi
+
+%preun
+package_type=rpm
+file_belongs_to_single_package ()
+{
+  if [ ! -e "$1" ]; then
+    false
+  elif [ "$package_type" = rpm ]; then
+    test `rpm -q --whatprovides "$1" | wc -l` = 1
+  elif [ "$package_type" = deb ]; then
+    test `dpkg -S "$1" | wc -l` = 1
+  else
+    exit 1
+  fi
+}
+
+
+do_if_file_belongs_to_single_package ()
+{
+  local file="$1"
+  shift
+
+  if file_belongs_to_single_package "$file"; then
+    "$@"
+  fi
+}
+#
+# Remove $1 desktop file from the list of default handlers for $2 mime type
+# in $3 file dumping output to stdout.
+#
+desktop_filter_out_default_mime_handler ()
+{
+  local defaults_list="$3"
+
+  local desktop_file="$1"
+  local mime_type="$2"
+
+  awk -f- "$defaults_list" <<EOF
+  BEGIN {
+    mime_type="$mime_type"
+    mime_type_regexp="~" mime_type "="
+    desktop_file="$desktop_file"
+  }
+  \$0 ~ mime_type {
+    \$0 = substr(\$0, length(mime_type) + 2);
+    split(\$0, desktop_files, ";")
+    remaining_desktop_files
+    counter=0
+    for (idx in desktop_files) {
+      if (desktop_files[idx] != desktop_file) {
+        ++counter;
+      }
+    }
+    if (counter) {
+      printf mime_type "="
+      for (idx in desktop_files) {
+        if (desktop_files[idx] != desktop_file) {
+          printf desktop_files[idx]
+          if (--counter) {
+            printf ";"
+          }
+        }
+      }
+      printf "\n"
+    }
+    next
+  }
+
+  { print }
+EOF
+}
+
+
+#
+# Remove $2 desktop file from the list of default handlers for $@ mime types
+# in $1 file.
+# Result is saved in $1 file.
+#
+desktop_uninstall_default_mime_handler_0 ()
+{
+  local defaults_list=$1
+  shift
+  [ -f "$defaults_list" ] || return 0
+
+  local desktop_file="$1"
+  shift
+
+  tmpfile1=$(mktemp)
+  tmpfile2=$(mktemp)
+  cat "$defaults_list" > "$tmpfile1"
+
+  local v
+  local update=
+  for mime in "$@"; do
+    desktop_filter_out_default_mime_handler "$desktop_file" "$mime" "$tmpfile1" > "$tmpfile2"
+    v="$tmpfile2"
+    tmpfile2="$tmpfile1"
+    tmpfile1="$v"
+
+    if ! diff -q "$tmpfile1" "$tmpfile2" > /dev/null; then
+      update=yes
+      desktop_trace Remove $desktop_file default handler for $mime mime type from $defaults_list file
+    fi
+  done
+
+  if [ -n "$update" ]; then
+    cat "$tmpfile1" > "$defaults_list"
+    desktop_trace "$defaults_list" file updated
+  fi
+
+  rm -f "$tmpfile1" "$tmpfile2"
+}
+
+
+#
+# Remove $1 desktop file from the list of default handlers for $@ mime types
+# in all known system defaults lists.
+#
+desktop_uninstall_default_mime_handler ()
+{
+  for f in /usr/share/applications/defaults.list /usr/local/share/applications/defaults.list; do
+    desktop_uninstall_default_mime_handler_0 "$f" "$@"
+  done
+}
+
+
+desktop_trace ()
+{
+  echo "$@"
+}
+
+do_if_file_belongs_to_single_package /opt/sparrow/lib/sparrow-Sparrow.desktop xdg-desktop-menu uninstall /opt/sparrow/lib/sparrow-Sparrow.desktop
+do_if_file_belongs_to_single_package /opt/sparrow/lib/sparrow-Sparrow-MimeInfo.xml xdg-mime uninstall /opt/sparrow/lib/sparrow-Sparrow-MimeInfo.xml
+do_if_file_belongs_to_single_package /opt/sparrow/lib/sparrow-Sparrow.desktop desktop_uninstall_default_mime_handler sparrow-Sparrow.desktop application/psbt application/bitcoin-transaction application/pgp-signature x-scheme-handler/bitcoin x-scheme-handler/auth47 x-scheme-handler/lightning
+
+
+%clean

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

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.9.0</string>
+  <string>2.1.3</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -35,6 +35,8 @@
   <string>true</string>
   <key>NSCameraUsageDescription</key>
   <string>Sparrow requires access to the camera in order to scan QR codes</string>
+  <key>NSLocalNetworkUsageDescription</key>
+  <string>Sparrow requires access to the local network in order to connect to your configured server</string>
   <key>CFBundleURLTypes</key>
   <array>
       <dict>

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

@@ -1,15 +1,11 @@
 package com.sparrowwallet.sparrow;
 
 import com.beust.jcommander.JCommander;
-import com.google.common.base.Charsets;
 import com.google.common.eventbus.Subscribe;
-import com.google.common.io.ByteSource;
 import com.sparrowwallet.drongo.*;
 import com.sparrowwallet.drongo.crypto.*;
 import com.sparrowwallet.drongo.policy.PolicyType;
-import com.sparrowwallet.drongo.protocol.ScriptType;
-import com.sparrowwallet.drongo.protocol.Sha256Hash;
-import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTInput;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
@@ -25,8 +21,8 @@ import com.sparrowwallet.sparrow.io.bbqr.BBQR;
 import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
-import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
-import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
+import com.sparrowwallet.sparrow.settings.SettingsGroup;
+import com.sparrowwallet.sparrow.settings.SettingsDialog;
 import com.sparrowwallet.sparrow.paynym.PayNymDialog;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
 import com.sparrowwallet.sparrow.transaction.TransactionData;
@@ -152,6 +148,10 @@ public class AppController implements Initializable {
     private CheckMenuItem useHdCameraResolution;
     private static final BooleanProperty useHdCameraResolutionProperty = new SimpleBooleanProperty();
 
+    @FXML
+    private CheckMenuItem mirrorCameraImage;
+    private static final BooleanProperty mirrorCameraImageProperty = new SimpleBooleanProperty();
+
     @FXML
     private CheckMenuItem showLoadingLog;
     private static final BooleanProperty showLoadingLogProperty = new SimpleBooleanProperty();
@@ -276,7 +276,7 @@ public class AppController implements Initializable {
     }
 
     void initializeView() {
-        setPlatformApplicationMenu();
+        Platform.runLater(this::setPlatformApplicationMenu);
 
         rootStack.getScene().getWindow().setOnHiding(windowEvent -> {
             if(searchWalletDialog != null && searchWalletDialog.isShowing()) {
@@ -381,6 +381,8 @@ public class AppController implements Initializable {
         hideEmptyUsedAddresses.selectedProperty().bindBidirectional(hideEmptyUsedAddressesProperty);
         useHdCameraResolutionProperty.set(Config.get().isHdCapture());
         useHdCameraResolution.selectedProperty().bindBidirectional(useHdCameraResolutionProperty);
+        mirrorCameraImageProperty.set(Config.get().isMirrorCapture());
+        mirrorCameraImage.selectedProperty().bindBidirectional(mirrorCameraImageProperty);
         showTxHexProperty.set(Config.get().isShowTransactionHex());
         showTxHex.selectedProperty().bindBidirectional(showTxHexProperty);
         showLoadingLogProperty.set(Config.get().isShowLoadingLog());
@@ -391,7 +393,7 @@ public class AppController implements Initializable {
         MenuItem homeItem = new MenuItem("Home Folder...");
         homeItem.setOnAction(this::restartInHome);
         restart.getItems().add(homeItem);
-        List<Network> networks = new ArrayList<>(List.of(Network.MAINNET, Network.TESTNET, Network.SIGNET));
+        List<Network> networks = new ArrayList<>(List.of(Network.MAINNET, Network.TESTNET, Network.TESTNET4, Network.SIGNET));
         networks.remove(Network.get());
         for(Network network : networks) {
             MenuItem networkItem = new MenuItem(network.toDisplayString());
@@ -433,8 +435,8 @@ public class AppController implements Initializable {
     }
 
     private void registerShortcuts() {
-        org.controlsfx.tools.Platform platform = org.controlsfx.tools.Platform.getCurrent();
-        if(platform == org.controlsfx.tools.Platform.OSX) {
+        OsType osType = OsType.getCurrent();
+        if(osType == OsType.MACOS) {
             tabs.getScene().addEventFilter(KeyEvent.KEY_PRESSED, event -> {
                 if(event.isShortcutDown() && event.isAltDown() && (event.getCode() == KeyCode.LEFT || event.getCode() == KeyCode.RIGHT)) {
                     int currentIndex = tabs.getSelectionModel().getSelectedIndex();
@@ -449,14 +451,14 @@ public class AppController implements Initializable {
     }
 
     private void setPlatformApplicationMenu() {
-        org.controlsfx.tools.Platform platform = org.controlsfx.tools.Platform.getCurrent();
-        if(platform == org.controlsfx.tools.Platform.OSX) {
+        OsType osType = OsType.getCurrent();
+        if(osType == OsType.MACOS) {
             MenuToolkit tk = MenuToolkit.toolkit();
-            MenuItem preferences = new MenuItem("Preferences...");
-            preferences.setOnAction(this::openPreferences);
-            preferences.setAccelerator(new KeyCodeCombination(KeyCode.COMMA, KeyCombination.META_DOWN));
+            MenuItem settings = new MenuItem("Settings...");
+            settings.setOnAction(this::openSettings);
+            settings.setAccelerator(new KeyCodeCombination(KeyCode.COMMA, KeyCombination.META_DOWN));
             Menu defaultApplicationMenu = new Menu("Apple", null, tk.createAboutMenuItem(SparrowWallet.APP_NAME, getAboutStage()), new SeparatorMenuItem(),
-                    preferences, new SeparatorMenuItem(),
+                    settings, new SeparatorMenuItem(),
                     tk.createHideMenuItem(SparrowWallet.APP_NAME), tk.createHideOthersMenuItem(), tk.createUnhideAllMenuItem(), new SeparatorMenuItem(),
                     tk.createQuitMenuItem(SparrowWallet.APP_NAME));
             tk.setApplicationMenu(defaultApplicationMenu);
@@ -464,11 +466,11 @@ public class AppController implements Initializable {
             fileMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
             toolsMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
             helpMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
-        } else if(platform == org.controlsfx.tools.Platform.WINDOWS) {
+        } else if(osType == OsType.WINDOWS) {
             toolsMenu.getItems().removeIf(item -> item.getStyleClass().contains("windowsHide"));
         }
 
-        if(platform == org.controlsfx.tools.Platform.UNIX || !TrayManager.isSupported()) {
+        if(osType == OsType.UNIX || !TrayManager.isSupported()) {
             viewMenu.getItems().remove(minimizeToTray);
         }
     }
@@ -494,7 +496,7 @@ public class AppController implements Initializable {
         welcomeDialog.initOwner(rootStack.getScene().getWindow());
         Optional<Mode> optionalMode = welcomeDialog.showAndWait();
         if(optionalMode.isPresent() && optionalMode.get().equals(Mode.ONLINE)) {
-            openPreferences(PreferenceGroup.SERVER);
+            openSettings(SettingsGroup.SERVER);
         }
     }
 
@@ -540,7 +542,7 @@ public class AppController implements Initializable {
             StackPane root = loader.load();
             AboutController controller = loader.getController();
 
-            if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+            if(OsType.getCurrent() == OsType.WINDOWS) {
                 root.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
             }
 
@@ -568,21 +570,27 @@ public class AppController implements Initializable {
     }
 
     public void installUdevRules(ActionEvent event) {
-        Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(null);
-        enumerateService.setOnSucceeded(workerStateEvent -> {
-            Platform.runLater(this::showInstallUdevMessage);
-        });
-        enumerateService.setOnFailed(workerStateEvent -> {
-            Platform.runLater(this::showInstallUdevMessage);
-        });
-        enumerateService.start();
-    }
+        String commands = """
+                sudo install -m 644 /opt/sparrow/lib/runtime/conf/udev/*.rules /etc/udev/rules.d
+                sudo udevadm control --reload
+                sudo udevadm trigger
+                sudo groupadd -f plugdev
+                sudo usermod -aG plugdev `whoami`
+                """;
+        String home = System.getProperty(JPACKAGE_APP_PATH);
+        if(home != null && !home.startsWith("/opt/sparrow") && home.endsWith("bin/Sparrow")) {
+            home = home.replace("bin/Sparrow", "");
+            commands = commands.replace("/opt/sparrow/", home);
+        }
 
-    public void showInstallUdevMessage() {
-        TextAreaDialog dialog = new TextAreaDialog("sudo " + Config.get().getHwi().getAbsolutePath() + " installudevrules", false);
+        TextAreaDialog dialog = new TextAreaDialog(commands, false);
         dialog.initOwner(rootStack.getScene().getWindow());
-        dialog.setTitle("Install Udev Rules");
-        dialog.getDialogPane().setHeaderText("Installing udev rules ensures devices can connect over USB.\nThis command requires root privileges.\nOpen a shell and enter the following:");
+        dialog.setTitle("Install udev Rules");
+        dialog.getDialogPane().setHeaderText("""
+                Installing udev rules ensures devices can connect over USB.
+                These commands require root privileges.
+                Open a shell and enter the following.
+                """);
         dialog.showAndWait();
     }
 
@@ -592,7 +600,7 @@ public class AppController implements Initializable {
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Open Transaction");
         fileChooser.getExtensionFilters().addAll(
-                new FileChooser.ExtensionFilter("All Files", org.controlsfx.tools.Platform.getCurrent().equals(org.controlsfx.tools.Platform.UNIX) ? "*" : "*.*"),
+                new FileChooser.ExtensionFilter("All Files", OsType.getCurrent().equals(OsType.UNIX) ? "*" : "*.*"),
                 new FileChooser.ExtensionFilter("PSBT", "*.psbt"),
                 new FileChooser.ExtensionFilter("TXN", "*.txn")
         );
@@ -623,19 +631,10 @@ public class AppController implements Initializable {
                 byte[] bytes = Files.readAllBytes(file.toPath());
                 String name = file.getName();
 
-                try {
+                if(Utils.isHex(bytes) || Utils.isBase64(bytes)) {
+                    addTransactionTab(name, file, new String(bytes, StandardCharsets.UTF_8).trim());
+                } else {
                     addTransactionTab(name, file, bytes);
-                } catch(ParseException e) {
-                    ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
-                    ByteSource byteSource = new ByteSource() {
-                        @Override
-                        public InputStream openStream() {
-                            return inputStream;
-                        }
-                    };
-
-                    String text = byteSource.asCharSource(Charsets.UTF_8).read().trim();
-                    addTransactionTab(name, file, text);
                 }
             } catch(IOException e) {
                 showErrorDialog("Error opening file", e.getMessage());
@@ -800,6 +799,7 @@ public class AppController implements Initializable {
 
             String fileName = ((Label)selectedTab.getGraphic()).getText();
             if(fileName != null && !fileName.isEmpty()) {
+                fileName = fileName.replace('/', '_');
                 if(!fileName.endsWith(".psbt")) {
                     fileName += ".psbt";
                 }
@@ -947,6 +947,11 @@ public class AppController implements Initializable {
         Config.get().setHdCapture(item.isSelected());
     }
 
+    public void mirrorCameraImage(ActionEvent event) {
+        CheckMenuItem item = (CheckMenuItem)event.getSource();
+        Config.get().setMirrorCapture(item.isSelected());
+    }
+
     public void showLoadingLog(ActionEvent event) {
         CheckMenuItem item = (CheckMenuItem)event.getSource();
         Config.get().setShowLoadingLog(item.isSelected());
@@ -1362,7 +1367,7 @@ public class AppController implements Initializable {
     public void exportWallet(ActionEvent event) {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
-            WalletExportDialog dlg = new WalletExportDialog(selectedWalletForm);
+            WalletExportDialog dlg = new WalletExportDialog(selectedWalletForm, getSelectedWalletForms());
             dlg.initOwner(rootStack.getScene().getWindow());
             Optional<Wallet> wallet = dlg.showAndWait();
             if(wallet.isPresent()) {
@@ -1371,18 +1376,18 @@ public class AppController implements Initializable {
         }
     }
 
-    public void openPreferences(ActionEvent event) {
-        openPreferences(PreferenceGroup.GENERAL);
+    public void openSettings(ActionEvent event) {
+        openSettings(SettingsGroup.GENERAL);
     }
 
-    public void openServerPreferences(ActionEvent event) {
-        openPreferences(PreferenceGroup.SERVER);
+    public void openServerSettings(ActionEvent event) {
+        openSettings(SettingsGroup.SERVER);
     }
 
-    private void openPreferences(PreferenceGroup preferenceGroup) {
-        PreferencesDialog preferencesDialog = new PreferencesDialog(preferenceGroup);
-        preferencesDialog.initOwner(rootStack.getScene().getWindow());
-        preferencesDialog.showAndWait();
+    private void openSettings(SettingsGroup settingsGroup) {
+        SettingsDialog settingsDialog = new SettingsDialog(settingsGroup);
+        settingsDialog.initOwner(rootStack.getScene().getWindow());
+        settingsDialog.showAndWait();
         configureSwitchServer();
         serverToggle.setDisable(!Config.get().hasServer());
     }
@@ -1464,6 +1469,7 @@ public class AppController implements Initializable {
             stage.setAlwaysOnTop(true);
             stage.setAlwaysOnTop(false);
             if(event.getSource() instanceof File file) {
+                downloadVerifierDialog.setInitialFile(file);
                 downloadVerifierDialog.setSignatureFile(file);
             }
             return;
@@ -1874,6 +1880,25 @@ public class AppController implements Initializable {
     }
 
     private void addTransactionTab(String name, File file, PSBT psbt) {
+        //Add any missing previous outputs if available in open wallets
+        for(PSBTInput psbtInput : psbt.getPsbtInputs()) {
+            if(psbtInput.getUtxo() == null) {
+                for(Wallet wallet : AppServices.get().getOpenWallets().keySet().stream().filter(Wallet::isValid).toList()) {
+                    TransactionOutPoint outpoint = psbtInput.getInput().getOutpoint();
+                    BlockTransaction blockTransaction = wallet.getWalletTransaction(outpoint.getHash());
+                    if(blockTransaction != null && blockTransaction.getTransaction().getOutputs().size() > outpoint.getIndex()) {
+                        psbtInput.setNonWitnessUtxo(blockTransaction.getTransaction());
+                        ScriptType type = psbtInput.getScriptType();
+                        if(type != null && Arrays.asList(ScriptType.WITNESS_TYPES).contains(type)) {
+                            psbtInput.setWitnessUtxo(blockTransaction.getTransaction().getOutputs().get((int)outpoint.getIndex()));
+                            psbtInput.setNonWitnessUtxo(null);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
         Window psbtWalletWindow = AppServices.get().getWindowForPSBT(psbt);
         if(psbtWalletWindow != null && !tabs.getScene().getWindow().equals(psbtWalletWindow)) {
             EventManager.get().post(new ViewPSBTEvent(psbtWalletWindow, name, file, psbt));
@@ -1891,7 +1916,7 @@ public class AppController implements Initializable {
     }
 
     private void addTransactionTab(BlockTransaction blockTransaction, TransactionView initialView, Integer initialIndex) {
-        addTransactionTab(null, null, blockTransaction.getTransaction(), null, blockTransaction, initialView, initialIndex);
+        addTransactionTab(blockTransaction.getLabel(), null, blockTransaction.getTransaction(), null, blockTransaction, initialView, initialIndex);
     }
 
     private void addTransactionTab(String name, File file, Transaction transaction, PSBT psbt, BlockTransaction blockTransaction, TransactionView initialView, Integer initialIndex) {
@@ -2080,7 +2105,7 @@ public class AppController implements Initializable {
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Open Image");
         fileChooser.getExtensionFilters().addAll(
-                new FileChooser.ExtensionFilter("All Files", org.controlsfx.tools.Platform.getCurrent().equals(org.controlsfx.tools.Platform.UNIX) ? "*" : "*.*"),
+                new FileChooser.ExtensionFilter("All Files", OsType.getCurrent().equals(OsType.UNIX) ? "*" : "*.*"),
                 new FileChooser.ExtensionFilter("Images", "*.png", "*.jpg", "*.jpeg", "*.gif")
         );
 
@@ -2723,8 +2748,8 @@ public class AppController implements Initializable {
     @Subscribe
     public void connectionFailed(ConnectionFailedEvent event) {
         String status = CONNECTION_FAILED_PREFIX + event.getMessage();
-        Hyperlink hyperlink = new Hyperlink("Server Preferences");
-        hyperlink.setOnAction(this::openServerPreferences);
+        Hyperlink hyperlink = new Hyperlink("Server Settings");
+        hyperlink.setOnAction(this::openServerSettings);
         statusUpdated(new StatusEvent(status, hyperlink));
         serverToggleStopAnimation();
         setTorIcon();
@@ -3034,6 +3059,8 @@ public class AppController implements Initializable {
     public void requestWalletOpen(RequestWalletOpenEvent event) {
         if(tabs.getScene().getWindow().equals(event.getWindow())) {
             if(event.getFile() != null) {
+                Optional<Tab> optExisting = tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof WalletTabData walletTabData && walletTabData.getStorage().getWalletFile().equals(event.getFile())).findFirst();
+                optExisting.ifPresent(tab -> tabs.getTabs().remove(tab));
                 openWalletFile(event.getFile(), true);
             } else {
                 openWallet(true);
@@ -3116,4 +3143,14 @@ public class AppController implements Initializable {
             }
         }
     }
+
+    @Subscribe
+    public void webcamResolutionChanged(WebcamResolutionChangedEvent event) {
+        useHdCameraResolutionProperty.set(event.isHdResolution());
+    }
+
+    @Subscribe
+    public void webcamMirroredChanged(WebcamMirroredChangedEvent event) {
+        mirrorCameraImageProperty.set(event.isMirrored());
+    }
 }

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

@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.net.HostAndPort;
 import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.bip47.PaymentCode;
@@ -293,7 +294,7 @@ public class AppServices {
 
             FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
             feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
-            if(event instanceof ConnectionEvent && Network.get().equals(Network.MAINNET) && feeRatesSource.isExternal()) {
+            if(event instanceof ConnectionEvent && feeRatesSource.supportsNetwork(Network.get()) && feeRatesSource.isExternal()) {
                 EventManager.get().post(new FeeRatesSourceChangedEvent(feeRatesSource));
             }
         });
@@ -379,7 +380,7 @@ public class AppServices {
                 exchangeSource == null ? DEFAULT_EXCHANGE_SOURCE : exchangeSource,
                 currency == null ? DEFAULT_FIAT_CURRENCY : currency);
         //Delay startup on first run, Windows requires a longer delay
-        ratesService.setDelay(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS ? Duration.seconds(RATES_DELAY_SECS_WINDOWS) : Duration.seconds(RATES_DELAY_SECS_DEFAULT));
+        ratesService.setDelay(OsType.getCurrent() == OsType.WINDOWS ? Duration.seconds(RATES_DELAY_SECS_WINDOWS) : Duration.seconds(RATES_DELAY_SECS_DEFAULT));
         ratesService.setPeriod(Duration.seconds(RATES_PERIOD_SECS));
         ratesService.setRestartOnFailure(true);
 
@@ -573,6 +574,34 @@ public class AppServices {
         }
     }
 
+    public static void runAfterDelay(long delay, Runnable runnable) {
+        if(delay <= 0) {
+            if(Platform.isFxApplicationThread()) {
+                runnable.run();
+            } else {
+                Platform.runLater(runnable);
+            }
+        } else {
+            ScheduledService<Void> delayService = new ScheduledService<>() {
+                @Override
+                protected Task<Void> createTask() {
+                    return new Task<>() {
+                        @Override
+                        protected Void call() {
+                            return null;
+                        }
+                    };
+                }
+            };
+            delayService.setOnSucceeded(_ -> {
+                delayService.cancel();
+                runnable.run();
+            });
+            delayService.setDelay(Duration.millis(delay));
+            delayService.start();
+        }
+    }
+
     private static Image getWindowIcon() {
         if(windowIcon == null) {
             windowIcon = new Image(SparrowWallet.class.getResourceAsStream("/image/sparrow-icon.png"));
@@ -591,7 +620,7 @@ public class AppServices {
     }
 
     private static double getReducedWindowHeight() {
-        return org.controlsfx.tools.Platform.getCurrent() != org.controlsfx.tools.Platform.OSX ? 802d : 768d;  //Check for menu bar of ~34px
+        return OsType.getCurrent() != OsType.MACOS ? 802d : 768d;  //Check for menu bar of ~34px
     }
 
     public Application getApplication() {
@@ -1094,7 +1123,8 @@ public class AppServices {
     public static boolean isWhirlpoolPostmixCompatible(Wallet wallet) {
         return WHIRLPOOL_NETWORKS.contains(Network.get())
                 && wallet.getScriptType() != ScriptType.P2TR    //Taproot not yet supported
-                && wallet.getKeystores().size() == 1;
+                && wallet.getKeystores().size() == 1
+                && wallet.getKeystores().getFirst().getWalletModel() != WalletModel.BITBOX_02; //BitBox02 does not support high account numbers
     }
 
     public static List<Wallet> addWhirlpoolWallets(Wallet decryptedWallet, String walletId, Storage storage) {
@@ -1114,6 +1144,15 @@ public class AppServices {
         return Font.font("Roboto Mono", 13);
     }
 
+    public static boolean isOnWayland() {
+        if(OsType.getCurrent() != OsType.UNIX) {
+            return false;
+        }
+
+        String waylandDisplay = System.getenv("WAYLAND_DISPLAY");
+        return waylandDisplay != null && !waylandDisplay.isEmpty();
+    }
+
     @Subscribe
     public void newConnection(ConnectionEvent event) {
         currentBlockHeight = event.getBlockHeight();

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow;
 
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.sparrow.control.KeystorePassphraseDialog;
 import com.sparrowwallet.sparrow.control.TextUtils;
@@ -48,7 +49,7 @@ public class DefaultInteractionServices implements InteractionServices {
         }
 
         String[] lines = content.split("\r\n|\r|\n");
-        if(lines.length > 3 || org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+        if(lines.length > 3 || OsType.getCurrent() == OsType.WINDOWS) {
             double numLines = Arrays.stream(lines).mapToDouble(line -> Math.ceil(TextUtils.computeTextWidth(Font.getDefault(), line, 0) / 300)).sum();
             alert.getDialogPane().setPrefHeight(200 + numLines * 20);
         }

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow;
 
 import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.control.WalletIcon;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -9,13 +10,12 @@ import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
-import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
-import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
+import com.sparrowwallet.sparrow.settings.SettingsGroup;
+import com.sparrowwallet.sparrow.settings.SettingsDialog;
 import javafx.application.Application;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import org.controlsfx.glyphfont.GlyphFontRegistry;
-import org.controlsfx.tools.Platform;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
@@ -42,10 +42,7 @@ public class SparrowDesktop extends Application {
     public void start(Stage stage) throws Exception {
         this.mainStage = stage;
 
-        GlyphFontRegistry.register(new FontAwesome5());
-        GlyphFontRegistry.register(new FontAwesome5Brands());
-        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13);
-        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Italic.ttf"), 11);
+        initializeFonts();
         URL.setURLStreamHandlerFactory(protocol -> WalletIcon.PROTOCOL.equals(protocol) ? new WalletIcon.WalletIconStreamHandler() : null);
 
         AppServices.initialize(this);
@@ -60,8 +57,8 @@ public class SparrowDesktop extends Application {
                 Config.get().setMode(mode);
 
                 if(mode.equals(Mode.ONLINE)) {
-                    PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER, true);
-                    Optional<Boolean> optNewWallet = preferencesDialog.showAndWait();
+                    SettingsDialog settingsDialog = new SettingsDialog(SettingsGroup.SERVER, true);
+                    Optional<Boolean> optNewWallet = settingsDialog.showAndWait();
                     createNewWallet = optNewWallet.isPresent() && optNewWallet.get();
                 } else if(Network.get() == Network.MAINNET) {
                     Config.get().setServerType(ServerType.PUBLIC_ELECTRUM_SERVER);
@@ -75,7 +72,7 @@ public class SparrowDesktop extends Application {
             Config.get().setServerType(ServerType.ELECTRUM_SERVER);
         }
 
-        if(Config.get().getHdCapture() == null && Platform.getCurrent() == Platform.OSX) {
+        if(Config.get().getHdCapture() == null && OsType.getCurrent() == OsType.MACOS) {
             Config.get().setHdCapture(Boolean.TRUE);
         }
 
@@ -89,28 +86,42 @@ public class SparrowDesktop extends Application {
 
         AppController appController = AppServices.newAppWindow(stage);
 
-        if(createNewWallet) {
-            appController.newWallet(null);
-        }
+        final boolean showNewWallet = createNewWallet;
+        //Delay opening new dialogs on Wayland
+        AppServices.runAfterDelay(AppServices.isOnWayland() ? 1000 : 0, () -> {
+            if(showNewWallet) {
+                appController.newWallet(null);
+            }
 
-        List<File> recentWalletFiles = Config.get().getRecentWalletFiles();
-        if(recentWalletFiles != null) {
-            //Preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
-            List<File> encryptedWalletFiles = recentWalletFiles.stream().filter(Storage::isEncrypted).collect(Collectors.toList());
-            List<File> sortedWalletFiles = new ArrayList<>(recentWalletFiles);
-            sortedWalletFiles.removeAll(encryptedWalletFiles);
-            sortedWalletFiles.addAll(encryptedWalletFiles);
+            List<File> recentWalletFiles = Config.get().getRecentWalletFiles();
+            if(recentWalletFiles != null) {
+                //Preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
+                List<File> encryptedWalletFiles = recentWalletFiles.stream().filter(Storage::isEncrypted).collect(Collectors.toList());
+                List<File> sortedWalletFiles = new ArrayList<>(recentWalletFiles);
+                sortedWalletFiles.removeAll(encryptedWalletFiles);
+                sortedWalletFiles.addAll(encryptedWalletFiles);
 
-            for(File walletFile : sortedWalletFiles) {
-                if(walletFile.exists()) {
-                    appController.openWalletFile(walletFile, false);
+                for(File walletFile : sortedWalletFiles) {
+                    if(walletFile.exists()) {
+                        appController.openWalletFile(walletFile, false);
+                    }
                 }
             }
+
+            AppServices.openFileUriArgumentsAfterWalletLoading(stage);
+
+            AppServices.get().start();
+        });
+    }
+
+    private void initializeFonts() {
+        GlyphFontRegistry.register(new FontAwesome5());
+        GlyphFontRegistry.register(new FontAwesome5Brands());
+        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13);
+        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Italic.ttf"), 11);
+        if(OsType.getCurrent() == OsType.MACOS) {
+            Font.loadFont(AppServices.class.getResourceAsStream("/font/LiberationSans-Regular.ttf"), 13);
         }
-
-        AppServices.openFileUriArgumentsAfterWalletLoading(stage);
-
-        AppServices.get().start();
     }
 
     @Override

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

@@ -18,7 +18,7 @@ import java.util.*;
 public class SparrowWallet {
     public static final String APP_ID = "sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.9.0";
+    public static final String APP_VERSION = "2.1.3";
     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";
@@ -66,6 +66,11 @@ public class SparrowWallet {
             Network.set(Network.TESTNET);
         }
 
+        File testnet4Flag = new File(Storage.getSparrowHome(), "network-" + Network.TESTNET4.getName());
+        if(testnet4Flag.exists()) {
+            Network.set(Network.TESTNET4);
+        }
+
         File signetFlag = new File(Storage.getSparrowHome(), "network-" + Network.SIGNET.getName());
         if(signetFlag.exists()) {
             Network.set(Network.SIGNET);

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

@@ -45,6 +45,7 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
                 tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate(), addressStatus.isDustAttack()));
                 setTooltip(tooltip);
+                getStyleClass().add("address-cell");
 
                 if(addressStatus.isDustAttack()) {
                     setGraphic(getDustAttackHyperlink(utxoEntry));

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

@@ -77,7 +77,7 @@ public class AddressTreeTable extends CoinTreeTable {
         getColumns().forEach(col -> col.setContextMenu(contextMenu));
 
         setEditable(true);
-        setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
+        setupColumnWidths();
 
         addressCol.setSortType(TreeTableColumn.SortType.ASCENDING);
         getSortOrder().add(addressCol);

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

@@ -0,0 +1,33 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+import static com.sparrowwallet.sparrow.AppServices.*;
+
+public class BitBoxPairingDialog extends Alert {
+    public BitBoxPairingDialog(String code) {
+        super(AlertType.INFORMATION);
+        initOwner(getActiveWindow());
+        setStageIcon(getDialogPane().getScene().getWindow());
+        getDialogPane().getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        setTitle("Confirm BitBox02 Pairing");
+        setHeaderText(getTitle());
+        VBox vBox = new VBox(20);
+        vBox.setAlignment(Pos.CENTER);
+        vBox.setPadding(new Insets(10, 20, 10, 20));
+        Label instructions = new Label("Confirm the following code is shown on BitBox02");
+        Label codeLabel = new Label(code);
+        codeLabel.getStyleClass().add("fixed-width");
+        vBox.getChildren().addAll(instructions, codeLabel);
+        getDialogPane().setContent(vBox);
+        moveToActiveWindowScreen(this);
+        getDialogPane().getButtonTypes().clear();
+        getDialogPane().getButtonTypes().add(ButtonType.CLOSE);
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHash;
 import com.sparrowwallet.sparrow.UnitFormat;
@@ -16,7 +17,6 @@ import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.Region;
 import javafx.util.Duration;
-import org.controlsfx.tools.Platform;
 
 import java.text.DecimalFormat;
 
@@ -32,7 +32,7 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
         tooltip.setShowDelay(Duration.millis(500));
         contextMenu = new CoinContextMenu();
         getStyleClass().add("coin-cell");
-        if(Platform.getCurrent() == Platform.OSX) {
+        if(OsType.getCurrent() == OsType.MACOS) {
             getStyleClass().add("number-field");
         }
     }

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

@@ -5,9 +5,9 @@ import javafx.scene.control.TextFormatter;
 import javafx.scene.control.TextInputControl;
 
 import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
 import java.util.function.UnaryOperator;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class CoinTextFormatter extends TextFormatter<String> {
@@ -51,8 +51,14 @@ public class CoinTextFormatter extends TextFormatter<String> {
                 commasRemoved = newText.length() - noFractionCommaText.length();
             }
 
-            if(!coinValidation.matcher(noFractionCommaText).matches()) {
-                return null;
+            Matcher matcher = coinValidation.matcher(noFractionCommaText);
+            if(!matcher.matches()) {
+                matcher.reset();
+                if(matcher.find()) {
+                    noFractionCommaText = matcher.group();
+                } else {
+                    return null;
+                }
             }
 
             if(unitFormat.getGroupingSeparator().equals(change.getText())) {

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

@@ -1,11 +1,15 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.wallet.SortDirection;
+import com.sparrowwallet.drongo.wallet.TableType;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletTable;
 import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletTableChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletDataChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
@@ -13,24 +17,38 @@ import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.wallet.Entry;
+import io.reactivex.Observable;
+import io.reactivex.subjects.PublishSubject;
 import javafx.application.Platform;
+import javafx.collections.ListChangeListener;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.Hyperlink;
-import javafx.scene.control.Label;
-import javafx.scene.control.TreeTableColumn;
-import javafx.scene.control.TreeTableView;
+import javafx.scene.control.*;
 import javafx.scene.layout.StackPane;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 public class CoinTreeTable extends TreeTableView<Entry> {
+    private TableType tableType;
     private BitcoinUnit bitcoinUnit;
     private UnitFormat unitFormat;
     private CurrencyRate currencyRate;
+    protected static final double STANDARD_WIDTH = 100.0;
+
+    private final PublishSubject<WalletTableChangedEvent> walletTableSubject = PublishSubject.create();
+    private final Observable<WalletTableChangedEvent> walletTableEvents = walletTableSubject.debounce(1, TimeUnit.SECONDS);
+
+    public TableType getTableType() {
+        return tableType;
+    }
+
+    public void setTableType(TableType tableType) {
+        this.tableType = tableType;
+    }
 
     public BitcoinUnit getBitcoinUnit() {
         return bitcoinUnit;
@@ -136,11 +154,100 @@ public class CoinTreeTable extends TreeTableView<Entry> {
         return stackPane;
     }
 
-    public void setSortColumn(int columnIndex, TreeTableColumn.SortType sortType) {
-        if(columnIndex >= 0 && columnIndex < getColumns().size() && getSortOrder().isEmpty() && !getRoot().getChildren().isEmpty()) {
-            TreeTableColumn<Entry, ?> column = getColumns().get(columnIndex);
-            column.setSortType(sortType == null ? TreeTableColumn.SortType.DESCENDING : sortType);
+    protected void setupColumnSort(int defaultColumnIndex, TreeTableColumn.SortType defaultSortType) {
+        WalletTable.Sort columnSort = getSavedColumnSort();
+        if(columnSort == null) {
+            columnSort = new WalletTable.Sort(defaultColumnIndex, getSortDirection(defaultSortType));
+        }
+
+        setSortColumn(columnSort);
+
+        getSortOrder().addListener((ListChangeListener<? super TreeTableColumn<Entry, ?>>) c -> {
+            if(c.next()) {
+                walletTableChanged();
+            }
+        });
+        for(TreeTableColumn<Entry, ?> column : getColumns()) {
+            column.sortTypeProperty().addListener((_, _, _) -> walletTableChanged());
+        }
+    }
+
+    protected void resetSortColumn() {
+        setSortColumn(getColumnSort());
+    }
+
+    protected void setSortColumn(WalletTable.Sort sort) {
+        if(sort.sortColumn() >= 0 && sort.sortColumn() < getColumns().size() && getSortOrder().isEmpty() && !getRoot().getChildren().isEmpty()) {
+            TreeTableColumn<Entry, ?> column = getColumns().get(sort.sortColumn());
+            column.setSortType(sort.sortDirection() == SortDirection.DESCENDING ? TreeTableColumn.SortType.DESCENDING : TreeTableColumn.SortType.ASCENDING);
             getSortOrder().add(column);
         }
     }
+
+    private WalletTable.Sort getColumnSort() {
+        if(getSortOrder().isEmpty() || !getColumns().contains(getSortOrder().getFirst())) {
+            return new WalletTable.Sort(tableType == TableType.UTXOS ? getColumns().size() - 1 : 0, SortDirection.DESCENDING);
+        }
+
+        return new WalletTable.Sort(getColumns().indexOf(getSortOrder().getFirst()), getSortDirection(getSortOrder().getFirst().getSortType()));
+    }
+
+    private SortDirection getSortDirection(TreeTableColumn.SortType sortType) {
+        return sortType == TreeTableColumn.SortType.ASCENDING ? SortDirection.ASCENDING : SortDirection.DESCENDING;
+    }
+
+    private WalletTable.Sort getSavedColumnSort() {
+        if(getRoot() != null && getRoot().getValue() != null && getRoot().getValue().getWallet() != null) {
+            Wallet wallet = getRoot().getValue().getWallet();
+            WalletTable walletTable = wallet.getWalletTable(tableType);
+            if(walletTable != null) {
+                return walletTable.getSort();
+            }
+        }
+
+        return null;
+    }
+
+    @SuppressWarnings("deprecation")
+    protected void setupColumnWidths() {
+        Double[] savedWidths = getSavedColumnWidths();
+        for(int i = 0; i < getColumns().size(); i++) {
+            TreeTableColumn<Entry, ?> column = getColumns().get(i);
+            column.setPrefWidth(savedWidths != null && getColumns().size() == savedWidths.length ? savedWidths[i] : STANDARD_WIDTH);
+        }
+
+        //TODO: Replace with TreeTableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN when JavaFX 20+ has headless support
+        setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
+
+        getColumns().getLast().widthProperty().addListener((_, _, _) -> walletTableChanged());
+
+        //Ignore initial resizes during layout
+        walletTableEvents.skip(3, TimeUnit.SECONDS).subscribe(event -> {
+            event.getWallet().getWalletTables().put(event.getTableType(), event.getWalletTable());
+            EventManager.get().post(event);
+        });
+    }
+
+    private void walletTableChanged() {
+        if(getRoot() != null && getRoot().getValue() != null && getRoot().getValue().getWallet() != null) {
+            WalletTable walletTable = new WalletTable(tableType, getColumnWidths(), getColumnSort());
+            walletTableSubject.onNext(new WalletTableChangedEvent(getRoot().getValue().getWallet(), walletTable));
+        }
+    }
+
+    private Double[] getColumnWidths() {
+        return getColumns().stream().map(TableColumnBase::getWidth).toArray(Double[]::new);
+    }
+
+    private Double[] getSavedColumnWidths() {
+        if(getRoot() != null && getRoot().getValue() != null && getRoot().getValue().getWallet() != null) {
+            Wallet wallet = getRoot().getValue().getWallet();
+            WalletTable walletTable = wallet.getWalletTable(tableType);
+            if(walletTable != null) {
+                return walletTable.getWidths();
+            }
+        }
+
+        return null;
+    }
 }

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

@@ -3,13 +3,14 @@ package com.sparrowwallet.sparrow.control;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.PdfUtils;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
 import javafx.event.ActionEvent;
 import javafx.scene.control.*;
 import javafx.scene.control.Button;
 
 public class DescriptorQRDisplayDialog extends QRDisplayDialog {
-    public DescriptorQRDisplayDialog(String walletName, String outputDescriptor, UR ur) {
-        super(ur);
+    public DescriptorQRDisplayDialog(String walletName, String outputDescriptor, UR ur, BBQR bbqr, boolean selectBbqrButton) {
+        super(ur, bbqr, false, false, selectBbqrButton);
 
         DialogPane dialogPane = getDialogPane();
         final ButtonType pdfButtonType = new javafx.scene.control.ButtonType("Save PDF...", ButtonBar.ButtonData.HELP_2);
@@ -19,7 +20,7 @@ public class DescriptorQRDisplayDialog extends QRDisplayDialog {
         pdfButton.setGraphicTextGap(5);
         pdfButton.setGraphic(getGlyph(FontAwesome5.Glyph.FILE_PDF));
         pdfButton.addEventFilter(ActionEvent.ACTION, event -> {
-            PdfUtils.saveOutputDescriptor(walletName, outputDescriptor, ur);
+            PdfUtils.saveOutputDescriptor(walletName, outputDescriptor, ur, isUseBbqrEncoding() ? bbqr : null);
             event.consume();
         });
     }

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

@@ -16,11 +16,8 @@ import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
-import com.sparrowwallet.sparrow.io.CardApi;
-import com.sparrowwallet.sparrow.io.Device;
-import com.sparrowwallet.sparrow.io.Hwi;
+import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
-import com.sparrowwallet.sparrow.io.CardAuthorizationException;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
@@ -778,10 +775,12 @@ public class DevicePane extends TitledDescriptionPane {
                 signButton.setDisable(false);
             }
         } else {
-            Hwi.SignPSBTService signPSBTService = new Hwi.SignPSBTService(device, passphrase.get(), psbt);
+            Hwi.SignPSBTService signPSBTService = new Hwi.SignPSBTService(device, passphrase.get(), psbt,
+                    OutputDescriptor.getOutputDescriptor(wallet), wallet.getFullName(), getDeviceRegistration());
             signPSBTService.setOnSucceeded(workerStateEvent -> {
                 PSBT signedPsbt = signPSBTService.getValue();
                 EventManager.get().post(new PSBTSignedEvent(psbt, signedPsbt));
+                updateDeviceRegistrations(signPSBTService.getNewDeviceRegistrations());
             });
             signPSBTService.setOnFailed(workerStateEvent -> {
                 setError("Signing Error", signPSBTService.getException().getMessage());
@@ -820,10 +819,12 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private void displayAddress() {
-        Hwi.DisplayAddressService displayAddressService = new Hwi.DisplayAddressService(device, passphrase.get(), wallet.getScriptType(), outputDescriptor);
+        Hwi.DisplayAddressService displayAddressService = new Hwi.DisplayAddressService(device, passphrase.get(), wallet.getScriptType(), outputDescriptor,
+                OutputDescriptor.getOutputDescriptor(wallet), wallet.getFullName(), getDeviceRegistration());
         displayAddressService.setOnSucceeded(successEvent -> {
             String address = displayAddressService.getValue();
             EventManager.get().post(new AddressDisplayedEvent(address));
+            updateDeviceRegistrations(displayAddressService.getNewDeviceRegistrations());
         });
         displayAddressService.setOnFailed(failedEvent -> {
             setError("Could not display address", displayAddressService.getException().getMessage());
@@ -833,6 +834,26 @@ public class DevicePane extends TitledDescriptionPane {
         displayAddressService.start();
     }
 
+    private byte[] getDeviceRegistration() {
+        Optional<Keystore> optKeystore = wallet.getKeystores().stream()
+                .filter(keystore -> keystore.getKeyDerivation().getMasterFingerprint().equals(device.getFingerprint()) && keystore.getDeviceRegistration() != null).findFirst();
+        return optKeystore.map(Keystore::getDeviceRegistration).orElse(null);
+    }
+
+    private void updateDeviceRegistrations(Set<byte[]> newDeviceRegistrations) {
+        if(!newDeviceRegistrations.isEmpty()) {
+            List<Keystore> registrationKeystores = getDeviceRegistrationKeystores();
+            if(!registrationKeystores.isEmpty()) {
+                registrationKeystores.forEach(keystore -> keystore.setDeviceRegistration(newDeviceRegistrations.iterator().next()));
+                EventManager.get().post(new KeystoreDeviceRegistrationsChangedEvent(wallet, registrationKeystores));
+            }
+        }
+    }
+
+    private List<Keystore> getDeviceRegistrationKeystores() {
+        return wallet.getKeystores().stream().filter(keystore -> keystore.getKeyDerivation().getMasterFingerprint().equals(device.getFingerprint())).toList();
+    }
+
     private void signMessage() {
         if(device.isCard()) {
             try {

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.pgp.PGPKeySource;
 import com.sparrowwallet.drongo.pgp.PGPUtils;
@@ -24,7 +25,6 @@ import javafx.scene.input.TransferMode;
 import javafx.scene.layout.*;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
-import org.controlsfx.tools.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import tornadofx.control.Field;
@@ -62,6 +62,7 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
     private static final List<String> ARCHIVE_EXTENSIONS = List.of("zip", "tar.gz", "tar.bz2", "tar.xz", "rar", "7z");
 
     private static final String SPARROW_RELEASE_PREFIX = "sparrow-";
+    private static final String SPARROW_RELEASE_ALT_PREFIX = "sparrow_";
     private static final String SPARROW_SIGNATURE_SUFFIX = "-manifest.txt.asc";
     private static final Pattern SPARROW_RELEASE_VERSION = Pattern.compile("[0-9]+(\\.[0-9]+)*");
     private static final long MIN_VALID_SPARROW_RELEASE_SIZE = 10 * 1024 * 1024;
@@ -70,6 +71,7 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
     private final ObjectProperty<File> manifest = new SimpleObjectProperty<>();
     private final ObjectProperty<File> publicKey = new SimpleObjectProperty<>();
     private final ObjectProperty<File> release = new SimpleObjectProperty<>();
+    private final ObjectProperty<File> initial = new SimpleObjectProperty<>();
 
     private final BooleanProperty manifestDisabled = new SimpleBooleanProperty();
     private final BooleanProperty publicKeyDisabled = new SimpleBooleanProperty();
@@ -81,7 +83,7 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
 
     private static File lastFileParent;
 
-    public DownloadVerifierDialog(File initialSignatureFile) {
+    public DownloadVerifierDialog(File initialFile) {
         final DialogPane dialogPane = getDialogPane();
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
@@ -223,11 +225,17 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
         });
 
         release.addListener((observable, oldValue, releaseFile) -> {
+            if(releaseFile != null) {
+                initial.set(null);
+            }
             verify();
         });
 
-        if(initialSignatureFile != null) {
-            javafx.application.Platform.runLater(() -> signature.set(initialSignatureFile));
+        if(initialFile != null) {
+            javafx.application.Platform.runLater(() -> {
+                initial.set(initialFile);
+                signature.set(initialFile);
+            });
         }
     }
 
@@ -455,7 +463,8 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
             }
         }
 
-        if(providedFile.getName().toLowerCase(Locale.ROOT).startsWith(SPARROW_RELEASE_PREFIX)) {
+        String providedName = providedFile.getName().toLowerCase(Locale.ROOT);
+        if(providedName.startsWith(SPARROW_RELEASE_PREFIX) || providedName.startsWith(SPARROW_RELEASE_ALT_PREFIX)) {
             Matcher matcher = SPARROW_RELEASE_VERSION.matcher(providedFile.getName());
             if(matcher.find()) {
                 String version = matcher.group();
@@ -482,6 +491,15 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
     }
 
     private File findReleaseFile(File manifestFile, Map<File, String> manifestMap) {
+        File initialFile = initial.get();
+        if(initialFile != null) {
+            for(File file : manifestMap.keySet()) {
+                if(initialFile.getName().equals(file.getName())) {
+                    return initialFile;
+                }
+            }
+        }
+
         List<String> releaseExtensions = getReleaseFileExtensions();
         List<List<String>> extensionLists = List.of(releaseExtensions, DISK_IMAGE_EXTENSIONS, ARCHIVE_EXTENSIONS, List.of(""));
 
@@ -500,9 +518,9 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
     }
 
     private List<String> getReleaseFileExtensions() {
-        Platform platform = Platform.getCurrent();
-        switch(platform) {
-            case OSX -> {
+        OsType osType = OsType.getCurrent();
+        switch(osType) {
+            case MACOS -> {
                 return MACOS_RELEASE_EXTENSIONS;
             }
             case WINDOWS -> {
@@ -515,10 +533,10 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
     }
 
     private String getReleaseFileExample(String version) {
-        Platform platform = Platform.getCurrent();
+        OsType osType = OsType.getCurrent();
         String arch = System.getProperty("os.arch");
-        switch(platform) {
-            case OSX -> {
+        switch(osType) {
+            case MACOS -> {
                 return "Sparrow-" + version + "-" + arch;
             }
             case WINDOWS -> {
@@ -565,7 +583,7 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
                 }
             }
 
-            if(name.startsWith(SPARROW_RELEASE_PREFIX) && file.length() >= MIN_VALID_SPARROW_RELEASE_SIZE) {
+            if((name.startsWith(SPARROW_RELEASE_PREFIX) || name.startsWith(SPARROW_RELEASE_ALT_PREFIX)) && file.length() >= MIN_VALID_SPARROW_RELEASE_SIZE) {
                 Matcher matcher = SPARROW_RELEASE_VERSION.matcher(name);
                 return matcher.find();
             }
@@ -578,6 +596,10 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
         signature.set(signatureFile);
     }
 
+    public void setInitialFile(File initialFile) {
+        initial.set(initialFile);
+    }
+
     private static class Header extends GridPane {
         public Header() {
             setMaxWidth(Double.MAX_VALUE);

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.*;
@@ -459,7 +460,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
             Double feeRate = transactionEntry.getBlockTransaction().getFeeRate();
             Long vSizefromTip = transactionEntry.getVSizeFromTip();
             if(feeRate != null && vSizefromTip != null) {
-                long blocksFromTip = (long)Math.ceil((double)vSizefromTip / Transaction.MAX_BLOCK_SIZE);
+                long blocksFromTip = (long)Math.ceil((double)vSizefromTip / Transaction.MAX_BLOCK_SIZE_VBYTES);
 
                 String amount = vSizefromTip + " vB";
                 if(vSizefromTip > 1000 * 1000) {
@@ -805,18 +806,17 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         cell.getStyleClass().remove("utxo-row");
         cell.getStyleClass().remove("unconfirmed-row");
         cell.getStyleClass().remove("summary-row");
-        cell.getStyleClass().remove("address-cell");
+        boolean addressCell = cell.getStyleClass().remove("address-cell");
         cell.getStyleClass().remove("hashindex-row");
         cell.getStyleClass().remove("confirming");
         cell.getStyleClass().remove("negative-amount");
         cell.getStyleClass().remove("spent");
         cell.getStyleClass().remove("unspendable");
+        cell.getStyleClass().remove("number-field");
 
         if(entry != null) {
-            if(entry instanceof TransactionEntry) {
+            if(entry instanceof TransactionEntry transactionEntry) {
                 cell.getStyleClass().add("transaction-row");
-                TransactionEntry transactionEntry = (TransactionEntry)entry;
-
                 if(cell instanceof ConfirmationsListener confirmationsListener) {
                     if(transactionEntry.isConfirming()) {
                         cell.getStyleClass().add("confirming");
@@ -825,23 +825,27 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                         confirmationsListener.getConfirmationsProperty().unbind();
                     }
                 }
+                if(OsType.getCurrent() == OsType.MACOS && transactionEntry.getBlockTransaction().getHeight() > 0 && !cell.getStyleClass().contains("label-cell")) {
+                    cell.getStyleClass().add("number-field");
+                }
             } else if(entry instanceof NodeEntry) {
                 cell.getStyleClass().add("node-row");
-            } else if(entry instanceof UtxoEntry) {
+            } else if(entry instanceof UtxoEntry utxoEntry) {
                 cell.getStyleClass().add("utxo-row");
-                UtxoEntry utxoEntry = (UtxoEntry)entry;
                 if(!utxoEntry.isSpendable()) {
                     cell.getStyleClass().add("unspendable");
                 }
-            } else if(entry instanceof HashIndexEntry) {
+                if(OsType.getCurrent() == OsType.MACOS && utxoEntry.getHashIndex().getHeight() > 0 && !addressCell && !cell.getStyleClass().contains("label-cell")) {
+                    cell.getStyleClass().add("number-field");
+                }
+            } else if(entry instanceof HashIndexEntry hashIndexEntry) {
                 cell.getStyleClass().add("hashindex-row");
-                HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;
                 if(hashIndexEntry.isSpent()) {
                     cell.getStyleClass().add("spent");
                 }
             } else if(entry instanceof WalletSummaryDialog.UnconfirmedEntry) {
                 cell.getStyleClass().add("unconfirmed-row");
-            } else if(entry instanceof WalletSummaryDialog.SummaryEntry) {
+            } else if(entry instanceof WalletSummaryDialog.SummaryEntry || entry instanceof WalletSummaryDialog.AllSummaryEntry) {
                 cell.getStyleClass().add("summary-row");
             }
         }

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.UnitFormat;
@@ -10,7 +11,6 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
-import org.controlsfx.tools.Platform;
 
 import java.math.BigDecimal;
 import java.util.Currency;
@@ -24,7 +24,7 @@ public class FiatCell extends TreeTableCell<Entry, Number> {
         tooltip = new Tooltip();
         contextMenu = new FiatContextMenu();
         getStyleClass().add("coin-cell");
-        if(Platform.getCurrent() == Platform.OSX) {
+        if(OsType.getCurrent() == OsType.MACOS) {
             getStyleClass().add("number-field");
         }
     }

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.google.gson.JsonParseException;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
@@ -24,9 +25,7 @@ import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -104,7 +103,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Open " + importer.getWalletModel().toDisplayString() + " File");
         fileChooser.getExtensionFilters().addAll(
-                new FileChooser.ExtensionFilter("All Files", Platform.getCurrent().equals(Platform.UNIX) ? "*" : "*.*"),
+                new FileChooser.ExtensionFilter("All Files", OsType.getCurrent().equals(OsType.UNIX) ? "*" : "*.*"),
                 new FileChooser.ExtensionFilter("JSON", "*.json"),
                 new FileChooser.ExtensionFilter("TXT", "*.txt")
         );

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

@@ -16,7 +16,7 @@ public class FileKeystoreImportPane extends FileImportPane {
     private final KeyDerivation requiredDerivation;
 
     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());
+        super(importer, importer.getName(), "Key import", importer.getKeystoreImportDescription(getAccount(wallet, requiredDerivation)), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
         this.wallet = wallet;
         this.importer = importer;
         this.requiredDerivation = requiredDerivation;

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

@@ -168,14 +168,21 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                     qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), true);
                 } else if(exporter instanceof PassportMultisig || exporter instanceof KeystoneMultisig || exporter instanceof JadeMultisig) {
                     qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), false);
-                } else if(exporter instanceof Bip129) {
+                } else if(exporter instanceof Bip129 || exporter instanceof WalletLabels) {
                     UR ur = UR.fromBytes(outputStream.toByteArray());
                     BBQR bbqr = new BBQR(BBQRType.UNICODE, outputStream.toByteArray());
-                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, true, false);
+                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, false, false);
                 } else if(exporter instanceof Descriptor) {
+                    boolean addBbqrOption = exportWallet.getKeystores().stream().anyMatch(keystore -> keystore.getWalletModel().showBbqr());
+                    boolean selectBbqrOption = exportWallet.getKeystores().stream().allMatch(keystore -> keystore.getWalletModel().selectBbqr());
                     OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(exportWallet, KeyPurpose.DEFAULT_PURPOSES, null);
                     CryptoOutput cryptoOutput = getCryptoOutput(exportWallet);
-                    qrDisplayDialog = new DescriptorQRDisplayDialog(exportWallet.getFullDisplayName(), outputDescriptor.toString(true), cryptoOutput.toUR());
+                    BBQR bbqr = addBbqrOption ? new BBQR(BBQRType.UNICODE, outputDescriptor.toString(true).getBytes(StandardCharsets.UTF_8)) : null;
+                    qrDisplayDialog = new DescriptorQRDisplayDialog(exportWallet.getFullDisplayName(), outputDescriptor.toString(true), cryptoOutput.toUR(), bbqr, selectBbqrOption);
+                } else if(exporter.getClass().equals(ColdcardMultisig.class)) {
+                    UR ur = UR.fromBytes(outputStream.toByteArray());
+                    BBQR bbqr = new BBQR(BBQRType.UNICODE, outputStream.toByteArray());
+                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, false, true);
                 } else {
                     qrDisplayDialog = new QRDisplayDialog(outputStream.toString(StandardCharsets.UTF_8));
                 }

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

@@ -1,16 +1,20 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.wallet.BlockTransactionHash;
+import com.sparrowwallet.drongo.wallet.Persistable;
 import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.animation.PauseTransition;
 import javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.event.Event;
+import javafx.geometry.Point2D;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.TextFieldTreeTableCell;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.DataFormat;
+import javafx.util.Duration;
 import javafx.util.converter.DefaultStringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,6 +51,20 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> implements Confirm
     public void commitEdit(String label) {
         if(label != null) {
             label = label.trim();
+            if(label.length() > Persistable.MAX_LABEL_LENGTH) {
+                label = label.substring(0, Persistable.MAX_LABEL_LENGTH);
+                Platform.runLater(() -> {
+                    Point2D p = this.localToScene(0.0, 0.0);
+                    final Tooltip truncateTooltip = new Tooltip();
+                    truncateTooltip.setText("Labels are truncated at " + Persistable.MAX_LABEL_LENGTH + " characters");
+                    truncateTooltip.setAutoHide(true);
+                    truncateTooltip.show(this, p.getX() + this.getScene().getX() + this.getScene().getWindow().getX() + this.getHeight(),
+                            p.getY() + this.getScene().getY() + this.getScene().getWindow().getY() + this.getHeight());
+                    PauseTransition pt = new PauseTransition(Duration.millis(2000));
+                    pt.setOnFinished(_ -> truncateTooltip.hide());
+                    pt.play();
+                });
+            }
         }
 
         // This block is necessary to support commit on losing focus, because

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.Theme;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -57,7 +58,7 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
                 stage.setResizable(false);
 
                 StackPane scenePane = new StackPane();
-                if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+                if(OsType.getCurrent() == OsType.WINDOWS) {
                     scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
                 }
 

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.control;
 
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
@@ -17,10 +18,13 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Storage;
 import javafx.application.Platform;
+import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -32,17 +36,21 @@ import tornadofx.control.Field;
 import tornadofx.control.Fieldset;
 import tornadofx.control.Form;
 
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.security.SignatureException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
 
 public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
     private static final Logger log = LoggerFactory.getLogger(MessageSignDialog.class);
 
+    private static final Pattern signedMessagePattern = Pattern.compile("-----BEGIN BITCOIN SIGNED MESSAGE-----\\r?\\n(.*)\\r?\\n-----BEGIN BITCOIN SIGNATURE-----\\r?\\n(.*)\\r?\\n(.*)\\r?\\n-----END BITCOIN SIGNATURE-----\r?\n?");
+
     private final TextField address;
     private final TextArea message;
     private final TextArea signature;
@@ -104,7 +112,8 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         this.wallet = wallet;
         this.walletNode = walletNode;
 
-        final DialogPane dialogPane = getDialogPane();
+        final DialogPane dialogPane = new MessageSignDialogPane();
+        setDialogPane(dialogPane);
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
@@ -199,13 +208,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         } else {
             dialogPane.getButtonTypes().addAll(showQrButtonType, signButtonType, verifyButtonType, doneButtonType);
 
-            Button showQrButton = (Button) dialogPane.lookupButton(showQrButtonType);
-            showQrButton.setDisable(wallet == null);
-            showQrButton.setGraphic(getGlyph(new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QRCODE)));
-            showQrButton.setGraphicTextGap(5);
-            showQrButton.setOnAction(event -> {
-                showQr();
-            });
+            Node showQrButton = dialogPane.lookupButton(showQrButtonType);
 
             Button signButton = (Button) dialogPane.lookupButton(signButtonType);
             signButton.setDisable(!canSign);
@@ -267,7 +270,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
 
         AppServices.onEscapePressed(dialogPane.getScene(), () -> setResult(ButtonBar.ButtonData.CANCEL_CLOSE));
         AppServices.moveToActiveWindowScreen(this);
-        setResultConverter(dialogButton -> dialogButton == showQrButtonType || dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());
+        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());
 
         Platform.runLater(() -> {
             if(address.getText().isEmpty()) {
@@ -495,6 +498,82 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         }
     }
 
+    private void exportFile() {
+        if(walletNode == null) {
+            AppServices.showErrorDialog("Address not in wallet", "The provided address is not present in the currently selected wallet.");
+            return;
+        }
+
+        StringJoiner joiner = new StringJoiner("\n");
+        joiner.add(message.getText().trim().replaceAll("\r*\n*", ""));
+        //Note we can expect a single keystore due to the check in the constructor
+        KeyDerivation firstDerivation = walletNode.getWallet().getKeystores().get(0).getKeyDerivation();
+        joiner.add(KeyDerivation.writePath(firstDerivation.extend(walletNode.getDerivation()).getDerivation(), true));
+        joiner.add(walletNode.getWallet().getScriptType().toString());
+
+        Stage window = new Stage();
+
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Save Text File");
+        fileChooser.setInitialFileName("signmessage.txt");
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            if(!file.getName().toLowerCase(Locale.ROOT).endsWith(".txt")) {
+                file = new File(file.getAbsolutePath() + ".txt");
+            }
+
+            try(BufferedWriter writer = new BufferedWriter(new FileWriter(file, StandardCharsets.UTF_8))) {
+                writer.write(joiner.toString());
+            } catch(IOException e) {
+                log.error("Error saving signing message", e);
+                AppServices.showErrorDialog("Error saving signing message", "Cannot write to " + file.getAbsolutePath());
+            }
+        }
+    }
+
+    private void importFile() {
+        Stage window = new Stage();
+
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Open Signed Text File");
+        fileChooser.getExtensionFilters().addAll(
+                new FileChooser.ExtensionFilter("All Files", OsType.getCurrent().equals(OsType.UNIX) ? "*" : "*.*"),
+                new FileChooser.ExtensionFilter("Text Files", "*.txt")
+        );
+
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showOpenDialog(window);
+
+        if(file != null) {
+            try {
+                String content = Files.readString(file.toPath(), StandardCharsets.UTF_8);
+                Matcher matcher = signedMessagePattern.matcher(content);
+                if(matcher.matches()) {
+                    String signedMessage = matcher.group(1);
+                    String signedAddress = matcher.group(2);
+                    String signedSignature = matcher.group(3);
+
+                    if(!message.getText().isEmpty() && !signedMessage.trim().equals(message.getText().trim().replaceAll("\r*\n*", ""))) {
+                        AppServices.showErrorDialog("Incorrect Message", "The file contained a different message of:\n\n" + signedMessage);
+                        return;
+                    } else if(!signedAddress.trim().equals(address.getText().trim())) {
+                        AppServices.showErrorDialog("Incorrect Address", "The file contained a different address of:\n\n" + signedAddress);
+                        return;
+                    }
+
+                    message.setText(signedMessage);
+                    signature.setText(signedSignature);
+                } else {
+                    signature.setText(content);
+                }
+            } catch(IOException e) {
+                log.error("Error loading signed message", e);
+                AppServices.showErrorDialog("Error loading signed message", e.getMessage());
+            }
+        }
+    }
+
     protected Glyph getSignGlyph() {
         if(wallet != null) {
             if(wallet.containsSource(KeystoreSource.HW_USB)) {
@@ -539,4 +618,37 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             decryptWalletService.start();
         }
     }
+
+    private class MessageSignDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                SplitMenuButton signByButton = new SplitMenuButton();
+                signByButton.setText("Sign by QR");
+                signByButton.setDisable(wallet == null);
+                signByButton.setGraphic(getGlyph(new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QRCODE)));
+                signByButton.setGraphicTextGap(5);
+                signByButton.setOnAction(event -> {
+                    showQr();
+                });
+                MenuItem exportFile = new MenuItem("Sign by File...");
+                exportFile.setGraphic(getGlyph(new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.FILE_EXPORT)));
+                exportFile.setOnAction(event -> {
+                    exportFile();
+                });
+                MenuItem importFile = new MenuItem("Load Signed File...");
+                importFile.setGraphic(getGlyph(new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.FILE_IMPORT)));
+                importFile.setOnAction(event -> {
+                    importFile();
+                });
+                signByButton.getItems().addAll(exportFile, importFile);
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(signByButton, buttonData);
+
+                return signByButton;
+            }
+
+            return super.createButton(buttonType);
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
 import com.sparrowwallet.sparrow.AppServices;
@@ -256,7 +257,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                     FileChooser fileChooser = new FileChooser();
                     fileChooser.setTitle("Open PDF");
                     fileChooser.getExtensionFilters().addAll(
-                            new FileChooser.ExtensionFilter("All Files", org.controlsfx.tools.Platform.getCurrent().equals(org.controlsfx.tools.Platform.UNIX) ? "*" : "*.*"),
+                            new FileChooser.ExtensionFilter("All Files", OsType.getCurrent().equals(OsType.UNIX) ? "*" : "*.*"),
                             new FileChooser.ExtensionFilter("PDF", "*.pdf")
                     );
 

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

@@ -1,5 +1,6 @@
 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;
@@ -15,10 +16,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
+    private final DeterministicSeed.Type type;
+
     public MnemonicKeystoreDisplayPane(Keystore keystore) {
         super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() && (keystore.getSeed().getPassphrase() == null || keystore.getSeed().getPassphrase().length() > 0) ? "Passphrase entered" : "No passphrase", "", "image/" + WalletModel.SEED.getType() + ".png");
         showHideLink.setVisible(false);
         buttonBox.getChildren().clear();
+        this.type = keystore.getSeed().getType();
 
         showWordList(keystore.getSeed());
     }
@@ -29,7 +33,7 @@ public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
         vBox.setSpacing(10);
 
         wordsPane = new TilePane();
-        wordsPane.setPrefRows(numWords / 3);
+        wordsPane.setPrefRows(Math.ceilDiv(numWords, 3));
         wordsPane.setHgap(10);
         wordsPane.setVgap(10);
         wordsPane.setOrientation(Orientation.VERTICAL);
@@ -43,7 +47,7 @@ public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
         wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
         List<WordEntry> wordEntries = new ArrayList<>(numWords);
         for(int i = 0; i < numWords; i++) {
-            wordEntries.add(new WordEntry(i, wordEntryList));
+            wordEntries.add(new WordEntry(i, wordEntryList, getWordlistProvider()));
         }
         for(int i = 0; i < numWords - 1; i++) {
             wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
@@ -57,4 +61,9 @@ public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
         stackPane.getChildren().add(vBox);
         return stackPane;
     }
+
+    @Override
+    protected WordlistProvider getWordlistProvider() {
+        return getWordListProvider(type);
+    }
 }

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

@@ -2,8 +2,10 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
 import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.slip39.Slip39MnemonicCode;
 import com.sparrowwallet.sparrow.AppServices;
-import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
 import javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -111,23 +113,9 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                     wordEntry.getEditor().setText(words.get(i));
                     wordEntry.getEditor().setEditable(false);
                 } else {
-                    ScheduledService<Void> service = new ScheduledService<>() {
-                        @Override
-                        protected Task<Void> createTask() {
-                            return new Task<>() {
-                                @Override
-                                protected Void call() {
-                                    return null;
-                                }
-                            };
-                        }
-                    };
-                    service.setDelay(Duration.millis(500));
-                    service.setOnSucceeded(event1 -> {
-                        service.cancel();
+                    AppServices.runAfterDelay(500, () -> {
                         Platform.runLater(() -> wordEntry.getEditor().requestFocus());
                     });
-                    service.start();
                 }
             }
         }
@@ -153,6 +141,10 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
     protected void showWordList(DeterministicSeed seed) {
         List<String> words = seed.getMnemonicCode();
+        showWordList(words);
+    }
+
+    protected void showWordList(List<String> words) {
         setContent(getMnemonicWordsEntry(words.size(), true, true));
         setExpanded(true);
 
@@ -175,7 +167,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         vBox.setSpacing(10);
 
         wordsPane = new TilePane();
-        wordsPane.setPrefRows(numWords/3);
+        wordsPane.setPrefRows(Math.ceilDiv(numWords, 3));
         wordsPane.setHgap(10);
         wordsPane.setVgap(10);
         wordsPane.setOrientation(Orientation.VERTICAL);
@@ -189,7 +181,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
         List<WordEntry> wordEntries = new ArrayList<>(numWords);
         for(int i = 0; i < numWords; i++) {
-            wordEntries.add(new WordEntry(i, wordEntryList));
+            wordEntries.add(new WordEntry(i, wordEntryList, getWordlistProvider()));
         }
         for(int i = 0; i < numWords - 1; i++) {
             wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
@@ -215,7 +207,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         buttonPane.getChildren().add(leftBox);
         AnchorPane.setLeftAnchor(leftBox, 0.0);
 
-        validLabel = new Label("Valid checksum", getValidGlyph());
+        validLabel = new Label("Valid checksum", GlyphUtils.getSuccessGlyph());
         validLabel.setContentDisplay(ContentDisplay.LEFT);
         validLabel.setGraphicTextGap(5.0);
         validLabel.managedProperty().bind(validLabel.visibleProperty());
@@ -224,7 +216,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         AnchorPane.setTopAnchor(validLabel, 5.0);
         AnchorPane.setLeftAnchor(validLabel, 0.0);
 
-        invalidLabel = new Label("Invalid checksum", getInvalidGlyph());
+        invalidLabel = new Label("Invalid checksum", GlyphUtils.getInvalidGlyph());
         invalidLabel.setContentDisplay(ContentDisplay.LEFT);
         invalidLabel.setGraphicTextGap(5.0);
         invalidLabel.managedProperty().bind(invalidLabel.visibleProperty());
@@ -242,7 +234,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                     empty = false;
                 }
 
-                if(!WordEntry.isValid(word)) {
+                if(!getWordlistProvider().isValid(word)) {
                     validWords = false;
                 }
             }
@@ -278,13 +270,20 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         //nothing by default
     }
 
+    protected WordlistProvider getWordlistProvider() {
+        return getWordListProvider(DeterministicSeed.Type.BIP39);
+    }
+
+    protected WordlistProvider getWordListProvider(DeterministicSeed.Type type) {
+        return type == DeterministicSeed.Type.SLIP39 ? new Slip39WordlistProvider() : new Bip39WordlistProvider();
+    }
+
     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) {
+        public WordEntry(int wordNumber, ObservableList<String> wordEntryList, WordlistProvider wordlistProvider) {
             super();
             setAlignment(Pos.CENTER_RIGHT);
 
@@ -302,7 +301,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                         for(int i = 0; i < words.length; i++) {
                             String word = words[i];
                             if(entry.nextField != null) {
-                                if(i == words.length - 2 && isValid(word)) {
+                                if(i == words.length - 2 && wordlistProvider.isValid(word)) {
                                     label.requestFocus();
                                 } else {
                                     entry.nextField.requestFocus();
@@ -335,8 +334,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
             });
             wordField.setTextFormatter(formatter);
 
-            wordList = Bip39MnemonicCode.INSTANCE.getWordList();
-            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList, wordNumber, wordEntryList));
+            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordlistProvider, wordNumber, wordEntryList));
             autoCompletionBinding.setDelay(50);
             autoCompletionBinding.setOnAutoCompleted(event -> {
                 if(nextField != null) {
@@ -357,7 +355,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
             ValidationSupport validationSupport = new ValidationSupport();
             validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
             validationSupport.registerValidator(wordField, Validator.combine(
-                    (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid word", (newValue.length() > 0 || !lastWord) && !wordList.contains(newValue))
+                    (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid word", (newValue.length() > 0 || !lastWord) && !wordlistProvider.isValid(newValue))
             ));
 
             wordField.textProperty().addListener((observable, oldValue, newValue) -> {
@@ -378,28 +376,24 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         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;
+        private final WordlistProvider wordlistProvider;
         private final int wordNumber;
         private final ObservableList<String> wordEntryList;
 
-        public WordlistSuggestionProvider(List<String> wordList, int wordNumber, ObservableList<String> wordEntryList) {
-            this.wordList = wordList;
+        public WordlistSuggestionProvider(WordlistProvider wordlistProvider, int wordNumber, ObservableList<String> wordEntryList) {
+            this.wordlistProvider = wordlistProvider;
             this.wordNumber = wordNumber;
             this.wordEntryList = wordEntryList;
         }
 
         @Override
         public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
-            if(wordNumber == wordEntryList.size() - 1 && allPreviousWordsValid()) {
+            if(wordlistProvider.supportsPossibleLastWords() && wordNumber == wordEntryList.size() - 1 && allPreviousWordsValid()) {
                 try {
-                    List<String> possibleLastWords = Bip39MnemonicCode.INSTANCE.getPossibleLastWords(wordEntryList.subList(0, wordEntryList.size() - 1));
+                    List<String> possibleLastWords = wordlistProvider.getPossibleLastWords(wordEntryList.subList(0, wordEntryList.size() - 1));
                     if(!request.getUserText().isEmpty()) {
                         possibleLastWords.removeIf(s -> !s.startsWith(request.getUserText()));
                     }
@@ -412,7 +406,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
             List<String> suggestions = new ArrayList<>();
             if(!request.getUserText().isEmpty()) {
-                for(String word : wordList) {
+                for(String word : wordlistProvider.getWordlist()) {
                     if(word.startsWith(request.getUserText())) {
                         suggestions.add(word);
                     }
@@ -424,7 +418,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
         private boolean allPreviousWordsValid() {
             for(int i = 0; i < wordEntryList.size() - 1; i++) {
-                if(!WordEntry.isValid(wordEntryList.get(i))) {
+                if(!wordlistProvider.isValid(wordEntryList.get(i))) {
                     return false;
                 }
             }
@@ -485,17 +479,53 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         }
     }
 
-    public static Glyph getValidGlyph() {
-        Glyph validGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
-        validGlyph.getStyleClass().add("success");
-        validGlyph.setFontSize(12);
-        return validGlyph;
+    protected interface WordlistProvider {
+        List<String> getWordlist();
+        boolean isValid(String word);
+        boolean supportsPossibleLastWords();
+        List<String> getPossibleLastWords(List<String> previousWords) throws MnemonicException.MnemonicLengthException, MnemonicException.MnemonicWordException;
     }
 
-    public static Glyph getInvalidGlyph() {
-        Glyph invalidGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
-        invalidGlyph.getStyleClass().add("failure");
-        invalidGlyph.setFontSize(12);
-        return invalidGlyph;
+    private static class Bip39WordlistProvider implements WordlistProvider {
+        @Override
+        public List<String> getWordlist() {
+            return Bip39MnemonicCode.INSTANCE.getWordList();
+        }
+
+        public boolean isValid(String word) {
+            return getWordlist().contains(word);
+        }
+
+        @Override
+        public boolean supportsPossibleLastWords() {
+            return true;
+        }
+
+        @Override
+        public List<String> getPossibleLastWords(List<String> previousWords) throws MnemonicException.MnemonicLengthException, MnemonicException.MnemonicWordException {
+            return Bip39MnemonicCode.INSTANCE.getPossibleLastWords(previousWords);
+        }
+    }
+
+    private static class Slip39WordlistProvider implements WordlistProvider {
+        @Override
+        public List<String> getWordlist() {
+            return Slip39MnemonicCode.INSTANCE.getWordList();
+        }
+
+        @Override
+        public boolean isValid(String word) {
+            return getWordlist().contains(word);
+        }
+
+        @Override
+        public boolean supportsPossibleLastWords() {
+            return false;
+        }
+
+        @Override
+        public List<String> getPossibleLastWords(List<String> previousWords) {
+            throw new UnsupportedOperationException();
+        }
     }
 }

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

@@ -0,0 +1,319 @@
+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.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.slip39.Share;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
+import com.sparrowwallet.sparrow.io.ImportException;
+import com.sparrowwallet.sparrow.io.KeystoreMnemonicShareImport;
+import com.sparrowwallet.sparrow.io.Slip39;
+import javafx.beans.property.SimpleIntegerProperty;
+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 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 java.util.*;
+
+public class MnemonicShareKeystoreImportPane extends MnemonicKeystorePane {
+    protected final Wallet wallet;
+    private final KeystoreMnemonicShareImport importer;
+    private final KeyDerivation defaultDerivation;
+    private final List<List<String>> mnemonicShares = new ArrayList<>();
+
+    private SplitMenuButton importButton;
+
+    private Button calculateButton;
+    private Button backButton;
+    private Button nextButton;
+    private int currentShare;
+
+    public MnemonicShareKeystoreImportPane(Wallet wallet, KeystoreMnemonicShareImport importer, KeyDerivation defaultDerivation) {
+        super(importer.getName(), "Enter seed share", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        this.wallet = wallet;
+        this.importer = importer;
+        this.defaultDerivation = defaultDerivation;
+
+        createImportButton();
+        buttonBox.getChildren().add(importButton);
+    }
+
+    @Override
+    protected Control createButton() {
+        createEnterMnemonicButton();
+        return enterMnemonicButton;
+    }
+
+    private void createEnterMnemonicButton() {
+        enterMnemonicButton = new SplitMenuButton();
+        enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT);
+        enterMnemonicButton.setText("Use 20 Words");
+        defaultWordSizeProperty = new SimpleIntegerProperty(20);
+        defaultWordSizeProperty.addListener((observable, oldValue, newValue) -> {
+            enterMnemonicButton.setText("Use " + newValue + " Words");
+        });
+        enterMnemonicButton.setOnAction(event -> {
+            resetShares();
+            enterMnemonic(defaultWordSizeProperty.get());
+        });
+        int[] numberWords = new int[] {20, 33};
+        for(int i = 0; i < numberWords.length; i++) {
+            MenuItem item = new MenuItem("Use " + numberWords[i] + " Words");
+            final int words = numberWords[i];
+            item.setOnAction(event -> {
+                resetShares();
+                defaultWordSizeProperty.set(words);
+                enterMnemonic(words);
+            });
+            enterMnemonicButton.getItems().add(item);
+        }
+        enterMnemonicButton.managedProperty().bind(enterMnemonicButton.visibleProperty());
+    }
+
+    protected List<Node> createRightButtons() {
+        calculateButton = new Button("Create Keystore");
+        calculateButton.setDefaultButton(true);
+        calculateButton.setOnAction(event -> {
+            prepareImport();
+        });
+        calculateButton.managedProperty().bind(calculateButton.visibleProperty());
+        calculateButton.setTooltip(new Tooltip("Create the keystore from the provided shares"));
+        calculateButton.setVisible(false);
+
+        backButton = new Button("Back");
+        backButton.setOnAction(event -> {
+            lastShare();
+        });
+        backButton.managedProperty().bind(backButton.visibleProperty());
+        backButton.setTooltip(new Tooltip("Display the last share added"));
+        backButton.setVisible(currentShare > 0);
+
+        nextButton = new Button("Next");
+        nextButton.setOnAction(event -> {
+            nextShare();
+        });
+        nextButton.managedProperty().bind(nextButton.visibleProperty());
+        nextButton.setTooltip(new Tooltip("Add the next share"));
+        nextButton.visibleProperty().bind(calculateButton.visibleProperty().not());
+        nextButton.setDefaultButton(true);
+        nextButton.setDisable(true);
+
+        return List.of(backButton, nextButton, calculateButton);
+    }
+
+    @Override
+    protected void enterMnemonic(int numWords) {
+        super.enterMnemonic(numWords);
+        setDescription("Enter existing share");
+    }
+
+    private void resetShares() {
+        currentShare = 0;
+        mnemonicShares.clear();
+    }
+
+    private void lastShare() {
+        currentShare--;
+        showWordList(mnemonicShares.get(currentShare));
+    }
+
+    private void nextShare() {
+        if(currentShare == mnemonicShares.size()) {
+            mnemonicShares.add(wordEntriesProperty.get());
+        } else {
+            mnemonicShares.set(currentShare, wordEntriesProperty.get());
+        }
+
+        currentShare++;
+
+        if(currentShare < mnemonicShares.size()) {
+            showWordList(mnemonicShares.get(currentShare));
+        } else {
+            setContent(getMnemonicWordsEntry(defaultWordSizeProperty.get(), true, true));
+        }
+        setExpanded(true);
+    }
+
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        boolean validSet = false;
+        boolean complete = false;
+        if(!empty && validWords) {
+            try {
+                Share.fromMnemonic(String.join(" ", wordEntriesProperty.get()));
+                validChecksum = true;
+
+                List<List<String>> existing = new ArrayList<>(mnemonicShares);
+                if(currentShare >= mnemonicShares.size()) {
+                    existing.add(wordEntriesProperty.get());
+                }
+
+                importer.getKeystore(wallet.getScriptType().getDefaultDerivation(), existing, passphraseProperty.get());
+                validSet = true;
+                complete = true;
+            } catch(MnemonicException e) {
+                invalidLabel.setText(e.getTitle());
+                invalidLabel.setTooltip(new Tooltip(e.getMessage()));
+            } catch(Slip39.Slip39ProgressException e) {
+                validSet = true;
+                invalidLabel.setText(e.getTitle());
+                invalidLabel.setTooltip(new Tooltip(e.getMessage()));
+            } catch(ImportException e) {
+                if(e.getCause() instanceof MnemonicException mnemonicException) {
+                    invalidLabel.setText(mnemonicException.getTitle());
+                    invalidLabel.setTooltip(new Tooltip(mnemonicException.getMessage()));
+                } else {
+                    invalidLabel.setText("Import Error");
+                    invalidLabel.setTooltip(new Tooltip(e.getMessage()));
+                }
+            }
+        }
+
+        calculateButton.setVisible(complete);
+        backButton.setVisible(currentShare > 0 && !complete);
+        nextButton.setDisable(!validChecksum || !validSet);
+        validLabel.setVisible(complete);
+        validLabel.setText(mnemonicShares.isEmpty() ? "Valid checksum" : "Completed share set");
+        invalidLabel.setVisible(!complete && !empty);
+        invalidLabel.setGraphic(validChecksum && validSet ? getIncompleteGlyph() : GlyphUtils.getFailureGlyph());
+    }
+
+    private void createImportButton() {
+        importButton = new SplitMenuButton();
+        importButton.setAlignment(Pos.CENTER_RIGHT);
+        importButton.setText("Import Keystore");
+        importButton.getStyleClass().add("default-button");
+        importButton.setOnAction(event -> {
+            importButton.setDisable(true);
+            importKeystore(getDefaultDerivation(), false);
+        });
+        String[] accounts = new String[] {"Import Default Account #0", "Import Account #1", "Import Account #2", "Import Account #3", "Import Account #4", "Import Account #5", "Import Account #6", "Import Account #7", "Import Account #8", "Import 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, false);
+            });
+            importButton.getItems().add(item);
+        }
+
+        importButton.managedProperty().bind(importButton.visibleProperty());
+        importButton.setVisible(false);
+    }
+
+    private List<ChildNumber> getDefaultDerivation() {
+        return defaultDerivation == null || defaultDerivation.getDerivation().isEmpty() ? wallet.getScriptType().getDefaultDerivation() : defaultDerivation.getDerivation();
+    }
+
+    private void prepareImport() {
+        nextShare();
+        backButton.setVisible(false);
+
+        if(importKeystore(wallet.getScriptType().getDefaultDerivation(), true)) {
+            setExpanded(true);
+            enterMnemonicButton.setVisible(false);
+            importButton.setVisible(true);
+            importButton.setDisable(false);
+            setDescription("Ready to import");
+            showHideLink.setText("Show Derivation...");
+            showHideLink.setVisible(false);
+            setContent(getDerivationEntry(getDefaultDerivation()));
+        }
+    }
+
+    private boolean importKeystore(List<ChildNumber> derivation, boolean dryrun) {
+        importButton.setDisable(true);
+        try {
+            Keystore keystore = importer.getKeystore(derivation, mnemonicShares, passphraseProperty.get());
+            if(!dryrun) {
+                if(passphraseProperty.get() != null && !passphraseProperty.get().isEmpty()) {
+                    KeystorePassphraseDialog keystorePassphraseDialog = new KeystorePassphraseDialog(null, keystore, true);
+                    keystorePassphraseDialog.initOwner(this.getScene().getWindow());
+                    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;
+        } 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 + ".");
+            importButton.setDisable(false);
+            return false;
+        }
+    }
+
+    private Node getDerivationEntry(List<ChildNumber> derivation) {
+        TextField derivationField = new TextField();
+        derivationField.setPromptText("Derivation path");
+        derivationField.setText(KeyDerivation.writePath(derivation));
+        HBox.setHgrow(derivationField, Priority.ALWAYS);
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+        validationSupport.registerValidator(derivationField, Validator.combine(
+                Validator.createEmptyValidator("Derivation is required"),
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid derivation", !KeyDerivation.isValid(newValue))
+        ));
+
+        Button importDerivationButton = new Button("Import Custom Derivation Keystore");
+        importDerivationButton.setDisable(true);
+        importDerivationButton.setOnAction(event -> {
+            showHideLink.setVisible(true);
+            setExpanded(false);
+            List<ChildNumber> importDerivation = KeyDerivation.parsePath(derivationField.getText());
+            importKeystore(importDerivation, false);
+        });
+
+        derivationField.textProperty().addListener((observable, oldValue, 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();
+        contentBox.setAlignment(Pos.TOP_RIGHT);
+        contentBox.setSpacing(20);
+        contentBox.getChildren().add(derivationField);
+        contentBox.getChildren().add(importDerivationButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPrefHeight(60);
+
+        return contentBox;
+    }
+
+    public static Glyph getIncompleteGlyph() {
+        Glyph warningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PLUS_CIRCLE);
+        warningGlyph.getStyleClass().add("warn-icon");
+        warningGlyph.setFontSize(12);
+        return warningGlyph;
+    }
+
+    @Override
+    protected WordlistProvider getWordlistProvider() {
+        return getWordListProvider(DeterministicSeed.Type.SLIP39);
+    }
+}

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

@@ -55,7 +55,7 @@ public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
     protected List<Node> createRightButtons() {
         discoverButton = new Button("Discover Wallet");
         discoverButton.setDisable(true);
-        discoverButton.setDefaultButton(true);
+        discoverButton.setDefaultButton(AppServices.onlineProperty().get());
         discoverButton.managedProperty().bind(discoverButton.visibleProperty());
         discoverButton.setOnAction(event -> {
             discoverWallet();
@@ -66,6 +66,7 @@ public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
 
         importButton = new Button("Import Wallet");
         importButton.setDisable(true);
+        importButton.setDefaultButton(!AppServices.onlineProperty().get());
         importButton.managedProperty().bind(importButton.visibleProperty());
         importButton.visibleProperty().bind(discoverButton.visibleProperty().not());
         importButton.setOnAction(event -> {
@@ -196,6 +197,7 @@ public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
         HBox.setHgrow(region, Priority.SOMETIMES);
 
         Button importMnemonicButton = new Button("Import");
+        importMnemonicButton.setDefaultButton(true);
         importMnemonicButton.setOnAction(event -> {
             showHideLink.setVisible(true);
             setExpanded(false);

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

@@ -1,14 +1,14 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import javafx.scene.control.TreeTableCell;
-import org.controlsfx.tools.Platform;
 
 public class NumberCell extends TreeTableCell<Entry, Number> {
     public NumberCell() {
         super();
         getStyleClass().add("number-cell");
-        if(Platform.getCurrent() == Platform.OSX) {
+        if(OsType.getCurrent() == OsType.MACOS) {
             getStyleClass().add("number-field");
         }
     }

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

@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.InputStream;
 import java.net.Proxy;
-import java.net.URL;
+import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -124,8 +124,11 @@ public class PayNymAvatar extends StackPane {
                             log.debug("Requesting PayNym avatar from " + url);
                         }
 
-                        try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream())) {
-                            Image image = new Image(is, 150, 150, true, false);
+                        try(InputStream is = (proxy == null ? new URI(url).toURL().openStream() : new URI(url).toURL().openConnection(proxy).getInputStream())) {
+                            Image image = new Image(is, 150, 150, true, true);
+                            if(image.getException() != null) {
+                                throw image.getException();
+                            }
                             paymentCodeCache.put(cacheId, image);
                             Platform.runLater(() -> EventManager.get().post(new PayNymImageLoadedEvent(paymentCode, image)));
                             return image;

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

@@ -407,6 +407,12 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
             if(total - fee <= dustThreshold) {
                 AppServices.showErrorDialog("Insufficient funds", "The unspent outputs for this private key contain insufficient funds to spend (" + total + " sats).");
                 return;
+            } else {
+                Optional<ButtonType> optType = AppServices.showWarningDialog("Insufficient funds", "The unspent outputs for this private key contain insufficient funds (" + total + " sats) for a transaction at this fee rate." +
+                        "\n\nContinue with a minimum fee rate transaction?", ButtonType.YES, ButtonType.NO);
+                if(optType.isPresent() && optType.get() == ButtonType.NO) {
+                    return;
+                }
             }
         }
 

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

@@ -10,6 +10,7 @@ import com.sparrowwallet.hummingbird.LegacyUREncoder;
 import com.sparrowwallet.hummingbird.registry.RegistryType;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.ImportException;
 import com.sparrowwallet.hummingbird.UR;
@@ -169,6 +170,11 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
         dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
         qrImageView.setImage(getQrCode(data));
 
+        if(qrImageView.getImage() == null) {
+            Label warning = new Label("Message is too long for display as a QR code");
+            stackPane.getChildren().add(warning);
+        }
+
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
         dialogPane.getButtonTypes().addAll(cancelButtonType);
 
@@ -259,6 +265,10 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
         }
     }
 
+    public boolean isUseBbqrEncoding() {
+        return useBbqrEncoding;
+    }
+
     private void setUseBbqrEncoding(boolean useBbqrEncoding) {
         if(useBbqrEncoding) {
             this.useBbqrEncoding = true;

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

@@ -1,10 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.github.sarxos.webcam.*;
-import com.sparrowwallet.drongo.ExtendedKey;
-import com.sparrowwallet.drongo.KeyDerivation;
-import com.sparrowwallet.drongo.OutputDescriptor;
-import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.*;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.P2PKHAddress;
 import com.sparrowwallet.drongo.address.P2SHAddress;
@@ -28,6 +25,8 @@ import com.sparrowwallet.hummingbird.URDecoder;
 import com.sparrowwallet.hummingbird.registry.pathcomponent.IndexPathComponent;
 import com.sparrowwallet.hummingbird.registry.pathcomponent.PathComponent;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WebcamResolutionChangedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.bbqr.BBQRDecoder;
@@ -95,7 +94,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
         this.webcamService = new WebcamService(webcamResolutionProperty.get(), null, new QRScanListener(), new ScanDelayCalculator());
         webcamService.setPeriod(Duration.millis(SCAN_PERIOD_MILLIS));
         webcamService.setRestartOnFailure(false);
-        WebcamView webcamView = new WebcamView(webcamService);
+        WebcamView webcamView = new WebcamView(webcamService, Config.get().isMirrorCapture());
 
         final DialogPane dialogPane = new QRScanDialogPane();
         setDialogPane(dialogPane);
@@ -138,7 +137,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             while(nested.getCause() != null) {
                 nested = nested.getCause();
             }
-            if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS &&
+            if(OsType.getCurrent() == OsType.WINDOWS &&
                     nested.getMessage().startsWith("Library 'OpenIMAJGrabber' was not loaded successfully from file")) {
                 exception = new WebcamDependencyException("Your system is missing a dependency required for the webcam. Follow the link below for more details.\n\n[https://sparrowwallet.com/docs/faq.html#your-system-is-missing-a-dependency-for-the-webcam]", exception);
             } else if(nested.getMessage().startsWith("Cannot start native grabber") && Config.get().getWebcamDevice() != null) {
@@ -153,6 +152,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
         webcamResolutionProperty.addListener((observable, oldValue, newResolution) -> {
             if(newResolution != null) {
                 setHeight(newResolution == WebcamResolution.HD ? (getHeight() - 100) : (getHeight() + 100));
+                EventManager.get().post(new WebcamResolutionChangedEvent(newResolution == WebcamResolution.HD));
             }
             webcamService.cancel();
         });

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

@@ -6,6 +6,7 @@ import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
+import com.sparrowwallet.drongo.wallet.TableType;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.UnitFormat;
@@ -86,10 +87,10 @@ public class SearchWalletDialog extends Dialog<Entry> {
         form.getChildren().add(fieldset);
 
         results = new CoinTreeTable();
+        results.setTableType(TableType.SEARCH_WALLET);
         results.setShowRoot(false);
         results.setPrefWidth(showWallet || showAccount ? 950 : 850);
         results.setUnitFormat(walletForms.iterator().next().getWallet());
-        results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
         results.setPlaceholder(new Label("No results"));
         results.setEditable(true);
 
@@ -169,7 +170,12 @@ public class SearchWalletDialog extends Dialog<Entry> {
             searchWallets(newValue);
         });
 
+        SearchWalletEntry rootEntry = new SearchWalletEntry(walletForms.getFirst().getWallet(), Collections.emptyList());
+        RecursiveTreeItem<Entry> rootItem = new RecursiveTreeItem<>(rootEntry, Entry::getChildren);
+        results.setRoot(rootItem);
+
         setResizable(true);
+        results.setupColumnWidths();
 
         AppServices.moveToActiveWindowScreen(this);
 

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.SeedQR;
 import com.sparrowwallet.sparrow.AppServices;
@@ -17,7 +18,7 @@ public class SeedDisplayDialog extends Dialog<Void> {
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
-        int lines = decryptedKeystore.getSeed().getMnemonicCode().size() / 3;
+        int lines = Math.ceilDiv(decryptedKeystore.getSeed().getMnemonicCode().size(), 3);
         int height = lines * 40;
 
         StackPane stackPane = new StackPane();
@@ -43,15 +44,19 @@ public class SeedDisplayDialog extends Dialog<Void> {
 
         stackPane.getChildren().addAll(anchorPane);
 
-        final ButtonType seedQRButtonType = new javafx.scene.control.ButtonType("Show SeedQR", ButtonBar.ButtonData.LEFT);
-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
-        dialogPane.getButtonTypes().addAll(seedQRButtonType, cancelButtonType);
+        if(decryptedKeystore.getSeed().getType() == DeterministicSeed.Type.BIP39) {
+            final ButtonType seedQRButtonType = new javafx.scene.control.ButtonType("Show SeedQR", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(seedQRButtonType);
 
-        Button seedQRButton = (Button)dialogPane.lookupButton(seedQRButtonType);
-        seedQRButton.addEventFilter(ActionEvent.ACTION, event -> {
-            event.consume();
-            showSeedQR(decryptedKeystore);
-        });
+            Button seedQRButton = (Button)dialogPane.lookupButton(seedQRButtonType);
+            seedQRButton.addEventFilter(ActionEvent.ACTION, event -> {
+                event.consume();
+                showSeedQR(decryptedKeystore);
+            });
+        }
+
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        dialogPane.getButtonTypes().add(cancelButtonType);
 
         dialogPane.setPrefWidth(500);
         dialogPane.setPrefHeight(150 + height);

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.control;
 
 import com.csvreader.CsvReader;
 import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
 import com.sparrowwallet.drongo.protocol.Transaction;
@@ -20,7 +21,6 @@ import javafx.stage.FileChooser;
 import javafx.util.StringConverter;
 import org.controlsfx.control.spreadsheet.*;
 import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -105,7 +105,7 @@ public class SendToManyDialog extends Dialog<List<Payment>> {
             SpreadsheetCell amountCell = SpreadsheetCellType.DOUBLE.createCell(row, 1, 1, 1, amount < 0 ? null : amount);
             amountCell.setFormat(bitcoinUnit == BitcoinUnit.BTC ? "0.00000000" : "###,###");
             amountCell.getStyleClass().add("number-value");
-            if(Platform.getCurrent() == Platform.OSX) {
+            if(OsType.getCurrent() == OsType.MACOS) {
                 amountCell.getStyleClass().add("number-field");
             }
             list.add(amountCell);
@@ -161,7 +161,7 @@ public class SendToManyDialog extends Dialog<List<Payment>> {
                     FileChooser fileChooser = new FileChooser();
                     fileChooser.setTitle("Open CSV");
                     fileChooser.getExtensionFilters().addAll(
-                            new FileChooser.ExtensionFilter("All Files", org.controlsfx.tools.Platform.getCurrent().equals(org.controlsfx.tools.Platform.UNIX) ? "*" : "*.*"),
+                            new FileChooser.ExtensionFilter("All Files", OsType.getCurrent().equals(OsType.UNIX) ? "*" : "*.*"),
                             new FileChooser.ExtensionFilter("CSV", "*.csv")
                     );
 

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

@@ -14,8 +14,8 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
-import java.util.Arrays;
-import java.util.OptionalDouble;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class TitledDescriptionPane extends TitledPane {
     private Label mainLabel;
@@ -127,25 +127,45 @@ public class TitledDescriptionPane extends TitledPane {
     }
 
     protected Node getContentBox(String message) {
-        Label details = new Label(message);
-        details.setWrapText(true);
-
-        HBox contentBox = new HBox();
+        // Create the VBox to hold text and Hyperlink components
+        VBox contentBox = new VBox();
         contentBox.setAlignment(Pos.TOP_LEFT);
-        contentBox.getChildren().add(details);
         contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPrefWidth(400);  // Set preferred width for wrapping
+        contentBox.setMinHeight(60);
 
-        double width = TextUtils.computeTextWidth(details.getFont(), message, 0.0D);
-        double numLines = Math.max(1, Math.ceil(width / 400d));
+        // Define the regex pattern to match URLs
+        String urlPattern = "(\\[https?://\\S+])";
+        Pattern pattern = Pattern.compile(urlPattern);
+        Matcher matcher = pattern.matcher(message);
 
-        //Handle long words like txids
-        OptionalDouble maxWordLength = Arrays.stream(message.split(" ")).mapToDouble(word -> TextUtils.computeTextWidth(details.getFont(), message, 0.0D)).max();
-        if(maxWordLength.isPresent() && maxWordLength.getAsDouble() > 300.0) {
-            numLines += 1.0;
+        // StringBuilder to track the non-URL text
+        int lastMatchEnd = 0;
+
+        // Iterate through the matches and build the components
+        while (matcher.find()) {
+            // Add the text before the URL as a normal Label
+            if (matcher.start() > lastMatchEnd) {
+                String nonUrlText = message.substring(lastMatchEnd, matcher.start());
+                Label textLabel = createWrappedLabel(nonUrlText);
+                contentBox.getChildren().add(textLabel);
+            }
+
+            // Extract the URL and create a Hyperlink for it
+            String url = matcher.group(1).replaceAll("\\[", "").replaceAll("\\]", "");
+            Hyperlink hyperlink = createHyperlink(url);
+            contentBox.getChildren().add(hyperlink);
+
+            // Update last match end
+            lastMatchEnd = matcher.end();
         }
 
-        double height = Math.max(60, numLines * 20);
-        contentBox.setPrefHeight(height);
+        // Add remaining text after the last URL (if any)
+        if (lastMatchEnd < message.length()) {
+            String remainingText = message.substring(lastMatchEnd);
+            Label remainingLabel = createWrappedLabel(remainingText);
+            contentBox.getChildren().add(remainingLabel);
+        }
 
         return contentBox;
     }
@@ -178,4 +198,21 @@ public class TitledDescriptionPane extends TitledPane {
 
         return account;
     }
+
+    // Helper method to create a wrapped Label with a specified maxWidth
+    private Label createWrappedLabel(String text) {
+        Label label = new Label(text);
+        label.setWrapText(true);
+        label.setMaxWidth(400);
+        return label;
+    }
+
+    // Helper method to create a Hyperlink
+    private Hyperlink createHyperlink(String url) {
+        Hyperlink hyperlink = new Hyperlink(url);
+        hyperlink.setMaxWidth(400);  // Set maximum width for wrapping
+        hyperlink.setWrapText(true);  // Ensure text wrapping in the hyperlink
+        hyperlink.setOnAction(_ -> AppServices.get().getApplication().getHostServices().showDocument(url));
+        return hyperlink;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.google.common.net.HostAndPort;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
@@ -14,7 +15,6 @@ import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,7 +28,7 @@ public class TorStatusLabel extends Label {
 
     public TorStatusLabel() {
         getStyleClass().add("tor-status");
-        setPadding(Platform.getCurrent() == Platform.WINDOWS ? new Insets(0, 0, 1, 3) : new Insets(1, 0, 0, 3));
+        setPadding(OsType.getCurrent() == OsType.WINDOWS ? new Insets(0, 0, 1, 3) : new Insets(1, 0, 0, 3));
         setGraphic(getIcon());
         update();
     }
@@ -62,7 +62,7 @@ public class TorStatusLabel extends Label {
 
     private Node getIcon() {
         Glyph adjust = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ADJUST);
-        adjust.setFontSize(Platform.getCurrent() == Platform.WINDOWS ? 14 : 15);
+        adjust.setFontSize(OsType.getCurrent() == OsType.WINDOWS ? 14 : 15);
         adjust.setRotate(180);
 
         Glyph bullseye = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.BULLSEYE);

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

@@ -1,7 +1,9 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.TransactionOutput;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
@@ -44,7 +46,6 @@ import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;
 
 import javax.imageio.ImageIO;
 import java.awt.image.*;
@@ -89,7 +90,7 @@ public class TransactionDiagram extends GridPane {
                 stage.setResizable(false);
 
                 StackPane scenePane = new StackPane();
-                if(Platform.getCurrent() == Platform.WINDOWS || Platform.getCurrent() == Platform.UNIX) {
+                if(OsType.getCurrent() == OsType.WINDOWS || OsType.getCurrent() == OsType.UNIX) {
                     scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
                 }
 
@@ -432,8 +433,14 @@ public class TransactionDiagram extends GridPane {
                 if(walletNode != null) {
                     inputValue = input.getValue();
                     Wallet nodeWallet = walletNode.getWallet();
-                    tooltip.setText("Spending " + getSatsValue(inputValue) + " sats from " + (isFinal() ? nodeWallet.getFullDisplayName() : (nodeWallet.isNested() ? nodeWallet.getDisplayName() : "")) + " " + walletNode + "\n" +
-                            input.getHashAsString() + ":" + input.getIndex() + "\n" + walletNode.getAddress());
+                    StringJoiner joiner = new StringJoiner("\n");
+                    joiner.add("Spending " + getSatsValue(inputValue) + " sats from " + (isFinal() ? nodeWallet.getFullDisplayName() : (nodeWallet.isNested() ? nodeWallet.getDisplayName() : "")) + " " + walletNode);
+                    joiner.add(input.getHashAsString() + ":" + input.getIndex());
+                    joiner.add(walletNode.getAddress().toString());
+                    if(input.getLabel() != null) {
+                        joiner.add(input.getLabel());
+                    }
+                    tooltip.setText(joiner.toString());
                     tooltip.getStyleClass().add("input-label");
 
                     if(input.getLabel() == null || input.getLabel().isEmpty()) {
@@ -696,7 +703,9 @@ public class TransactionDiagram extends GridPane {
                 paymentBox.getChildren().addAll(region, amountLabel);
             }
 
-            outputNodes.add(new OutputNode(paymentBox, payment.getAddress(), payment.getAmount()));
+            Wallet bip47Wallet = toWallet != null && toWallet.isBip47() ? toWallet : (toBip47Wallet != null && toBip47Wallet.isBip47() ? toBip47Wallet : null);
+            PaymentCode paymentCode = bip47Wallet == null ? null : bip47Wallet.getKeystores().getFirst().getExternalPaymentCode();
+            outputNodes.add(new OutputNode(paymentBox, payment.getAddress(), payment.getAmount(), paymentCode));
         }
 
         Set<Integer> seenIndexes = new HashSet<>();
@@ -760,7 +769,7 @@ public class TransactionDiagram extends GridPane {
             outputsBox.getChildren().add(outputNode.outputLabel);
             outputsBox.getChildren().add(createSpacer());
 
-            ContextMenu contextMenu = new LabelContextMenu(outputNode.address, outputNode.amount);
+            ContextMenu contextMenu = new LabelContextMenu(outputNode.address, outputNode.amount, outputNode.paymentCode);
             if(!outputNode.outputLabel.getChildren().isEmpty() && outputNode.outputLabel.getChildren().get(0) instanceof Label outputLabelControl) {
                 outputLabelControl.setContextMenu(contextMenu);
             }
@@ -1067,16 +1076,26 @@ public class TransactionDiagram extends GridPane {
         public Pane outputLabel;
         public Address address;
         public long amount;
+        public PaymentCode paymentCode;
 
         public OutputNode(Pane outputLabel, Address address, long amount) {
+            this(outputLabel, address, amount, null);
+        }
+
+        public OutputNode(Pane outputLabel, Address address, long amount, PaymentCode paymentCode) {
             this.outputLabel = outputLabel;
             this.address = address;
             this.amount = amount;
+            this.paymentCode = paymentCode;
         }
     }
 
     private class LabelContextMenu extends ContextMenu {
         public LabelContextMenu(Address address, long value) {
+            this(address, value, null);
+        }
+
+        public LabelContextMenu(Address address, long value, PaymentCode paymentCode) {
             if(address != null) {
                 MenuItem copyAddress = new MenuItem("Copy Address");
                 copyAddress.setOnAction(event -> {
@@ -1113,6 +1132,17 @@ public class TransactionDiagram extends GridPane {
                 Clipboard.getSystemClipboard().setContent(content);
             });
             getItems().addAll(copySatsValue, copyBtcValue);
+
+            if(paymentCode != null) {
+                MenuItem copyPaymentCode = new MenuItem("Copy Payment Code");
+                copyPaymentCode.setOnAction(AE -> {
+                    hide();
+                    ClipboardContent content = new ClipboardContent();
+                    content.putString(paymentCode.toString());
+                    Clipboard.getSystemClipboard().setContent(content);
+                });
+                getItems().add(copyPaymentCode);
+            }
         }
     }
 }

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

@@ -1,11 +1,11 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.wallet.TableType;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.TransactionEntry;
 import com.sparrowwallet.sparrow.wallet.WalletTransactionsEntry;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.scene.control.TreeTableColumn;
-import javafx.scene.control.TreeTableView;
 
 public class TransactionsTreeTable extends CoinTreeTable {
     public void initialize(WalletTransactionsEntry rootEntry) {
@@ -49,8 +49,8 @@ public class TransactionsTreeTable extends CoinTreeTable {
 
         setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet()));
         setEditable(true);
-        setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
-        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
+        setupColumnWidths();
+        setupColumnSort(0, TreeTableColumn.SortType.DESCENDING);
     }
 
     public void updateAll(WalletTransactionsEntry rootEntry) {
@@ -60,13 +60,13 @@ public class TransactionsTreeTable extends CoinTreeTable {
         setRoot(rootItem);
         rootItem.setExpanded(true);
 
-        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
+        resetSortColumn();
     }
 
     public void updateHistory() {
         //Transaction entries should have already been updated using WalletTransactionsEntry.updateHistory, so only a resort required
         sort();
-        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
+        resetSortColumn();
     }
 
     public void updateLabel(Entry entry) {

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.OsType;
 import javafx.application.Platform;
 import javafx.stage.Stage;
 import org.slf4j.Logger;
@@ -31,7 +32,7 @@ public class TrayManager {
 
         try {
             List<Image> imgList = new ArrayList<>();
-            if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+            if(OsType.getCurrent() == OsType.WINDOWS) {
                 imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-black-small.png")));
                 imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-black-small@2x.png")));
                 imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-black-small@3x.png")));

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

@@ -27,8 +27,9 @@ 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.TREZOR_SAFE_3 || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02)) {
+            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.TREZOR_SAFE_3 ||
+                    device.getModel() == WalletModel.TREZOR_SAFE_5 || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02 ||
+                    device.getModel() == WalletModel.ONEKEY_CLASSIC_1S || device.getModel() == WalletModel.ONEKEY_PRO)) {
                 deviceItem = new Menu(device.getModel().toDisplayString());
                 MenuItem toggleItem = new MenuItem("Toggle Passphrase" + (!device.getModel().externalPassphraseEntry() ? "" : (device.isNeedsPassphraseSent() ? " Off" : " On")));
                 toggleItem.setOnAction(event -> {

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

@@ -1,10 +1,10 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.wallet.TableType;
 import com.sparrowwallet.sparrow.wallet.*;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TreeTableColumn;
-import javafx.scene.control.TreeTableView;
 
 import java.util.Comparator;
 
@@ -82,8 +82,8 @@ public class UtxosTreeTable extends CoinTreeTable {
 
         setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet()));
         setEditable(true);
-        setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
-        setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
+        setupColumnWidths();
+        setupColumnSort(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
 
         getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
     }
@@ -95,14 +95,14 @@ public class UtxosTreeTable extends CoinTreeTable {
         setRoot(rootItem);
         rootItem.setExpanded(true);
 
-        setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
+        resetSortColumn();
     }
 
     public void updateHistory() {
         //Utxo entries should have already been updated, so only a resort required
         if(!getRoot().getChildren().isEmpty()) {
             sort();
-            setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
+            resetSortColumn();
         }
     }
 

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

@@ -18,8 +18,8 @@ import java.util.List;
 public class WalletExportDialog extends Dialog<Wallet> {
     private Wallet wallet;
 
-    public WalletExportDialog(WalletForm walletForm) {
-        this.wallet = walletForm.getWallet();
+    public WalletExportDialog(WalletForm selectedWalletForm, List<WalletForm> allWalletForms) {
+        this.wallet = selectedWalletForm.getWallet();
 
         EventManager.get().register(this);
         setOnCloseRequest(event -> {
@@ -45,10 +45,10 @@ public class WalletExportDialog extends Dialog<Wallet> {
 
         List<WalletExport> exporters;
         if(wallet.getPolicyType() == PolicyType.SINGLE) {
-            exporters = List.of(new Electrum(), new ElectrumPersonalServer(), new Descriptor(), new SpecterDesktop(), new Sparrow(), new WalletLabels(), new WalletTransactions(walletForm));
+            exporters = List.of(new Electrum(), new ElectrumPersonalServer(), new Descriptor(), new SpecterDesktop(), new Sparrow(), new WalletLabels(allWalletForms), new WalletTransactions(selectedWalletForm));
         } else if(wallet.getPolicyType() == PolicyType.MULTI) {
             exporters = List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new ElectrumPersonalServer(), new KeystoneMultisig(),
-                    new Descriptor(), new JadeMultisig(), new PassportMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new SpecterDIY(), new Sparrow(), new WalletLabels(), new WalletTransactions(walletForm));
+                    new Descriptor(), new JadeMultisig(), new PassportMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new SpecterDIY(), new Sparrow(), new WalletLabels(allWalletForms), new WalletTransactions(selectedWalletForm));
         } else {
             throw new UnsupportedOperationException("Cannot export wallet with policy type " + wallet.getPolicyType());
         }

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

@@ -61,7 +61,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         }
 
         List<WalletImport> walletImporters = new ArrayList<>(List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(),
-                new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow(), new JadeMultisig()));
+                new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow(), new JadeMultisig(), new PassportMultisig(), new SpecterDIYMultisig()));
         if(!selectedWalletForms.isEmpty()) {
             walletImporters.add(new WalletLabels(selectedWalletForms));
         }

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

@@ -10,6 +10,8 @@ import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.geometry.Insets;
 import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomTextField;
@@ -56,6 +58,11 @@ public class WalletNameDialog extends Dialog<WalletNameDialog.NameAndBirthDate>
         dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
         dialogPane.setPrefWidth(460);
         dialogPane.setPrefHeight(requestBirthDate ? 250 : 200);
+        dialogPane.getScene().addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            if (event.getCode() == KeyCode.ESCAPE) {
+                WalletNameDialog.this.close();
+            }
+        });
         AppServices.moveToActiveWindowScreen(this);
 
         Glyph wallet = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.WALLET);

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.wallet.TableType;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.CurrencyRate;
@@ -54,6 +55,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
         HBox hBox = new HBox(40);
 
         CoinTreeTable table = new CoinTreeTable();
+        table.setTableType(TableType.WALLET_SUMMARY);
 
         TreeTableColumn<Entry, String> nameColumn = new TreeTableColumn<>("Wallet");
         nameColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
@@ -101,7 +103,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
         table.setRoot(rootItem);
         rootItem.setExpanded(true);
 
-        table.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
+        table.setupColumnWidths();
         table.setPrefWidth(450);
 
         VBox vBox = new VBox();

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

@@ -1,8 +1,13 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WebcamMirroredChangedEvent;
+import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
+import javafx.scene.control.CheckMenuItem;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -21,12 +26,26 @@ public class WebcamView {
 
     private final ObjectProperty<Image> imageProperty = new SimpleObjectProperty<>(null);
 
-    public WebcamView(WebcamService service) {
+    public WebcamView(WebcamService service, boolean mirrored) {
         this.service = service ;
         this.imageView = new ImageView();
         imageView.setPreserveRatio(true);
-        // make the cam behave like a mirror:
-        imageView.setScaleX(-1);
+        if(mirrored) {
+            setMirrored(true);
+        }
+
+        ContextMenu contextMenu = new ContextMenu();
+        CheckMenuItem mirrorItem = new CheckMenuItem("Mirror Camera");
+        mirrorItem.setSelected(mirrored);
+        mirrorItem.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            setMirrored(newValue);
+            Config.get().setMirrorCapture(newValue);
+            EventManager.get().post(new WebcamMirroredChangedEvent(newValue));
+        });
+        contextMenu.getItems().add(mirrorItem);
+        imageView.setOnContextMenuRequested(event -> {
+            contextMenu.show(imageView, event.getScreenX(), event.getScreenY());
+        });
 
         service.valueProperty().addListener((observable, oldValue, newValue) -> {
             if(newValue != null) {
@@ -112,4 +131,8 @@ public class WebcamView {
     public Node getView() {
         return view;
     }
+
+    public void setMirrored(boolean mirrored) {
+        imageView.setScaleX(mirrored ? -1 : 1);
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+import java.util.List;
+
+public class KeystoreDeviceRegistrationsChangedEvent extends WalletChangedEvent {
+    private final List<Keystore> changedKeystores;
+
+    public KeystoreDeviceRegistrationsChangedEvent(Wallet wallet, List<Keystore> changedKeystores) {
+        super(wallet);
+        this.changedKeystores = changedKeystores;
+    }
+
+    public List<Keystore> getChangedKeystores() {
+        return changedKeystores;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.TableType;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletTable;
+
+public class WalletTableChangedEvent extends WalletChangedEvent {
+    private final WalletTable walletTable;
+
+    public WalletTableChangedEvent(Wallet wallet, WalletTable walletTable) {
+        super(wallet);
+        this.walletTable = walletTable;
+    }
+
+    public WalletTable getWalletTable() {
+        return walletTable;
+    }
+
+    public TableType getTableType() {
+        return walletTable == null ? null : walletTable.getTableType();
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+public class WebcamMirroredChangedEvent {
+    private final boolean mirrored;
+
+    public WebcamMirroredChangedEvent(boolean mirrored) {
+        this.mirrored = mirrored;
+    }
+
+    public boolean isMirrored() {
+        return mirrored;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+public class WebcamResolutionChangedEvent {
+    private final boolean hdResolution;
+
+    public WebcamResolutionChangedEvent(boolean hdResolution) {
+        this.hdResolution = hdResolution;
+    }
+
+    public boolean isHdResolution() {
+        return hdResolution;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java

@@ -40,6 +40,7 @@ public class FontAwesome5 extends GlyphFont {
         FEATHER_ALT('\uf56b'),
         FILE_CSV('\uf6dd'),
         FILE_IMPORT('\uf56f'),
+        FILE_EXPORT('\uf56e'),
         FILE_PDF('\uf1c1'),
         HAND_HOLDING('\uf4bd'),
         HAND_HOLDING_MEDICAL('\ue05c'),

src/main/java/com/sparrowwallet/sparrow/glyphfont/GlyphUtils.java

@@ -183,6 +183,13 @@ public class GlyphUtils {
         return successGlyph;
     }
 
+    public static Glyph getInvalidGlyph() {
+        Glyph invalidGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+        invalidGlyph.getStyleClass().add("failure");
+        invalidGlyph.setFontSize(12);
+        return invalidGlyph;
+    }
+
     public static Glyph getWarningGlyph() {
         Glyph warningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
         warningGlyph.getStyleClass().add("warn-icon");

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

@@ -28,7 +28,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {
 
     @Override
     public String getName() {
-        return "Unchained or Caravan Multisig";
+        return "Unchained Caravan Multisig";
     }
 
     @Override
@@ -56,11 +56,11 @@ public class CaravanMultisig implements WalletImport, WalletExport {
                 Keystore keystore = new Keystore(extKey.name.length() > Keystore.MAX_LABEL_LENGTH ? extKey.name.substring(0, Keystore.MAX_LABEL_LENGTH) : extKey.name);
 
                 if("Unknown".equals(extKey.bip32Path)) {
-                    extKey.bip32Path = "m/45'/0/0/0";
+                    extKey.bip32Path = "m/0/0/0/0";
                 }
 
                 try {
-                    keystore.setKeyDerivation(new KeyDerivation(extKey.xfp, extKey.bip32Path));
+                    keystore.setKeyDerivation(new KeyDerivation(extKey.xfp, extKey.bip32Path, true));
                 } catch(NumberFormatException e) {
                     keystore.setKeyDerivation(new KeyDerivation(extKey.xfp, scriptType.getDefaultDerivationPath()));
                 }
@@ -107,7 +107,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {
             CaravanFile cf = new CaravanFile();
             cf.name = wallet.getFullName();
             cf.addressType = wallet.getScriptType().toString().replace('-', '_');
-            cf.network = Network.get().getName();
+            cf.network = Network.getCanonical().getName();
             cf.client = new Client();
 
             Quorum quorum = new Quorum();

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.io;
 
 import com.google.common.base.Throwables;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
 import com.sparrowwallet.drongo.crypto.ECKey;
@@ -13,7 +14,6 @@ import com.sparrowwallet.sparrow.io.ckcard.CkCardApi;
 import com.sparrowwallet.sparrow.io.satochip.SatoCardApi;
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Service;
-import org.controlsfx.tools.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -171,7 +171,7 @@ public abstract class CardApi {
     }
 
     private static void setLibrary() {
-        if(!initialized && Platform.getCurrent() == Platform.UNIX) {
+        if(!initialized && OsType.getCurrent() == OsType.UNIX) {
             for(File lib : LINUX_PCSC_LIBS) {
                 if(lib.exists()) {
                     System.setProperty("sun.security.smartcardio.library", lib.getAbsolutePath());

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

@@ -48,7 +48,7 @@ public class CoboVaultSinglesig implements KeystoreFileImport, WalletImport {
             keystore.setLabel(getName());
             keystore.setSource(KeystoreSource.HW_AIRGAPPED);
             keystore.setWalletModel(WalletModel.COBO_VAULT);
-            keystore.setKeyDerivation(new KeyDerivation(coboKeystore.MasterFingerprint.toLowerCase(Locale.ROOT), "m/" + coboKeystore.AccountKeyPath));
+            keystore.setKeyDerivation(new KeyDerivation(coboKeystore.MasterFingerprint.toLowerCase(Locale.ROOT), "m/" + coboKeystore.AccountKeyPath, true));
             keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(coboKeystore.ExtPubKey));
 
             ExtendedKey.Header header = ExtendedKey.Header.fromExtendedKey(coboKeystore.ExtPubKey);

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

@@ -7,10 +7,7 @@ import com.sparrowwallet.drongo.Utils;
 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.KeystoreSource;
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.drongo.wallet.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,16 +71,16 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
                 if(header.getDefaultScriptType() != scriptType) {
                     throw new ImportException("This wallet's script type (" + scriptType + ") does not match the " + getName() + " script type (" + header.getDefaultScriptType() + ")");
                 }
-                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.path));
+                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.path, true));
                 keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(cck.xpub));
             } else if(scriptType.equals(ScriptType.P2SH)) {
-                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.p2sh_deriv));
+                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.p2sh_deriv, true));
                 keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(cck.p2sh));
             } else if(scriptType.equals(ScriptType.P2SH_P2WSH)) {
-                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.p2wsh_p2sh_deriv != null ? cck.p2wsh_p2sh_deriv : cck.p2sh_p2wsh_deriv));
+                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.p2wsh_p2sh_deriv != null ? cck.p2wsh_p2sh_deriv : cck.p2sh_p2wsh_deriv, true));
                 keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(cck.p2wsh_p2sh != null ? cck.p2wsh_p2sh : cck.p2sh_p2wsh));
             } else if(scriptType.equals(ScriptType.P2WSH)) {
-                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.p2wsh_deriv));
+                keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.p2wsh_deriv, true));
                 keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(cck.p2wsh));
             } else {
                 throw new ImportException("Correct derivation not found for script type: " + scriptType);
@@ -111,7 +108,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
     @Override
     public String getKeystoreImportDescription(int account) {
-        return "Import file created by using the Settings > Multisig Wallets > Export XPUB > " + account + " feature on your Coldcard.";
+        return "Import file or QR created by using Advanced/Tools > Export Wallet > Sparrow Wallet" + (account > 0 ? " > 1 > " + account : "") + " on your Coldcard. For older firmware use Settings > Multisig Wallets > Export XPUB > " + account + ".";
     }
 
     @Override
@@ -160,7 +157,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
                                 Keystore keystore = new Keystore("Coldcard");
                                 keystore.setSource(KeystoreSource.HW_AIRGAPPED);
                                 keystore.setWalletModel(WalletModel.COLDCARD);
-                                keystore.setKeyDerivation(new KeyDerivation(key, derivation));
+                                keystore.setKeyDerivation(new KeyDerivation(key, derivation, true));
                                 keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(value));
                                 wallet.makeLabelsUnique(keystore);
                                 wallet.getKeystores().add(keystore);
@@ -174,8 +171,10 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
             wallet.setDefaultPolicy(policy);
             wallet.setScriptType(scriptType);
 
-            if(!wallet.isValid()) {
-                throw new IllegalStateException("This file does not describe a valid wallet. " + getKeystoreImportDescription());
+            try {
+                wallet.checkWallet();
+            } catch(InvalidWalletException e) {
+                throw new IllegalStateException("This file does not describe a valid wallet: " + e.getMessage());
             }
 
             return wallet;
@@ -186,7 +185,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
     @Override
     public String getWalletImportDescription() {
-        return "Import file created by using the Settings > Multisig Wallets > [Wallet Detail] > Coldcard Export feature on your Coldcard.";
+        return "Import file or QR created by using Settings > Multisig Wallets > [Wallet Detail] > Coldcard Export on your Coldcard.";
     }
 
     @Override
@@ -239,7 +238,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
     @Override
     public String getWalletExportDescription() {
-        return "Export file that can be read by your Coldcard using the Settings > Multisig Wallets > Import from File feature.";
+        return "Export file or QR that can be read by your Coldcard using Settings > Multisig Wallets > Import from File or QR.";
     }
 
     @Override

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

@@ -30,7 +30,7 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
 
     @Override
     public String getKeystoreImportDescription(int account) {
-        return "Import file created by using the Advanced > MicroSD > Export Wallet > Generic JSON > " + account + " feature on your Coldcard. Note this requires firmware version 3.1.3 or later.";
+        return "Import file or QR created by using Advanced/Tools > Export Wallet > Sparrow Wallet" + (account > 0 ? " > 1 > " + account : "") + " on your Coldcard. For older firmware use Advanced > MicroSD > Export Wallet > Generic JSON > " + account + ".";
     }
 
     @Override
@@ -78,7 +78,7 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
                             keystore.setLabel(getName());
                             keystore.setSource(KeystoreSource.HW_AIRGAPPED);
                             keystore.setWalletModel(WalletModel.COLDCARD);
-                            keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, ck.deriv));
+                            keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, ck.deriv, true));
                             keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(ck.xpub));
 
                             return keystore;

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

@@ -54,10 +54,10 @@ public class Config {
     private List<File> recentWalletFiles;
     private Integer keyDerivationPeriod;
     private long dustAttackThreshold = DUST_ATTACK_THRESHOLD_SATS;
-    private File hwi;
     private int enumerateHwPeriod = ENUMERATE_HW_PERIOD_SECS;
     private QRDensity qrDensity;
     private Boolean hdCapture;
+    private boolean mirrorCapture = true;
     private boolean useZbar = true;
     private String webcamDevice;
     private ServerType serverType;
@@ -370,15 +370,6 @@ public class Config {
         return dustAttackThreshold;
     }
 
-    public File getHwi() {
-        return hwi;
-    }
-
-    public void setHwi(File hwi) {
-        this.hwi = hwi;
-        flush();
-    }
-
     public int getEnumerateHwPeriod() {
         return enumerateHwPeriod;
     }
@@ -405,6 +396,15 @@ public class Config {
         flush();
     }
 
+    public boolean isMirrorCapture() {
+        return mirrorCapture;
+    }
+
+    public void setMirrorCapture(boolean mirrorCapture) {
+        this.mirrorCapture = mirrorCapture;
+        flush();
+    }
+
     public boolean isUseZbar() {
         return useZbar;
     }

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

@@ -1,9 +1,12 @@
 package com.sparrowwallet.sparrow.io;
 
+import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.sparrow.wallet.KeystoreController;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -92,7 +95,7 @@ public class Descriptor implements WalletImport, WalletExport {
             InputStream secondClone = new ByteArrayInputStream(baos.toByteArray());
 
             try {
-                return PdfUtils.getOutputDescriptor(firstClone).toWallet();
+                return ensureKeyDerivations(PdfUtils.getOutputDescriptor(firstClone).toWallet());
             } catch(Exception e) {
                 //ignore
             }
@@ -100,7 +103,7 @@ public class Descriptor implements WalletImport, WalletExport {
             List<String> paragraphs = getParagraphs(secondClone);
             for(String paragraph : paragraphs) {
                 OutputDescriptor descriptor = OutputDescriptor.getOutputDescriptor(paragraph);
-                return descriptor.toWallet();
+                return ensureKeyDerivations(descriptor.toWallet());
             }
 
             throw new ImportException("Could not find an output descriptor in the file");
@@ -116,7 +119,7 @@ public class Descriptor implements WalletImport, WalletExport {
         BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
         for(String line : reader.lines().map(String::trim).toArray(String[]::new)) {
             if(line.isEmpty()) {
-                if(paragraph.length() > 0) {
+                if(!paragraph.isEmpty()) {
                     paragraphs.add(paragraph.toString());
                     paragraph.setLength(0);
                 }
@@ -127,13 +130,23 @@ public class Descriptor implements WalletImport, WalletExport {
             }
         }
 
-        if(paragraph.length() > 0) {
+        if(!paragraph.isEmpty()) {
             paragraphs.add(paragraph.toString());
         }
 
         return paragraphs;
     }
 
+    private static Wallet ensureKeyDerivations(Wallet wallet) {
+        for(Keystore keystore : wallet.getKeystores()) {
+            if(keystore.getKeyDerivation().getMasterFingerprint() == null || keystore.getKeyDerivation().getDerivationPath() == null) {
+                keystore.setKeyDerivation(new KeyDerivation(KeystoreController.DEFAULT_WATCH_ONLY_FINGERPRINT, wallet.getScriptType().getDefaultDerivationPath()));
+            }
+        }
+
+        return wallet;
+    }
+
     @Override
     public boolean isWalletImportScannable() {
         return true;

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.io;
 
 import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.lark.HardwareClient;
 
 import java.util.Objects;
 
@@ -122,4 +123,18 @@ public class Device {
     public int hashCode() {
         return Objects.hash(type, path);
     }
+
+    public static Device fromHardwareClient(HardwareClient hardwareClient) {
+        Device device = new Device();
+        device.type = hardwareClient.getType();
+        device.path = hardwareClient.getPath();
+        device.model = hardwareClient.getModel();
+        device.needsPinSent = hardwareClient.needsPinSent();
+        device.needsPassphraseSent = hardwareClient.needsPassphraseSent();
+        device.fingerprint = hardwareClient.fingerprint();
+        device.card = hardwareClient.card();
+        device.warnings = hardwareClient.warnings();
+        device.error = hardwareClient.error();
+        return device;
+    }
 }

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

@@ -186,7 +186,7 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                     keystore.setWalletModel(WalletModel.ELECTRUM);
                 }
 
-                keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, derivationPath));
+                keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, derivationPath, true));
                 keystore.setExtendedPublicKey(xPub);
                 keystore.setLabel(ek.label != null ? ek.label : "Electrum");
                 if(keystore.getLabel().length() > Keystore.MAX_LABEL_LENGTH) {
@@ -328,8 +328,12 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                     ek.derivation = keystore.getKeyDerivation().getDerivationPath();
                     ek.root_fingerprint = keystore.getKeyDerivation().getMasterFingerprint();
                     ek.xpub = keystore.getExtendedPublicKey().toString(xpubHeader);
-                    ek.type = "hardware";
-                    ek.hw_type = keystore.getWalletModel().getType();
+                    if(keystore.getWalletModel().hasUsb()) {
+                        ek.type = "hardware";
+                        ek.hw_type = keystore.getWalletModel().getType();
+                    } else {
+                        ek.type = "bip32";
+                    }
                     ew.use_encryption = false;
                 } else if(keystore.getSource() == KeystoreSource.SW_SEED) {
                     ek.type = "bip32";

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

@@ -36,7 +36,7 @@ public class GordianSeedTool implements KeystoreFileImport {
 
     @Override
     public String getKeystoreImportDescription(int account) {
-        return "Select your seed and scan the QR code created by Authenticate > Derive Key > Other Key Derivations > " + Network.get().toDisplayString() + " > Master Key > Account Descriptor. Click the share icon at the bottom.";
+        return "Select your seed and scan the QR code created by Authenticate > Derive Key > Other Key Derivations > " + Network.getCanonical().getCapitalizedName() + " > Master Key > Account Descriptor. Click the share icon at the bottom.";
     }
 
     @Override

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

@@ -1,48 +1,47 @@
 package com.sparrowwallet.sparrow.io;
 
-import com.google.common.io.ByteStreams;
-import com.google.common.io.CharStreams;
-import com.google.gson.*;
-import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.OsType;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.psbt.PSBT;
-import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.wallet.StandardAccount;
 import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.lark.DeviceException;
+import com.sparrowwallet.lark.Lark;
+import com.sparrowwallet.lark.bitbox02.BitBoxFileNoiseConfig;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.control.BitBoxPairingDialog;
+import javafx.application.Platform;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
-import org.controlsfx.tools.Platform;
+import javafx.scene.control.ButtonType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.smartcardio.CardException;
 import javax.smartcardio.CardNotPresentException;
-import java.io.*;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
+import java.io.File;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class Hwi {
     private static final Logger log = LoggerFactory.getLogger(Hwi.class);
     private static final String HWI_HOME_DIR = "hwi";
-    private static final String HWI_VERSION_PREFIX = "hwi-";
-    private static final String HWI_VERSION = "3.0.0";
-    private static final String HWI_VERSION_DIR = HWI_VERSION_PREFIX + HWI_VERSION;
+    private static final String LARK_HOME_DIR = "lark";
+    private static final String BITBOX_FILENAME = "bitbox02.json";
 
     private static boolean isPromptActive = false;
 
+    private final Set<byte[]> newDeviceRegistrations = new HashSet<>();
+
+    static {
+        deleteHwiDir();
+    }
+
     public List<Device> enumerate(String passphrase) throws ImportException {
         List<Device> devices = new ArrayList<>();
         devices.addAll(enumerateUsb(passphrase));
@@ -51,45 +50,13 @@ public class Hwi {
     }
 
     private List<Device> enumerateUsb(String passphrase) throws ImportException {
-        String output = null;
         try {
-            List<String> command;
-            if(passphrase != null) {
-                command = new ArrayList<>(List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), "--password", escape(passphrase), Command.ENUMERATE.toString()));
-            } else {
-                command = new ArrayList<>(List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), Command.ENUMERATE.toString()));
-            }
-
-            addChainType(command, true);
-
+            Lark lark = getLark(passphrase);
             isPromptActive = true;
-            output = execute(command);
-            Device[] devices = getGson().fromJson(output, Device[].class);
-            if(devices == null) {
-                throw new ImportException("Error scanning, check devices are ready");
-            }
-            //Restore previous (pre v2.2.0) behaviour for Trezor One - don't default to an empty passphrase if one is not supplied
-            Arrays.stream(devices).filter(device -> device.containsWarning("Using default passphrase of the empty string")).forEach(device -> {
-                device.setFingerprint(null);
-                device.setNeedsPassphraseSent(true);
-                device.setError("Passphrase needs to be specified before the fingerprint information can be retrieved");
-            });
-            return Arrays.stream(devices).filter(device -> device != null && device.getModel() != null).collect(Collectors.toList());
-        } catch(IOException e) {
-            log.error("Error executing " + HWI_VERSION_DIR, e);
-            throw new ImportException("Error executing HWI", e);
-        } catch(Exception e) {
-            if(output != null) {
-                try {
-                    JsonObject result = JsonParser.parseString(output).getAsJsonObject();
-                    JsonElement error = result.get("error");
-                    throw new ImportException(error.getAsString());
-                } catch(Exception ex) {
-                    log.error("Error parsing JSON: " + output, e);
-                    throw new ImportException("Error scanning" + (output.isEmpty() ? ", check devices are ready" : ": " + output), e);
-                }
-            }
-            throw e;
+            return lark.enumerate().stream().map(Device::fromHardwareClient).toList();
+        } catch(Throwable e) {
+            log.error("Error enumerating USB devices", e);
+            throw new ImportException(e.getMessage() == null || e.getMessage().isEmpty() ? "Error scanning, check devices are ready" : e.getMessage(), e);
         } finally {
             isPromptActive = false;
         }
@@ -124,31 +91,43 @@ public class Hwi {
 
     public boolean promptPin(Device device) throws ImportException {
         try {
-            String output = execute(getDeviceCommand(device, Command.PROMPT_PIN));
+            Lark lark = getLark();
+            boolean result = lark.promptPin(device.getType(), device.getPath());
             isPromptActive = true;
-            return wasSuccessful(output);
-        } catch(IOException e) {
-            throw new ImportException(e);
+            return result;
+        } catch(DeviceException e) {
+            throw new ImportException(e.getMessage(), e);
+        } catch(RuntimeException e) {
+            log.error("Error prompting pin", e);
+            throw e;
         }
     }
 
     public boolean sendPin(Device device, String pin) throws ImportException {
         try {
-            String output = execute(getDeviceCommand(device, Command.SEND_PIN, pin));
+            Lark lark = getLark();
+            boolean result = lark.sendPin(device.getType(), device.getPath(), pin);
             isPromptActive = false;
-            return wasSuccessful(output);
-        } catch(IOException e) {
-            throw new ImportException(e);
+            return result;
+        } catch(DeviceException e) {
+            throw new ImportException(e.getMessage(), e);
+        } catch(RuntimeException e) {
+            log.error("Error sending pin", e);
+            throw e;
         }
     }
 
     public boolean togglePassphrase(Device device) throws ImportException {
         try {
-            String output = execute(getDeviceCommand(device, Command.TOGGLE_PASSPHRASE));
+            Lark lark = getLark();
+            boolean result = lark.togglePassphrase(device.getType(), device.getPath());
             isPromptActive = false;
-            return wasSuccessful(output);
-        } catch(IOException e) {
-            throw new ImportException(e);
+            return result;
+        } catch(DeviceException e) {
+            throw new ImportException(e.getMessage(), e);
+        } catch(RuntimeException e) {
+            log.error("Error toggling passphrase", e);
+            throw e;
         }
     }
 
@@ -163,59 +142,36 @@ public class Hwi {
 
     public String getXpub(Device device, String passphrase, String derivationPath) throws ImportException {
         try {
-            String output;
-            if(passphrase != null && device.getModel().externalPassphraseEntry()) {
-                output = execute(getDeviceCommand(device, passphrase, Command.GET_XPUB, derivationPath));
-            } else {
-                output = execute(getDeviceCommand(device, Command.GET_XPUB, derivationPath));
-            }
-
+            Lark lark = getLark(passphrase);
+            ExtendedKey xpub = lark.getPubKeyAtPath(device.getType(), device.getPath(), derivationPath);
             isPromptActive = false;
-            JsonObject result = JsonParser.parseString(output).getAsJsonObject();
-            if(result.get("xpub") != null) {
-                return result.get("xpub").getAsString();
-            } else {
-                JsonElement error = result.get("error");
-                if(error != null) {
-                    throw new ImportException(error.getAsString());
-                } else {
-                    throw new ImportException("Could not retrieve xpub - reconnect your device and try again.");
-                }
-            }
-        } catch(IOException e) {
-            throw new ImportException(e);
+            return xpub.toString();
+        } catch(DeviceException e) {
+            throw new ImportException(e.getMessage(), e);
+        } catch(RuntimeException e) {
+            log.error("Error retrieving xpub", e);
+            throw e;
         }
     }
 
-    public String displayAddress(Device device, String passphrase, ScriptType scriptType, OutputDescriptor outputDescriptor) throws DisplayAddressException {
+    public String displayAddress(Device device, String passphrase, ScriptType scriptType, OutputDescriptor addressDescriptor,
+                                 OutputDescriptor walletDescriptor, String walletName, byte[] walletRegistration) throws DisplayAddressException {
         try {
             if(!Arrays.asList(ScriptType.ADDRESSABLE_TYPES).contains(scriptType)) {
                 throw new IllegalArgumentException("Cannot display address for script type " + scriptType + ": Only addressable types supported");
             }
 
-            String descriptor = outputDescriptor.toString();
-
             isPromptActive = true;
-            String output;
-            if(passphrase != null && device.getModel().externalPassphraseEntry()) {
-                output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--desc", descriptor));
-            } else {
-                output = execute(getDeviceCommand(device, Command.DISPLAY_ADDRESS, "--desc", descriptor));
-            }
-
-            JsonObject result = JsonParser.parseString(output).getAsJsonObject();
-            if(result.get("address") != null) {
-                return result.get("address").getAsString();
-            } else {
-                JsonElement error = result.get("error");
-                if(error != null) {
-                    throw new DisplayAddressException(error.getAsString());
-                } else {
-                    throw new DisplayAddressException("Could not retrieve address");
-                }
-            }
-        } catch(IOException e) {
-            throw new DisplayAddressException(e);
+            Lark lark = getLark(passphrase, walletDescriptor, walletName, walletRegistration);
+            String address = lark.displayAddress(device.getType(), device.getPath(), addressDescriptor);
+            newDeviceRegistrations.addAll(lark.getWalletRegistrations().values());
+            newDeviceRegistrations.remove(walletRegistration);
+            return address;
+        } catch(DeviceException e) {
+            throw new DisplayAddressException(e.getMessage(), e);
+        } catch(RuntimeException e) {
+            log.error("Error displaying address", e);
+            throw e;
         } finally {
             isPromptActive = false;
         }
@@ -224,406 +180,76 @@ public class Hwi {
     public String signMessage(Device device, String passphrase, String message, String derivationPath) throws SignMessageException {
         try {
             isPromptActive = true;
-            String output;
-            if(passphrase != null && device.getModel().externalPassphraseEntry()) {
-                output = execute(getDeviceArguments(device, passphrase, Command.SIGN_MESSAGE), Command.SIGN_MESSAGE, message, derivationPath);
-            } else {
-                output = execute(getDeviceArguments(device, Command.SIGN_MESSAGE), Command.SIGN_MESSAGE, message, derivationPath);
-            }
-
-            JsonObject result = JsonParser.parseString(output).getAsJsonObject();
-            if(result.get("signature") != null) {
-                return result.get("signature").getAsString();
-            } else {
-                JsonElement error = result.get("error");
-                if(error != null) {
-                    throw new SignMessageException(error.getAsString());
-                } else {
-                    throw new SignMessageException("Could not sign message");
-                }
-            }
-        } catch(IOException e) {
-            throw new SignMessageException(e);
+            Lark lark = getLark(passphrase);
+            return lark.signMessage(device.getType(), device.getPath(), message, derivationPath);
+        } catch(DeviceException e) {
+            throw new SignMessageException(e.getMessage(), e);
+        } catch(RuntimeException e) {
+            log.error("Error signing message", e);
+            throw e;
         } finally {
             isPromptActive = false;
         }
     }
 
-    public PSBT signPSBT(Device device, String passphrase, PSBT psbt) throws SignTransactionException {
+    public PSBT signPSBT(Device device, String passphrase, PSBT psbt,
+                         OutputDescriptor walletDescriptor, String walletName, byte[] walletRegistration) throws SignTransactionException {
         try {
-            String psbtBase64 = psbt.toBase64String();
-
             isPromptActive = true;
-            String output;
-            if(passphrase != null && device.getModel().externalPassphraseEntry()) {
-                output = execute(getDeviceArguments(device, passphrase, Command.SIGN_TX), Command.SIGN_TX, psbtBase64);
-            } else {
-                output = execute(getDeviceArguments(device, Command.SIGN_TX), Command.SIGN_TX, psbtBase64);
-            }
-
-            JsonObject result = JsonParser.parseString(output).getAsJsonObject();
-            if(result.get("psbt") != null) {
-                String strPsbt = result.get("psbt").getAsString();
-                return PSBT.fromString(strPsbt);
-            } else {
-                JsonElement error = result.get("error");
-                if(error != null && error.getAsString().equals("sign_tx canceled")) {
-                    throw new SignTransactionException("Signing cancelled");
-                } else if(error != null && error.getAsString().equals("open failed")) {
-                    throw new SignTransactionException("Please reconnect your USB device");
-                } else if(error != null) {
-                    throw new SignTransactionException(error.getAsString());
-                } else {
-                    throw new SignTransactionException("Could not retrieve PSBT");
-                }
-            }
-        } catch(IOException e) {
-            throw new SignTransactionException("Could not sign PSBT", e);
-        } catch(PSBTParseException e) {
-            throw new SignTransactionException("Could not parse signed PSBT" + (e.getMessage() != null ? ": " + e.getMessage() : ""), e);
+            Lark lark = getLark(passphrase, walletDescriptor, walletName, walletRegistration);
+            PSBT signed = lark.signTransaction(device.getType(), device.getPath(), psbt);
+            newDeviceRegistrations.addAll(lark.getWalletRegistrations().values());
+            newDeviceRegistrations.remove(walletRegistration);
+            return signed;
+        } catch(DeviceException e) {
+            throw new SignTransactionException(e.getMessage(), e);
+        } catch(RuntimeException e) {
+            log.error("Error signing PSBT", e);
+            throw e;
         } finally {
             isPromptActive = false;
         }
     }
 
-    private String execute(List<String> command) throws IOException {
-        long start = System.currentTimeMillis();
-        Process process = null;
-        try {
-            ProcessBuilder processBuilder = new ProcessBuilder(command);
-            process = processBuilder.start();
-            return getProcessOutput(process);
-        } finally {
-            deleteExtractionOnFailure(process, start);
-        }
+    private Lark getLark() {
+        return getLark(null);
     }
 
-    private String execute(List<String> arguments, Command command, String... commandArguments) throws IOException {
-        long start = System.currentTimeMillis();
-        Process process = null;
-        try {
-            List<String> processArguments = new ArrayList<>(arguments);
+    private Lark getLark(String passphrase) {
+        return getLark(passphrase, null, null, null);
+    }
 
-            boolean useStdin = Arrays.stream(commandArguments).noneMatch(arg -> arg.contains("\n"));
-            if(useStdin) {
-                processArguments.add("--stdin");
+    private Lark getLark(String passphrase, OutputDescriptor walletDescriptor, String walletName, byte[] walletRegistration) {
+        Lark lark = new Lark(AppServices.getHttpClientService());
+        lark.setBitBoxNoiseConfig(new BitBoxFxNoiseConfig());
+        if(passphrase != null) {
+            lark.setPassphrase(passphrase);
+        }
+
+        if(walletDescriptor != null && walletName != null) {
+            if(walletRegistration != null) {
+                lark.addWalletRegistration(walletDescriptor, walletName, walletRegistration);
             } else {
-                processArguments.add(command.toString());
-                processArguments.addAll(Arrays.asList(commandArguments));
+                lark.addWalletName(walletDescriptor, walletName);
             }
-
-            ProcessBuilder processBuilder = new ProcessBuilder(processArguments);
-            process = processBuilder.start();
-
-            if(useStdin) {
-                try(BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream(), StandardCharsets.UTF_8))) {
-                    writer.write(command.toString());
-                    for(String commandArgument : commandArguments) {
-                        writer.write(" \"");
-                        writer.write(commandArgument.replace("\\", "\\\\").replace("\"", "\\\""));
-                        writer.write("\"");
-                    }
-                    writer.flush();
-                }
-            }
-
-            return getProcessOutput(process);
-        } finally {
-            deleteExtractionOnFailure(process, start);
         }
+
+        return lark;
     }
 
-    private String getProcessOutput(Process process) throws IOException {
-        String output;
-        try(InputStreamReader reader = new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)) {
-            output = CharStreams.toString(reader);
-        }
-
-        if(output.isEmpty() && process.getErrorStream() != null) {
-            try(InputStreamReader reader = new InputStreamReader(process.getErrorStream(), StandardCharsets.UTF_8)) {
-                String errorOutput = CharStreams.toString(reader);
-                if(!errorOutput.isEmpty()) {
-                    throw new IOException(errorOutput);
-                }
-            }
-        }
-
-        return output;
-    }
-
-    private synchronized File getHwiExecutable(Command command) {
-        File hwiExecutable = Config.get().getHwi();
-        if(hwiExecutable != null && hwiExecutable.exists()) {
-            File homeDir = getHwiHomeDir();
-            String tmpDir = System.getProperty("java.io.tmpdir");
-            String hwiPath = hwiExecutable.getAbsolutePath();
-            if(command.isTestFirst() && (hwiPath.contains(tmpDir) || hwiPath.startsWith(homeDir.getAbsolutePath())) && (!hwiPath.contains(HWI_VERSION_DIR) || !testHwi(hwiExecutable))) {
-                if(Platform.getCurrent() == Platform.OSX) {
-                    IOUtils.deleteDirectory(hwiExecutable.getParentFile());
-                } else {
-                    hwiExecutable.delete();
-                }
-            }
-        }
-
-        if(hwiExecutable == null || !hwiExecutable.exists()) {
-            try {
-                Platform platform = Platform.getCurrent();
-                String osArch = System.getProperty("os.arch");
-                Set<PosixFilePermission> ownerExecutableWritable = PosixFilePermissions.fromString("rwxr--r--");
-
-                //A PyInstaller --onefile expands into a new directory on every run triggering OSX Gatekeeper checks.
-                //To avoid doing these with every invocation, use a --onedir packaging and expand into a temp folder on OSX
-                //The check will still happen on first invocation, but will not thereafter
-                //See https://github.com/bitcoin-core/HWI/issues/327 for details
-                if(platform == Platform.OSX) {
-                    InputStream inputStream;
-                    if(osArch.equals("aarch64")) {
-                        inputStream = Hwi.class.getResourceAsStream("/native/osx/aarch64/" + HWI_VERSION_DIR + "-mac-aarch64-signed.tar.bz2");
-                    } else {
-                        inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + HWI_VERSION_DIR + "-mac-amd64-signed.tar.bz2");
-                    }
-
-                    if(inputStream == null) {
-                        throw new IllegalStateException("Cannot load " + HWI_VERSION_DIR + " from classpath");
-                    }
-
-                    File hwiHomeDir = getHwiHomeDir();
-                    File hwiVersionDir = new File(hwiHomeDir, HWI_VERSION_DIR);
-                    IOUtils.deleteDirectory(hwiVersionDir);
-                    if(!hwiVersionDir.exists()) {
-                        Files.createDirectories(hwiVersionDir.toPath(), PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
-                    }
-
-                    log.debug("Using HWI path: " + hwiVersionDir.getAbsolutePath());
-
-                    File hwiExec = null;
-                    try(TarArchiveInputStream tarInput = new TarArchiveInputStream(new BZip2CompressorInputStream(inputStream))) {
-                        TarArchiveEntry tarEntry = tarInput.getNextEntry();
-                        while(tarEntry != null) {
-                            if(tarEntry.isDirectory()) {
-                                newDirectory(hwiVersionDir, tarEntry, ownerExecutableWritable);
-                            } else if(tarEntry.isSymbolicLink()) {
-                                newSymlink(hwiVersionDir, tarEntry, ownerExecutableWritable);
-                            } else {
-                                File newFile = newFile(hwiVersionDir, tarEntry, ownerExecutableWritable);
-                                try(FileOutputStream fos = new FileOutputStream(newFile)) {
-                                    ByteStreams.copy(tarInput, new FileOutputStream(newFile));
-                                    fos.flush();
-                                }
-
-                                if(tarEntry.getName().equals("hwi")) {
-                                    hwiExec = newFile;
-                                }
-                            }
-
-                            tarEntry = tarInput.getNextEntry();
-                        }
-                    }
-
-                    hwiExecutable = hwiExec;
-                } else {
-                    InputStream inputStream;
-                    Path tempExecPath;
-                    if(platform == Platform.WINDOWS) {
-                        Files.createDirectories(getHwiHomeDir().toPath());
-                        inputStream = Hwi.class.getResourceAsStream("/native/windows/x64/hwi.exe");
-                        tempExecPath = Files.createTempFile(getHwiHomeDir().toPath(), HWI_VERSION_DIR, null);
-                    } else if(osArch.equals("aarch64")) {
-                        inputStream = Hwi.class.getResourceAsStream("/native/linux/aarch64/hwi");
-                        tempExecPath = Files.createTempFile(HWI_VERSION_DIR, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
-                    } else {
-                        inputStream = Hwi.class.getResourceAsStream("/native/linux/x64/hwi");
-                        tempExecPath = Files.createTempFile(HWI_VERSION_DIR, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
-                    }
-
-                    if(inputStream == null) {
-                        throw new IllegalStateException("Cannot load " + HWI_VERSION_DIR + " from classpath");
-                    }
-
-                    File tempExec = tempExecPath.toFile();
-                    tempExec.deleteOnExit();
-                    try(OutputStream tempExecStream = new BufferedOutputStream(new FileOutputStream(tempExec))) {
-                        ByteStreams.copy(inputStream, tempExecStream);
-                        inputStream.close();
-                        tempExecStream.flush();
-                    };
-
-                    hwiExecutable = tempExec;
-                }
-            } catch(Exception e) {
-                log.error("Error initializing HWI", e);
-            }
-
-            Config.get().setHwi(hwiExecutable);
-        }
-
-        return hwiExecutable;
-    }
-
-    private File getHwiHomeDir() {
-        if(Platform.getCurrent() == Platform.OSX || Platform.getCurrent() == Platform.WINDOWS) {
-            return new File(Storage.getSparrowDir(), HWI_HOME_DIR);
-        }
-
-        return new File(System.getProperty("java.io.tmpdir"));
-    }
-
-    private boolean testHwi(File hwiExecutable) {
+    private static void deleteHwiDir() {
         try {
-            List<String> command = List.of(hwiExecutable.getAbsolutePath(), "--version");
-            ProcessBuilder processBuilder = new ProcessBuilder(command);
-            Process process = processBuilder.start();
-            int exitValue = process.waitFor();
-            return exitValue == 0;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    public static File newDirectory(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
-        String destDirPath = destinationDir.getCanonicalPath();
-
-        Path path = Path.of(destDirPath, tarEntry.getName());
-        File destDir = Files.createDirectory(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();
-
-        String destSubDirPath = destDir.getCanonicalPath();
-        if(!destSubDirPath.startsWith(destDirPath + File.separator)) {
-            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
-        }
-
-        return destDir;
-    }
-
-    public static File newFile(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
-        String destDirPath = destinationDir.getCanonicalPath();
-
-        Path path = Path.of(destDirPath, tarEntry.getName());
-        File destFile = Files.createFile(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();
-
-        String destFilePath = destFile.getCanonicalPath();
-        if(!destFilePath.startsWith(destDirPath + File.separator)) {
-            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
-        }
-
-        return destFile;
-    }
-
-    public static File newSymlink(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
-        String destDirPath = destinationDir.getCanonicalPath();
-
-        Path path = Path.of(destDirPath, tarEntry.getName());
-        File destFile = Files.createSymbolicLink(path, Paths.get(tarEntry.getLinkName())).toFile();
-
-        String destFilePath = destFile.getCanonicalPath();
-        if(!destFilePath.startsWith(destDirPath + File.separator)) {
-            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
-        }
-
-        return destFile;
-    }
-
-    private boolean wasSuccessful(String output) throws ImportException {
-        JsonObject result = JsonParser.parseString(output).getAsJsonObject();
-        if(result.get("error") != null) {
-            throw new ImportException(result.get("error").getAsString());
-        }
-
-        return result.get("success").getAsBoolean();
-    }
-
-    private void deleteExtractionOnFailure(Process process, long after) {
-        try {
-            if(Platform.getCurrent() != Platform.OSX && process != null && process.waitFor(100, TimeUnit.MILLISECONDS) && process.exitValue() != 0) {
-                File extraction = getTemporaryExtraction(after);
-                if(extraction != null) {
-                    IOUtils.deleteDirectory(extraction);
+            if(OsType.getCurrent() == OsType.MACOS || OsType.getCurrent() == OsType.WINDOWS) {
+                File hwiHomeDir = new File(Storage.getSparrowDir(), HWI_HOME_DIR);
+                if(hwiHomeDir.exists()) {
+                    IOUtils.deleteDirectory(hwiHomeDir);
                 }
             }
         } catch(Exception e) {
-            log.debug("Error deleting temporary extraction", e);
+            log.error("Error deleting hwi directory", e);
         }
     }
 
-    private File getTemporaryExtraction(long after) {
-        File tmpDir = new File(System.getProperty("java.io.tmpdir"));
-        if(!tmpDir.exists()) {
-            return null;
-        }
-
-        File[] tmps = tmpDir.listFiles(file -> {
-            if(!file.isDirectory() || file.lastModified() < after) {
-                return false;
-            }
-            String name = file.getName();
-            if(name.length() < 9 || !name.startsWith("_MEI")) {
-                return false;
-            }
-            File hwilib = new File(file, "hwilib");
-            return hwilib.exists();
-        });
-
-        return tmps == null || tmps.length == 0 ? null : Arrays.stream(tmps).sorted(Comparator.comparingLong(File::lastModified)).findFirst().orElse(null);
-    }
-
-    private List<String> getDeviceArguments(Device device, Command command) throws IOException {
-        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType()));
-        addChainType(elements, false);
-        return elements;
-    }
-
-    private List<String> getDeviceArguments(Device device, String passphrase, Command command) throws IOException {
-        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", escape(passphrase)));
-        addChainType(elements, false);
-        return elements;
-    }
-
-    private List<String> getDeviceCommand(Device device, Command command) throws IOException {
-        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
-        addChainType(elements, true);
-        return elements;
-    }
-
-    private List<String> getDeviceCommand(Device device, Command command, String... commandData) throws IOException {
-        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
-        addChainType(elements, true);
-        elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
-        return elements;
-    }
-
-    private List<String> getDeviceCommand(Device device, String passphrase, Command command, String... commandData) throws IOException {
-        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", escape(passphrase), command.toString()));
-        addChainType(elements, true);
-        elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
-        return elements;
-    }
-
-    private void addChainType(List<String> elements, boolean commandPresent) {
-        if(Network.get() != Network.MAINNET) {
-            elements.add(elements.size() - (commandPresent ? 1 : 0), "--chain");
-            elements.add(elements.size() - (commandPresent ? 1 : 0), getChainName(Network.get()));
-        }
-    }
-
-    private String getChainName(Network network) {
-        if(network == Network.MAINNET) {
-            return "main";
-        } else if(network == Network.TESTNET) {
-            return "test";
-        }
-
-        return network.toString();
-    }
-
-    private String escape(String passphrase) {
-        Platform platform = Platform.getCurrent();
-        if(platform == Platform.WINDOWS) {
-            return passphrase.replace("\"", "\\\"");
-        }
-
-        return passphrase;
-    }
-
     public static class EnumerateService extends Service<List<Device>> {
         private final String passphrase;
 
@@ -724,13 +350,24 @@ public class Hwi {
         private final Device device;
         private final String passphrase;
         private final ScriptType scriptType;
-        private final OutputDescriptor outputDescriptor;
+        private final OutputDescriptor addressDescriptor;
+        private final OutputDescriptor walletDescriptor;
+        private final String walletName;
+        private final byte[] walletRegistration;
+        private final Set<byte[]> newDeviceRegistrations = new HashSet<>();
 
-        public DisplayAddressService(Device device, String passphrase, ScriptType scriptType, OutputDescriptor outputDescriptor) {
+        public DisplayAddressService(Device device, String passphrase, ScriptType scriptType, OutputDescriptor addressDescriptor, OutputDescriptor walletDescriptor, String walletName, byte[] walletRegistration) {
             this.device = device;
             this.passphrase = passphrase;
             this.scriptType = scriptType;
-            this.outputDescriptor = outputDescriptor;
+            this.addressDescriptor = addressDescriptor;
+            this.walletDescriptor = walletDescriptor;
+            this.walletName = walletName;
+            this.walletRegistration = walletRegistration;
+        }
+
+        public Set<byte[]> getNewDeviceRegistrations() {
+            return newDeviceRegistrations;
         }
 
         @Override
@@ -738,7 +375,9 @@ public class Hwi {
             return new Task<>() {
                 protected String call() throws DisplayAddressException {
                     Hwi hwi = new Hwi();
-                    return hwi.displayAddress(device, passphrase, scriptType, outputDescriptor);
+                    String address = hwi.displayAddress(device, passphrase, scriptType, addressDescriptor, walletDescriptor, walletName, walletRegistration);
+                    newDeviceRegistrations.addAll(hwi.newDeviceRegistrations);
+                    return address;
                 }
             };
         }
@@ -816,11 +455,22 @@ public class Hwi {
         private final Device device;
         private final String passphrase;
         private final PSBT psbt;
+        private final OutputDescriptor walletDescriptor;
+        private final String walletName;
+        private final byte[] walletRegistration;
+        private final Set<byte[]> newDeviceRegistrations = new HashSet<>();
 
-        public SignPSBTService(Device device, String passphrase, PSBT psbt) {
+        public SignPSBTService(Device device, String passphrase, PSBT psbt, OutputDescriptor walletDescriptor, String walletName, byte[] walletRegistration) {
             this.device = device;
             this.passphrase = passphrase;
             this.psbt = psbt;
+            this.walletDescriptor = walletDescriptor;
+            this.walletName = walletName;
+            this.walletRegistration = walletRegistration;
+        }
+
+        public Set<byte[]> getNewDeviceRegistrations() {
+            return newDeviceRegistrations;
         }
 
         @Override
@@ -828,72 +478,61 @@ public class Hwi {
             return new Task<>() {
                 protected PSBT call() throws SignTransactionException {
                     Hwi hwi = new Hwi();
-                    return hwi.signPSBT(device, passphrase, psbt);
+                    PSBT signed = hwi.signPSBT(device, passphrase, psbt, walletDescriptor, walletName, walletRegistration);
+                    newDeviceRegistrations.addAll(hwi.newDeviceRegistrations);
+                    return signed;
                 }
             };
         }
     }
 
-    public Gson getGson() {
-        GsonBuilder gsonBuilder = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
-        gsonBuilder.registerTypeAdapter(WalletModel.class, new DeviceModelSerializer());
-        gsonBuilder.registerTypeAdapter(WalletModel.class, new DeviceModelDeserializer());
-        return gsonBuilder.create();
-    }
+    private static final class BitBoxFxNoiseConfig extends BitBoxFileNoiseConfig {
+        private BitBoxPairingDialog pairingDialog;
 
-    private static class DeviceModelSerializer implements JsonSerializer<WalletModel> {
-        @Override
-        public JsonElement serialize(WalletModel src, Type typeOfSrc, JsonSerializationContext context) {
-            return new JsonPrimitive(src.toString().toLowerCase(Locale.ROOT));
+        public BitBoxFxNoiseConfig() {
+            super(Path.of(Storage.getSparrowHome().getAbsolutePath(), LARK_HOME_DIR, BITBOX_FILENAME).toFile());
         }
-    }
 
-    private static class DeviceModelDeserializer implements JsonDeserializer<WalletModel> {
         @Override
-        public WalletModel deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            String modelStr = json.getAsJsonPrimitive().getAsString();
-            try {
-                return WalletModel.valueOf(modelStr.toUpperCase(Locale.ROOT).replace(' ', '_'));
-            } catch(Exception e) {
-                for(WalletModel model : WalletModel.values()) {
-                    if(modelStr.startsWith(model.getType())) {
-                        return model;
-                    }
+        public boolean showPairing(String code, DeviceResponse response) throws DeviceException {
+            CountDownLatch latch = new CountDownLatch(1);
+            AtomicBoolean confirmedDevice = new AtomicBoolean(false);
+
+            Thread showPairingDeviceThread = new Thread(() -> {
+                try {
+                    isPromptActive = true;
+                    confirmedDevice.set(response.call());
+                    latch.countDown();
+                } catch(DeviceException e) {
+                    throw new RuntimeException(e);
+                } finally {
+                    isPromptActive = false;
                 }
+            });
+            showPairingDeviceThread.start();
+
+            Platform.runLater(() -> {
+                pairingDialog = new BitBoxPairingDialog(code);
+                pairingDialog.initOwner(AppServices.getActiveWindow());
+                pairingDialog.show();
+            });
+
+            try {
+                latch.await();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
             }
-            throw new IllegalArgumentException("Could not determine wallet model for " + modelStr);
-        }
-    }
 
-    private enum Command {
-        ENUMERATE("enumerate", true),
-        PROMPT_PIN("promptpin", true),
-        SEND_PIN("sendpin", false),
-        TOGGLE_PASSPHRASE("togglepassphrase", true),
-        DISPLAY_ADDRESS("displayaddress", true),
-        SIGN_MESSAGE("signmessage", true),
-        GET_XPUB("getxpub", true),
-        SIGN_TX("signtx", true);
+            Platform.runLater(() -> {
+                if(pairingDialog != null && pairingDialog.isShowing()) {
+                    pairingDialog.setResult(ButtonType.APPLY);
+                }
+                if(!confirmedDevice.get()) {
+                    AppServices.showWarningDialog("Pairing Refused", "Pairing was refused on the device.");
+                }
+            });
 
-        private final String command;
-        private final boolean testFirst;
-
-        Command(String command, boolean testFirst) {
-            this.command = command;
-            this.testFirst = testFirst;
-        }
-
-        public String getCommand() {
-            return command;
-        }
-
-        public boolean isTestFirst() {
-            return testFirst;
-        }
-
-        @Override
-        public String toString() {
-            return command;
+            return confirmedDevice.get();
         }
     }
 }

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

@@ -30,7 +30,7 @@ public class Jade implements KeystoreFileImport {
 
     @Override
     public String getKeystoreImportDescription(int account) {
-        return "Import QR created on your Jade by selecting Xpub Export from the Settings menu once you have loaded your seed.";
+        return "Import QR created on your Jade by selecting Options > Wallet > Export Xpub once you have loaded your seed. Make sure to select Singlesig as the Wallet type in the Options menu there.";
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.io;
 
+import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
@@ -67,4 +68,24 @@ public class JadeMultisig extends ColdcardMultisig {
 
         return wallet;
     }
+
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        throw new ImportException("Failed to detect a valid " + scriptType.getDescription() + " keystore.");
+    }
+
+    @Override
+    public String getKeystoreImportDescription(int account) {
+        return "Import QR created on your Jade by selecting Options > Wallet > Export Xpub once you have loaded your seed. Make sure to select Multisig as the Wallet type in the Options menu there.";
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return true;
+    }
+
+    @Override
+    public boolean isFileFormatAvailable() {
+        return false;
+    }
 }

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

@@ -0,0 +1,10 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.wallet.Keystore;
+
+import java.util.List;
+
+public interface KeystoreMnemonicShareImport extends KeystoreImport {
+    Keystore getKeystore(List<ChildNumber> derivation, List<List<String>> mnemonicShares, String passphrase) throws ImportException;
+}

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.io;
 
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
 
 import java.io.InputStream;
@@ -45,4 +46,25 @@ public class PassportMultisig extends ColdcardMultisig {
     public boolean isWalletExportScannable() {
         return true;
     }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return true;
+    }
+
+    @Override
+    public String getWalletImportDescription() {
+        return "Import file or QR created by using Settings > Bitcoin > Multisig > [Wallet Detail] > Export via QR/microSD on your Passport.";
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        Wallet wallet = super.importWallet(inputStream, password);
+        for(Keystore keystore : wallet.getKeystores()) {
+            keystore.setLabel(keystore.getLabel().replace("Coldcard", "Passport"));
+            keystore.setWalletModel(WalletModel.PASSPORT);
+        }
+
+        return wallet;
+    }
 }

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

@@ -22,6 +22,9 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.UREncoder;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoding;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
@@ -39,7 +42,7 @@ public class PdfUtils {
     private static final int QR_WIDTH = 480;
     private static final int QR_HEIGHT = 480;
 
-    public static void saveOutputDescriptor(String walletName, String outputDescriptor, UR ur) {
+    public static void saveOutputDescriptor(String walletName, String outputDescriptor, UR ur, BBQR bbqr) {
         Stage window = new Stage();
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Save PDF");
@@ -56,9 +59,22 @@ public class PdfUtils {
                 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()) {
+                String fragment = null;
+                if(bbqr != null) {
+                    BBQREncoder bbqrEncoder = new BBQREncoder(bbqr.type(), BBQREncoding.ZLIB, bbqr.data(), 2000, 0);
+                    if(bbqrEncoder.isSinglePart()) {
+                        fragment = bbqrEncoder.nextPart();
+                    }
+                }
+
+                if(fragment == null) {
+                    UREncoder urEncoder = new UREncoder(ur, 2000, 10, 0);
+                    if(urEncoder.isSinglePart()) {
+                        fragment = urEncoder.nextPart();
+                    }
+                }
+
+                if(fragment != null) {
                     Image image = Image.getInstance(SwingFXUtils.fromFXImage(getQrCode(fragment), null), Color.WHITE);
                     document.add(image);
                 }

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

@@ -0,0 +1,60 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.drongo.wallet.slip39.RecoveryState;
+import com.sparrowwallet.drongo.wallet.slip39.Share;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+public class Slip39 implements KeystoreMnemonicShareImport {
+    @Override
+    public String getName() {
+        return "Mnemonic Shares (SLIP39)";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SEED;
+    }
+
+    @Override
+    public String getKeystoreImportDescription() {
+        return "Import your 20 or 33 word mnemonic shares and optional passphrase.";
+    }
+
+    @Override
+    public Keystore getKeystore(List<ChildNumber> derivation, List<List<String>> mnemonicShares, String passphrase) throws ImportException {
+        try {
+            RecoveryState recoveryState = new RecoveryState();
+            for(List<String> mnemonicWords : mnemonicShares) {
+                Share share = Share.fromMnemonic(String.join(" ", mnemonicWords));
+                recoveryState.addShare(share);
+            }
+
+            if(recoveryState.isComplete()) {
+                byte[] secret = recoveryState.recover(passphrase.getBytes(StandardCharsets.UTF_8));
+                DeterministicSeed seed = new DeterministicSeed(secret, passphrase, System.currentTimeMillis(), DeterministicSeed.Type.SLIP39);
+                return Keystore.fromSeed(seed, derivation);
+            } else {
+                throw new Slip39ProgressException(recoveryState.getShortStatus(), recoveryState.getStatus());
+            }
+        } catch(MnemonicException e) {
+            throw new ImportException(e);
+        }
+    }
+
+    public static class Slip39ProgressException extends ImportException {
+        private final String title;
+
+        public Slip39ProgressException(String title, String message) {
+            super(message);
+            this.title = title;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+public class SpecterDIYMultisig extends SpecterDesktop {
+    @Override
+    public String getWalletImportDescription() {
+        return "Import file or QR created by using the Multisig Wallet > Settings > Export Wallet Descriptor feature on your Specter DIY device.";
+    }
+
+    public String getName() {
+        return "Specter DIY Multisig";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SPECTER_DIY;
+    }
+}

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

@@ -108,9 +108,7 @@ public class SpecterDesktop implements WalletImport, WalletExport {
                         WalletModel walletModel = device.getWalletModel();
                         if(walletModel != null) {
                             keystore.setWalletModel(walletModel);
-                            if(walletModel == WalletModel.TREZOR_1 || walletModel == WalletModel.TREZOR_T || walletModel == WalletModel.TREZOR_SAFE_3 || walletModel == WalletModel.KEEPKEY ||
-                                walletModel == WalletModel.LEDGER_NANO_S || walletModel == WalletModel.LEDGER_NANO_X || walletModel == WalletModel.LEDGER_NANO_S_PLUS ||
-                                walletModel == WalletModel.BITBOX_02 || walletModel == WalletModel.COLDCARD) {
+                            if(walletModel.hasUsb()) {
                                 keystore.setSource(KeystoreSource.HW_USB);
                             } else if(walletModel == WalletModel.BITCOIN_CORE) {
                                 keystore.setSource(KeystoreSource.SW_WATCH);

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

@@ -12,13 +12,13 @@ import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.controlsfx.tools.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.security.cert.Certificate;
@@ -216,8 +216,8 @@ public class Storage {
     }
 
     private void checkWalletNetwork(Wallet wallet) {
-        if(wallet.getNetwork() != null && wallet.getNetwork() != Network.get()) {
-            throw new IllegalStateException("Provided " + wallet.getNetwork() + " wallet is invalid on a " + Network.get() + " network. Use a " + wallet.getNetwork() + " configuration to load this wallet.");
+        if(wallet.getNetwork() != null && wallet.getNetwork() != Network.getCanonical()) {
+            throw new IllegalStateException("Provided " + wallet.getNetwork() + " wallet is invalid on a " + Network.getCanonical() + " network. Use a " + wallet.getNetwork() + " configuration to load this wallet.");
         }
     }
 
@@ -526,8 +526,21 @@ public class Storage {
 
     public static File getSparrowDir() {
         File sparrowDir;
-        if(Network.get() != Network.MAINNET) {
-            sparrowDir = new File(getSparrowHome(), Network.get().getName());
+        Network network = Network.get();
+        if(network != Network.MAINNET) {
+            sparrowDir = new File(getSparrowHome(), network.getHome());
+            if(!network.getName().equals(network.getHome()) && !sparrowDir.exists()) {
+                File networkNameDir = new File(getSparrowHome(), network.getName());
+                if(networkNameDir.exists() && networkNameDir.isDirectory() && !Files.isSymbolicLink(networkNameDir.toPath())) {
+                    try {
+                        if(networkNameDir.renameTo(sparrowDir) && !isWindows()) {
+                            Files.createSymbolicLink(networkNameDir.toPath(), Path.of(sparrowDir.getName()));
+                        }
+                    } catch(Exception e) {
+                        log.debug("Error creating symlink from " + networkNameDir.getAbsolutePath() + " to " + sparrowDir.getName(), e);
+                    }
+                }
+            }
         } else {
             sparrowDir = getSparrowHome();
         }
@@ -536,6 +549,23 @@ public class Storage {
             createOwnerOnlyDirectory(sparrowDir);
         }
 
+        if(!network.getName().equals(network.getHome()) && !isWindows()) {
+            try {
+                Path networkNamePath = getSparrowHome().toPath().resolve(network.getName());
+                if(Files.isSymbolicLink(networkNamePath)) {
+                    Path symlinkTarget = getSparrowHome().toPath().resolve(Files.readSymbolicLink(networkNamePath));
+                    if(!Files.isSameFile(sparrowDir.toPath(), symlinkTarget)) {
+                        Files.delete(networkNamePath);
+                        Files.createSymbolicLink(networkNamePath, Path.of(sparrowDir.getName()));
+                    }
+                } else if(!Files.exists(networkNamePath)) {
+                    Files.createSymbolicLink(networkNamePath, Path.of(sparrowDir.getName()));
+                }
+            } catch(Exception e) {
+                log.debug("Error updating symlink from " + network.getName() + " to " + sparrowDir.getName(), e);
+            }
+        }
+
         return sparrowDir;
     }
 
@@ -548,7 +578,7 @@ public class Storage {
             return new File(System.getProperty(SparrowWallet.APP_HOME_PROPERTY));
         }
 
-        if(Platform.getCurrent() == Platform.WINDOWS) {
+        if(isWindows()) {
             return new File(getHomeDir(), WINDOWS_SPARROW_DIR);
         }
 
@@ -556,7 +586,7 @@ public class Storage {
     }
 
     static File getHomeDir() {
-        if(Platform.getCurrent() == Platform.WINDOWS) {
+        if(isWindows()) {
             return new File(System.getenv("APPDATA"));
         }
 
@@ -565,7 +595,7 @@ public class Storage {
 
     public static boolean createOwnerOnlyDirectory(File directory) {
         try {
-            if(Platform.getCurrent() == Platform.WINDOWS) {
+            if(isWindows()) {
                 Files.createDirectories(directory.toPath());
                 return true;
             }
@@ -583,7 +613,7 @@ public class Storage {
 
     public static boolean createOwnerOnlyFile(File file) {
         try {
-            if(Platform.getCurrent() == Platform.WINDOWS) {
+            if(isWindows()) {
                 Files.createFile(file.toPath());
                 return true;
             }
@@ -614,6 +644,10 @@ public class Storage {
         return ownerOnly;
     }
 
+    private static boolean isWindows() {
+        return OsType.getCurrent() == OsType.WINDOWS;
+    }
+
     public static class LoadWalletService extends Service<WalletAndKey> {
         private final Storage storage;
         private final SecureString password;

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

@@ -1,33 +1,41 @@
 package com.sparrowwallet.sparrow.io;
 
 import com.csvreader.CsvReader;
-import com.google.gson.Gson;
+import com.google.gson.*;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreLabelsChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletEntryLabelsChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletUtxoStatusChangedEvent;
+import com.sparrowwallet.sparrow.net.ExchangeSource;
 import com.sparrowwallet.sparrow.wallet.*;
+import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class WalletLabels implements WalletImport, WalletExport {
     private static final Logger log = LoggerFactory.getLogger(WalletLabels.class);
+    private static final long ONE_DAY = 24*60*60*1000L;
 
     private final List<WalletForm> walletForms;
 
-    public WalletLabels() {
-        this.walletForms = Collections.emptyList();
-    }
-
     public WalletLabels(List<WalletForm> walletForms) {
         this.walletForms = walletForms;
     }
@@ -50,8 +58,9 @@ public class WalletLabels implements WalletImport, WalletExport {
     @Override
     public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         List<Label> labels = new ArrayList<>();
-        List<Wallet> allWallets = wallet.isMasterWallet() ? wallet.getAllWallets() : wallet.getMasterWallet().getAllWallets();
-        for(Wallet exportWallet : allWallets) {
+        Map<Date, Double> fiatRates = getFiatRates(walletForms);
+        for(WalletForm exportWalletForm : walletForms) {
+            Wallet exportWallet = exportWalletForm.getWallet();
             OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(exportWallet);
             String origin = outputDescriptor.toString(true, false, false);
 
@@ -61,34 +70,43 @@ public class WalletLabels implements WalletImport, WalletExport {
                 }
             }
 
-            for(BlockTransaction blkTx : exportWallet.getWalletTransactions().values()) {
-                if(blkTx.getLabel() != null && !blkTx.getLabel().isEmpty()) {
-                    labels.add(new Label(Type.tx, blkTx.getHashAsString(), blkTx.getLabel(), origin, null));
+            Set<Sha256Hash> confirmingTxs = new HashSet<>();
+            WalletTransactionsEntry walletTransactionsEntry = exportWalletForm.getWalletTransactionsEntry();
+            for(Entry entry : walletTransactionsEntry.getChildren()) {
+                TransactionEntry txEntry = (TransactionEntry)entry;
+                BlockTransaction blkTx = txEntry.getBlockTransaction();
+                labels.add(new TransactionLabel(blkTx.getHashAsString(), blkTx.getLabel(), origin,
+                        txEntry.isConfirming() ? null : blkTx.getHeight(), blkTx.getDate(),
+                        blkTx.getFee() == null || blkTx.getFee() == 0 ? null : blkTx.getFee(), txEntry.getValue(),
+                        getFiatValue(blkTx.getDate(), Transaction.SATOSHIS_PER_BITCOIN, fiatRates)));
+                if(txEntry.isConfirming()) {
+                    confirmingTxs.add(blkTx.getHash());
                 }
             }
 
             for(WalletNode addressNode : exportWallet.getWalletAddresses().values()) {
-                if(addressNode.getLabel() != null && !addressNode.getLabel().isEmpty()) {
-                    labels.add(new Label(Type.addr, addressNode.getAddress().toString(), addressNode.getLabel(), null, null));
-                }
+                labels.add(new AddressLabel(addressNode.getAddress().toString(), addressNode.getLabel(), origin, addressNode.getDerivationPath().substring(1),
+                        addressNode.getTransactionOutputs().stream().flatMap(txo -> txo.isSpent() ? Stream.of(txo, txo.getSpentBy()) : Stream.of(txo))
+                                .filter(ref -> !confirmingTxs.contains(ref.getHash())).map(BlockTransactionHash::getHeight).toList()));
             }
 
-            for(BlockTransactionHashIndex txo : exportWallet.getWalletTxos().keySet()) {
-                String spendable = (txo.isSpent() ? null : txo.getStatus() == Status.FROZEN ? "false" : "true");
-                if(txo.getLabel() != null && !txo.getLabel().isEmpty()) {
-                    labels.add(new Label(Type.output, txo.toString(), txo.getLabel(), null, spendable));
-                } else if(!txo.isSpent()) {
-                    labels.add(new Label(Type.output, txo.toString(), null, null, spendable));
-                }
+            for(Map.Entry<BlockTransactionHashIndex, WalletNode> txoEntry : exportWallet.getWalletTxos().entrySet()) {
+                BlockTransactionHashIndex txo = txoEntry.getKey();
+                WalletNode addressNode = txoEntry.getValue();
+                Boolean spendable = (txo.isSpent() ? null : txo.getStatus() != Status.FROZEN);
+                labels.add(new InputOutputLabel(Type.output, txo.toString(), txo.getLabel(), origin, spendable, addressNode.getDerivationPath().substring(1), txo.getValue(),
+                        confirmingTxs.contains(txo.getHash()) ? null : txo.getHeight(), txo.getDate(), getFiatValue(txo, fiatRates)));
 
-                if(txo.isSpent() && txo.getSpentBy().getLabel() != null && !txo.getSpentBy().getLabel().isEmpty()) {
-                    labels.add(new Label(Type.input, txo.getSpentBy().toString(), txo.getSpentBy().getLabel(), null, null));
+                if(txo.isSpent()) {
+                    BlockTransactionHashIndex txi = txo.getSpentBy();
+                    labels.add(new InputOutputLabel(Type.input, txi.toString(), txi.getLabel(), origin, null, addressNode.getDerivationPath().substring(1), txi.getValue(),
+                            confirmingTxs.contains(txi.getHash()) ? null : txi.getHeight(), txi.getDate(), getFiatValue(txi, fiatRates)));
                 }
             }
         }
 
         try {
-            Gson gson = new Gson();
+            Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new GsonUTCDateAdapter()).create();
             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8));
 
             for(Label label : labels) {
@@ -114,7 +132,7 @@ public class WalletLabels implements WalletImport, WalletExport {
 
     @Override
     public boolean isWalletExportScannable() {
-        return false;
+        return true;
     }
 
     @Override
@@ -247,11 +265,11 @@ public class WalletLabels implements WalletImport, WalletExport {
                                         addChangedEntry(changedWalletEntries, txioEntry);
                                     }
 
-                                    if(label.type == Type.output && !reference.isSpent()) {
-                                        if("false".equalsIgnoreCase(label.spendable) && reference.getStatus() != Status.FROZEN) {
+                                    if(label.type == Type.output && !reference.isSpent() && label.spendable != null) {
+                                        if(!label.spendable && reference.getStatus() != Status.FROZEN) {
                                             reference.setStatus(Status.FROZEN);
                                             addChangedUtxo(changedWalletUtxoStatuses, txioEntry);
-                                        } else if("true".equalsIgnoreCase(label.spendable) && reference.getStatus() == Status.FROZEN) {
+                                        } else if(label.spendable && reference.getStatus() == Status.FROZEN) {
                                             reference.setStatus(null);
                                             addChangedUtxo(changedWalletUtxoStatuses, txioEntry);
                                         }
@@ -316,7 +334,7 @@ public class WalletLabels implements WalletImport, WalletExport {
 
     @Override
     public boolean isWalletImportScannable() {
-        return false;
+        return true;
     }
 
     @Override
@@ -324,12 +342,77 @@ public class WalletLabels implements WalletImport, WalletExport {
         return true;
     }
 
+    private Map<Date, Double> getFiatRates(List<WalletForm> walletForms) {
+        ExchangeSource exchangeSource = getExchangeSource();
+        Currency fiatCurrency = getFiatCurrency();
+        Map<Date, Double> fiatRates = new HashMap<>();
+        if(fiatCurrency != null) {
+            long min = Long.MAX_VALUE;
+            long max = Long.MIN_VALUE;
+
+            for(WalletForm walletForm : walletForms) {
+                WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
+                if(!walletTransactionsEntry.getChildren().isEmpty()) {
+                    LongSummaryStatistics stats = walletTransactionsEntry.getChildren().stream()
+                            .map(entry -> ((TransactionEntry)entry).getBlockTransaction().getDate())
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.summarizingLong(Date::getTime));
+                    min = Math.min(min, stats.getMin());
+                    max = Math.max(max, stats.getMax());
+                }
+            }
+
+            if(max > min) {
+                fiatRates = exchangeSource.getHistoricalExchangeRates(fiatCurrency, new Date(min - ONE_DAY), new Date(max));
+            }
+        }
+
+        return fiatRates;
+    }
+
+    private static ExchangeSource getExchangeSource() {
+        return Config.get().getExchangeSource() == null ? ExchangeSource.COINGECKO : Config.get().getExchangeSource();
+    }
+
+    private static Currency getFiatCurrency() {
+        return getExchangeSource() == ExchangeSource.NONE || !AppServices.onlineProperty().get() ? null : Config.get().getFiatCurrency();
+    }
+
+    private Map<Currency, BigDecimal> getFiatValue(TransactionEntry txEntry, Map<Date, Double> fiatRates) {
+        return getFiatValue(txEntry.getBlockTransaction().getDate(), txEntry.getValue(), fiatRates);
+    }
+
+    private Map<Currency, BigDecimal> getFiatValue(BlockTransactionHashIndex ref, Map<Date, Double> fiatRates) {
+        return getFiatValue(ref.getDate(), ref.getValue(), fiatRates);
+    }
+
+    private Map<Currency, BigDecimal> getFiatValue(Date date, long value, Map<Date, Double> fiatRates) {
+        Currency fiatCurrency = getFiatCurrency();
+        if(fiatCurrency != null) {
+            Double dayRate = null;
+            if(date == null) {
+                if(AppServices.getFiatCurrencyExchangeRate() != null) {
+                    dayRate = AppServices.getFiatCurrencyExchangeRate().getBtcRate();
+                }
+            } else {
+                dayRate = fiatRates.get(DateUtils.truncate(date, Calendar.DAY_OF_MONTH));
+            }
+
+            if(dayRate != null) {
+                BigDecimal fiatValue = BigDecimal.valueOf(dayRate * value / Transaction.SATOSHIS_PER_BITCOIN);
+                return Map.of(fiatCurrency, fiatValue.setScale(fiatCurrency.getDefaultFractionDigits(), RoundingMode.HALF_UP));
+            }
+        }
+
+        return null;
+    }
+
     private enum Type {
         tx, addr, pubkey, input, output, xpub
     }
 
     private static class Label {
-        public Label(Type type, String ref, String label, String origin, String spendable) {
+        public Label(Type type, String ref, String label, String origin, Boolean spendable) {
             this.type = type;
             this.ref = ref;
             this.label = label;
@@ -341,6 +424,74 @@ public class WalletLabels implements WalletImport, WalletExport {
         String ref;
         String label;
         String origin;
-        String spendable;
+        Boolean spendable;
+    }
+
+    private static class TransactionLabel extends Label {
+        public TransactionLabel(String ref, String label, String origin, Integer height, Date time, Long fee, Long value, Map<Currency, BigDecimal> rate) {
+            super(Type.tx, ref, label, origin, null);
+            this.height = height;
+            this.time = time;
+            this.fee = fee;
+            this.value = value;
+            this.rate = rate;
+        }
+
+        Integer height;
+        Date time;
+        Long fee;
+        Long value;
+        Map<Currency, BigDecimal> rate;
+    }
+
+    private static class AddressLabel extends Label {
+        public AddressLabel(String ref, String label, String origin, String keypath, List<Integer> heights) {
+            super(Type.addr, ref, label, origin, null);
+            this.keypath = keypath;
+            this.heights = heights;
+        }
+
+        String keypath;
+        List<Integer> heights;
+    }
+
+    private static class InputOutputLabel extends Label {
+        public InputOutputLabel(Type type, String ref, String label, String origin, Boolean spendable, String keypath, Long value, Integer height, Date time, Map<Currency, BigDecimal> fmv) {
+            super(type, ref, label, origin, spendable);
+            this.keypath = keypath;
+            this.value = value;
+            this.height = height;
+            this.time = time;
+            this.fmv = fmv;
+        }
+
+        String keypath;
+        Long value;
+        Integer height;
+        Date time;
+        Map<Currency, BigDecimal> fmv;
+    }
+
+    public static class GsonUTCDateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
+        private final DateFormat dateFormat;
+
+        public GsonUTCDateAdapter() {
+            dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+            dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        }
+
+        @Override
+        public JsonElement serialize(Date src, java.lang.reflect.Type typeOfSrc, JsonSerializationContext context) {
+            return new JsonPrimitive(dateFormat.format(src));
+        }
+
+        @Override
+        public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            try {
+                return dateFormat.parse(json.getAsString());
+            } catch (ParseException e) {
+                throw new JsonParseException(e);
+            }
+        }
     }
 }

src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQRDecoder.java

@@ -37,6 +37,7 @@ public class BBQRDecoder {
 
             if(receivedParts.size() == totalParts) {
                 byte[] data = concatParts();
+                data = header.inflate(data);
 
                 if(type == BBQRType.PSBT) {
                     result = new Result(new PSBT(data));

src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQREncoder.java

@@ -35,7 +35,7 @@ public class BBQREncoder {
         BBQREncoding encoding = desiredEncoding;
 
         try {
-            encoded = encoding.encode(data);
+            encoded = encoding.encode(encoding.deflate(data));
             if(encoding == BBQREncoding.ZLIB) {
                 String uncompressed = BBQREncoding.BASE32.encode(data);
                 if(encoded.length() > uncompressed.length()) {

src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQREncoding.java

@@ -42,6 +42,11 @@ public enum BBQREncoding {
     }, ZLIB("Z") {
         @Override
         public String encode(byte[] data) throws BBQREncodingException {
+            return BASE32.encode(data);
+        }
+
+        @Override
+        public byte[] deflate(byte[] data) throws BBQREncodingException {
             try {
                 Deflater deflater = new Deflater(JZlib.Z_BEST_COMPRESSION, 10, true);
                 ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -49,7 +54,7 @@ public enum BBQREncoding {
                 zOut.write(data);
                 zOut.close();
 
-                return BASE32.encode(out.toByteArray());
+                return out.toByteArray();
             } catch(Exception e) {
                 throw new BBQREncodingException("Error deflating with zlib", e);
             }
@@ -57,9 +62,14 @@ public enum BBQREncoding {
 
         @Override
         public byte[] decode(String part) throws BBQREncodingException {
+            return BASE32.decode(part);
+        }
+
+        @Override
+        public byte[] inflate(byte[] data) throws BBQREncodingException {
             try {
                 Inflater inflater = new Inflater(10, true);
-                ByteArrayInputStream in = new ByteArrayInputStream(BASE32.decode(part));
+                ByteArrayInputStream in = new ByteArrayInputStream(data);
                 InflaterInputStream zIn = new InflaterInputStream(in, inflater);
                 byte[] decoded = zIn.readAllBytes();
                 zIn.close();
@@ -96,6 +106,14 @@ public enum BBQREncoding {
         return code;
     }
 
+    public byte[] deflate(byte[] data) throws BBQREncodingException {
+        return data;
+    }
+
+    public byte[] inflate(byte[] data) throws BBQREncodingException {
+        return data;
+    }
+
     public abstract String encode(byte[] data) throws BBQREncodingException;
 
     public abstract byte[] decode(String part) throws BBQREncodingException;

src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQRHeader.java

@@ -13,6 +13,10 @@ public record BBQRHeader(BBQREncoding encoding, BBQRType type, int seqTotal, int
         return encoding.decode(part.substring(8));
     }
 
+    public byte[] inflate(byte[] data) {
+        return encoding.inflate(data);
+    }
+
     public static BBQRHeader fromString(String part) {
         if(part.length() < 8) {
             throw new IllegalArgumentException("Part too short");

src/main/java/com/sparrowwallet/sparrow/io/db/BlockTransactionDao.java

@@ -61,6 +61,6 @@ public interface BlockTransactionDao {
     }
 
     default String truncate(String label) {
-        return (label != null && label.length() > 255 ? label.substring(0, 255) : label);
+        return (label != null && label.length() > BlockTransaction.MAX_LABEL_LENGTH ? label.substring(0, BlockTransaction.MAX_LABEL_LENGTH) : label);
     }
 }

src/main/java/com/sparrowwallet/sparrow/io/db/DbPersistence.java

@@ -268,7 +268,7 @@ public class DbPersistence implements Persistence {
                 }
 
                 if(dirtyPersistables.label != null) {
-                    walletDao.updateLabel(wallet.getId(), dirtyPersistables.label.length() > 255 ? dirtyPersistables.label.substring(0, 255) : dirtyPersistables.label);
+                    walletDao.updateLabel(wallet.getId(), dirtyPersistables.label.length() > Wallet.MAX_LABEL_LENGTH ? dirtyPersistables.label.substring(0, Wallet.MAX_LABEL_LENGTH) : dirtyPersistables.label);
                 }
 
                 if(dirtyPersistables.blockHeight != null) {
@@ -323,6 +323,11 @@ public class DbPersistence implements Persistence {
                     walletConfigDao.addOrUpdate(wallet, wallet.getWalletConfig());
                 }
 
+                if(dirtyPersistables.walletTable != null) {
+                    WalletTableDao walletTableDao = handle.attach(WalletTableDao.class);
+                    walletTableDao.addOrUpdate(wallet, dirtyPersistables.walletTable.getTableType(), dirtyPersistables.walletTable);
+                }
+
                 if(dirtyPersistables.mixConfig) {
                     MixConfigDao mixConfigDao = handle.attach(MixConfigDao.class);
                     mixConfigDao.addOrUpdate(wallet, wallet.getMixConfig());
@@ -355,6 +360,13 @@ public class DbPersistence implements Persistence {
                     }
                 }
 
+                if(!dirtyPersistables.registrationKeystores.isEmpty()) {
+                    KeystoreDao keystoreDao = handle.attach(KeystoreDao.class);
+                    for(Keystore keystore : dirtyPersistables.registrationKeystores) {
+                        keystoreDao.updateDeviceRegistration(keystore.getDeviceRegistration(), keystore.getId());
+                    }
+                }
+
                 dirtyPersistablesMap.remove(wallet);
             } finally {
                 walletDao.setSchema(DEFAULT_SCHEMA);
@@ -624,7 +636,7 @@ public class DbPersistence implements Persistence {
     }
 
     private Flyway getFlyway(Storage storage, String schema, String password, File resourcesDir) throws StorageException {
-        return Flyway.configure().dataSource(getDataSource(storage, password)).locations("filesystem:" + resourcesDir.getAbsolutePath()).schemas(schema).failOnMissingLocations(true).load();
+        return Flyway.configure().cleanDisabled(false).dataSource(getDataSource(storage, password)).locations("filesystem:" + resourcesDir.getAbsolutePath()).schemas(schema).failOnMissingLocations(true).load();
     }
 
     //Flyway does not support JPMS yet, so the migration files are extracted to a temp dir in order to avoid classloader encapsulation issues
@@ -761,6 +773,13 @@ public class DbPersistence implements Persistence {
         }
     }
 
+    @Subscribe
+    public void walletTableChanged(WalletTableChangedEvent event) {
+        if(persistsFor(event.getWallet()) && event.getTableType() != null && event.getWallet().getWalletTable(event.getTableType()) != null) {
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).walletTable = event.getWalletTable());
+        }
+    }
+
     @Subscribe
     public void walletMixConfigChanged(WalletMixConfigChangedEvent event) {
         if(persistsFor(event.getWallet()) && event.getWallet().getMixConfig() != null) {
@@ -792,6 +811,13 @@ public class DbPersistence implements Persistence {
         }
     }
 
+    @Subscribe
+    public void keystoreDeviceRegistrationsChanged(KeystoreDeviceRegistrationsChangedEvent event) {
+        if(persistsFor(event.getWallet())) {
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).registrationKeystores.addAll(event.getChangedKeystores()));
+        }
+    }
+
     @Subscribe
     public void walletWatchLastChanged(WalletWatchLastChangedEvent event) {
         if(persistsFor(event.getWallet())) {
@@ -810,11 +836,13 @@ public class DbPersistence implements Persistence {
         public final List<Entry> labelEntries = new ArrayList<>();
         public final List<BlockTransactionHashIndex> utxoStatuses = new ArrayList<>();
         public boolean walletConfig;
+        public WalletTable walletTable = null;
         public boolean mixConfig;
         public final Map<Sha256Hash, UtxoMixData> changedUtxoMixes = new HashMap<>();
         public final Map<Sha256Hash, UtxoMixData> removedUtxoMixes = new HashMap<>();
         public final List<Keystore> labelKeystores = new ArrayList<>();
         public final List<Keystore> encryptionKeystores = new ArrayList<>();
+        public final List<Keystore> registrationKeystores = new ArrayList<>();
 
         public String toString() {
             return "Dirty Persistables" +
@@ -830,11 +858,13 @@ public class DbPersistence implements Persistence {
                     "\nUTXO labels:" + labelEntries.stream().filter(entry -> entry instanceof HashIndexEntry).map(entry -> ((HashIndexEntry)entry).getHashIndex().toString()).collect(Collectors.toList()) +
                     "\nUTXO statuses:" + utxoStatuses +
                     "\nWallet config:" + walletConfig +
+                    "\nWallet table:" + walletTable +
                     "\nMix config:" + mixConfig +
                     "\nUTXO mixes changed:" + changedUtxoMixes +
                     "\nUTXO mixes removed:" + removedUtxoMixes +
                     "\nKeystore labels:" + labelKeystores.stream().map(Keystore::getLabel).collect(Collectors.toList()) +
-                    "\nKeystore encryptions:" + encryptionKeystores.stream().map(Keystore::getLabel).collect(Collectors.toList());
+                    "\nKeystore encryptions:" + encryptionKeystores.stream().map(Keystore::getLabel).collect(Collectors.toList()) +
+                    "\nKeystore registrations:" + registrationKeystores.stream().map(Keystore::getDeviceRegistration).collect(Collectors.toList());
         }
     }
 }