ensure /sys devices are writeable before calling udevadm

default to first keystore for signing path if satochip keystore cannot be determined

.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@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Set up JDK 18.0.1
-        uses: actions/setup-java@v3
+      - 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
@@ -31,9 +31,9 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         run: ./gradlew packageTarDistribution
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: Sparrow Build - ${{ runner.os }}
+          name: Sparrow Build - ${{ runner.os }} ${{ runner.arch }}
           path: |
             build/jpackage/*
             !build/jpackage/Sparrow/
@@ -48,9 +48,9 @@ jobs:
         run: for f in build/jpackage/sparrow*; do mv -v "$f" "${f/sparrow/sparrow-server}"; done;
       - name: Upload Headless Artifact
         if: ${{ runner.os == 'Linux' }}
-        uses: actions/upload-artifact@v3
+        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 'org-openjfx-javafxplugin'
-    id 'extra-java-module-info'
-    id 'org.beryx.jlink' version '2.26.0'
+    id 'org.beryx.jlink' version '3.1.1'
+    id 'org.gradlex.extra-java-module-info' version '1.9'
 }
 
-def sparrowVersion = '1.8.2'
+def sparrowVersion = '2.1.1'
 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' ]
 }
 
@@ -63,25 +58,27 @@ java {
 
 dependencies {
     //Any changes to the dependencies must be reflected in the module definitions below!
-    implementation(project(':drongo')) {
-        exclude group: 'org.hamcrest'
-        exclude group: 'junit'
-    }
-    implementation('com.google.guava:guava:31.1-jre')
-    implementation('com.google.code.gson:gson:2.8.6')
+    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')
-    implementation('com.zaxxer:HikariCP:4.0.3')
+    implementation('com.zaxxer:HikariCP:4.0.3') {
+        exclude group: 'org.slf4j'
+    }
     implementation('org.jdbi:jdbi3-core:3.20.0') {
         exclude group: 'org.slf4j'
     }
-    implementation('org.jdbi:jdbi3-sqlobject:3.20.0')
-    implementation('org.flywaydb:flyway-core:7.10.7-SNAPSHOT')
+    implementation('org.jdbi:jdbi3-sqlobject:3.20.0') {
+        exclude group: 'org.slf4j'
+    }
+    implementation('org.flywaydb:flyway-core:9.1.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'
@@ -89,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'
@@ -97,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'
@@ -118,25 +128,26 @@ dependencies {
     }
     implementation('dev.bwt:bwt-jni:0.1.8')
     implementation('net.sourceforge.javacsv:javacsv:2.0')
-    implementation('org.slf4j:jul-to-slf4j:1.7.30') {
+    implementation ('org.slf4j:slf4j-api:2.0.12')
+    implementation('org.slf4j:jul-to-slf4j:2.0.12') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.39')
+    implementation('com.sparrowwallet.bokmakierie:bokmakierie:1.0')
+    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.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')
-    testImplementation('junit:junit:4.13.1')
-}
-
-application {
-    mainModule = 'com.sparrowwallet.sparrow'
-    mainClass = 'com.sparrowwallet.sparrow.SparrowWallet'
+    implementation('com.jcraft:jzlib:1.1.3')
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.0')
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 }
 
 compileJava {
@@ -157,10 +168,14 @@ processResources {
 }
 
 test {
-    jvmArgs '--add-opens=java.base/java.io=com.google.gson'
+    useJUnitPlatform()
+    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"]
 }
 
-run {
+application {
+    mainModule = 'com.sparrowwallet.sparrow'
+    mainClass = 'com.sparrowwallet.sparrow.SparrowWallet'
+
     applicationDefaultJvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError",
                                  "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
                                  "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls",
@@ -182,7 +197,8 @@ run {
                                  "--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",
@@ -203,14 +219,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'
-        uses 'org.eclipse.jetty.websocket.api.extensions.Extension'
-        uses 'org.eclipse.jetty.websocket.common.RemoteEndpointFactory'
     }
 
-    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",
@@ -236,12 +248,16 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=java.desktop",
                    "--add-reads=com.sparrowwallet.merged.module=java.sql",
                    "--add-reads=com.sparrowwallet.merged.module=com.sparrowwallet.sparrow",
-                   "--add-reads=com.sparrowwallet.merged.module=logback.classic",
+                   "--add-reads=com.sparrowwallet.merged.module=ch.qos.logback.classic",
+                   "--add-reads=com.sparrowwallet.merged.module=org.slf4j",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
                    "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor",
-                   "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
+                   "--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=org.flywaydb.core=java.desktop"]
 
         if(os.windows) {
             jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
@@ -260,15 +276,15 @@ jlink {
         appVersion = "${sparrowVersion}"
         skipInstaller = os.macOsX || properties.skipInstallers
         imageOptions = []
-        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/auth47.properties', '--file-associations', 'src/main/deploy/lightning.properties', '--license-file', 'LICENSE']
+        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/asc.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/auth47.properties', '--file-associations', 'src/main/deploy/lightning.properties', '--license-file', 'LICENSE']
         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']
             }
@@ -281,22 +297,48 @@ jlink {
             installerType = "dmg"
         }
     }
+    if(os.linux) {
+        jpackageImage {
+            dependsOn('prepareModulesDir', 'copyUdevRules')
+        }
+    }
 }
 
-task removeGroupWritePermission(type: Exec) {
+if(os.linux) {
+    tasks.jlink.finalizedBy('addUserWritePermission', 'copyUdevRules')
+} else {
+    tasks.jlink.finalizedBy('addUserWritePermission')
+}
+
+tasks.register('addUserWritePermission', Exec) {
+    if(os.windows) {
+        commandLine 'icacls', "$buildDir\\image\\legal", '/grant', 'Users:(OI)(CI)F', '/T'
+    } else {
+        commandLine 'chmod', '-R', 'u+w', "$buildDir/image/legal"
+    }
+}
+
+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")
@@ -307,60 +349,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')
@@ -368,7 +361,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')
@@ -376,19 +369,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')
@@ -396,51 +389,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('jul-to-slf4j-1.7.30.jar', 'org.slf4j.jul.to.slf4j', '1.7.30') {
-        exports('org.slf4j.bridge')
-        requires('java.logging')
-        requires('org.slf4j')
-    }
-    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')
-    }
-    module('logback-classic-1.2.8.jar', 'logback.classic', '1.2.8') {
-        exports('ch.qos.logback.classic')
-        requires('org.slf4j')
-        requires('logback.core')
-        requires('java.xml')
-        requires('java.logging')
-    }
-    module('failureaccess-1.0.1.jar', 'failureaccess', '1.0.1') {
-        exports('com.google.common.util.concurrent.internal')
-    }
-    module('listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar', 'com.google.guava.listenablefuture', '9999.0-empty-to-avoid-conflict-with-guava')
-    module('guava-31.1-jre.jar', 'com.google.common', '31.1-jre') {
-        exports('com.google.common.eventbus')
-        exports('com.google.common.net')
-        exports('com.google.common.base')
-        exports('com.google.common.collect')
-        exports('com.google.common.io')
-        exports('com.google.common.primitives')
-        exports('com.google.common.math')
-        requires('failureaccess')
-        requires('java.logging')
-    }
-    module('jsr305-3.0.2.jar', 'com.google.code.findbugs.jsr305', '3.0.2')
-    module('j2objc-annotations-1.3.jar', 'com.google.j2objc.j2objc.annotations', '1.3')
-    module('jdbi3-core-3.20.0.jar', 'org.jdbi.v3.core', '3.20.0') {
+    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('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')
@@ -450,11 +411,12 @@ extraJavaModuleInfo {
         requires('io.leangen.geantyref')
         requires('java.sql')
         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')
@@ -466,20 +428,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')
@@ -488,124 +450,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('nightjar-0.2.39.jar', 'com.sparrowwallet.nightjar', '0.2.39') {
-        requires('com.google.common')
-        requires('net.sourceforge.streamsupport')
-        requires('org.slf4j')
-        requires('org.bouncycastle.provider')
-        requires('com.fasterxml.jackson.databind')
-        requires('com.fasterxml.jackson.annotation')
-        requires('com.fasterxml.jackson.core')
-        requires('logback.classic')
-        requires('org.json')
-        requires('io.reactivex.rxjava2')
-        exports('com.samourai.http.client')
-        exports('com.samourai.tor.client')
-        exports('com.samourai.wallet.api.backend')
-        exports('com.samourai.wallet.api.backend.beans')
-        exports('com.samourai.wallet.client.indexHandler')
-        exports('com.samourai.wallet.hd')
-        exports('com.samourai.wallet.util')
-        exports('com.samourai.wallet.bip47.rpc')
-        exports('com.samourai.wallet.bip47.rpc.java')
-        exports('com.samourai.wallet.cahoots')
-        exports('com.samourai.wallet.cahoots.psbt')
-        exports('com.samourai.wallet.cahoots.stonewallx2')
-        exports('com.samourai.soroban.cahoots')
-        exports('com.samourai.soroban.client')
-        exports('com.samourai.soroban.client.cahoots')
-        exports('com.samourai.soroban.client.meeting')
-        exports('com.samourai.soroban.client.rpc')
-        exports('com.samourai.wallet.send')
-        exports('com.samourai.whirlpool.client.event')
-        exports('com.samourai.whirlpool.client.wallet')
-        exports('com.samourai.whirlpool.client.wallet.beans')
-        exports('com.samourai.whirlpool.client.wallet.data.dataSource')
-        exports('com.samourai.whirlpool.client.wallet.data.dataPersister')
-        exports('com.samourai.whirlpool.client.whirlpool')
-        exports('com.samourai.whirlpool.client.whirlpool.beans')
-        exports('com.samourai.whirlpool.client.wallet.data.pool')
-        exports('com.samourai.whirlpool.client.wallet.data.utxo')
-        exports('com.samourai.whirlpool.client.wallet.data.utxoConfig')
-        exports('com.samourai.whirlpool.client.wallet.data.supplier')
-        exports('com.samourai.whirlpool.client.mix.handler')
-        exports('com.samourai.whirlpool.client.mix.listener')
-        exports('com.samourai.whirlpool.protocol.beans')
-        exports('com.samourai.whirlpool.protocol.rest')
-        exports('com.samourai.whirlpool.client.tx0')
-        exports('com.samourai.wallet.segwit.bech32')
-        exports('com.samourai.whirlpool.client.wallet.data.chain')
-        exports('com.samourai.whirlpool.client.wallet.data.wallet')
-        exports('com.samourai.whirlpool.client.wallet.data.minerFee')
-        exports('com.samourai.whirlpool.client.wallet.data.walletState')
-        exports('com.sparrowwallet.nightjar.http')
-        exports('com.sparrowwallet.nightjar.stomp')
-        exports('com.sparrowwallet.nightjar.tor')
-    }
-    module('throwing-supplier-1.0.3.jar', 'zeroleak.throwingsupplier', '1.0.3') {
-        exports('com.zeroleak.throwingsupplier')
-    }
-    module('okhttp-2.7.5.jar', 'com.squareup.okhttp', '2.7.5') {
-        exports('com.squareup.okhttp')
-    }
-    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('json-20180130.jar', 'org.json', '1.0') {
-        exports('org.json')
-    }
-    module('scrypt-1.4.0.jar', 'com.lambdaworks.scrypt', '1.4.0') {
-        exports('com.lambdaworks.codec')
-        exports('com.lambdaworks.crypto')
-    }
-    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('protobuf-java-2.6.1.jar', 'com.google.protobuf', '2.6.1') {
-        exports('com.google.protobuf')
-    }
-    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')
@@ -616,24 +496,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')
@@ -644,7 +524,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')
@@ -652,7 +532,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')
@@ -663,12 +543,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')
@@ -678,10 +558,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')
@@ -692,15 +572,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')
     }
@@ -718,16 +598,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('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {
-        requires('java.xml')
-    }
-    module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') {
+    module('org.jcommander:jcommander', 'org.jcommander') {
         exports('com.beust.jcommander')
     }
-    module('junit-4.12.jar', 'junit', '4.12') {
-        exports('org.junit')
-        requires('org.hamcrest.core')
+    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')
     }
-    module('hamcrest-core-1.3.jar', 'org.hamcrest.core', '1.3')
 }

buildSrc/build.gradle

@@ -3,9 +3,8 @@ plugins {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:8.0.1'
-    implementation 'com.google.gradle:osdetector-gradle-plugin:1.7.0'
-    implementation 'org.javamodularity:moduleplugin:1.8.12'
+    implementation 'com.google.gradle:osdetector-gradle-plugin:1.7.3'
+    implementation 'org.javamodularity:moduleplugin:1.8.14'
 }
 
 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
 
@@ -42,7 +43,7 @@ Check if key fingerprint matches: `3B04D753C9050D9A5D343F39843C48A565F8F04B`:
 ```
 gpg --import --import-options show-only adoptium.asc
 ```
-If key doesn't match, do not procede.
+If key doesn't match, do not proceed.
 
 Add Adoptium PGP key to a the keyring shared folder:
 ```sh
@@ -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.1"
+GIT_TAG="2.0.0"
 ```
 
 The project can then be initially cloned as follows:

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

settings.gradle

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

src/main/deploy/asc.properties

@@ -0,0 +1,3 @@
+mime-type=application/pgp-signature
+extension=asc
+description=ASCII Armored File

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

@@ -0,0 +1,9 @@
+Package: sparrow
+Version: 2.1.1-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.1-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

@@ -6,5 +6,6 @@ Icon=/opt/sparrow/lib/Sparrow.png
 Terminal=false
 Type=Application
 Categories=Finance;Network;
-MimeType=application/psbt;application/bitcoin-transaction;x-scheme-handler/bitcoin;x-scheme-handler/auth47;x-scheme-handler/lightning
+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.1
+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.8.2</string>
+  <string>2.1.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -94,6 +94,21 @@
           <key>UTTypeIconFile</key>
           <string>sparrow.icns</string>
       </dict>
+      <dict>
+          <key>UTTypeIdentifier</key>
+          <string>com.sparrowwallet.asc</string>
+          <key>UTTypeTagSpecification</key>
+          <dict>
+              <key>public.filename-extension</key>
+              <array>
+                  <string>asc</string>
+              </array>
+          </dict>
+          <key>UTTypeDescription</key>
+          <string>ASCII Armored File</string>
+          <key>UTTypeIconFile</key>
+          <string>sparrow.icns</string>
+      </dict>
   </array>
  <key>CFBundleDocumentTypes</key>
  <array>

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

@@ -7,9 +7,7 @@ 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;
@@ -21,14 +19,13 @@ import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+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.soroban.CounterpartyDialog;
+import com.sparrowwallet.sparrow.settings.SettingsGroup;
+import com.sparrowwallet.sparrow.settings.SettingsDialog;
 import com.sparrowwallet.sparrow.paynym.PayNymDialog;
-import com.sparrowwallet.sparrow.soroban.Soroban;
-import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
 import com.sparrowwallet.sparrow.transaction.TransactionData;
 import com.sparrowwallet.sparrow.transaction.TransactionView;
@@ -77,6 +74,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.sparrowwallet.sparrow.AppServices.*;
+import static com.sparrowwallet.sparrow.control.DownloadVerifierDialog.*;
 
 public class AppController implements Initializable {
     private static final Logger log = LoggerFactory.getLogger(AppController.class);
@@ -152,6 +150,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();
@@ -184,9 +186,6 @@ public class AppController implements Initializable {
     @FXML
     private MenuItem sweepPrivateKey;
 
-    @FXML
-    private MenuItem findMixingPartner;
-
     @FXML
     private MenuItem showPayNym;
 
@@ -198,7 +197,7 @@ public class AppController implements Initializable {
     private static final BooleanProperty preventSleepProperty = new SimpleBooleanProperty();
 
     @FXML
-    private MenuItem restart;
+    private Menu restart;
 
     @FXML
     private StackPane rootStack;
@@ -212,12 +211,18 @@ public class AppController implements Initializable {
     @FXML
     private UnlabeledToggleSwitch serverToggle;
 
+    private Storage.KeyDerivationService keyDerivationService;
+
     private PauseTransition wait;
 
     private Timeline statusTimeline;
 
+    private SearchWalletDialog searchWalletDialog;
+
     private SendToManyDialog sendToManyDialog;
 
+    private DownloadVerifierDialog downloadVerifierDialog;
+
     private Tab previouslySelectedTab;
 
     private boolean subTabsVisible;
@@ -273,11 +278,20 @@ public class AppController implements Initializable {
     }
 
     void initializeView() {
-        setPlatformApplicationMenu();
+        Platform.runLater(this::setPlatformApplicationMenu);
+
+        rootStack.getScene().getWindow().setOnHiding(windowEvent -> {
+            if(searchWalletDialog != null && searchWalletDialog.isShowing()) {
+                searchWalletDialog.close();
+            }
+            if(sendToManyDialog != null && sendToManyDialog.isShowing()) {
+                sendToManyDialog.close();
+            }
+        });
 
         rootStack.setOnDragOver(event -> {
             if(event.getGestureSource() != rootStack && event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
+                event.acceptTransferModes(TransferMode.LINK);
             }
             event.consume();
         });
@@ -286,9 +300,7 @@ public class AppController implements Initializable {
             Dragboard db = event.getDragboard();
             boolean success = false;
             if(db.hasFiles()) {
-                for(File file : db.getFiles()) {
-                    openFile(file);
-                }
+                openFiles(db.getFiles());
                 success = true;
             }
             event.setDropCompleted(success);
@@ -330,6 +342,8 @@ public class AppController implements Initializable {
             EventManager.get().post(new OpenWalletsEvent(tabs.getScene().getWindow(), Collections.emptyList()));
         });
 
+        tabs.setPickOnBounds(false);
+
         registerShortcuts();
 
         BitcoinUnit unit = Config.get().getBitcoinUnit();
@@ -369,13 +383,25 @@ 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());
         showLoadingLog.selectedProperty().bindBidirectional(showLoadingLogProperty);
         preventSleepProperty.set(Config.get().isPreventSleep());
         preventSleep.selectedProperty().bindBidirectional(preventSleepProperty);
-        restart.setText("Restart in " + (Network.get() == Network.MAINNET ? Network.TESTNET.toDisplayString() : Network.MAINNET.toDisplayString()));
+
+        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.TESTNET4, Network.SIGNET));
+        networks.remove(Network.get());
+        for(Network network : networks) {
+            MenuItem networkItem = new MenuItem(network.toDisplayString());
+            networkItem.setOnAction(event -> restart(event, network));
+            restart.getItems().add(networkItem);
+        }
         restart.setVisible(System.getProperty(JPACKAGE_APP_PATH) != null);
 
         saveTransaction.setDisable(true);
@@ -395,10 +421,6 @@ public class AppController implements Initializable {
         sendToMany.disableProperty().bind(exportWallet.disableProperty());
         sweepPrivateKey.disableProperty().bind(Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not()));
         showPayNym.setDisable(true);
-        findMixingPartner.setDisable(true);
-        AppServices.onlineProperty().addListener((observable, oldValue, newValue) -> {
-            findMixingPartner.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
-        });
 
         configureSwitchServer();
         setServerType(Config.get().getServerType());
@@ -415,8 +437,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();
@@ -431,14 +453,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);
@@ -446,11 +468,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);
         }
     }
@@ -476,7 +498,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);
         }
     }
 
@@ -522,7 +544,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)));
             }
 
@@ -550,21 +572,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();
     }
 
@@ -574,7 +602,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")
         );
@@ -626,7 +654,7 @@ public class AppController implements Initializable {
             } catch(TransactionParseException e) {
                 showErrorDialog("Invalid transaction", e.getMessage());
             } catch(Exception e) {
-                showErrorDialog("Invalid file", e.getMessage());
+                showErrorDialog("Invalid file", "Cannot recognise the format of the " + file.getName() + " file.");
             }
         }
     }
@@ -742,8 +770,10 @@ public class AppController implements Initializable {
             Transaction transaction = transactionTabData.getTransaction();
 
             try {
-                UR ur = UR.fromBytes(transaction.bitcoinSerialize());
-                QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur);
+                byte[] txBytes = transaction.bitcoinSerialize();
+                UR ur = UR.fromBytes(txBytes);
+                BBQR bbqr = new BBQR(BBQRType.TXN, txBytes);
+                QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, false, false);
                 qrDisplayDialog.initOwner(rootStack.getScene().getWindow());
                 qrDisplayDialog.showAndWait();
             } catch(Exception e) {
@@ -780,6 +810,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";
                 }
@@ -841,8 +872,10 @@ public class AppController implements Initializable {
         if(tabData.getType() == TabData.TabType.TRANSACTION) {
             TransactionTabData transactionTabData = (TransactionTabData)tabData;
 
-            CryptoPSBT cryptoPSBT = new CryptoPSBT(transactionTabData.getPsbt().serialize());
-            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR());
+            byte[] psbtBytes = transactionTabData.getPsbt().serialize();
+            CryptoPSBT cryptoPSBT = new CryptoPSBT(psbtBytes);
+            BBQR bbqr = new BBQR(BBQRType.PSBT, psbtBytes);
+            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR(), bbqr, false, true, false);
             qrDisplayDialog.initOwner(rootStack.getScene().getWindow());
             qrDisplayDialog.show();
         }
@@ -925,6 +958,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());
@@ -957,19 +995,46 @@ public class AppController implements Initializable {
         AppServices.get().setPreventSleep(item.isSelected());
     }
 
-    public void restart(ActionEvent event) {
+    public void restartInHome(ActionEvent event) {
+        Args args = getRestartArgs();
+        File initialDir = null;
+        if(args.dir != null) {
+            initialDir = new File(args.dir);
+        }
+
+        Stage window = new Stage();
+        DirectoryChooser directoryChooser = new DirectoryChooser();
+        directoryChooser.setTitle("Choose Sparrow Home Folder");
+        directoryChooser.setInitialDirectory(initialDir == null || !initialDir.exists() ? Storage.getSparrowHome() : initialDir);
+        File newHome = directoryChooser.showDialog(window);
+
+        if(newHome != null) {
+            args.dir = newHome.getAbsolutePath();
+            restart(event, args);
+        }
+    }
+
+    public void restart(ActionEvent event, Network network) {
         if(System.getProperty(JPACKAGE_APP_PATH) == null) {
             throw new IllegalStateException("Property " + JPACKAGE_APP_PATH + " is not present");
         }
 
+        Args args = getRestartArgs();
+        args.network = network;
+        restart(event, args);
+    }
+
+    private static Args getRestartArgs() {
         Args args = new Args();
         ProcessHandle.current().info().arguments().ifPresent(argv -> {
             JCommander jCommander = JCommander.newBuilder().addObject(args).acceptUnknownOptions(true).build();
             jCommander.parse(argv);
         });
 
-        args.network = (Network.get() == Network.MAINNET ? Network.TESTNET : Network.MAINNET);
+        return args;
+    }
 
+    private void restart(ActionEvent event, Args args) {
         try {
             List<String> cmd = new ArrayList<>();
             cmd.add(System.getProperty(JPACKAGE_APP_PATH));
@@ -982,11 +1047,19 @@ public class AppController implements Initializable {
         }
     }
 
-    public void openFile(File file) {
-        if(isWalletFile(file)) {
-            openWalletFile(file, true);
-        } else {
-            openTransactionFile(file);
+    public void openFiles(List<File> files) {
+        boolean verifyOpened = false;
+        for(File file : files) {
+            if(isWalletFile(file)) {
+                openWalletFile(file, true);
+            } else if(isVerifyDownloadFile(file)) {
+                if(!verifyOpened) {
+                    verifyDownload(new ActionEvent(file, rootStack));
+                    verifyOpened = true;
+                }
+            } else {
+                openTransactionFile(file);
+            }
         }
     }
 
@@ -1257,7 +1330,7 @@ public class AppController implements Initializable {
                     log.error("Error saving imported wallet", e);
                 }
             } else {
-                Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get());
+                keyDerivationService = new Storage.KeyDerivationService(storage, password.get());
                 keyDerivationService.setOnSucceeded(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(Storage.getWalletFile(wallet.getName()).getAbsolutePath(), TimedEvent.Action.END, "Done"));
                     ECKey encryptionFullKey = keyDerivationService.getValue();
@@ -1288,11 +1361,13 @@ public class AppController implements Initializable {
                         if(key != null) {
                             key.clear();
                         }
+                        keyDerivationService = null;
                     }
                 });
                 keyDerivationService.setOnFailed(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(Storage.getWalletFile(wallet.getName()).getAbsolutePath(), TimedEvent.Action.END, "Failed"));
                     showErrorDialog("Error encrypting wallet", keyDerivationService.getException().getMessage());
+                    keyDerivationService = null;
                 });
                 EventManager.get().post(new StorageEvent(Storage.getWalletFile(wallet.getName()).getAbsolutePath(), TimedEvent.Action.START, "Encrypting wallet..."));
                 keyDerivationService.start();
@@ -1312,18 +1387,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());
     }
@@ -1365,7 +1440,6 @@ public class AppController implements Initializable {
             }
 
             sendToManyDialog = new SendToManyDialog(bitcoinUnit);
-            sendToManyDialog.initOwner(rootStack.getScene().getWindow());
             sendToManyDialog.initModality(Modality.NONE);
             Optional<List<Payment>> optPayments = sendToManyDialog.showAndWait();
             sendToManyDialog = null;
@@ -1391,74 +1465,6 @@ public class AppController implements Initializable {
         optTransaction.ifPresent(transaction -> addTransactionTab(null, null, transaction));
     }
 
-    public void findMixingPartner(ActionEvent event) {
-        WalletForm selectedWalletForm = getSelectedWalletForm();
-        if(selectedWalletForm != null) {
-            Wallet wallet = selectedWalletForm.getWallet();
-            Soroban soroban = AppServices.getSorobanServices().getSoroban(selectedWalletForm.getWalletId());
-            if(soroban.getHdWallet() == null) {
-                if(wallet.isEncrypted()) {
-                    Wallet copy = wallet.copy();
-                    WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
-                    dlg.initOwner(rootStack.getScene().getWindow());
-                    Optional<SecureString> password = dlg.showAndWait();
-                    if(password.isPresent()) {
-                        Storage storage = selectedWalletForm.getStorage();
-                        Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
-                        keyDerivationService.setOnSucceeded(workerStateEvent -> {
-                            EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.END, "Done"));
-                            ECKey encryptionFullKey = keyDerivationService.getValue();
-                            Key key = new Key(encryptionFullKey.getPrivKeyBytes(), storage.getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
-                            copy.decrypt(key);
-
-                            try {
-                                soroban.setHDWallet(copy);
-                                CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
-                                counterpartyDialog.initOwner(rootStack.getScene().getWindow());
-                                if(Config.get().isSameAppMixing()) {
-                                    counterpartyDialog.initModality(Modality.NONE);
-                                }
-                                counterpartyDialog.showAndWait();
-                            } finally {
-                                key.clear();
-                                encryptionFullKey.clear();
-                                password.get().clear();
-                            }
-                        });
-                        keyDerivationService.setOnFailed(workerStateEvent -> {
-                            EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.END, "Failed"));
-                            if(keyDerivationService.getException() instanceof InvalidPasswordException) {
-                                Optional<ButtonType> optResponse = showErrorDialog("Invalid Password", "The wallet password was invalid. Try again?", ButtonType.CANCEL, ButtonType.OK);
-                                if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
-                                    Platform.runLater(() -> findMixingPartner(null));
-                                }
-                            } else {
-                                log.error("Error deriving wallet key", keyDerivationService.getException());
-                            }
-                        });
-                        EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.START, "Decrypting wallet..."));
-                        keyDerivationService.start();
-                    }
-                } else {
-                    soroban.setHDWallet(wallet);
-                    CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
-                    counterpartyDialog.initOwner(rootStack.getScene().getWindow());
-                    if(Config.get().isSameAppMixing()) {
-                        counterpartyDialog.initModality(Modality.NONE);
-                    }
-                    counterpartyDialog.showAndWait();
-                }
-            } else {
-                CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
-                counterpartyDialog.initOwner(rootStack.getScene().getWindow());
-                if(Config.get().isSameAppMixing()) {
-                    counterpartyDialog.initModality(Modality.NONE);
-                }
-                counterpartyDialog.showAndWait();
-            }
-        }
-    }
-
     public void showPayNym(ActionEvent event) {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
@@ -1468,6 +1474,23 @@ public class AppController implements Initializable {
         }
     }
 
+    public void verifyDownload(ActionEvent event) {
+        if(downloadVerifierDialog != null) {
+            Stage stage = (Stage)downloadVerifierDialog.getDialogPane().getScene().getWindow();
+            stage.setAlwaysOnTop(true);
+            stage.setAlwaysOnTop(false);
+            if(event.getSource() instanceof File file) {
+                downloadVerifierDialog.setSignatureFile(file);
+            }
+            return;
+        }
+
+        downloadVerifierDialog = new DownloadVerifierDialog(event.getSource() instanceof File file ? file : null);
+        downloadVerifierDialog.initOwner(rootStack.getScene().getWindow());
+        downloadVerifierDialog.showAndWait();
+        downloadVerifierDialog = null;
+    }
+
     public void minimizeToTray(ActionEvent event) {
         AppServices.get().minimizeStage((Stage)tabs.getScene().getWindow());
     }
@@ -1534,13 +1557,46 @@ public class AppController implements Initializable {
     }
 
     private void searchWallets(List<WalletForm> walletForms) {
-        SearchWalletDialog searchWalletDialog = new SearchWalletDialog(walletForms);
-        searchWalletDialog.initOwner(rootStack.getScene().getWindow());
-        Optional<Entry> optEntry = searchWalletDialog.showAndWait();
-        if(optEntry.isPresent()) {
-            Entry entry = optEntry.get();
-            EventManager.get().post(new FunctionActionEvent(entry.getWalletFunction(), entry.getWallet()));
-            Platform.runLater(() -> EventManager.get().post(new SelectEntryEvent(entry)));
+        if(searchWalletDialog != null) {
+            if(!searchWalletDialog.getWalletForms().equals(walletForms)) {
+                searchWalletDialog.close();
+            } else {
+                Stage stage = (Stage)searchWalletDialog.getDialogPane().getScene().getWindow();
+                stage.setAlwaysOnTop(true);
+                stage.setAlwaysOnTop(false);
+                return;
+            }
+        }
+
+        Platform.runLater(() -> {
+            searchWalletDialog = new SearchWalletDialog(walletForms);
+            searchWalletDialog.initModality(Modality.NONE);
+            Optional<Entry> optEntry = searchWalletDialog.showAndWait();
+            if(optEntry.isPresent()) {
+                Entry entry = optEntry.get();
+                EventManager.get().post(new FunctionActionEvent(entry.getWalletFunction(), entry.getWallet()));
+                Platform.runLater(() -> EventManager.get().post(new SelectEntryEvent(entry)));
+            }
+            searchWalletDialog = null;
+        });
+    }
+
+    public void showAllWalletsSummary(ActionEvent event) {
+        List<List<WalletForm>> allWalletForms = new ArrayList<>();
+        for(Tab tab : tabs.getTabs()) {
+            if(tab.getUserData() instanceof WalletTabData) {
+                TabPane subTabs = (TabPane)tab.getContent();
+                allWalletForms.add(subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm())
+                        .filter(walletForm -> walletForm.getWallet().isValid() && !walletForm.isLocked()).collect(Collectors.toList()));
+            }
+        }
+
+        if(allWalletForms.isEmpty() || allWalletForms.stream().allMatch(List::isEmpty)) {
+            showErrorDialog("No wallets", "There are no open and unlocked wallets to summarize.");
+        } else {
+            WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(allWalletForms);
+            walletSummaryDialog.initOwner(rootStack.getScene().getWindow());
+            walletSummaryDialog.showAndWait();
         }
     }
 
@@ -1552,7 +1608,7 @@ public class AppController implements Initializable {
                 TabPane subTabs = (TabPane) selectedTab.getContent();
                 List<WalletForm> walletForms = subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm()).collect(Collectors.toList());
                 if(!walletForms.isEmpty()) {
-                    WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(walletForms);
+                    WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(List.of(walletForms));
                     walletSummaryDialog.initOwner(rootStack.getScene().getWindow());
                     walletSummaryDialog.showAndWait();
                 }
@@ -1608,14 +1664,6 @@ public class AppController implements Initializable {
             tabLabel.setGraphicTextGap(5.0);
             tab.setGraphic(tabLabel);
             tab.setClosable(true);
-            tab.setOnCloseRequest(event -> {
-                if(AppServices.getWhirlpoolServices().getWhirlpoolForMixToWallet(((WalletTabData)tab.getUserData()).getWalletForm().getWalletId()) != null) {
-                    Optional<ButtonType> optType = AppServices.showWarningDialog("Close mix to wallet?", "This wallet has been configured as the final destination for mixes, and needs to be open for this to occur.\n\nAre you sure you want to close?", ButtonType.NO, ButtonType.YES);
-                    if(optType.isPresent() && optType.get() == ButtonType.NO) {
-                        event.consume();
-                    }
-                }
-            });
 
             TabPane subTabs = new TabPane();
             subTabs.setSide(Side.LEFT);
@@ -1842,6 +1890,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));
@@ -1859,7 +1926,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) {
@@ -2048,7 +2115,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")
         );
 
@@ -2109,7 +2176,7 @@ public class AppController implements Initializable {
                 dlg.initOwner(rootStack.getScene().getWindow());
                 Optional<SecureString> password = dlg.showAndWait();
                 if(password.isPresent()) {
-                    Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
+                    keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
                     keyDerivationService.setOnSucceeded(workerStateEvent -> {
                         EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.END, "Done"));
                         ECKey encryptionFullKey = keyDerivationService.getValue();
@@ -2119,7 +2186,7 @@ public class AppController implements Initializable {
                             deleteStorage(storage, true);
                         } finally {
                             encryptionFullKey.clear();
-                            password.get().clear();
+                            keyDerivationService = null;
                         }
                     });
                     keyDerivationService.setOnFailed(workerStateEvent -> {
@@ -2132,6 +2199,7 @@ public class AppController implements Initializable {
                         } else {
                             log.error("Error deriving wallet key", keyDerivationService.getException());
                         }
+                        keyDerivationService = null;
                     });
                     EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.START, "Decrypting wallet..."));
                     keyDerivationService.start();
@@ -2434,7 +2502,6 @@ public class AppController implements Initializable {
                 showLoadingLog.setDisable(true);
                 showTxHex.setDisable(false);
                 showPayNym.setDisable(true);
-                findMixingPartner.setDisable(true);
             } else if(event instanceof WalletTabSelectedEvent) {
                 WalletTabSelectedEvent walletTabEvent = (WalletTabSelectedEvent)event;
                 WalletTabData walletTabData = walletTabEvent.getWalletTabData();
@@ -2446,7 +2513,6 @@ public class AppController implements Initializable {
                 showLoadingLog.setDisable(false);
                 showTxHex.setDisable(true);
                 showPayNym.setDisable(exportWallet.isDisable() || !walletTabData.getWallet().hasPaymentCode());
-                findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(walletTabData.getWallet()) || !AppServices.onlineProperty().get());
             }
         }
     }
@@ -2472,7 +2538,6 @@ public class AppController implements Initializable {
             if(selectedWalletForm.getWalletId().equals(event.getWalletId())) {
                 exportWallet.setDisable(!event.getWallet().isValid() || selectedWalletForm.isLocked());
                 showPayNym.setDisable(exportWallet.isDisable() || !event.getWallet().hasPaymentCode());
-                findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(event.getWallet()) || !AppServices.onlineProperty().get());
             }
         }
 
@@ -2693,8 +2758,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();
@@ -2714,7 +2779,7 @@ public class AppController implements Initializable {
     public void disconnection(DisconnectionEvent event) {
         serverToggle.setDisable(false);
         if(!AppServices.isConnecting() && !AppServices.isConnected() && !statusBar.getText().startsWith(CONNECTION_FAILED_PREFIX) && !statusBar.getText().contains(TRYING_ANOTHER_SERVER_MESSAGE)) {
-            statusUpdated(new StatusEvent("Disconnected"));
+            statusUpdated(new StatusEvent("Disconnected (click toggle on the right to connect)", 240));
         }
         if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
             statusBar.setProgress(0);
@@ -3004,6 +3069,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);
@@ -3029,6 +3096,13 @@ public class AppController implements Initializable {
         }
     }
 
+    @Subscribe
+    public void requestVerifyDownloadOpen(RequestVerifyDownloadEvent event) {
+        if(tabs.getScene().getWindow().equals(event.getWindow())) {
+            verifyDownload(new ActionEvent(event.getFile(), rootStack));
+        }
+    }
+
     @Subscribe
     public void functionAction(FunctionActionEvent event) {
         selectTab(event.getWallet());
@@ -3079,4 +3153,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;
@@ -24,8 +25,6 @@ import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
-import com.sparrowwallet.sparrow.soroban.SorobanServices;
-import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -33,6 +32,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXMLLoader;
@@ -68,6 +68,8 @@ import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.sparrowwallet.sparrow.control.DownloadVerifierDialog.*;
+
 public class AppServices {
     private static final Logger log = LoggerFactory.getLogger(AppServices.class);
 
@@ -78,6 +80,8 @@ public class AppServices {
     private static final int RATES_PERIOD_SECS = 5 * 60;
     private static final int VERSION_CHECK_PERIOD_HOURS = 24;
     private static final int CONNECTION_DELAY_SECS = 2;
+    private static final int RATES_DELAY_SECS_DEFAULT = 2;
+    private static final int RATES_DELAY_SECS_WINDOWS = 5;
     private static final ExchangeSource DEFAULT_EXCHANGE_SOURCE = ExchangeSource.COINGECKO;
     private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
     private static final String TOR_DEFAULT_PROXY_CIRCUIT_ID = "default";
@@ -90,11 +94,7 @@ public class AppServices {
 
     private static AppServices INSTANCE;
 
-    private final WhirlpoolServices whirlpoolServices = new WhirlpoolServices();
-
-    private final SorobanServices sorobanServices = new SorobanServices();
-
-    private InteractionServices interactionServices;
+    private final InteractionServices interactionServices;
 
     private static HttpClientService httpClientService;
 
@@ -112,6 +112,8 @@ public class AppServices {
 
     private ElectrumServer.ConnectionService connectionService;
 
+    private ElectrumServer.FeeRatesService feeRatesService;
+
     private Hwi.ScheduledEnumerateService deviceEnumerateService;
 
     private VersionCheckService versionCheckService;
@@ -160,6 +162,11 @@ public class AppServices {
                 connectionService.cancel();
                 ratesService.cancel();
                 versionCheckService.cancel();
+
+                if(httpClientService != null) {
+                    HttpClientService.ShutdownService shutdownService = new HttpClientService.ShutdownService(httpClientService);
+                    shutdownService.start();
+                }
             }
         }
     };
@@ -176,13 +183,12 @@ public class AppServices {
         this.application = application;
         this.interactionServices = interactionServices;
         EventManager.get().register(this);
-        EventManager.get().register(whirlpoolServices);
-        EventManager.get().register(sorobanServices);
     }
 
     public void start() {
         Config config = Config.get();
         connectionService = createConnectionService();
+        feeRatesService = createFeeRatesService();
         ratesService = createRatesService(config.getExchangeSource(), config.getFiatCurrency());
         versionCheckService = createVersionCheckService();
         torService = createTorService();
@@ -196,6 +202,8 @@ public class AppServices {
             } else {
                 restartServices();
             }
+        } else {
+            EventManager.get().post(new DisconnectionEvent());
         }
 
         addURIHandlers();
@@ -279,8 +287,15 @@ public class AppServices {
             onlineProperty.setValue(true);
             onlineProperty.addListener(onlineServicesListener);
 
-            if(connectionService.getValue() != null) {
-                EventManager.get().post(connectionService.getValue());
+            FeeRatesUpdatedEvent event = connectionService.getValue();
+            if(event != null) {
+                EventManager.get().post(event);
+            }
+
+            FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
+            feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
+            if(event instanceof ConnectionEvent && feeRatesSource.supportsNetwork(Network.get()) && feeRatesSource.isExternal()) {
+                EventManager.get().post(new FeeRatesSourceChangedEvent(feeRatesSource));
             }
         });
         connectionService.setOnFailed(failEvent -> {
@@ -351,10 +366,21 @@ public class AppServices {
         return connectionService;
     }
 
+    private ElectrumServer.FeeRatesService createFeeRatesService() {
+        ElectrumServer.FeeRatesService feeRatesService = new ElectrumServer.FeeRatesService();
+        feeRatesService.setOnSucceeded(workerStateEvent -> {
+            EventManager.get().post(feeRatesService.getValue());
+        });
+
+        return feeRatesService;
+    }
+
     private ExchangeSource.RatesService createRatesService(ExchangeSource exchangeSource, Currency currency) {
         ExchangeSource.RatesService ratesService = new ExchangeSource.RatesService(
                 exchangeSource == null ? DEFAULT_EXCHANGE_SOURCE : exchangeSource,
                 currency == null ? DEFAULT_FIAT_CURRENCY : currency);
+        //Delay startup on first run, Windows requires a longer delay
+        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);
 
@@ -469,7 +495,7 @@ public class AppServices {
     public static Proxy getProxy(String proxyCircuitId) {
         Config config = Config.get();
         Proxy proxy = null;
-        if(config.isUseProxy()) {
+        if(config.isUseProxy() && config.getProxyServer() != null) {
             HostAndPort proxyHostAndPort = HostAndPort.fromString(config.getProxyServer());
             InetSocketAddress proxyAddress = new InetSocketAddress(proxyHostAndPort.getHost(), proxyHostAndPort.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
             proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
@@ -501,24 +527,15 @@ public class AppServices {
         return INSTANCE;
     }
 
-    public static WhirlpoolServices getWhirlpoolServices() {
-        return get().whirlpoolServices;
-    }
-
-    public static SorobanServices getSorobanServices() {
-        return get().sorobanServices;
-    }
-
     public static InteractionServices getInteractionServices() {
         return get().interactionServices;
     }
 
     public static HttpClientService getHttpClientService() {
+        HostAndPort torProxy = getTorProxy();
         if(httpClientService == null) {
-            HostAndPort torProxy = getTorProxy();
             httpClientService = new HttpClientService(torProxy);
         } else {
-            HostAndPort torProxy = getTorProxy();
             if(!Objects.equals(httpClientService.getTorProxy(), torProxy)) {
                 httpClientService.setTorProxy(getTorProxy());
             }
@@ -557,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"));
@@ -575,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() {
@@ -780,7 +825,7 @@ public class AppServices {
     }
 
     public static Window getActiveWindow() {
-        return Stage.getWindows().stream().filter(Window::isFocused).findFirst().orElse(get().walletWindows.keySet().iterator().hasNext() ? get().walletWindows.keySet().iterator().next() : null);
+        return Stage.getWindows().stream().filter(Window::isFocused).findFirst().orElse(get().walletWindows.keySet().iterator().hasNext() ? get().walletWindows.keySet().iterator().next() : (Stage.getWindows().iterator().hasNext() ? Stage.getWindows().iterator().next() : null));
     }
 
     public static void moveToActiveWindowScreen(Dialog<?> dialog) {
@@ -853,6 +898,25 @@ public class AppServices {
         }
     }
 
+    public static void openFileUriArgumentsAfterWalletLoading(Window window) {
+        if(!argFiles.isEmpty() || !argUris.isEmpty()) {
+            Service<Void> service = new Service<>() {
+                @Override
+                protected Task<Void> createTask() {
+                    return new Task<>() {
+                        @Override
+                        protected Void call() {
+                            Platform.runLater(() -> openFileUriArguments(window));
+                            return null;
+                        }
+                    };
+                }
+            };
+            service.setExecutor(Storage.LoadWalletService.getSingleThreadedExecutor());
+            service.start();
+        }
+    }
+
     public static void openFileUriArguments(Window window) {
         openFiles(argFiles, window);
         argFiles.clear();
@@ -872,6 +936,7 @@ public class AppServices {
             }
 
             if(openWindow instanceof Stage) {
+                ((Stage)openWindow).setIconified(false);
                 ((Stage)openWindow).setAlwaysOnTop(true);
                 ((Stage)openWindow).setAlwaysOnTop(false);
             }
@@ -879,6 +944,8 @@ public class AppServices {
             for(File file : openFiles) {
                 if(isWalletFile(file)) {
                     EventManager.get().post(new RequestWalletOpenEvent(openWindow, file));
+                } else if(isVerifyDownloadFile(file)) {
+                    EventManager.get().post(new RequestVerifyDownloadEvent(openWindow, file));
                 } else {
                     EventManager.get().post(new RequestTransactionOpenEvent(openWindow, file));
                 }
@@ -1041,10 +1108,50 @@ public class AppServices {
         return wallet;
     }
 
+    public static final List<Network> WHIRLPOOL_NETWORKS = List.of(Network.MAINNET, Network.TESTNET);
+
+    public static boolean isWhirlpoolCompatible(Wallet wallet) {
+        return WHIRLPOOL_NETWORKS.contains(Network.get())
+                && wallet.getScriptType() != ScriptType.P2TR    //Taproot not yet supported
+                && wallet.getKeystores().size() == 1
+                && wallet.getKeystores().get(0).hasSeed()
+                && wallet.getKeystores().get(0).getSeed().getType() == DeterministicSeed.Type.BIP39
+                && wallet.getStandardAccountType() != null
+                && StandardAccount.isMixableAccount(wallet.getStandardAccountType());
+    }
+
+    public static boolean isWhirlpoolPostmixCompatible(Wallet wallet) {
+        return WHIRLPOOL_NETWORKS.contains(Network.get())
+                && wallet.getScriptType() != ScriptType.P2TR    //Taproot not yet supported
+                && wallet.getKeystores().size() == 1;
+    }
+
+    public static List<Wallet> addWhirlpoolWallets(Wallet decryptedWallet, String walletId, Storage storage) {
+        List<Wallet> childWallets = new ArrayList<>();
+        for(StandardAccount whirlpoolAccount : StandardAccount.WHIRLPOOL_ACCOUNTS) {
+            if(decryptedWallet.getChildWallet(whirlpoolAccount) == null) {
+                Wallet childWallet = decryptedWallet.addChildWallet(whirlpoolAccount);
+                childWallets.add(childWallet);
+                EventManager.get().post(new ChildWalletsAddedEvent(storage, decryptedWallet, childWallet));
+            }
+        }
+
+        return childWallets;
+    }
+
     public static Font getMonospaceFont() {
         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();
@@ -1075,17 +1182,18 @@ public class AppServices {
 
     @Subscribe
     public void mempoolRateSizes(MempoolRateSizesUpdatedEvent event) {
-        addMempoolRateSizes(event.getMempoolRateSizes());
+        if(event.getMempoolRateSizes() != null) {
+            addMempoolRateSizes(event.getMempoolRateSizes());
+        }
     }
 
     @Subscribe
     public void feeRateSourceChanged(FeeRatesSourceChangedEvent event) {
-        ElectrumServer.FeeRatesService feeRatesService = new ElectrumServer.FeeRatesService();
-        feeRatesService.setOnSucceeded(workerStateEvent -> {
-            EventManager.get().post(feeRatesService.getValue());
-        });
         //Perform once-off fee rates retrieval to immediately change displayed rates
-        feeRatesService.start();
+        if(feeRatesService != null && !feeRatesService.isRunning() && Config.get().getMode() != Mode.OFFLINE) {
+            feeRatesService = createFeeRatesService();
+            feeRatesService.start();
+        }
     }
 
     @Subscribe

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

@@ -12,7 +12,12 @@ import org.fxmisc.richtext.event.MouseOverTextEvent;
 import org.fxmisc.richtext.model.TwoDimensional;
 
 import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import static com.sparrowwallet.drongo.protocol.ScriptType.*;
 import static org.fxmisc.richtext.model.TwoDimensional.Bias.Backward;
 
 public abstract class BaseController {
@@ -24,14 +29,11 @@ public abstract class BaseController {
 
         scriptArea.setMouseOverTextDelay(Duration.ofMillis(150));
         scriptArea.addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_BEGIN, e -> {
-            TwoDimensional.Position position = scriptArea.getParagraph(0).getStyleSpans().offsetToPosition(e.getCharacterIndex(), Backward);
-            if(position.getMajor() % 2 == 0 && scriptArea.getScript().getChunks().size() > position.getMajor() / 2) {
-                ScriptChunk hoverChunk = scriptArea.getScript().getChunks().get(position.getMajor()/2);
-                if(!hoverChunk.isOpCode()) {
-                    Point2D pos = e.getScreenPosition();
-                    popupMsg.setText(describeScriptChunk(hoverChunk));
-                    popup.show(scriptArea, pos.getX(), pos.getY() + 10);
-                }
+            ScriptChunk hoverChunk = getScriptChunk(scriptArea, e.getCharacterIndex());
+            if(hoverChunk != null) {
+                Point2D pos = e.getScreenPosition();
+                popupMsg.setText(describeScriptChunk(hoverChunk));
+                popup.show(scriptArea, pos.getX(), pos.getY() + 10);
             }
         });
         scriptArea.addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_END, e -> {
@@ -80,4 +82,26 @@ public abstract class BaseController {
 
         return "Invalid";
     }
+
+    public static ScriptChunk getScriptChunk(ScriptArea area, int characterIndex) {
+        TwoDimensional.Position position = area.getParagraph(0).getStyleSpans().offsetToPosition(characterIndex, Backward);
+        int ignoreCount = 0;
+        for(int i = 0; i < position.getMajor() && i < area.getParagraph(0).getStyleSpans().getSpanCount(); i++) {
+            Collection<String> styles = area.getParagraph(0).getStyleSpans().getStyleSpan(i).getStyle();
+            if(i < position.getMajor() && (styles.contains("") || styles.contains("script-nest"))) {
+                ignoreCount++;
+            }
+        }
+        boolean hashScripts = List.of(P2PKH, P2SH, P2WPKH, P2WSH).stream().anyMatch(type -> type.isScriptType(area.getScript()));
+        List<ScriptChunk> flatChunks = area.getScript().getChunks().stream().flatMap(chunk -> !hashScripts && chunk.isScript() ? chunk.getScript().getChunks().stream() : Stream.of(chunk)).collect(Collectors.toList());
+        int chunkIndex = position.getMajor() - ignoreCount;
+        if(chunkIndex < flatChunks.size()) {
+            ScriptChunk chunk = flatChunks.get(chunkIndex);
+            if(!chunk.isOpCode()) {
+                return chunk;
+            }
+        }
+
+        return null;
+    }
 }

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,11 +72,12 @@ 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);
         }
 
         System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
+        System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
 
         if(Config.get().getAppHeight() != null && Config.get().getAppWidth() != null) {
             mainStage.setWidth(Config.get().getAppWidth());
@@ -88,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.openFileUriArguments(stage);
-
-        AppServices.get().start();
     }
 
     @Override

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

@@ -16,9 +16,9 @@ import java.io.File;
 import java.util.*;
 
 public class SparrowWallet {
-    public static final String APP_ID = "com.sparrowwallet.sparrow";
+    public static final String APP_ID = "sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.8.2";
+    public static final String APP_VERSION = "2.1.1";
     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);
@@ -79,7 +84,7 @@ public class SparrowWallet {
 
         try {
             instance = new Instance(fileUriArguments);
-            instance.acquireLock(); //If fileUriArguments is not empty, will exit app after sending fileUriArguments if lock cannot be acquired
+            instance.acquireLock(!fileUriArguments.isEmpty()); //If fileUriArguments is not empty, will exit app after sending fileUriArguments if lock cannot be acquired
         } catch(InstanceException e) {
             getLogger().error("Could not access application lock", e);
         }
@@ -130,13 +135,13 @@ public class SparrowWallet {
         private final List<String> fileUriArguments;
 
         public Instance(List<String> fileUriArguments) {
-            super(SparrowWallet.APP_ID + "." + Network.get(), !fileUriArguments.isEmpty());
+            super(SparrowWallet.APP_ID, true);
             this.fileUriArguments = fileUriArguments;
         }
 
         @Override
         protected void receiveMessageList(List<String> messageList) {
-            if(messageList != null && !messageList.isEmpty()) {
+            if(messageList != null) {
                 AppServices.parseFileUriArguments(messageList);
                 AppServices.openFileUriArguments(null);
             }

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

@@ -5,21 +5,19 @@ import com.sparrowwallet.drongo.wallet.StandardAccount;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
-import com.sparrowwallet.sparrow.io.Config;
-import com.sparrowwallet.sparrow.net.ServerType;
-import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.collections.FXCollections;
 import javafx.scene.control.*;
 import javafx.scene.layout.VBox;
 import javafx.util.StringConverter;
 import org.controlsfx.glyphfont.Glyph;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import static com.sparrowwallet.drongo.wallet.StandardAccount.*;
 
 public class AddAccountDialog extends Dialog<List<StandardAccount>> {
+    private static final int MAX_SHOWN_ACCOUNTS = 8;
+
     private final ComboBox<StandardAccount> standardAccountCombo;
     private boolean discoverAccounts = false;
 
@@ -44,31 +42,32 @@ public class AddAccountDialog extends Dialog<List<StandardAccount>> {
         standardAccountCombo = new ComboBox<>();
         standardAccountCombo.setMaxWidth(Double.MAX_VALUE);
 
-        List<Integer> existingIndexes = new ArrayList<>();
+        Set<Integer> existingIndexes = new LinkedHashSet<>();
         Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
         existingIndexes.add(masterWallet.getAccountIndex());
         for(Wallet childWallet : masterWallet.getChildWallets()) {
             if(!childWallet.isNested()) {
                 existingIndexes.add(childWallet.getAccountIndex());
+                Optional<StandardAccount> optStdAcc = Arrays.stream(StandardAccount.values()).filter(stdacc -> stdacc.getName().equals(childWallet.getName())).findFirst();
+                optStdAcc.ifPresent(standardAccount -> existingIndexes.add(standardAccount.getAccountNumber()));
             }
         }
 
         List<StandardAccount> availableAccounts = new ArrayList<>();
         for(StandardAccount standardAccount : StandardAccount.values()) {
-            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.isWhirlpoolAccount(standardAccount)) {
+            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.isWhirlpoolAccount(standardAccount) && availableAccounts.size() <= MAX_SHOWN_ACCOUNTS) {
                 availableAccounts.add(standardAccount);
             }
         }
 
-        if(WhirlpoolServices.canWalletMix(masterWallet) && !masterWallet.isWhirlpoolMasterWallet()) {
+        if(AppServices.isWhirlpoolCompatible(masterWallet) && !masterWallet.isWhirlpoolMasterWallet()) {
             availableAccounts.add(WHIRLPOOL_PREMIX);
-        } else if(WhirlpoolServices.canWatchPostmix(masterWallet) && !existingIndexes.contains(WHIRLPOOL_POSTMIX.getAccountNumber())) {
+        } else if(AppServices.isWhirlpoolPostmixCompatible(masterWallet) && !existingIndexes.contains(WHIRLPOOL_POSTMIX.getAccountNumber())) {
             availableAccounts.add(WHIRLPOOL_POSTMIX);
         }
 
         final ButtonType discoverButtonType = new javafx.scene.control.ButtonType("Discover", ButtonBar.ButtonData.LEFT);
-        if(!availableAccounts.isEmpty() && Config.get().getServerType() != ServerType.BITCOIN_CORE &&
-                (masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.SW_SEED)
+        if(!availableAccounts.isEmpty() && (masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.SW_SEED)
                         || (masterWallet.getKeystores().size() == 1 && masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.HW_USB)))) {
             dialogPane.getButtonTypes().add(discoverButtonType);
             Button discoverButton = (Button)dialogPane.lookupButton(discoverButtonType);

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/CopyableTextField.java

@@ -10,6 +10,7 @@ import javafx.beans.value.ChangeListener;
 import javafx.event.EventHandler;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
@@ -52,6 +53,7 @@ public class CopyableTextField extends CustomTextField {
                 selectedTextProperty().removeListener(selectionListener);
             }
         });
+        setContextMenu(new ContextMenu());
     }
 
     private void setupCopyButtonField(ObjectProperty<Node> rightProperty) {

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

@@ -0,0 +1,750 @@
+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;
+import com.sparrowwallet.drongo.pgp.PGPVerificationException;
+import com.sparrowwallet.drongo.pgp.PGPVerificationResult;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
+import com.sparrowwallet.sparrow.net.VersionCheckService;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.Dragboard;
+import javafx.scene.input.TransferMode;
+import javafx.scene.layout.*;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import tornadofx.control.Field;
+import tornadofx.control.Fieldset;
+import tornadofx.control.Form;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static com.sparrowwallet.sparrow.AppController.DRAG_OVER_CLASS;
+
+public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
+    private static final Logger log = LoggerFactory.getLogger(DownloadVerifierDialog.class);
+
+    private static final DateFormat signatureDateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy z");
+
+    private static final long MAX_VALID_MANIFEST_SIZE = 100 * 1024;
+    private static final String SHA256SUMS_MANIFEST_PREFIX = "sha256sums";
+
+    private static final List<String> SIGNATURE_EXTENSIONS = List.of("asc", "sig", "gpg");
+    private static final List<String> MANIFEST_EXTENSIONS = List.of("txt");
+    private static final List<String> PUBLIC_KEY_EXTENSIONS = List.of("asc");
+    private static final List<String> MACOS_RELEASE_EXTENSIONS = List.of("dmg");
+    private static final List<String> WINDOWS_RELEASE_EXTENSIONS = List.of("exe", "zip");
+    private static final List<String> LINUX_RELEASE_EXTENSIONS = List.of("deb", "rpm", "tar.gz");
+    private static final List<String> DISK_IMAGE_EXTENSIONS = List.of("img", "bin", "dfu");
+    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_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;
+
+    private final ObjectProperty<File> signature = new SimpleObjectProperty<>();
+    private final ObjectProperty<File> manifest = new SimpleObjectProperty<>();
+    private final ObjectProperty<File> publicKey = new SimpleObjectProperty<>();
+    private final ObjectProperty<File> release = new SimpleObjectProperty<>();
+
+    private final BooleanProperty manifestDisabled = new SimpleBooleanProperty();
+    private final BooleanProperty publicKeyDisabled = new SimpleBooleanProperty();
+
+    private final Label signedBy;
+    private final Label releaseHash;
+    private final Label releaseVerified;
+    private final Hyperlink releaseLink;
+
+    private static File lastFileParent;
+
+    public DownloadVerifierDialog(File initialSignatureFile) {
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.setHeader(new Header());
+        setupDrag(dialogPane);
+
+        VBox vBox = new VBox();
+        vBox.setSpacing(20);
+        vBox.setPadding(new Insets(20, 10, 10, 20));
+
+        Form form = new Form();
+        Fieldset filesFieldset = new Fieldset();
+        filesFieldset.setText("Files");
+        filesFieldset.setSpacing(10);
+
+        String version = VersionCheckService.getVersion() != null ? VersionCheckService.getVersion() : "x.x.x";
+
+        Field signatureField = setupField(signature, "Signature", SIGNATURE_EXTENSIONS, false, "sparrow-" + version + "-manifest.txt", null);
+        Field manifestField = setupField(manifest, "Manifest", MANIFEST_EXTENSIONS, false, "sparrow-" + version + "-manifest", manifestDisabled);
+        Field publicKeyField = setupField(publicKey, "Public Key", PUBLIC_KEY_EXTENSIONS, true, "pgp_keys", publicKeyDisabled);
+        Field releaseFileField = setupField(release, "Release File", getReleaseFileExtensions(), false, getReleaseFileExample(version), null);
+
+        filesFieldset.getChildren().addAll(signatureField, manifestField, publicKeyField, releaseFileField);
+        form.getChildren().add(filesFieldset);
+
+        Fieldset resultsFieldset = new Fieldset();
+        resultsFieldset.setText("Results");
+        resultsFieldset.setSpacing(10);
+
+        signedBy = new Label();
+        Field signedByField = setupResultField(signedBy, "Signed By");
+
+        releaseHash = new Label();
+        Field hashMatchedField = setupResultField(releaseHash, "Release Hash");
+
+        releaseVerified = new Label();
+        Field releaseVerifiedField = setupResultField(releaseVerified, "Verified");
+
+        releaseLink = new Hyperlink("");
+        releaseVerifiedField.getInputs().add(releaseLink);
+        releaseLink.setOnAction(event -> {
+            if(release.get() != null && release.get().exists()) {
+                if(release.get().getName().toLowerCase(Locale.ROOT).startsWith("sparrow")) {
+                    Optional<ButtonType> optType = AppServices.showAlertDialog("Exit Sparrow?", "Sparrow must be closed before installation. Exit?", Alert.AlertType.CONFIRMATION, ButtonType.NO, ButtonType.YES);
+                    if(optType.isPresent() && optType.get() == ButtonType.YES) {
+                        javafx.application.Platform.exit();
+                        AppServices.get().getApplication().getHostServices().showDocument("file://" + release.get().getAbsolutePath());
+                    }
+                } else {
+                    AppServices.get().getApplication().getHostServices().showDocument("file://" + release.get().getAbsolutePath());
+                }
+            }
+        });
+
+        resultsFieldset.getChildren().addAll(signedByField, hashMatchedField, releaseVerifiedField);
+        form.getChildren().add(resultsFieldset);
+
+        vBox.getChildren().addAll(form);
+        dialogPane.setContent(vBox);
+
+        ButtonType clearButtonType = new javafx.scene.control.ButtonType("Clear", ButtonBar.ButtonData.CANCEL_CLOSE);
+        ButtonType closeButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(clearButtonType, closeButtonType);
+
+        setOnCloseRequest(event -> {
+            if(ButtonBar.ButtonData.CANCEL_CLOSE.equals(getResult())) {
+                signature.set(null);
+                manifest.set(null);
+                publicKey.set(null);
+                release.set(null);
+                signedBy.setText("");
+                signedBy.setGraphic(null);
+                signedBy.setTooltip(null);
+                releaseHash.setText("");
+                releaseHash.setGraphic(null);
+                releaseVerified.setText("");
+                releaseVerified.setGraphic(null);
+                releaseLink.setText("");
+                event.consume();
+            }
+        });
+        setResultConverter(ButtonType::getButtonData);
+
+        AppServices.moveToActiveWindowScreen(this);
+        dialogPane.setPrefWidth(900);
+        setResizable(true);
+
+        signature.addListener((observable, oldValue, signatureFile) -> {
+            if(signatureFile != null) {
+                boolean verify = true;
+                File actualSignatureFile = findSignatureFile(signatureFile);
+                if(actualSignatureFile != null  && !actualSignatureFile.equals(signature.get())) {
+                    signature.set(actualSignatureFile);
+                    verify = false;
+                } else if(PGPUtils.signatureContainsManifest(signatureFile)) {
+                    manifest.set(signatureFile);
+                    verify = false;
+                } else {
+                    File manifestFile = findManifestFile(signatureFile);
+                    if(manifestFile != null && !manifestFile.equals(manifest.get())) {
+                        manifest.set(manifestFile);
+                        verify = false;
+                    }
+                }
+
+                if(verify) {
+                    verify();
+                }
+            }
+        });
+
+        manifest.addListener((observable, oldValue, manifestFile) -> {
+            if(manifestFile != null) {
+                boolean verify = true;
+                try {
+                    Map<File, String> manifestMap = getManifest(manifestFile);
+                    File releaseFile = findReleaseFile(manifestFile, manifestMap);
+                    if(releaseFile != null && !releaseFile.equals(release.get())) {
+                        release.set(releaseFile);
+                        verify = false;
+                    }
+                } catch(IOException e) {
+                    log.debug("Error reading manifest file", e);
+                    verify = false;
+                } catch(InvalidManifestException e) {
+                    release.set(manifestFile);
+                    verify = false;
+                }
+
+                if(verify) {
+                    verify();
+                }
+            }
+        });
+
+        publicKey.addListener((observable, oldValue, newValue) -> {
+            verify();
+        });
+
+        release.addListener((observable, oldValue, releaseFile) -> {
+            verify();
+        });
+
+        if(initialSignatureFile != null) {
+            javafx.application.Platform.runLater(() -> signature.set(initialSignatureFile));
+        }
+    }
+
+    private void setupDrag(DialogPane dialogPane) {
+        dialogPane.setOnDragOver(event -> {
+            if(event.getGestureSource() != dialogPane && event.getDragboard().hasFiles()) {
+                event.acceptTransferModes(TransferMode.LINK);
+            }
+            event.consume();
+        });
+
+        dialogPane.setOnDragDropped(event -> {
+            Dragboard db = event.getDragboard();
+            boolean success = false;
+            if(db.hasFiles()) {
+                for(File file : db.getFiles()) {
+                    if(isVerifyDownloadFile(file)) {
+                        signature.set(file);
+                        break;
+                    }
+                }
+                success = true;
+            }
+            event.setDropCompleted(success);
+            event.consume();
+        });
+
+        dialogPane.setOnDragEntered(event -> {
+            dialogPane.getStyleClass().add(DRAG_OVER_CLASS);
+        });
+
+        dialogPane.setOnDragExited(event -> {
+            dialogPane.getStyleClass().removeAll(DRAG_OVER_CLASS);
+        });
+    }
+
+    private void verify() {
+        manifestDisabled.set(false);
+        publicKeyDisabled.set(false);
+
+        if(signature.get() == null || manifest.get() == null) {
+            clearReleaseFields();
+            return;
+        }
+
+        PGPVerifyService pgpVerifyService = new PGPVerifyService(signature.get(), manifest.get(), publicKey.get());
+        pgpVerifyService.setOnRunning(event -> {
+            signedBy.setText("Verifying...");
+            signedBy.setGraphic(GlyphUtils.getBusyGlyph());
+            signedBy.setTooltip(null);
+            clearReleaseFields();
+        });
+        pgpVerifyService.setOnSucceeded(event -> {
+            PGPVerificationResult result = pgpVerifyService.getValue();
+
+            String message = result.userId() + " on " + signatureDateFormat.format(result.signatureTimestamp()) + (result.expired() ? " (key expired)" : "");
+            signedBy.setText(message);
+            signedBy.setGraphic(result.expired() ? GlyphUtils.getWarningGlyph() : GlyphUtils.getSuccessGlyph());
+            signedBy.setTooltip(new Tooltip(result.fingerprint()));
+
+            if(!result.expired() && result.keySource() != PGPKeySource.USER) {
+                publicKeyDisabled.set(true);
+            }
+
+            if(manifest.get().equals(release.get())) {
+                manifestDisabled.set(true);
+                releaseHash.setText("No hash required, signature signs release file directly");
+                releaseHash.setGraphic(GlyphUtils.getSuccessGlyph());
+                releaseHash.setTooltip(null);
+                releaseVerified.setText("Ready to install ");
+                releaseVerified.setGraphic(GlyphUtils.getSuccessGlyph());
+                releaseLink.setText(release.get().getName());
+            } else {
+                verifyManifest();
+            }
+        });
+        pgpVerifyService.setOnFailed(event -> {
+            Throwable e = event.getSource().getException();
+            signedBy.setText(getDisplayMessage(e));
+            signedBy.setGraphic(GlyphUtils.getFailureGlyph());
+            signedBy.setTooltip(null);
+            clearReleaseFields();
+        });
+
+        pgpVerifyService.start();
+    }
+
+    private void clearReleaseFields() {
+        releaseHash.setText("");
+        releaseHash.setGraphic(null);
+        releaseHash.setTooltip(null);
+        releaseVerified.setText("");
+        releaseVerified.setGraphic(null);
+        releaseLink.setText("");
+    }
+
+    private void verifyManifest() {
+        File releaseFile = release.get();
+        if(releaseFile != null && releaseFile.exists()) {
+            FileSha256Service hashService = new FileSha256Service(releaseFile);
+            hashService.setOnRunning(event -> {
+                releaseHash.setText("Calculating...");
+                releaseHash.setGraphic(GlyphUtils.getBusyGlyph());
+                releaseHash.setTooltip(null);
+                releaseVerified.setText("");
+                releaseVerified.setGraphic(null);
+                releaseLink.setText("");
+            });
+            hashService.setOnSucceeded(event -> {
+                String calculatedHash = hashService.getValue();
+                try {
+                    Map<File, String> manifestMap = getManifest(manifest.get());
+                    String manifestHash = getManifestHash(releaseFile.getName(), manifestMap);
+                    if(calculatedHash.equalsIgnoreCase(manifestHash)) {
+                        releaseHash.setText("Matched manifest hash");
+                        releaseHash.setGraphic(GlyphUtils.getSuccessGlyph());
+                        releaseHash.setTooltip(new Tooltip(calculatedHash));
+                        releaseVerified.setText("Ready to install ");
+                        releaseVerified.setGraphic(GlyphUtils.getSuccessGlyph());
+                        releaseLink.setText(releaseFile.getName());
+                    } else if(manifestHash == null) {
+                        releaseHash.setText("Could not find manifest hash for " + releaseFile.getName());
+                        releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseHash.setTooltip(new Tooltip("Manifest hashes provided for:\n" + manifestMap.keySet().stream().map(File::getName).collect(Collectors.joining("\n"))));
+                        releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                        releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseLink.setText("");
+                    } else {
+                        releaseHash.setText("Did not match manifest hash");
+                        releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseHash.setTooltip(new Tooltip("Calculated Hash: " + calculatedHash + "\nManifest Hash: " + manifestHash));
+                        releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                        releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseLink.setText("");
+                    }
+                } catch(IOException | InvalidManifestException e) {
+                    releaseHash.setText("Could not read manifest");
+                    releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                    releaseHash.setTooltip(new Tooltip(e.getMessage()));
+                    releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                    releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                    releaseLink.setText("");
+                }
+            });
+            hashService.setOnFailed(event -> {
+                releaseHash.setText("Could not calculate manifest");
+                releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                releaseHash.setTooltip(new Tooltip(event.getSource().getException().getMessage()));
+                releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                releaseLink.setText("");
+            });
+            hashService.start();
+        } else {
+            releaseHash.setText("No release file");
+            releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+            releaseHash.setTooltip(null);
+            releaseVerified.setText("Not verified");
+            releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+            releaseLink.setText("");
+        }
+    }
+
+    private Field setupField(ObjectProperty<File> fileProperty, String title, List<String> extensions, boolean optional, String example, BooleanProperty disabledProperty) {
+        Field field = new Field();
+        field.setText(title + ":");
+        FileField fileField = new FileField(fileProperty, title, extensions, optional, example, disabledProperty);
+        field.getInputs().add(fileField);
+        return field;
+    }
+
+    private Field setupResultField(Label label, String title) {
+        Field field = new Field();
+        field.setText(title + ":");
+        field.getInputs().add(label);
+        label.setGraphicTextGap(8);
+        return field;
+    }
+
+    public static Map<File, String> getManifest(File manifest) throws IOException, InvalidManifestException {
+        if(manifest.length() > MAX_VALID_MANIFEST_SIZE) {
+            throw new InvalidManifestException();
+        }
+
+        try(InputStream manifestStream = new FileInputStream(manifest)) {
+            return getManifest(manifestStream);
+        }
+    }
+
+    public static Map<File, String> getManifest(InputStream manifestStream) throws IOException {
+        Map<File, String> manifest = new HashMap<>();
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(manifestStream, StandardCharsets.UTF_8));
+        String line;
+        while((line = reader.readLine()) != null) {
+            String[] parts = line.split("\\s+");
+            if(parts.length > 1 && parts[0].length() == 64) {
+                String manifestHash = parts[0];
+                String manifestFileName = parts[1];
+                if(manifestFileName.startsWith("*") || manifestFileName.startsWith("U") || manifestFileName.startsWith("^")) {
+                    manifestFileName = manifestFileName.substring(1);
+                }
+                manifest.put(new File(manifestFileName), manifestHash);
+            }
+        }
+
+        return manifest;
+    }
+
+    private String getManifestHash(String contentFileName, Map<File, String> manifest) {
+        for(Map.Entry<File, String> entry : manifest.entrySet()) {
+            if(contentFileName.equalsIgnoreCase(entry.getKey().getName())) {
+                return entry.getValue();
+            }
+        }
+
+        return null;
+    }
+
+    private File findSignatureFile(File providedFile) {
+        for(String extension : SIGNATURE_EXTENSIONS) {
+            File signatureFile = new File(providedFile.getParentFile(), providedFile.getName() + "." + extension);
+            if(signatureFile.exists()) {
+                return signatureFile;
+            }
+        }
+
+        if(providedFile.getName().toLowerCase(Locale.ROOT).startsWith(SPARROW_RELEASE_PREFIX)) {
+            Matcher matcher = SPARROW_RELEASE_VERSION.matcher(providedFile.getName());
+            if(matcher.find()) {
+                String version = matcher.group();
+                File signatureFile = new File(providedFile.getParentFile(), SPARROW_RELEASE_PREFIX + version + SPARROW_SIGNATURE_SUFFIX);
+                if(signatureFile.exists()) {
+                    return signatureFile;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private File findManifestFile(File providedFile) {
+        String signatureName = providedFile.getName();
+        if(signatureName.length() > 4 && SIGNATURE_EXTENSIONS.stream().anyMatch(ext -> signatureName.toLowerCase(Locale.ROOT).endsWith("." + ext))) {
+            File manifestFile = new File(providedFile.getParent(), signatureName.substring(0, signatureName.length() - 4));
+            if(manifestFile.exists()) {
+                return manifestFile;
+            }
+        }
+
+        return null;
+    }
+
+    private File findReleaseFile(File manifestFile, Map<File, String> manifestMap) {
+        List<String> releaseExtensions = getReleaseFileExtensions();
+        List<List<String>> extensionLists = List.of(releaseExtensions, DISK_IMAGE_EXTENSIONS, ARCHIVE_EXTENSIONS, List.of(""));
+
+        for(List<String> extensions : extensionLists) {
+            for(File file : manifestMap.keySet()) {
+                if(extensions.stream().anyMatch(ext -> file.getName().toLowerCase(Locale.ROOT).endsWith(ext))) {
+                    File releaseFile = new File(manifestFile.getParent(), file.getName());
+                    if(releaseFile.exists()) {
+                        return releaseFile;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private List<String> getReleaseFileExtensions() {
+        OsType osType = OsType.getCurrent();
+        switch(osType) {
+            case MACOS -> {
+                return MACOS_RELEASE_EXTENSIONS;
+            }
+            case WINDOWS -> {
+                return WINDOWS_RELEASE_EXTENSIONS;
+            }
+            default -> {
+                return LINUX_RELEASE_EXTENSIONS;
+            }
+        }
+    }
+
+    private String getReleaseFileExample(String version) {
+        OsType osType = OsType.getCurrent();
+        String arch = System.getProperty("os.arch");
+        switch(osType) {
+            case MACOS -> {
+                return "Sparrow-" + version + "-" + arch;
+            }
+            case WINDOWS -> {
+                return "Sparrow-" + version;
+            }
+            default ->  {
+                return "sparrow_" + version + "-1_" + (arch.equals("aarch64") ? "arm64" : arch);
+            }
+        }
+    }
+
+    private String getDisplayMessage(Throwable e) {
+        String message = e.getMessage();
+        message = message.substring(0, 1).toUpperCase(Locale.ROOT) + message.substring(1);
+
+        if(message.endsWith(".")) {
+            message = message.substring(0, message.length() - 1);
+        }
+
+        if(message.equals("Invalid header encountered")) {
+            message += ", not a valid signature file";
+        }
+
+        if(message.startsWith("Malformed message")) {
+            message = "Not a valid signature file";
+        }
+
+        return message;
+    }
+
+    public static boolean isVerifyDownloadFile(File file) {
+        if(file != null) {
+            String name = file.getName().toLowerCase(Locale.ROOT);
+            if(name.length() > 4 && SIGNATURE_EXTENSIONS.stream().anyMatch(ext -> name.endsWith("." + ext))) {
+                return true;
+            }
+
+            if(MANIFEST_EXTENSIONS.stream().anyMatch(ext -> name.endsWith("." + ext)) || name.startsWith(SHA256SUMS_MANIFEST_PREFIX)) {
+                try {
+                    Map<File, String> manifest = getManifest(file);
+                    return !manifest.isEmpty();
+                } catch(Exception e) {
+                    //ignore
+                }
+            }
+
+            if(name.startsWith(SPARROW_RELEASE_PREFIX) && file.length() >= MIN_VALID_SPARROW_RELEASE_SIZE) {
+                Matcher matcher = SPARROW_RELEASE_VERSION.matcher(name);
+                return matcher.find();
+            }
+        }
+
+        return false;
+    }
+
+    public void setSignatureFile(File signatureFile) {
+        signature.set(signatureFile);
+    }
+
+    private static class Header extends GridPane {
+        public Header() {
+            setMaxWidth(Double.MAX_VALUE);
+            getStyleClass().add("header-panel");
+
+            VBox vBox = new VBox();
+            vBox.setPadding(new Insets(10, 0, 0, 0));
+
+            Label headerLabel = new Label("Verify Download");
+            headerLabel.setWrapText(true);
+            headerLabel.setAlignment(Pos.CENTER_LEFT);
+            headerLabel.setMaxWidth(Double.MAX_VALUE);
+            headerLabel.setMaxHeight(Double.MAX_VALUE);
+
+            CopyableLabel descriptionLabel = new CopyableLabel("Download the release file, GPG signature and optional manifest of a project to verify the download integrity");
+            descriptionLabel.setAlignment(Pos.CENTER_LEFT);
+
+            vBox.getChildren().addAll(headerLabel, descriptionLabel);
+            add(vBox, 0, 0);
+
+            StackPane graphicContainer = new StackPane();
+            graphicContainer.getStyleClass().add("graphic-container");
+            Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
+            if (!image.isError()) {
+                ImageView imageView = new ImageView();
+                imageView.setSmooth(false);
+                imageView.setImage(image);
+                graphicContainer.getChildren().add(imageView);
+            }
+            add(graphicContainer, 1, 0);
+
+            ColumnConstraints textColumn = new ColumnConstraints();
+            textColumn.setFillWidth(true);
+            textColumn.setHgrow(Priority.ALWAYS);
+            ColumnConstraints graphicColumn = new ColumnConstraints();
+            graphicColumn.setFillWidth(false);
+            graphicColumn.setHgrow(Priority.NEVER);
+            getColumnConstraints().setAll(textColumn , graphicColumn);
+        }
+    }
+
+    private static class FileField extends HBox {
+        private final ObjectProperty<File> fileProperty;
+
+        public FileField(ObjectProperty<File> fileProperty, String title, List<String> extensions, boolean optional, String example, BooleanProperty disabledProperty) {
+            super(10);
+            this.fileProperty = fileProperty;
+            TextField textField = new TextField();
+            textField.setEditable(false);
+            textField.setPromptText("e.g. " + example + formatExtensionsList(extensions) + (optional ? " (optional)" : ""));
+            textField.setOnMouseClicked(event -> browseForFile(title, extensions));
+            Button browseButton = new Button("Browse...");
+            browseButton.setOnAction(event -> browseForFile(title, extensions));
+            getChildren().addAll(textField, browseButton);
+            HBox.setHgrow(textField, Priority.ALWAYS);
+
+            fileProperty.addListener((observable, oldValue, file) -> {
+                textField.setText(file == null ? "" : file.getAbsolutePath());
+                if(file != null) {
+                    lastFileParent = file.getParentFile();
+                }
+            });
+
+            if(disabledProperty != null) {
+                disabledProperty.addListener((observable, oldValue, disabled) -> {
+                    textField.setDisable(disabled);
+                    browseButton.setDisable(disabled);
+                });
+            }
+        }
+
+        private void browseForFile(String title, List<String> extensions) {
+            Stage window = new Stage();
+            FileChooser fileChooser = new FileChooser();
+            fileChooser.setTitle("Open File");
+            File userDir = new File(System.getProperty("user.home"));
+            File downloadsDir = new File(userDir, "Downloads");
+            fileChooser.setInitialDirectory(lastFileParent != null ? lastFileParent : (downloadsDir.exists() ? downloadsDir : userDir));
+            fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter(title + " files", extensions));
+
+            AppServices.moveToActiveWindowScreen(window, 800, 450);
+            File file = fileChooser.showOpenDialog(window);
+            if(file != null) {
+                fileProperty.set(file);
+            }
+        }
+
+        public String formatExtensionsList(List<String> items) {
+            StringBuilder result = new StringBuilder();
+            for(int i = 0; i < items.size(); i++) {
+                result.append(".").append(items.get(i));
+
+                if (i < items.size() - 1) {
+                    result.append(", ");
+                }
+
+                if (i == items.size() - 2) {
+                    result.append("or ");
+                }
+            }
+
+            return result.toString();
+        }
+    }
+
+    private static class PGPVerifyService extends Service<PGPVerificationResult> {
+        private final File signature;
+        private final File manifest;
+        private final File publicKey;
+
+        public PGPVerifyService(File signature, File manifest, File publicKey) {
+            this.signature = signature;
+            this.manifest = manifest;
+            this.publicKey = publicKey;
+        }
+
+        @Override
+        protected Task<PGPVerificationResult> createTask() {
+            return new Task<>() {
+                protected PGPVerificationResult call() throws IOException, PGPVerificationException {
+                    boolean detachedSignature = !manifest.equals(signature);
+
+                    try(InputStream publicKeyStream = publicKey == null ? null : new FileInputStream(publicKey);
+                        InputStream contentStream = new BufferedInputStream(new FileInputStream(manifest));
+                        InputStream detachedSignatureStream = detachedSignature ? new FileInputStream(signature) : null) {
+                        return PGPUtils.verify(publicKeyStream, contentStream, detachedSignatureStream);
+                    }
+                }
+            };
+        }
+    }
+
+    private static class FileSha256Service extends Service<String> {
+        private final File file;
+
+        public FileSha256Service(File file) {
+            this.file = file;
+        }
+
+        @Override
+        protected Task<String> createTask() {
+            return new Task<>() {
+                protected String call() throws IOException {
+                    try(InputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
+                        return sha256(inputStream);
+                    }
+                }
+            };
+        }
+
+        private String sha256(InputStream stream) throws IOException {
+            try {
+                final byte[] buffer = new byte[1024 * 1024];
+                final MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
+                int bytesRead = 0;
+                while((bytesRead = stream.read(buffer)) >= 0) {
+                    if (bytesRead > 0) {
+                        sha256.update(buffer, 0, bytesRead);
+                    }
+                }
+
+                return Utils.bytesToHex(sha256.digest());
+            } catch(NoSuchAlgorithmException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private static class InvalidManifestException extends Exception { }
+}

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) {
@@ -585,12 +586,14 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 getItems().add(createCpfp);
             }
 
-            MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
-            openBlockExplorer.setOnAction(AE -> {
-                hide();
-                AppServices.openBlockExplorer(blockTransaction.getHashAsString());
-            });
-            getItems().add(openBlockExplorer);
+            if(!Config.get().isBlockExplorerDisabled()) {
+                MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
+                openBlockExplorer.setOnAction(AE -> {
+                    hide();
+                    AppServices.openBlockExplorer(blockTransaction.getHashAsString());
+                });
+                getItems().add(openBlockExplorer);
+            }
 
             MenuItem copyTxid = new MenuItem("Copy Transaction ID");
             copyTxid.setOnAction(AE -> {
@@ -604,7 +607,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         }
     }
 
-    private static class TransactionContextMenu extends ContextMenu {
+    protected static class TransactionContextMenu extends ContextMenu {
         public TransactionContextMenu(String date, BlockTransaction blockTransaction) {
             MenuItem viewTransaction = new MenuItem("View Transaction");
             viewTransaction.setGraphic(getViewTransactionGlyph());
@@ -612,12 +615,16 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 hide();
                 EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), blockTransaction));
             });
+            getItems().add(viewTransaction);
 
-            MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
-            openBlockExplorer.setOnAction(AE -> {
-                hide();
-                AppServices.openBlockExplorer(blockTransaction.getHashAsString());
-            });
+            if(!Config.get().isBlockExplorerDisabled()) {
+                MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
+                openBlockExplorer.setOnAction(AE -> {
+                    hide();
+                    AppServices.openBlockExplorer(blockTransaction.getHashAsString());
+                });
+                getItems().add(openBlockExplorer);
+            }
 
             MenuItem copyDate = new MenuItem("Copy Date");
             copyDate.setOnAction(AE -> {
@@ -626,6 +633,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 content.putString(date);
                 Clipboard.getSystemClipboard().setContent(content);
             });
+            getItems().add(copyDate);
 
             MenuItem copyTxid = new MenuItem("Copy Transaction ID");
             copyTxid.setOnAction(AE -> {
@@ -634,6 +642,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 content.putString(blockTransaction.getHashAsString());
                 Clipboard.getSystemClipboard().setContent(content);
             });
+            getItems().add(copyTxid);
 
             MenuItem copyHeight = new MenuItem("Copy Block Height");
             copyHeight.setOnAction(AE -> {
@@ -642,8 +651,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 content.putString(blockTransaction.getHeight() > 0 ? Integer.toString(blockTransaction.getHeight()) : "Mempool");
                 Clipboard.getSystemClipboard().setContent(content);
             });
-
-            getItems().addAll(viewTransaction, openBlockExplorer, copyDate, copyTxid, copyHeight);
+            getItems().add(copyHeight);
         }
     }
 
@@ -798,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");
@@ -818,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/FeeRangeSlider.java

@@ -13,6 +13,8 @@ import java.util.stream.Collectors;
 import static com.sparrowwallet.sparrow.AppServices.*;
 
 public class FeeRangeSlider extends Slider {
+    private static final double FEE_RATE_SCROLL_INCREMENT = 0.01;
+
     public FeeRangeSlider() {
         super(0, FEE_RATES_RANGE.size() - 1, 0);
         setMajorTickUnit(1);
@@ -45,6 +47,18 @@ public class FeeRangeSlider extends Slider {
                 updateMaxFeeRange(newValue.doubleValue());
             }
         });
+
+        setOnScroll(event -> {
+            if(event.getDeltaY() != 0) {
+                double newFeeRate = getFeeRate() + (event.getDeltaY() > 0 ? FEE_RATE_SCROLL_INCREMENT : -FEE_RATE_SCROLL_INCREMENT);
+                if(newFeeRate < LONG_FEE_RATES_RANGE.get(0)) {
+                    newFeeRate = LONG_FEE_RATES_RANGE.get(0);
+                } else if(newFeeRate > LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1)) {
+                    newFeeRate = LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1);
+                }
+                setFeeRate(newFeeRate);
+            }
+        });
     }
 
     public double getFeeRate() {

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")
         );
@@ -240,6 +239,8 @@ public abstract class FileImportPane extends TitledDescriptionPane {
         contentBox.setPadding(new Insets(10, 30, 10, 30));
         contentBox.setPrefHeight(60);
 
+        javafx.application.Platform.runLater(passwordField::requestFocus);
+
         return contentBox;
     }
 }

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

@@ -4,12 +4,14 @@ 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.hummingbird.registry.RegistryType;
+import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -153,7 +155,9 @@ public class FileKeystoreExportPane extends TitledDescriptionPane {
             } else {
                 QRDisplayDialog qrDisplayDialog;
                 if(exporter instanceof Bip129) {
-                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), baos.toByteArray(), false);
+                    UR ur = UR.fromBytes(baos.toByteArray());
+                    BBQR bbqr = new BBQR(BBQRType.UNICODE, baos.toByteArray());
+                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, true, false);
                 } else {
                     qrDisplayDialog = new QRDisplayDialog(baos.toString(StandardCharsets.UTF_8));
                 }

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;
@@ -29,7 +29,7 @@ public class FileKeystoreImportPane extends FileImportPane {
         }
 
         if(requiredDerivation != null && !requiredDerivation.getDerivation().equals(keystore.getKeyDerivation().getDerivation())) {
-            setError("Incorrect derivation", "This account requires a derivation of " + requiredDerivation.getDerivationPath() + ", but the imported keystore has a derivation of " + keystore.getKeyDerivation().getDerivationPath() + ".");
+            setError("Incorrect derivation", "This account requires a derivation of " + requiredDerivation.getDerivationPath() + ", but the imported keystore has a derivation of " + KeyDerivation.writePath(keystore.getKeyDerivation().getDerivation()) + ".");
         } else {
             EventManager.get().post(new KeystoreImportEvent(keystore));
         }

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

@@ -4,6 +4,7 @@ import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.registry.CryptoOutput;
 import com.sparrowwallet.hummingbird.registry.RegistryType;
 import com.sparrowwallet.sparrow.AppServices;
@@ -13,6 +14,8 @@ import com.sparrowwallet.sparrow.event.TimedEvent;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import javafx.geometry.Pos;
@@ -163,12 +166,23 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                 QRDisplayDialog qrDisplayDialog;
                 if(exporter instanceof CoboVaultMultisig) {
                     qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), true);
-                } else if(exporter instanceof PassportMultisig || exporter instanceof KeystoneMultisig || exporter instanceof JadeMultisig || exporter instanceof Bip129) {
+                } 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) {
+                    UR ur = UR.fromBytes(outputStream.toByteArray());
+                    BBQR bbqr = new BBQR(BBQRType.UNICODE, outputStream.toByteArray());
+                    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/FileWalletKeystoreImportPane.java

@@ -12,6 +12,7 @@ import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletImportEvent;
 import com.sparrowwallet.sparrow.io.ImportException;
 import com.sparrowwallet.sparrow.io.KeystoreFileImport;
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -38,6 +39,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
     private final KeystoreFileImport importer;
     private String fileName;
     private byte[] fileBytes;
+    private String password;
 
     public FileWalletKeystoreImportPane(KeystoreFileImport importer) {
         super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
@@ -46,6 +48,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
 
     protected void importFile(String fileName, InputStream inputStream, String password) throws ImportException {
         this.fileName = fileName;
+        this.password = password;
 
         List<ScriptType> scriptTypes = ScriptType.getAddressableScriptTypes(PolicyType.SINGLE);
         if(wallets != null && !wallets.isEmpty()) {
@@ -83,7 +86,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
             EventManager.get().post(new WalletImportEvent(wallet));
         } else {
             ByteArrayInputStream bais = new ByteArrayInputStream(fileBytes);
-            Keystore keystore = importer.getKeystore(scriptType, bais, "");
+            Keystore keystore = importer.getKeystore(scriptType, bais, password);
 
             Wallet wallet = new Wallet();
             wallet.setName(Files.getNameWithoutExtension(fileName));
@@ -151,6 +154,8 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
         contentBox.setPadding(new Insets(10, 30, 10, 30));
         contentBox.setPrefHeight(60);
 
+        Platform.runLater(scriptTypeComboBox::requestFocus);
+
         return contentBox;
     }
 }

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()) {
@@ -472,7 +475,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(qrText, true);
         qrDisplayDialog.initOwner(getDialogPane().getScene().getWindow());
         Optional<ButtonType> optButtonType = qrDisplayDialog.showAndWait();
-        if(optButtonType.isPresent() && optButtonType.get().getButtonData() == ButtonBar.ButtonData.NEXT_FORWARD) {
+        if(optButtonType.isPresent() && optButtonType.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
             scanQr();
         }
     }
@@ -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/MixStatusCell.java

@@ -1,27 +1,11 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.samourai.whirlpool.client.mix.listener.MixFailReason;
-import com.samourai.whirlpool.client.mix.listener.MixStep;
-import com.samourai.whirlpool.client.wallet.beans.MixProgress;
-import com.samourai.whirlpool.protocol.beans.Utxo;
-import com.sparrowwallet.sparrow.AppServices;
-import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
-import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
-import com.sparrowwallet.sparrow.whirlpool.WhirlpoolException;
-import javafx.animation.Timeline;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
-import javafx.util.Duration;
-import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;
-
-import java.util.Locale;
 
 public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
-    private static final int ERROR_DISPLAY_MILLIS = 5 * 60 * 1000;
-
     public MixStatusCell() {
         super();
         setAlignment(Pos.CENTER_RIGHT);
@@ -41,174 +25,9 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
             setGraphic(null);
         } else {
             setText(Integer.toString(mixStatus.getMixesDone()));
-            if(mixStatus.getNextMixUtxo() == null) {
-                setContextMenu(new MixStatusContextMenu(mixStatus.getUtxoEntry(), mixStatus.getMixProgress() != null && mixStatus.getMixProgress().getMixStep() != MixStep.FAIL));
-            } else {
-                setContextMenu(null);
-            }
-
-            if(mixStatus.getNextMixUtxo() != null) {
-                setMixSuccess(mixStatus.getNextMixUtxo());
-            } else if(mixStatus.getMixFailReason() != null) {
-                setMixFail(mixStatus.getMixFailReason(), mixStatus.getMixError(), mixStatus.getMixErrorTimestamp());
-            } else if(mixStatus.getMixProgress() != null) {
-                setMixProgress(mixStatus.getUtxoEntry(), mixStatus.getMixProgress());
-            } else {
-                setGraphic(null);
-                setTooltip(null);
-            }
-        }
-    }
-
-    private void setMixSuccess(Utxo nextMixUtxo) {
-        ProgressIndicator progressIndicator = getProgressIndicator();
-        progressIndicator.setProgress(-1);
-        setGraphic(progressIndicator);
-        Tooltip tt = new Tooltip();
-        tt.setText("Waiting for broadcast of " + nextMixUtxo.getHash().substring(0, 8) + "..." + ":" + nextMixUtxo.getIndex() );
-        setTooltip(tt);
-    }
-
-    private void setMixFail(MixFailReason mixFailReason, String mixError, Long mixErrorTimestamp) {
-        if(mixFailReason != MixFailReason.CANCEL) {
-            long elapsed = mixErrorTimestamp == null ? 0L : System.currentTimeMillis() - mixErrorTimestamp;
-            if(elapsed >= ERROR_DISPLAY_MILLIS) {
-                //Old error, don't set again.
-                return;
-            }
-
-            Glyph failGlyph = getFailGlyph();
-            setGraphic(failGlyph);
-            Tooltip tt = new Tooltip();
-            tt.setText(mixFailReason.getMessage() + (mixError == null ? "" : ": " + mixError) +
-                    "\nMix failures are generally caused by peers disconnecting during a mix." +
-                    "\nMake sure your internet connection is stable and the computer is configured to prevent sleeping." +
-                    "\nTo prevent sleeping, use the " + getPlatformSleepConfig() + " or enable the function in the Tools menu.");
-            setTooltip(tt);
-
-            Duration fadeDuration = Duration.millis(ERROR_DISPLAY_MILLIS - elapsed);
-            double fadeFromValue = 1.0 - ((double)elapsed / ERROR_DISPLAY_MILLIS);
-            Timeline timeline = AnimationUtil.getSlowFadeOut(failGlyph, fadeDuration, fadeFromValue, 10);
-            timeline.setOnFinished(event -> {
-                setTooltip(null);
-            });
-            timeline.play();
-        } else {
+            setContextMenu(null);
             setGraphic(null);
             setTooltip(null);
         }
     }
-
-    private String getPlatformSleepConfig() {
-        Platform platform = Platform.getCurrent();
-        if(platform == Platform.OSX) {
-            return "OSX System Preferences";
-        } else if(platform == Platform.WINDOWS) {
-            return "Windows Control Panel";
-        }
-
-        return "system power settings";
-    }
-
-    private void setMixProgress(UtxoEntry utxoEntry, MixProgress mixProgress) {
-        if(mixProgress.getMixStep() != MixStep.FAIL) {
-            ProgressIndicator progressIndicator = getProgressIndicator();
-            progressIndicator.setProgress(mixProgress.getMixStep().getProgressPercent() == 100 ? -1 : mixProgress.getMixStep().getProgressPercent() / 100.0);
-            setGraphic(progressIndicator);
-            Tooltip tt = new Tooltip();
-            String status = mixProgress.getMixStep().getMessage().substring(0, 1).toUpperCase(Locale.ROOT) + mixProgress.getMixStep().getMessage().substring(1);
-            tt.setText(status);
-            setTooltip(tt);
-
-            if(mixProgress.getMixStep() == MixStep.REGISTERED_INPUT) {
-                tt.setOnShowing(event -> {
-                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-                    Whirlpool.RegisteredInputsService registeredInputsService = new Whirlpool.RegisteredInputsService(whirlpool, mixProgress.getPoolId());
-                    registeredInputsService.setOnSucceeded(eventStateHandler -> {
-                        if(registeredInputsService.getValue() != null) {
-                            tt.setText(status + " (1 of " + registeredInputsService.getValue() + ")");
-                        }
-                    });
-                    registeredInputsService.start();
-                });
-            }
-        } else {
-            setGraphic(null);
-            setTooltip(null);
-        }
-    }
-
-    private ProgressIndicator getProgressIndicator() {
-        ProgressIndicator progressIndicator;
-        if(getGraphic() instanceof ProgressIndicator) {
-            progressIndicator = (ProgressIndicator)getGraphic();
-        } else {
-            progressIndicator = new ProgressBar();
-        }
-
-        return progressIndicator;
-    }
-
-    private static Glyph getMixGlyph() {
-        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
-        copyGlyph.setFontSize(12);
-        return copyGlyph;
-    }
-
-    private static Glyph getStopGlyph() {
-        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.STOP_CIRCLE);
-        copyGlyph.setFontSize(12);
-        return copyGlyph;
-    }
-
-    public static Glyph getFailGlyph() {
-        Glyph failGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
-        failGlyph.getStyleClass().add("fail-warning");
-        failGlyph.setFontSize(12);
-        return failGlyph;
-    }
-
-    private static class MixStatusContextMenu extends ContextMenu {
-        public MixStatusContextMenu(UtxoEntry utxoEntry, boolean isMixing) {
-            Whirlpool pool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-            if(isMixing) {
-                MenuItem mixStop = new MenuItem("Stop Mixing");
-                if(pool != null) {
-                    mixStop.disableProperty().bind(pool.mixingProperty().not());
-                }
-                mixStop.setGraphic(getStopGlyph());
-                mixStop.setOnAction(event -> {
-                    hide();
-                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-                    if(whirlpool != null) {
-                        try {
-                            whirlpool.mixStop(utxoEntry.getHashIndex());
-                        } catch(WhirlpoolException e) {
-                            AppServices.showErrorDialog("Error stopping mixing UTXO", e.getMessage());
-                        }
-                    }
-                });
-                getItems().add(mixStop);
-            } else {
-                MenuItem mixNow = new MenuItem("Mix Now");
-                if(pool != null) {
-                    mixNow.disableProperty().bind(pool.mixingProperty().not());
-                }
-
-                mixNow.setGraphic(getMixGlyph());
-                mixNow.setOnAction(event -> {
-                    hide();
-                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-                    if(whirlpool != null) {
-                        try {
-                            whirlpool.mix(utxoEntry.getHashIndex());
-                        } catch(WhirlpoolException e) {
-                            AppServices.showErrorDialog("Error mixing UTXO", e.getMessage());
-                        }
-                    }
-                });
-                getItems().add(mixNow);
-            }
-        }
-    }
 }

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/MnemonicKeystoreImportPane.java

@@ -33,6 +33,7 @@ import java.util.Optional;
 public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
     protected final Wallet wallet;
     private final KeystoreMnemonicImport importer;
+    private final KeyDerivation defaultDerivation;
 
     private SplitMenuButton importButton;
 
@@ -43,10 +44,11 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
     private Button confirmButton;
     private List<String> generatedMnemonicCode;
 
-    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer) {
+    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer, KeyDerivation defaultDerivation) {
         super(importer.getName(), "Create or enter seed", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
         this.wallet = wallet;
         this.importer = importer;
+        this.defaultDerivation = defaultDerivation;
 
         createImportButton();
         buttonBox.getChildren().add(importButton);
@@ -59,7 +61,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
         importButton.getStyleClass().add("default-button");
         importButton.setOnAction(event -> {
             importButton.setDisable(true);
-            importKeystore(wallet.getScriptType().getDefaultDerivation(), false);
+            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;
@@ -77,6 +79,10 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
         importButton.setVisible(false);
     }
 
+    private List<ChildNumber> getDefaultDerivation() {
+        return defaultDerivation == null || defaultDerivation.getDerivation().isEmpty() ? wallet.getScriptType().getDefaultDerivation() : defaultDerivation.getDerivation();
+    }
+
     protected void enterMnemonic(int numWords) {
         generatedMnemonicCode = null;
         super.enterMnemonic(numWords);
@@ -243,7 +249,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
             setDescription("Ready to import");
             showHideLink.setText("Show Derivation...");
             showHideLink.setVisible(false);
-            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
+            setContent(getDerivationEntry(getDefaultDerivation()));
         }
     }
 

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/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;
@@ -79,10 +79,6 @@ public class PayNymAvatar extends StackPane {
         this.paymentCodeProperty.set(paymentCode);
     }
 
-    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
-        setPaymentCode(PaymentCode.fromString(paymentCode.toString()));
-    }
-
     public void clearPaymentCode() {
         this.paymentCodeProperty.set(null);
     }
@@ -128,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/PayNymCell.java

@@ -81,10 +81,7 @@ public class PayNymCell extends ListCell<PayNym> {
                         linkButton.setDisable(true);
                         payNymController.linkPayNym(payNym);
                     });
-
-                    if(payNymController.isSelectLinkedOnly()) {
-                        getStyleClass().add("unlinked");
-                    }
+                    getStyleClass().add("unlinked");
                 }
             }
 

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

@@ -10,11 +10,6 @@ public class PaymentCodeTextField extends CopyableTextField {
         setPaymentCodeString();
     }
 
-    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
-        this.paymentCodeStr = paymentCode.toString();
-        setPaymentCodeString();
-    }
-
     private void setPaymentCodeString() {
         String abbrevPcode = paymentCodeStr.substring(0, 12) + "..." + paymentCodeStr.substring(paymentCodeStr.length() - 5);
         setText(abbrevPcode);

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/QRDensity.java

@@ -1,22 +1,28 @@
 package com.sparrowwallet.sparrow.control;
 
 public enum QRDensity {
-    NORMAL("Normal", 400),
-    LOW("Low", 80);
+    NORMAL("Normal", 400, 2000),
+    LOW("Low", 80, 1000);
 
     private final String name;
-    private final int maxFragmentLength;
+    private final int maxUrFragmentLength;
+    private final int maxBbqrFragmentLength;
 
-    QRDensity(String name, int maxFragmentLength) {
+    QRDensity(String name, int maxUrFragmentLength, int maxBbqrFragmentLength) {
         this.name = name;
-        this.maxFragmentLength = maxFragmentLength;
+        this.maxUrFragmentLength = maxUrFragmentLength;
+        this.maxBbqrFragmentLength = maxBbqrFragmentLength;
     }
 
     public String getName() {
         return name;
     }
 
-    public int getMaxFragmentLength() {
-        return maxFragmentLength;
+    public int getMaxUrFragmentLength() {
+        return maxUrFragmentLength;
+    }
+
+    public int getMaxBbqrFragmentLength() {
+        return maxBbqrFragmentLength;
     }
 }

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

@@ -10,10 +10,14 @@ 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;
 import com.sparrowwallet.hummingbird.UREncoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoding;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.scene.Node;
@@ -39,15 +43,21 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
 
     private static final int MIN_FRAGMENT_LENGTH = 10;
 
-    private static final int ANIMATION_PERIOD_MILLIS = 200;
+    private static final double ANIMATION_PERIOD_MILLIS = 200d;
 
     private static final int DEFAULT_QR_SIZE = 580;
     private static final int REDUCED_QR_SIZE = 520;
 
+    private static final BBQREncoding DEFAULT_BBQR_ENCODING = BBQREncoding.ZLIB;
+
     private final int qrSize = getQRSize();
 
     private final UR ur;
-    private UREncoder encoder;
+    private UREncoder urEncoder;
+
+    private final BBQR bbqr;
+    private BBQREncoder bbqrEncoder;
+    private boolean useBbqrEncoding;
 
     private final ImageView qrImageView;
 
@@ -62,17 +72,26 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
     private static boolean initialDensityChange;
 
     public QRDisplayDialog(String type, byte[] data, boolean addLegacyEncodingOption) throws UR.URException {
-        this(UR.fromBytes(type, data), addLegacyEncodingOption, false);
+        this(UR.fromBytes(type, data), null, addLegacyEncodingOption, false, false);
     }
 
     public QRDisplayDialog(UR ur) {
-        this(ur, false, false);
+        this(ur, null, false, false, false);
     }
 
-    public QRDisplayDialog(UR ur, boolean addLegacyEncodingOption, boolean addScanButton) {
+    public QRDisplayDialog(UR ur, BBQR bbqr, boolean addLegacyEncodingOption, boolean addScanButton, boolean selectBbqrButton) {
         this.ur = ur;
-        this.addLegacyEncodingOption = addLegacyEncodingOption;
-        this.encoder = new UREncoder(ur, Config.get().getQrDensity().getMaxFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+        this.bbqr = bbqr;
+        this.addLegacyEncodingOption = bbqr == null && addLegacyEncodingOption;
+
+        this.urEncoder = new UREncoder(ur, Config.get().getQrDensity().getMaxUrFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+
+        if(bbqr != null) {
+            this.bbqrEncoder = new BBQREncoder(bbqr.type(), DEFAULT_BBQR_ENCODING, bbqr.data(), Config.get().getQrDensity().getMaxBbqrFragmentLength(), 0);
+            if(selectBbqrButton) {
+                useBbqrEncoding = true;
+            }
+        }
 
         final DialogPane dialogPane = new QRDisplayDialogPane();
         setDialogPane(dialogPane);
@@ -82,19 +101,29 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
         qrImageView = new ImageView();
         stackPane.getChildren().add(qrImageView);
 
+        qrImageView.setOnScroll(scrollEvent -> {
+            if(animateQRService != null && animateQRService.isRunning() && scrollEvent.getDeltaY() != 0) {
+                Duration duration = animateQRService.getPeriod();
+                Duration newDuration = scrollEvent.getDeltaY() > 0 ? duration.multiply(1.1) : duration.multiply(0.9);
+                if(newDuration.lessThan(Duration.millis(ANIMATION_PERIOD_MILLIS*10)) && newDuration.greaterThan(Duration.millis(ANIMATION_PERIOD_MILLIS/2))) {
+                    animateQRService.setPeriod(newDuration);
+                }
+            }
+        });
+
         dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
 
         nextPart();
-        if(encoder.isSinglePart()) {
+        if(isSinglePart()) {
             qrImageView.setImage(getQrCode(currentPart));
         } else {
             createAnimateQRService();
         }
 
-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
         dialogPane.getButtonTypes().add(cancelButtonType);
 
-        if(addLegacyEncodingOption) {
+        if(this.addLegacyEncodingOption) {
             final ButtonType legacyEncodingButtonType = new javafx.scene.control.ButtonType("Use Legacy Encoding (Cobo Vault)", ButtonBar.ButtonData.LEFT);
             dialogPane.getButtonTypes().add(legacyEncodingButtonType);
         } else {
@@ -102,8 +131,13 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
             dialogPane.getButtonTypes().add(densityButtonType);
         }
 
+        if(bbqr != null) {
+            final ButtonType bbqrButtonType = new javafx.scene.control.ButtonType("Show BBQr", ButtonBar.ButtonData.BACK_PREVIOUS);
+            dialogPane.getButtonTypes().add(bbqrButtonType);
+        }
+
         if(addScanButton) {
-            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.NEXT_FORWARD);
+            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.OK_DONE);
             dialogPane.getButtonTypes().add(scanButtonType);
         }
 
@@ -121,7 +155,9 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
 
     public QRDisplayDialog(String data, boolean addScanButton) {
         this.ur = null;
-        this.encoder = null;
+        this.bbqr = null;
+        this.urEncoder = null;
+        this.bbqrEncoder = null;
 
         final DialogPane dialogPane = new QRDisplayDialogPane();
         setDialogPane(dialogPane);
@@ -134,11 +170,16 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
         dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
         qrImageView.setImage(getQrCode(data));
 
-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        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);
 
         if(addScanButton) {
-            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.NEXT_FORWARD);
+            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.OK_DONE);
             dialogPane.getButtonTypes().add(scanButtonType);
         }
 
@@ -163,9 +204,22 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
         });
     }
 
+    private boolean isSinglePart() {
+        if(useBbqrEncoding) {
+            return bbqrEncoder.isSinglePart();
+        } else if(!useLegacyEncoding) {
+            return urEncoder.isSinglePart();
+        } else {
+            return legacyParts.length == 1;
+        }
+    }
+
     private void nextPart() {
-        if(!useLegacyEncoding) {
-            String fragment = encoder.nextPart();
+        if(useBbqrEncoding) {
+            String fragment = bbqrEncoder.nextPart();
+            currentPart = fragment.toUpperCase(Locale.ROOT);
+        } else if(!useLegacyEncoding) {
+            String fragment = urEncoder.nextPart();
             currentPart = fragment.toUpperCase(Locale.ROOT);
         } else {
             currentPart = legacyParts[legacyPartIndex];
@@ -201,37 +255,27 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
                 this.legacyParts = legacyEncoder.encode();
                 this.useLegacyEncoding = true;
 
-                if(legacyParts.length == 1) {
-                    if(animateQRService != null) {
-                        animateQRService.cancel();
-                    }
-
-                    nextPart();
-                    qrImageView.setImage(getQrCode(currentPart));
-                } else if(animateQRService == null) {
-                    createAnimateQRService();
-                } else if(!animateQRService.isRunning()) {
-                    animateQRService.reset();
-                    animateQRService.start();
-                }
+                restartAnimation();
             } catch(UR.InvalidTypeException e) {
                 //Can't happen
             }
         } else {
             this.useLegacyEncoding = false;
+            restartAnimation();
+        }
+    }
 
-            if(encoder.isSinglePart()) {
-                if(animateQRService != null) {
-                    animateQRService.cancel();
-                }
+    public boolean isUseBbqrEncoding() {
+        return useBbqrEncoding;
+    }
 
-                qrImageView.setImage(getQrCode(currentPart));
-            } else if(animateQRService == null) {
-                createAnimateQRService();
-            } else if(!animateQRService.isRunning()) {
-                animateQRService.reset();
-                animateQRService.start();
-            }
+    private void setUseBbqrEncoding(boolean useBbqrEncoding) {
+        if(useBbqrEncoding) {
+            this.useBbqrEncoding = true;
+            restartAnimation();
+        } else {
+            this.useBbqrEncoding = false;
+            restartAnimation();
         }
     }
 
@@ -240,12 +284,28 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
             animateQRService.cancel();
         }
 
-        this.encoder = new UREncoder(ur, Config.get().getQrDensity().getMaxFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
-        nextPart();
-        if(encoder.isSinglePart()) {
+        if(bbqr != null) {
+            this.bbqrEncoder = new BBQREncoder(bbqr.type(), DEFAULT_BBQR_ENCODING, bbqr.data(), Config.get().getQrDensity().getMaxBbqrFragmentLength(), 0);
+        }
+
+        this.urEncoder = new UREncoder(ur, Config.get().getQrDensity().getMaxUrFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+
+        restartAnimation();
+    }
+
+    private void restartAnimation() {
+        if(isSinglePart()) {
+            if(animateQRService != null) {
+                animateQRService.cancel();
+            }
+
+            nextPart();
             qrImageView.setImage(getQrCode(currentPart));
-        } else {
+        } else if(animateQRService == null) {
             createAnimateQRService();
+        } else if(!animateQRService.isRunning()) {
+            animateQRService.reset();
+            animateQRService.start();
         }
     }
 
@@ -290,7 +350,7 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
                     final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
                     ButtonBar.setButtonData(density, buttonData);
                     density.setOnAction(event -> {
-                        if(!initialDensityChange && !encoder.isSinglePart()) {
+                        if(!initialDensityChange && !isSinglePart()) {
                             Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Discard progress?", "Changing the QR code density means any progress on the receiving device must be discarded. Proceed?", ButtonType.NO, ButtonType.YES);
                             if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
                                 initialDensityChange = true;
@@ -306,12 +366,25 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
 
                     return density;
                 }
-            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.NEXT_FORWARD) {
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
                 Button scanButton = (Button)super.createButton(buttonType);
                 scanButton.setGraphicTextGap(5);
                 scanButton.setGraphic(getGlyph(FontAwesome5.Glyph.CAMERA));
 
                 return scanButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.BACK_PREVIOUS) {
+                ToggleButton bbqr = new ToggleButton(buttonType.getText());
+                bbqr.setGraphicTextGap(5);
+                bbqr.setGraphic(getGlyph(FontAwesome5.Glyph.QRCODE));
+                bbqr.setSelected(useBbqrEncoding);
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(bbqr, buttonData);
+
+                bbqr.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    setUseBbqrEncoding(newValue);
+                });
+
+                return bbqr;
             }
 
             return super.createButton(buttonType);

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,8 +25,13 @@ 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;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRException;
+import com.sparrowwallet.sparrow.wallet.KeystoreController;
 import javafx.application.Platform;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -63,8 +65,9 @@ import java.util.stream.IntStream;
 public class QRScanDialog extends Dialog<QRScanDialog.Result> {
     private static final Logger log = LoggerFactory.getLogger(QRScanDialog.class);
 
-    private final URDecoder decoder;
-    private final LegacyURDecoder legacyDecoder;
+    private final URDecoder urDecoder;
+    private final LegacyURDecoder legacyUrDecoder;
+    private final BBQRDecoder bbqrDecoder;
     private final WebcamService webcamService;
     private List<String> parts;
 
@@ -80,8 +83,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
     private final ObjectProperty<WebcamDevice> webcamDeviceProperty = new SimpleObjectProperty<>();
 
     public QRScanDialog() {
-        this.decoder = new URDecoder();
-        this.legacyDecoder = new LegacyURDecoder();
+        this.urDecoder = new URDecoder();
+        this.legacyUrDecoder = new LegacyURDecoder();
+        this.bbqrDecoder = new BBQRDecoder();
 
         if(Config.get().isHdCapture()) {
             webcamResolutionProperty.set(WebcamResolution.HD);
@@ -90,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);
@@ -133,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) {
@@ -148,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();
         });
@@ -167,7 +172,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             Platform.runLater(() -> webcamResolutionProperty.set(null));
         });
 
-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
         final ButtonType hdButtonType = new javafx.scene.control.ButtonType("Use HD Capture", ButtonBar.ButtonData.LEFT);
         final ButtonType camButtonType = new javafx.scene.control.ButtonType("Default Camera", ButtonBar.ButtonData.HELP_2);
         dialogPane.getButtonTypes().addAll(hdButtonType, camButtonType, cancelButtonType);
@@ -192,23 +197,23 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
             if(qrtext.toLowerCase(Locale.ROOT).startsWith(UR.UR_PREFIX)) {
                 if(LegacyURDecoder.isLegacyURFragment(qrtext)) {
-                    legacyDecoder.receivePart(qrtext);
-                    Platform.runLater(() -> percentComplete.setValue(legacyDecoder.getPercentComplete()));
+                    legacyUrDecoder.receivePart(qrtext);
+                    Platform.runLater(() -> percentComplete.setValue(legacyUrDecoder.getPercentComplete()));
 
-                    if(legacyDecoder.isComplete()) {
+                    if(legacyUrDecoder.isComplete()) {
                         try {
-                            UR ur = legacyDecoder.decode();
+                            UR ur = legacyUrDecoder.decode();
                             result = extractResultFromUR(ur);
                         } catch(Exception e) {
                             result = new Result(new URException(e.getMessage()));
                         }
                     }
                 } else {
-                    decoder.receivePart(qrtext);
-                    Platform.runLater(() -> percentComplete.setValue(decoder.getProcessedPartsCount() > 0 ? decoder.getEstimatedPercentComplete() : 0));
+                    urDecoder.receivePart(qrtext);
+                    Platform.runLater(() -> percentComplete.setValue(urDecoder.getProcessedPartsCount() > 0 ? urDecoder.getEstimatedPercentComplete() : 0));
 
-                    if(decoder.getResult() != null) {
-                        URDecoder.Result urResult = decoder.getResult();
+                    if(urDecoder.getResult() != null) {
+                        URDecoder.Result urResult = urDecoder.getResult();
                         if(urResult.type == ResultType.SUCCESS) {
                             result = extractResultFromUR(urResult.ur);
                             Platform.runLater(() -> setResult(result));
@@ -217,6 +222,19 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                         }
                     }
                 }
+            } else if(BBQRDecoder.isBBQRFragment(qrtext)) {
+                bbqrDecoder.receivePart(qrtext);
+                Platform.runLater(() -> percentComplete.setValue(bbqrDecoder.getPercentComplete()));
+
+                if(bbqrDecoder.getResult() != null) {
+                    BBQRDecoder.Result bbqrResult = bbqrDecoder.getResult();
+                    if(bbqrResult.getResultType() == BBQRDecoder.ResultType.SUCCESS) {
+                        result = extractResultFromBBQR(bbqrResult);
+                        Platform.runLater(() -> setResult(result));
+                    } else {
+                        result = new Result(new BBQRException(bbqrResult.getError()));
+                    }
+                }
             } else if(partMatcher.matches()) {
                 int m = Integer.parseInt(partMatcher.group(1));
                 int n = Integer.parseInt(partMatcher.group(2));
@@ -604,7 +622,8 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
                 List<ChildNumber> path = cryptoKeypath.getComponents().stream().map(comp -> (IndexPathComponent)comp)
                         .map(comp -> new ChildNumber(comp.getIndex(), comp.isHardened())).collect(Collectors.toList());
-                return new KeyDerivation(Utils.bytesToHex(cryptoKeypath.getSourceFingerprint()), KeyDerivation.writePath(path));
+                String fingerprint = cryptoKeypath.getSourceFingerprint() == null ? KeystoreController.DEFAULT_WATCH_ONLY_FINGERPRINT : Utils.bytesToHex(cryptoKeypath.getSourceFingerprint());
+                return new KeyDerivation(fingerprint, KeyDerivation.writePath(path));
             }
 
             return null;
@@ -651,6 +670,19 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
             return wallets;
         }
+
+        private Result extractResultFromBBQR(BBQRDecoder.Result result) {
+            if(result.getPsbt() != null) {
+                return new Result(result.getPsbt());
+            } else if(result.getTransaction() != null) {
+                return new Result(result.getTransaction());
+            } else if(result.toString() != null) {
+                return new Result(result.toString());
+            } else {
+                log.error("Unsupported BBQR type " + result.getBbqrType());
+                return new Result(new URException("BBQR type " + result.getBbqrType() + " is not supported"));
+            }
+        }
     }
 
     private class QRScanListener implements WebcamListener {

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

@@ -54,10 +54,12 @@ public class ScriptArea extends CodeArea {
                 ScriptChunk chunk = script.getChunks().get(i);
                 if(chunk.isOpCode()) {
                     append(chunk.toString(), "script-opcode");
-                } else if(chunk.isSignature()) {
-                    append("<signature" + signatureCount++ + ">", "script-signature");
                 } else if(chunk.isPubKey()) {
                     append("<pubkey" + pubKeyCount++ + ">", "script-pubkey");
+                } else if(chunk.isSignature()) {
+                    append("<signature" + signatureCount++ + ">", "script-signature");
+                } else if(chunk.isTaprootControlBlock()) {
+                    append("<controlblock>", "script-controlblock");
                 } else if(chunk.isString()) {
                     append(chunk.toString(), "script-other");
                 } else if(chunk.isScript()) {

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

@@ -2,25 +2,22 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.protocol.Script;
 import com.sparrowwallet.drongo.protocol.ScriptChunk;
+import com.sparrowwallet.sparrow.BaseController;
 import javafx.geometry.Point2D;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.ContextMenuEvent;
-import org.fxmisc.richtext.CodeArea;
-import org.fxmisc.richtext.model.TwoDimensional;
 
 import java.util.OptionalInt;
 
-import static org.fxmisc.richtext.model.TwoDimensional.Bias.Backward;
-
 public class ScriptContextMenu extends ContextMenu {
     private Script script;
     private MenuItem copyvalue;
     private ScriptChunk hoverChunk;
 
-    public ScriptContextMenu(CodeArea area, Script script)
+    public ScriptContextMenu(ScriptArea area, Script script)
     {
         this.script = script;
 
@@ -40,12 +37,9 @@ public class ScriptContextMenu extends ContextMenu {
             Point2D point = area.screenToLocal(event.getScreenX(), event.getScreenY());
             OptionalInt characterIndex = area.hit(point.getX(), point.getY()).getCharacterIndex();
             if(characterIndex.isPresent()) {
-                TwoDimensional.Position position = area.getParagraph(0).getStyleSpans().offsetToPosition(characterIndex.getAsInt(), Backward);
-                if(position.getMajor() % 2 == 0) {
-                    ScriptChunk chunk = script.getChunks().get(position.getMajor() / 2);
-                    if(!chunk.isOpCode()) {
-                        this.hoverChunk = chunk;
-                    }
+                ScriptChunk chunk = BaseController.getScriptChunk(area, characterIndex.getAsInt());
+                if(chunk != null) {
+                    this.hoverChunk = chunk;
                 }
             }
             copyvalue.setDisable(hoverChunk == null);

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

@@ -1,18 +1,28 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.csvreader.CsvWriter;
+import com.sparrowwallet.drongo.BitcoinUnit;
 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;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.*;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.ListChangeListener;
+import javafx.event.ActionEvent;
 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.textfield.TextFields;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,10 +30,11 @@ import tornadofx.control.Field;
 import tornadofx.control.Fieldset;
 import tornadofx.control.Form;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 
 public class SearchWalletDialog extends Dialog<Entry> {
     private static final Logger log = LoggerFactory.getLogger(SearchWalletDialog.class);
@@ -48,7 +59,7 @@ public class SearchWalletDialog extends Dialog<Entry> {
         dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("search.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setHeaderText(showWallet ? "Search All Wallets" : "Search Wallet");
+        dialogPane.setHeaderText(showWallet ? "Search All Wallets" : "Search Wallet " + walletForms.get(0).getMasterWallet().getName());
 
         Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
         if(!image.isError()) {
@@ -76,11 +87,12 @@ 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);
 
         if(showWallet) {
             TreeTableColumn<Entry, String> walletColumn = new TreeTableColumn<>("Wallet");
@@ -117,7 +129,7 @@ public class SearchWalletDialog extends Dialog<Entry> {
         labelCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
             return param.getValue().getValue().labelProperty();
         });
-        labelCol.setCellFactory(p -> new SearchLabelCell());
+        labelCol.setCellFactory(p -> new LabelCell());
         results.getColumns().add(labelCol);
 
         TreeTableColumn<Entry, Number> amountCol = new TreeTableColumn<>("Value");
@@ -130,12 +142,20 @@ public class SearchWalletDialog extends Dialog<Entry> {
         vBox.getChildren().addAll(form, results);
         dialogPane.setContent(vBox);
 
+        ButtonType exportButtonType = new ButtonType("Export CSV", ButtonBar.ButtonData.LEFT);
         ButtonType showButtonType = new javafx.scene.control.ButtonType("Show", ButtonBar.ButtonData.APPLY);
         ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
 
-        dialogPane.getButtonTypes().addAll(cancelButtonType, showButtonType);
+        dialogPane.getButtonTypes().addAll(exportButtonType, cancelButtonType, showButtonType);
 
-        Button showButton = (Button) dialogPane.lookupButton(showButtonType);
+        Button exportButton = (Button)dialogPane.lookupButton(exportButtonType);
+        exportButton.setGraphic(GlyphUtils.getDownArrowGlyph());
+        exportButton.addEventFilter(ActionEvent.ACTION, event -> {
+            event.consume();
+            exportResults(showWallet);
+        });
+
+        Button showButton = (Button)dialogPane.lookupButton(showButtonType);
         showButton.setDefaultButton(true);
         showButton.setDisable(true);
 
@@ -147,52 +167,56 @@ public class SearchWalletDialog extends Dialog<Entry> {
         });
 
         search.textProperty().addListener((observable, oldValue, newValue) -> {
-            searchWallets(newValue.toLowerCase(Locale.ROOT));
+            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);
 
         Platform.runLater(search::requestFocus);
     }
 
-    private void searchWallets(String searchText) {
-        List<Entry> matchingEntries = new ArrayList<>();
+    public List<WalletForm> getWalletForms() {
+        return walletForms;
+    }
 
-        if(!searchText.isEmpty()) {
-            Long searchValue = getSearchValue(searchText);
-            Address searchAddress = getSearchAddress(searchText);
+    private void searchWallets(String searchPhrase) {
+        Set<Entry> matchingEntries = new LinkedHashSet<>();
 
-            for(WalletForm walletForm : walletForms) {
-                WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
-                for(Entry entry : walletTransactionsEntry.getChildren()) {
-                    if(entry instanceof TransactionEntry transactionEntry) {
-                        if(transactionEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
-                                (transactionEntry.getLabel() != null && transactionEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
-                                (transactionEntry.getValue() != null && searchValue != null && Math.abs(transactionEntry.getValue()) == searchValue) ||
-                                (searchAddress != null && transactionEntry.getBlockTransaction().getTransaction().getOutputs().stream().map(output -> output.getScript().getToAddress()).filter(Objects::nonNull).anyMatch(address -> address.equals(searchAddress)))) {
-                            matchingEntries.add(entry);
-                        }
-                    }
-                }
+        if(!searchPhrase.isEmpty()) {
+            Set<String> searchWords = new LinkedHashSet<>(Arrays.stream(searchPhrase.split("\\s+"))
+                    .filter(text -> isAddress(text) || isHash(text) || isHashIndex(text)).toList());
+            String freeText = removeOccurrences(searchPhrase, searchWords).trim();
+            if(!freeText.isEmpty()) {
+                searchWords.add(freeText);
+            }
 
-                for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
-                    NodeEntry purposeEntry = walletForm.getNodeEntry(keyPurpose);
-                    for(Entry entry : purposeEntry.getChildren()) {
-                        if(entry instanceof NodeEntry nodeEntry) {
-                            if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
-                                    (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
-                                    (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
+            for(String searchText : searchWords) {
+                Long searchValue = getSearchValue(searchText);
+                Address searchAddress = getSearchAddress(searchText);
+                searchText = searchText.toLowerCase(Locale.ROOT);
+
+                for(WalletForm walletForm : walletForms) {
+                    WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
+                    for(Entry entry : walletTransactionsEntry.getChildren()) {
+                        if(entry instanceof TransactionEntry transactionEntry) {
+                            if(transactionEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
+                                    (transactionEntry.getLabel() != null && transactionEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
+                                    (transactionEntry.getValue() != null && searchValue != null && Math.abs(transactionEntry.getValue()) == searchValue) ||
+                                    (searchAddress != null && transactionEntry.getBlockTransaction().getTransaction().getOutputs().stream().map(output -> output.getScript().getToAddress()).filter(Objects::nonNull).anyMatch(address -> address.equals(searchAddress)))) {
                                 matchingEntries.add(entry);
                             }
                         }
                     }
-                }
 
-                for(WalletForm nestedWalletForm : walletForm.getNestedWalletForms()) {
-                    for(KeyPurpose keyPurpose : nestedWalletForm.getWallet().getWalletKeyPurposes()) {
-                        NodeEntry purposeEntry = nestedWalletForm.getNodeEntry(keyPurpose);
+                    for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
+                        NodeEntry purposeEntry = walletForm.getNodeEntry(keyPurpose);
                         for(Entry entry : purposeEntry.getChildren()) {
                             if(entry instanceof NodeEntry nodeEntry) {
                                 if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
@@ -203,22 +227,38 @@ public class SearchWalletDialog extends Dialog<Entry> {
                             }
                         }
                     }
-                }
 
-                WalletUtxosEntry walletUtxosEntry = walletForm.getWalletUtxosEntry();
-                for(Entry entry : walletUtxosEntry.getChildren()) {
-                    if(entry instanceof HashIndexEntry hashIndexEntry) {
-                        if(hashIndexEntry.getBlockTransaction().getHash().toString().toLowerCase(Locale.ROOT).equals(searchText) ||
-                                (hashIndexEntry.getLabel() != null && hashIndexEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
-                                (hashIndexEntry.getValue() != null && searchValue != null && Math.abs(hashIndexEntry.getValue()) == searchValue)) {
-                            matchingEntries.add(entry);
+                    for(WalletForm nestedWalletForm : walletForm.getNestedWalletForms()) {
+                        for(KeyPurpose keyPurpose : nestedWalletForm.getWallet().getWalletKeyPurposes()) {
+                            NodeEntry purposeEntry = nestedWalletForm.getNodeEntry(keyPurpose);
+                            for(Entry entry : purposeEntry.getChildren()) {
+                                if(entry instanceof NodeEntry nodeEntry) {
+                                    if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
+                                            (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
+                                            (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
+                                        matchingEntries.add(entry);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    WalletUtxosEntry walletUtxosEntry = walletForm.getWalletUtxosEntry();
+                    for(Entry entry : walletUtxosEntry.getChildren()) {
+                        if(entry instanceof HashIndexEntry hashIndexEntry) {
+                            if(hashIndexEntry.getBlockTransaction().getHash().toString().toLowerCase(Locale.ROOT).equals(searchText) ||
+                                    hashIndexEntry.getHashIndex().toString().toLowerCase(Locale.ROOT).equals(searchText) ||
+                                    (hashIndexEntry.getLabel() != null && hashIndexEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
+                                    (hashIndexEntry.getValue() != null && searchValue != null && Math.abs(hashIndexEntry.getValue()) == searchValue)) {
+                                matchingEntries.add(entry);
+                            }
                         }
                     }
                 }
             }
         }
 
-        SearchWalletEntry rootEntry = new SearchWalletEntry(walletForms.iterator().next().getWallet(), matchingEntries);
+        SearchWalletEntry rootEntry = new SearchWalletEntry(walletForms.iterator().next().getWallet(), new ArrayList<>(matchingEntries));
         RecursiveTreeItem<Entry> rootItem = new RecursiveTreeItem<>(rootEntry, Entry::getChildren);
         results.setRoot(rootItem);
     }
@@ -239,6 +279,95 @@ public class SearchWalletDialog extends Dialog<Entry> {
         }
     }
 
+    private boolean isAddress(String text) {
+        try {
+            Address.fromString(text);
+            return true;
+        } catch(InvalidAddressException e) {
+            return false;
+        }
+    }
+
+    private boolean isHash(String text) {
+        return text.length() == 64 && Utils.isHex(text);
+    }
+
+    private boolean isHashIndex(String text) {
+        String[] parts = text.split(":");
+        if(parts.length == 2 && isHash(parts[0])) {
+            try {
+                Integer.parseInt(parts[1]);
+                return true;
+            } catch(NumberFormatException e) {
+                //ignore
+            }
+        }
+
+        return false;
+    }
+
+    private String removeOccurrences(String inputString, Collection<String> stringsToRemove) {
+        for(String str : stringsToRemove) {
+            inputString = inputString.replaceAll("(?i)" + str, "");
+        }
+
+        return inputString;
+    }
+
+    public void exportResults(boolean showWallet) {
+        Stage window = new Stage();
+
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Export search results to CSV");
+        fileChooser.setInitialFileName(getDialogPane().getHeaderText() + ".csv");
+
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            try(FileOutputStream outputStream = new FileOutputStream(file)) {
+                CsvWriter writer = new CsvWriter(outputStream, ',', StandardCharsets.UTF_8);
+                List<String> headers = new ArrayList<>(List.of("Wallet", "Account", "Type", "Date", "Txid / Address / Output", "Label", "Value"));
+                if(!showWallet) {
+                    headers.remove(0);
+                }
+                writer.writeRecord(headers.toArray(new String[0]));
+                for(TreeItem<Entry> item : results.getRoot().getChildren()) {
+                    Entry entry = item.getValue();
+                    if(showWallet) {
+                       writer.write(entry.getWallet().getMasterName());
+                    }
+                    writer.write(entry.getWallet().getDisplayName());
+                    writer.write(entry.getEntryType());
+                    if(entry instanceof TransactionEntry transactionEntry) {
+                        writer.write(transactionEntry.getBlockTransaction().getDate() == null ? "Unconfirmed" : EntryCell.DATE_FORMAT.format(transactionEntry.getBlockTransaction().getDate()));
+                        writer.write(transactionEntry.getBlockTransaction().getHash().toString());
+                    } else if(entry instanceof NodeEntry nodeEntry) {
+                        writer.write("");
+                        writer.write(nodeEntry.getAddress().toString());
+                    } else if(entry instanceof HashIndexEntry hashIndexEntry) {
+                        writer.write(hashIndexEntry.getBlockTransaction().getDate() == null ? "Unconfirmed" : EntryCell.DATE_FORMAT.format(hashIndexEntry.getBlockTransaction().getDate()));
+                        writer.write(hashIndexEntry.getHashIndex().toString());
+                    } else {
+                        writer.write("");
+                        writer.write("");
+                    }
+                    writer.write(entry.getLabel());
+                    writer.write(getCoinValue(entry.getValue() == null ? 0 : entry.getValue()));
+                    writer.endRecord();
+                }
+                writer.close();
+            } catch(IOException e) {
+                log.error("Error exporting search results as CSV", e);
+                AppServices.showErrorDialog("Error exporting search results as CSV", e.getMessage());
+            }
+        }
+    }
+
+    private String getCoinValue(Long value) {
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        return BitcoinUnit.BTC.equals(results.getBitcoinUnit()) ? format.tableFormatBtcValue(value) : String.format(Locale.ENGLISH, "%d", value);
+    }
+
     private static class SearchWalletEntry extends Entry {
         public SearchWalletEntry(Wallet wallet, List<Entry> entries) {
             super(wallet, wallet.getName(), entries);
@@ -264,15 +393,19 @@ public class SearchWalletDialog extends Dialog<Entry> {
         @Override
         protected void updateItem(Entry entry, boolean empty) {
             super.updateItem(entry, empty);
-            setContextMenu(null);
-        }
-    }
 
-    private static class SearchLabelCell extends LabelCell {
-        @Override
-        public void updateItem(String label, boolean empty) {
-            super.updateItem(label, empty);
-            setContextMenu(null);
+            ContextMenu copyMenu;
+            if(entry instanceof TransactionEntry transactionEntry) {
+                copyMenu = new TransactionContextMenu(getText(), transactionEntry.getBlockTransaction());
+            } else if(entry instanceof NodeEntry nodeEntry) {
+                copyMenu = new AddressContextMenu(nodeEntry.getAddress(), nodeEntry.getOutputDescriptor(), null, false, null);
+            } else if(entry instanceof UtxoEntry utxoEntry) {
+                copyMenu = new HashIndexEntryContextMenu(null, utxoEntry);
+            } else {
+                copyMenu = new ContextMenu();
+            }
+            copyMenu.getItems().removeIf(menuItem -> !menuItem.getText().startsWith("Copy"));
+            setContextMenu(copyMenu);
         }
     }
 }

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

@@ -1,19 +1,24 @@
 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;
 import javafx.application.Platform;
+import javafx.event.ActionEvent;
 import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.StackPane;
 
+import java.util.Optional;
+
 public class SeedDisplayDialog extends Dialog<Void> {
     public SeedDisplayDialog(Keystore decryptedKeystore) {
         final DialogPane dialogPane = getDialogPane();
         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();
@@ -39,8 +44,19 @@ public class SeedDisplayDialog extends Dialog<Void> {
 
         stackPane.getChildren().addAll(anchorPane);
 
+        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);
+            });
+        }
+
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
-        dialogPane.getButtonTypes().addAll(cancelButtonType);
+        dialogPane.getButtonTypes().add(cancelButtonType);
 
         dialogPane.setPrefWidth(500);
         dialogPane.setPrefHeight(150 + height);
@@ -48,4 +64,15 @@ public class SeedDisplayDialog extends Dialog<Void> {
 
         Platform.runLater(() -> keystoreAccordion.setExpandedPane(keystorePane));
     }
+
+    private void showSeedQR(Keystore decryptedKeystore) {
+        Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Sensitive QR", "The following QR contains these seed words. " +
+                "Be careful before displaying or digitally recording it.\n\nAre you sure you want to continue?", ButtonType.YES, ButtonType.NO);
+        if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
+            String seedQR = SeedQR.getSeedQR(decryptedKeystore.getSeed());
+            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(seedQR);
+            qrDisplayDialog.initOwner(getDialogPane().getScene().getWindow());
+            qrDisplayDialog.showAndWait();
+        }
+    }
 }

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

@@ -0,0 +1,34 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import org.fxmisc.richtext.CodeArea;
+
+public class SelectableCodeArea extends CodeArea {
+    public SelectableCodeArea() {
+        super();
+
+        ContextMenu contextMenu = new ContextMenu();
+        MenuItem copy = new MenuItem("Copy");
+        copy.setDisable(true);
+        copy.setOnAction(event -> {
+            ClipboardContent content = new ClipboardContent();
+            content.putString(getSelectedText());
+            Clipboard.getSystemClipboard().setContent(content);
+        });
+        MenuItem copyAll = new MenuItem("Copy All");
+        copyAll.setOnAction(event -> {
+            ClipboardContent content = new ClipboardContent();
+            content.putString(getText());
+            Clipboard.getSystemClipboard().setContent(content);
+        });
+        contextMenu.getItems().addAll(copy, copyAll);
+        setContextMenu(contextMenu);
+
+        selectedTextProperty().addListener((observable, oldValue, newValue) -> {
+            copy.setDisable(newValue.isEmpty());
+        });
+    }
+}

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,6 +1,7 @@
 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.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.TransactionOutput;
@@ -12,11 +13,9 @@ import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.Theme;
 import com.sparrowwallet.sparrow.event.ExcludeUtxoEvent;
 import com.sparrowwallet.sparrow.event.ReplaceChangeAddressEvent;
-import com.sparrowwallet.sparrow.event.SorobanInitiatedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
 import com.sparrowwallet.sparrow.io.Config;
-import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.wallet.OptimizationStrategy;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -46,7 +45,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.*;
@@ -91,7 +89,7 @@ public class TransactionDiagram extends GridPane {
                 stage.setResizable(false);
 
                 StackPane scenePane = new StackPane();
-                if(Platform.getCurrent() == Platform.WINDOWS) {
+                if(OsType.getCurrent() == OsType.WINDOWS || OsType.getCurrent() == OsType.UNIX) {
                     scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
                 }
 
@@ -246,19 +244,9 @@ public class TransactionDiagram extends GridPane {
     }
 
     private List<Map<BlockTransactionHashIndex, WalletNode>> getDisplayedUtxoSets() {
-        boolean addUserSet = getOptimizationStrategy() == OptimizationStrategy.PRIVACY && SorobanServices.canWalletMix(walletTx.getWallet())
-                && walletTx.getPayments().size() == 1
-                && (walletTx.getPayments().get(0).getAddress().getScriptType() == walletTx.getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType());
-
         List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets = new ArrayList<>();
         for(Map<BlockTransactionHashIndex, WalletNode> selectedUtxoSet : walletTx.getSelectedUtxoSets()) {
-            displayedUtxoSets.add(getDisplayedUtxos(selectedUtxoSet, addUserSet ? 2 : walletTx.getSelectedUtxoSets().size()));
-        }
-
-        if(addUserSet && displayedUtxoSets.size() == 1) {
-            Map<BlockTransactionHashIndex, WalletNode> addUserUtxoSet = new HashMap<>();
-            addUserUtxoSet.put(new AddUserBlockTransactionHashIndex(!walletTx.isTwoPersonCoinjoin()), null);
-            displayedUtxoSets.add(addUserUtxoSet);
+            displayedUtxoSets.add(getDisplayedUtxos(selectedUtxoSet, walletTx.getSelectedUtxoSets().size()));
         }
 
         List<Map<BlockTransactionHashIndex, WalletNode>> paddedUtxoSets = new ArrayList<>();
@@ -339,11 +327,9 @@ public class TransactionDiagram extends GridPane {
             double setHeight = (height / numSets) - 5;
             for(int set = 0; set < numSets; set++) {
                 boolean externalUserSet = displayedUtxoSets.get(set).values().stream().anyMatch(Objects::nonNull);
-                boolean addUserSet = displayedUtxoSets.get(set).keySet().stream().anyMatch(ref -> ref instanceof AddUserBlockTransactionHashIndex);
-                if(externalUserSet || addUserSet) {
-                    boolean replace = !isFinal() && set > 0 && SorobanServices.canWalletMix(walletTx.getWallet());
-                    Glyph bracketGlyph = !replace && walletTx.isCoinControlUsed() ? getLockGlyph() : (addUserSet ? getUserAddGlyph() : getCoinsGlyph(replace));
-                    String tooltipText = addUserSet ? "Click to add a mix partner" : (walletTx.getWallet().getFullDisplayName() + (replace ? "\nClick to replace with a mix partner" : ""));
+                if(externalUserSet) {
+                    Glyph bracketGlyph = walletTx.isCoinControlUsed() ? getLockGlyph() : getCoinsGlyph();
+                    String tooltipText = walletTx.getWallet().getFullDisplayName();
                     StackPane stackPane = getBracket(width, setHeight, bracketGlyph, tooltipText);
                     allBrackets.getChildren().add(stackPane);
                 } else {
@@ -446,8 +432,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()) {
@@ -474,14 +466,6 @@ public class TransactionDiagram extends GridPane {
                         tooltip.setText(joiner.toString());
                     } else if(input instanceof InvisibleBlockTransactionHashIndex) {
                         tooltip.setText("");
-                    } else if(input instanceof AddUserBlockTransactionHashIndex) {
-                        tooltip.setText("");
-                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getWarningGlyph());
-                        label.setOnMouseClicked(event -> {
-                            EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
-                            closeExpanded();
-                            event.consume();
-                        });
                     } else {
                         if(walletTx.getInputTransactions() != null && walletTx.getInputTransactions().get(input.getHash()) != null) {
                             BlockTransaction blockTransaction = walletTx.getInputTransactions().get(input.getHash());
@@ -570,7 +554,7 @@ public class TransactionDiagram extends GridPane {
             CubicCurve curve = new CubicCurve();
             curve.getStyleClass().add("input-line");
 
-            if(inputs.get(numUtxos-i) instanceof PayjoinBlockTransactionHashIndex || inputs.get(numUtxos-i) instanceof AddUserBlockTransactionHashIndex) {
+            if(inputs.get(numUtxos-i) instanceof PayjoinBlockTransactionHashIndex) {
                 curve.getStyleClass().add("input-dashed-line");
             } else if(inputs.get(numUtxos-i) instanceof InvisibleBlockTransactionHashIndex) {
                 continue;
@@ -789,7 +773,7 @@ public class TransactionDiagram extends GridPane {
         }
 
         boolean highFee = (walletTx.getFeePercentage() > 0.1);
-        Label feeLabel = highFee ? new Label("High Fee", getWarningGlyph()) : new Label("Fee", getFeeGlyph());
+        Label feeLabel = highFee ? new Label("High Fee", getFeeWarningGlyph()) : new Label("Fee", getFeeGlyph());
         feeLabel.getStyleClass().addAll("output-label", "fee-label");
         String percentage = String.format("%.2f", walletTx.getFeePercentage() * 100.0);
         Tooltip feeTooltip = new Tooltip(walletTx.getFee() < 0 ? "Unknown fee" : "Fee of " + getSatsValue(walletTx.getFee()) + " sats (" + percentage + "%)");
@@ -952,46 +936,10 @@ public class TransactionDiagram extends GridPane {
         return null;
     }
 
-    private Glyph getUserAddGlyph() {
-        Glyph userAddGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER_PLUS);
-        userAddGlyph.getStyleClass().add("useradd-icon");
-        userAddGlyph.setFontSize(12);
-        userAddGlyph.setOnMouseEntered(event -> {
-            userAddGlyph.setFontSize(18);
-        });
-        userAddGlyph.setOnMouseExited(event -> {
-            userAddGlyph.setFontSize(12);
-        });
-        userAddGlyph.setOnMouseClicked(event -> {
-            EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
-            closeExpanded();
-            event.consume();
-        });
-        return userAddGlyph;
-    }
-
-    private Glyph getCoinsGlyph(boolean allowReplacement) {
+    private Glyph getCoinsGlyph() {
         Glyph coinsGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
         coinsGlyph.setFontSize(12);
-        if(allowReplacement) {
-            coinsGlyph.getStyleClass().add("coins-replace-icon");
-            coinsGlyph.setOnMouseEntered(event -> {
-                coinsGlyph.setIcon(FontAwesome5.Glyph.USER_PLUS);
-                coinsGlyph.setFontSize(18);
-            });
-            coinsGlyph.setOnMouseExited(event -> {
-                coinsGlyph.setIcon(FontAwesome5.Glyph.COINS);
-                coinsGlyph.setFontSize(12);
-            });
-            coinsGlyph.setOnMouseClicked(event -> {
-                EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
-                closeExpanded();
-                event.consume();
-            });
-        } else {
-            coinsGlyph.getStyleClass().add("coins-icon");
-        }
-
+        coinsGlyph.getStyleClass().add("coins-icon");
         return coinsGlyph;
     }
 
@@ -1094,20 +1042,6 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
-    private static class AddUserBlockTransactionHashIndex extends BlockTransactionHashIndex {
-        private final boolean required;
-
-        public AddUserBlockTransactionHashIndex(boolean required) {
-            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
-            this.required = required;
-        }
-
-        @Override
-        public String getLabel() {
-            return "Add Mix Partner" + (required ? "" : "?");
-        }
-    }
-
     public static class AdditionalPayment extends Payment {
         private final List<Payment> additionalPayments;
 

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,7 +27,8 @@ public class UsbStatusButton extends MenuButton {
     public void setDevices(List<Device> devices) {
         for(Device device : devices) {
             MenuItem deviceItem = new MenuItem(device.getModel().toDisplayString());
-            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.KEEPKEY || 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)) {
                 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/WalletIcon.java

@@ -19,9 +19,10 @@ import javafx.scene.shape.Circle;
 import org.controlsfx.glyphfont.Glyph;
 import org.girod.javafx.svgimage.SVGImage;
 import org.girod.javafx.svgimage.SVGLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
@@ -137,7 +138,7 @@ public class WalletIcon extends StackPane {
     }
 
     private void addWalletIcon(String walletId) {
-        Image image = new Image(PROTOCOL + ":" + walletId + "?" + QUERY, WIDTH, HEIGHT, true, false);
+        Image image = new Image(PROTOCOL + ":" + walletId.replaceAll(" ", "%20").replaceAll("#", "%23") + "?" + QUERY, WIDTH, HEIGHT, true, false);
         getChildren().clear();
         Circle circle = new Circle(getPrefWidth() / 2,getPrefHeight() / 2,getPrefWidth() / 2);
         circle.setFill(new ImagePattern(image));
@@ -176,6 +177,8 @@ public class WalletIcon extends StackPane {
     }
 
     public static class WalletIconStreamHandler extends URLStreamHandler {
+        private static final Logger log = LoggerFactory.getLogger(WalletIconStreamHandler.class);
+
         @Override
         protected URLConnection openConnection(URL url) throws IOException {
             return new URLConnection(url) {
@@ -186,17 +189,19 @@ public class WalletIcon extends StackPane {
 
                 @Override
                 public InputStream getInputStream() throws IOException {
-                    String walletId = url.getPath();
+                    String walletId = url.getPath().replaceAll("%20", " ").replaceAll("%23", "#");
                     String query = url.getQuery();
 
                     Wallet wallet = AppServices.get().getWallet(walletId);
                     if(wallet == null) {
-                        throw new IOException("Cannot find wallet for wallet id " + walletId);
+                        log.warn("Cannot find wallet for wallet id " + walletId);
+                        return getFallbackIconStream();
                     }
 
                     if(query.startsWith(QUERY)) {
                         if(wallet.getWalletConfig() == null || wallet.getWalletConfig().getIconData() == null) {
-                            throw new IOException("No icon data for " + walletId);
+                            log.warn("No icon data for " + walletId);
+                            return getFallbackIconStream();
                         }
 
                         ByteArrayInputStream bais = new ByteArrayInputStream(wallet.getWalletConfig().getIconData());
@@ -207,7 +212,12 @@ public class WalletIcon extends StackPane {
                         }
                     }
 
-                    throw new MalformedURLException("Cannot load url " + url);
+                    log.warn("Cannot load url " + url);
+                    return getFallbackIconStream();
+                }
+
+                private static InputStream getFallbackIconStream() {
+                    return WalletIconStreamHandler.class.getResourceAsStream("/image/sparrow.png");
                 }
             };
         }

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

@@ -51,7 +51,8 @@ public class WalletImportDialog extends Dialog<Wallet> {
         AnchorPane.setRightAnchor(scrollPane, 0.0);
 
         importAccordion = new Accordion();
-        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new GordianSeedTool(), new SeedSigner(), new SpecterDIY(), new Krux(), new AirGapVault());
+        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(),
+                new GordianSeedTool(), new SeedSigner(), new SpecterDIY(), new Krux(), new AirGapVault(), new Samourai());
         for(KeystoreFileImport importer : keystoreImporters) {
             if(!importer.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
                 FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
@@ -59,7 +60,8 @@ 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()));
+        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 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;
@@ -18,17 +19,21 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class WalletSummaryDialog extends Dialog<Void> {
-    public WalletSummaryDialog(List<WalletForm> walletForms) {
-        if(walletForms.isEmpty()) {
+    public WalletSummaryDialog(List<List<WalletForm>> summaryWalletFormsList) {
+        List<List<WalletForm>> walletFormsList = new ArrayList<>(summaryWalletFormsList);
+        walletFormsList.removeIf(List::isEmpty);
+        if(walletFormsList.isEmpty()) {
             throw new IllegalArgumentException("No wallets selected to summarize");
         }
 
-        Wallet masterWallet = walletForms.get(0).getMasterWallet();
+        boolean allOpenWallets = walletFormsList.size() > 1;
+        List<Wallet> masterWallets = walletFormsList.stream().map(walletForms -> walletForms.get(0).getMasterWallet()).toList();
 
         final DialogPane dialogPane = getDialogPane();
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
@@ -37,7 +42,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
         dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/transactions.css").toExternalForm());
 
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setHeaderText("Wallet Summary for " + masterWallet.getName());
+        dialogPane.setHeaderText("Wallet Summary for " + (allOpenWallets ? "All Open Wallets" : masterWallets.get(0).getName()));
 
         Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
         if(!image.isError()) {
@@ -50,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) -> {
@@ -64,7 +70,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
         });
         balanceColumn.setCellFactory(p -> new CoinCell());
         table.getColumns().add(balanceColumn);
-        table.setUnitFormat(masterWallet);
+        table.setUnitFormat(masterWallets.get(0));
 
         CurrencyRate currencyRate = AppServices.getFiatCurrencyExchangeRate();
         if(currencyRate != null && currencyRate.isAvailable() && Config.get().getExchangeSource() != ExchangeSource.NONE) {
@@ -77,19 +83,27 @@ public class WalletSummaryDialog extends Dialog<Void> {
             table.setCurrencyRate(currencyRate);
         }
 
-        SummaryEntry rootEntry = new SummaryEntry(walletForms);
+        Entry rootEntry = allOpenWallets ? new AllSummaryEntry(walletFormsList) : new SummaryEntry(walletFormsList.get(0));
         TreeItem<Entry> rootItem = new TreeItem<>(rootEntry);
         for(Entry childEntry : rootEntry.getChildren()) {
             TreeItem<Entry> childItem = new TreeItem<>(childEntry);
             rootItem.getChildren().add(childItem);
-            childItem.getChildren().add(new TreeItem<>(new UnconfirmedEntry((WalletTransactionsEntry)childEntry)));
+            if(allOpenWallets) {
+                for(Entry walletEntry : childEntry.getChildren()) {
+                    TreeItem<Entry> walletItem = new TreeItem<>(walletEntry);
+                    childItem.getChildren().add(walletItem);
+                    walletItem.getChildren().add(new TreeItem<>(new UnconfirmedEntry((WalletTransactionsEntry)walletEntry)));
+                }
+            } else {
+                childItem.getChildren().add(new TreeItem<>(new UnconfirmedEntry((WalletTransactionsEntry)childEntry)));
+            }
         }
 
         table.setShowRoot(true);
         table.setRoot(rootItem);
         rootItem.setExpanded(true);
 
-        table.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
+        table.setupColumnWidths();
         table.setPrefWidth(450);
 
         VBox vBox = new VBox();
@@ -97,6 +111,14 @@ public class WalletSummaryDialog extends Dialog<Void> {
 
         hBox.getChildren().add(vBox);
 
+        Wallet balanceWallet;
+        if(allOpenWallets) {
+            balanceWallet = new Wallet();
+            balanceWallet.getChildWallets().addAll(masterWallets.stream().flatMap(mws -> mws.getAllWallets().stream()).toList());
+        } else {
+            balanceWallet = masterWallets.get(0);
+        }
+
         NumberAxis xAxis = new NumberAxis();
         xAxis.setSide(Side.BOTTOM);
         xAxis.setForceZeroInRange(false);
@@ -104,7 +126,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
         NumberAxis yAxis = new NumberAxis();
         yAxis.setSide(Side.LEFT);
         BalanceChart balanceChart = new BalanceChart(xAxis, yAxis);
-        balanceChart.initialize(new WalletTransactionsEntry(masterWallet, true));
+        balanceChart.initialize(new WalletTransactionsEntry(balanceWallet, true));
         balanceChart.setAnimated(false);
         balanceChart.setLegendVisible(false);
         balanceChart.setVerticalGridLinesVisible(false);
@@ -120,6 +142,32 @@ public class WalletSummaryDialog extends Dialog<Void> {
         AppServices.moveToActiveWindowScreen(this);
     }
 
+    public static class AllSummaryEntry extends Entry {
+        private AllSummaryEntry(List<List<WalletForm>> walletFormsList) {
+            super(null, "All Wallets", walletFormsList.stream().map(SummaryEntry::new).collect(Collectors.toList()));
+        }
+
+        @Override
+        public Long getValue() {
+            long value = 0;
+            for(Entry entry : getChildren()) {
+                value += entry.getValue();
+            }
+
+            return value;
+        }
+
+        @Override
+        public String getEntryType() {
+            return null;
+        }
+
+        @Override
+        public Function getWalletFunction() {
+            return Function.TRANSACTIONS;
+        }
+    }
+
     public static class SummaryEntry extends Entry {
         private SummaryEntry(List<WalletForm> walletForms) {
             super(walletForms.get(0).getWallet(), walletForms.get(0).getWallet().getName(), walletForms.stream().map(WalletForm::getWalletTransactionsEntry).collect(Collectors.toList()));

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

@@ -5,6 +5,7 @@ import com.google.zxing.*;
 import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
 import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.qrcode.QRCodeReader;
+import com.sparrowwallet.bokmakierie.Bokmakierie;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -43,6 +44,7 @@ public class WebcamService extends ScheduledService<Image> {
     private Webcam cam;
     private long lastQrSampleTime;
     private final Reader qrReader;
+    private final Bokmakierie bokmakierie;
 
     static {
         Webcam.setDriver(new WebcamScanDriver());
@@ -55,6 +57,7 @@ public class WebcamService extends ScheduledService<Image> {
         this.delayCalculator = delayCalculator;
         this.lastQrSampleTime = System.currentTimeMillis();
         this.qrReader = new QRCodeReader();
+        this.bokmakierie = new Bokmakierie();
     }
 
     @Override
@@ -156,6 +159,15 @@ public class WebcamService extends ScheduledService<Image> {
         LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage);
         BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
 
+        try {
+            com.sparrowwallet.bokmakierie.Result result = bokmakierie.scan(bufferedImage);
+            if(result != null) {
+                return new Result(result.getMessage(), result.getRawBytes(), new ResultPoint[0], BarcodeFormat.QR_CODE);
+            }
+        } catch(Exception e) {
+            log.debug("Error scanning QR", e);
+        }
+
         if(ZBar.isEnabled()) {
             ZBar.Scan scan = ZBar.scan(bufferedImage);
             if(scan != null) {

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/control/XprvKeystoreImportPane.java

@@ -28,16 +28,18 @@ import java.util.List;
 public class XprvKeystoreImportPane extends TitledDescriptionPane {
     protected final Wallet wallet;
     protected final KeystoreXprvImport importer;
+    protected final KeyDerivation defaultDerivation;
 
     private Button enterXprvButton;
     private SplitMenuButton importButton;
 
     private ExtendedKey xprv;
 
-    public XprvKeystoreImportPane(Wallet wallet, KeystoreXprvImport importer) {
+    public XprvKeystoreImportPane(Wallet wallet, KeystoreXprvImport importer, KeyDerivation defaultDerivation) {
         super(importer.getName(), "Extended key import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
         this.wallet = wallet;
         this.importer = importer;
+        this.defaultDerivation = defaultDerivation;
 
         createImportButton();
         buttonBox.getChildren().add(importButton);
@@ -47,6 +49,7 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
         super("Master Private Key", "BIP32 key", "", "image/" + WalletModel.SEED.getType() + ".png");
         this.wallet = null;
         this.importer = null;
+        this.defaultDerivation = keystore.getKeyDerivation();
 
         try {
             this.xprv = keystore.getExtendedMasterPrivateKey();
@@ -79,7 +82,7 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
         importButton.getStyleClass().add("default-button");
         importButton.setOnAction(event -> {
             importButton.setDisable(true);
-            importKeystore(wallet.getScriptType().getDefaultDerivation());
+            importKeystore(getDefaultDerivation());
         });
         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;
@@ -97,6 +100,10 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
         importButton.setVisible(false);
     }
 
+    private List<ChildNumber> getDefaultDerivation() {
+        return defaultDerivation == null || defaultDerivation.getDerivation().isEmpty() ? wallet.getScriptType().getDefaultDerivation() : defaultDerivation.getDerivation();
+    }
+
     private void enterXprv() {
         setDescription("Enter master private key");
         showHideLink.setVisible(false);
@@ -149,7 +156,7 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
             importButton.setVisible(true);
             setDescription("Ready to import");
             xprv = ExtendedKey.fromDescriptor(xprvField.getText());
-            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
+            setContent(getDerivationEntry(getDefaultDerivation()));
         });
 
         xprvField.textProperty().addListener((observable, oldValue, newValue) -> {

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/RequestVerifyDownloadEvent.java

@@ -0,0 +1,28 @@
+package com.sparrowwallet.sparrow.event;
+
+import javafx.stage.Window;
+
+import java.io.File;
+
+public class RequestVerifyDownloadEvent {
+    private final Window window;
+    private final File file;
+
+    public RequestVerifyDownloadEvent(Window window) {
+        this.window = window;
+        this.file = null;
+    }
+
+    public RequestVerifyDownloadEvent(Window window, File file) {
+        this.window = window;
+        this.file = file;
+    }
+
+    public Window getWindow() {
+        return window;
+    }
+
+    public File getFile() {
+        return file;
+    }
+}

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

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

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

@@ -1,6 +1,5 @@
 package com.sparrowwallet.sparrow.event;
 
-import com.samourai.whirlpool.client.whirlpool.beans.Pool;
 import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
@@ -17,7 +16,6 @@ public class SpendUtxoEvent {
     private final Long fee;
     private final boolean requireAllUtxos;
     private final BlockTransaction replacedTransaction;
-    private final Pool pool;
     private final PaymentCode paymentCode;
 
     public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
@@ -32,19 +30,6 @@ public class SpendUtxoEvent {
         this.fee = fee;
         this.requireAllUtxos = requireAllUtxos;
         this.replacedTransaction = replacedTransaction;
-        this.pool = null;
-        this.paymentCode = null;
-    }
-
-    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, Pool pool) {
-        this.wallet = wallet;
-        this.utxos = utxos;
-        this.payments = payments;
-        this.opReturns = opReturns;
-        this.fee = fee;
-        this.requireAllUtxos = false;
-        this.replacedTransaction = null;
-        this.pool = pool;
         this.paymentCode = null;
     }
 
@@ -56,7 +41,6 @@ public class SpendUtxoEvent {
         this.fee = null;
         this.requireAllUtxos = false;
         this.replacedTransaction = null;
-        this.pool = null;
         this.paymentCode = paymentCode;
     }
 
@@ -88,10 +72,6 @@ public class SpendUtxoEvent {
         return replacedTransaction;
     }
 
-    public Pool getPool() {
-        return pool;
-    }
-
     public PaymentCode getPaymentCode() {
         return paymentCode;
     }

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/event/WhirlpoolIndexHighFrequencyEvent.java

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

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

@@ -1,67 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.samourai.whirlpool.client.mix.listener.MixFailReason;
-import com.samourai.whirlpool.client.wallet.beans.MixProgress;
-import com.samourai.whirlpool.protocol.beans.Utxo;
-import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
-import com.sparrowwallet.drongo.wallet.Wallet;
-
-public class WhirlpoolMixEvent {
-    private final Wallet wallet;
-    private final BlockTransactionHashIndex utxo;
-    private final MixProgress mixProgress;
-    private final Utxo nextUtxo;
-    private final MixFailReason mixFailReason;
-    private final String mixError;
-
-    public WhirlpoolMixEvent(Wallet wallet, BlockTransactionHashIndex utxo, MixProgress mixProgress) {
-        this.wallet = wallet;
-        this.utxo = utxo;
-        this.mixProgress = mixProgress;
-        this.nextUtxo = null;
-        this.mixFailReason = null;
-        this.mixError = null;
-    }
-
-    public WhirlpoolMixEvent(Wallet wallet, BlockTransactionHashIndex utxo, Utxo nextUtxo) {
-        this.wallet = wallet;
-        this.utxo = utxo;
-        this.mixProgress = null;
-        this.nextUtxo = nextUtxo;
-        this.mixFailReason = null;
-        this.mixError = null;
-    }
-
-    public WhirlpoolMixEvent(Wallet wallet, BlockTransactionHashIndex utxo, MixFailReason mixFailReason, String mixError) {
-        this.wallet = wallet;
-        this.utxo = utxo;
-        this.mixProgress = null;
-        this.nextUtxo = null;
-        this.mixFailReason = mixFailReason;
-        this.mixError = mixError;
-    }
-
-    public Wallet getWallet() {
-        return wallet;
-    }
-
-    public BlockTransactionHashIndex getUtxo() {
-        return utxo;
-    }
-
-    public MixProgress getMixProgress() {
-        return mixProgress;
-    }
-
-    public Utxo getNextUtxo() {
-        return nextUtxo;
-    }
-
-    public MixFailReason getMixFailReason() {
-        return mixFailReason;
-    }
-
-    public String getMixError() {
-        return mixError;
-    }
-}

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

@@ -1,19 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.samourai.whirlpool.protocol.beans.Utxo;
-import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.drongo.wallet.WalletNode;
-
-public class WhirlpoolMixSuccessEvent extends WhirlpoolMixEvent {
-    private final WalletNode walletNode;
-
-    public WhirlpoolMixSuccessEvent(Wallet wallet, BlockTransactionHashIndex utxo, Utxo nextUtxo, WalletNode walletNode) {
-        super(wallet, utxo, nextUtxo);
-        this.walletNode = walletNode;
-    }
-
-    public WalletNode getWalletNode() {
-        return walletNode;
-    }
-}

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

@@ -40,10 +40,12 @@ 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'),
         HAND_HOLDING_WATER('\uf4c1'),
+        HOURGLASS_HALF('\uf252'),
         HISTORY('\uf1da'),
         INFO_CIRCLE('\uf05a'),
         KEY('\uf084'),

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

@@ -141,7 +141,7 @@ public class GlyphUtils {
         return feeGlyph;
     }
 
-    public static Glyph getWarningGlyph() {
+    public static Glyph getFeeWarningGlyph() {
         Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
         feeWarningGlyph.getStyleClass().add("fee-warning-icon");
         feeWarningGlyph.setFontSize(12);
@@ -175,4 +175,46 @@ public class GlyphUtils {
         userGlyph.setFontSize(12);
         return userGlyph;
     }
+
+    public static Glyph getSuccessGlyph() {
+        Glyph successGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
+        successGlyph.getStyleClass().add("success");
+        successGlyph.setFontSize(12);
+        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");
+        warningGlyph.setFontSize(12);
+        return warningGlyph;
+    }
+
+    public static Glyph getFailureGlyph() {
+        Glyph failureGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.TIMES_CIRCLE);
+        failureGlyph.getStyleClass().add("failure");
+        failureGlyph.setFontSize(12);
+        return failureGlyph;
+    }
+
+    public static Glyph getBusyGlyph() {
+        Glyph busyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HOURGLASS_HALF);
+        busyGlyph.getStyleClass().add("busy");
+        busyGlyph.setFontSize(12);
+        return busyGlyph;
+    }
+
+    public static Glyph getDownArrowGlyph() {
+        Glyph downGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
+        downGlyph.getStyleClass().add("arrow-down");
+        downGlyph.setFontSize(12);
+        return downGlyph;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/instance/Instance.java

@@ -1,535 +1,270 @@
-/**
- * Copyright 2019 Pratanu Mandal
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-
 package com.sparrowwallet.sparrow.instance;
 
+import com.sparrowwallet.sparrow.io.Storage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.RandomAccessFile;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
+import java.net.ConnectException;
 import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
+import java.net.StandardProtocolFamily;
+import java.net.UnixDomainSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.Set;
 
-/**
- * The <code>Instance</code> class is the primary logical entry point to the library.<br>
- * It allows to create an application lock or free it and send and receive messages between first and subsequent instances.<br><br>
- * 
- * <pre>
- *	// unique application ID
- *	String APP_ID = "tk.pratanumandal.unique4j-mlsdvo-20191511-#j.6";
- *	
- *	// create Instance instance
- *	Instance unique = new Instance(APP_ID) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected void receiveMessage(String message) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;// print received message (timestamp)
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;System.out.println(message);
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *	&nbsp;&nbsp;&nbsp;&nbsp;
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected String sendMessage() {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;// send timestamp as message
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Timestamp ts = new Timestamp(new Date().getTime());
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return "Another instance launch attempted: " + ts.toString();
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *	};
- *	
- *	// try to obtain lock
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.acquireLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- *	
- *	...
- *	
- *	// try to free the lock before exiting program
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.freeLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- * </pre>
- * 
- * @author Pratanu Mandal
- * @since 1.3
- *
- */
 public abstract class Instance {
     private static final Logger log = LoggerFactory.getLogger(Instance.class);
-	
-	// starting position of port check
-	private static final int PORT_START = 7221;
-	
-	// system temporary directory path
-	private static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
-	
-	/**
-	 * Unique string representing the application ID.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 */
-	public final String APP_ID;
-	
-	// auto exit from application or not
-	private final boolean AUTO_EXIT;
-	
-	// lock server port
-	private int port;
-	
-	// lock server socket
-	private ServerSocket server;
-	
-	// lock file RAF object
-	private RandomAccessFile lockRAF;
-	
-	// file lock for the lock file RAF object
-	private FileLock fileLock;
+    private static final String LINK_ENV_PROPERTY = "SPARROW_NO_LOCK_FILE_LINK";
 
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor configures to automatically exit the application for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 */
-	public Instance(final String APP_ID) {
-		this(APP_ID, true);
-	}
-	
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor allows to explicitly specify the exit strategy for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @since 1.2
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 * @param AUTO_EXIT If true, automatically exit the application for subsequent instances
-	 */
-	public Instance(final String APP_ID, final boolean AUTO_EXIT) {
-		this.APP_ID = APP_ID;
-		this.AUTO_EXIT = AUTO_EXIT;
-	}
-	
-	/**
-	 * Try to obtain lock. If not possible, send data to first instance.
-	 * 
-	 * @deprecated Use <code>acquireLock()</code> instead.
-	 * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
-	 */
-	@Deprecated
-	public void lock() throws InstanceException {
-		acquireLock();
-	}
-	
-	/**
-	 * Try to obtain lock. If not possible, send data to first instance.
-	 * 
-	 * @since 1.2
-	 * 
-	 * @return true if able to acquire lock, false otherwise
-	 * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
-	 */
-	public boolean acquireLock() throws InstanceException {
-		// try to obtain port number from lock file
-		port = lockFile();
-		
-		if (port == -1) {
-			// failed to fetch port number
-			// try to start server
-			startServer();
-		}
-		else {
-			// port number fetched from lock file
-			// try to start client
-			doClient();
-		}
-		
-		return (server != null);
-	}
-	
-	// start the server
-	private void startServer() throws InstanceException {
-		// try to create server
-		port = PORT_START;
-		while (true) {
-			try {
-				server = new ServerSocket(port, 50, InetAddress.getByName(null));
-				break;
-			} catch (IOException e) {
-				port++;
-			}
-		}
-		
-		// try to lock file
-		lockFile(port);
-		
-		// server created successfully; this is the first instance
-		// keep listening for data from other instances
-		Thread thread = new Thread() {
-			@Override
-			public void run() {
-				while (!server.isClosed()) {
-					try {
-						// establish connection
-						final Socket socket = server.accept();
-						
-						// handle socket on a different thread to allow parallel connections
-						Thread thread = new Thread() {
-							@Override
-							public void run() {
-								try {
-									// open writer
-									OutputStream os = socket.getOutputStream();
-									DataOutputStream dos = new DataOutputStream(os);
-									
-									// open reader
-									InputStream is = socket.getInputStream();
-									DataInputStream dis = new DataInputStream(is);
-									
-									// read message length from client
-									int length = dis.readInt();
-									
-									// read message string from client
-									String message = null;
-									if (length > -1) {
-										byte[] messageBytes = new byte[length];
-										int bytesRead = dis.read(messageBytes, 0, length);
-										message = new String(messageBytes, 0, bytesRead, "UTF-8");
-									}
-									
-									// write response to client
-									if (APP_ID == null) {
-										dos.writeInt(-1);
-									}
-									else {
-										byte[] appId = APP_ID.getBytes("UTF-8");
-										
-										dos.writeInt(appId.length);
-										dos.write(appId);
-									}
-									dos.flush();
-									
-									// close writer and reader
-									dos.close();
-									dis.close();
-									
-									// perform user action on message
-									receiveMessage(message);
-									
-									// close socket
-									socket.close();
-								} catch (IOException e) {
-									handleException(new InstanceException(e));
-								}
-							}
-						};
-						
-						// start socket thread
-						thread.start();
-					} catch (SocketException e) {
-						if (!server.isClosed()) {
-							handleException(new InstanceException(e));
-						}
-					} catch (IOException e) {
-						handleException(new InstanceException(e));
-					}
-				}
-			}
-		};
-		
-		thread.start();
-	}
-	
-	// do client tasks
-	private void doClient() throws InstanceException {
-		// get localhost address
-		InetAddress address = null;
-		try {
-			address = InetAddress.getByName(null);
-		} catch (UnknownHostException e) {
-			throw new InstanceException(e);
-		}
-		
-		// try to establish connection to server
-		Socket socket = null;
-		try {
-			socket = new Socket(address, port);
-		} catch (IOException e) {
-			// connection failed try to start server
-			startServer();
-		}
-		
-		// connection successful try to connect to server
-		if (socket != null) {
-			try {
-				// get message to be sent to first instance
-				String message = sendMessage();
-				
-				// open writer
-				OutputStream os = socket.getOutputStream();
-				DataOutputStream dos = new DataOutputStream(os);
-				
-				// open reader
-				InputStream is = socket.getInputStream();
-				DataInputStream dis = new DataInputStream(is);
-				
-				// write message to server
-				if (message == null) {
-					dos.writeInt(-1);
-				}
-				else {
-					byte[] messageBytes = message.getBytes("UTF-8");
-					
-					dos.writeInt(messageBytes.length);
-					dos.write(messageBytes);
-				}
-				
-				dos.flush();
-				
-				// read response length from server
-				int length = dis.readInt();
-				
-				// read response string from server
-				String response = null;
-				if (length > -1) {
-					byte[] responseBytes = new byte[length];
-					int bytesRead = dis.read(responseBytes, 0, length);
-					response = new String(responseBytes, 0, bytesRead, "UTF-8");
-				}
-				
-				// close writer and reader
-				dos.close();
-				dis.close();
-				
-				if (response.equals(APP_ID)) {
-					// validation successful
-					if (AUTO_EXIT) {
-						// perform pre-exit tasks
-						beforeExit();
-						// exit this instance
-						System.exit(0);
-					}
-				}
-				else {
-					// validation failed, this is the first instance
-					startServer();
-				}
-			} catch (IOException e) {
-				throw new InstanceException(e);
-			} finally {
-				// close socket
-			 	try {
-			 		if (socket != null) socket.close();
-				} catch (IOException e) {
-					throw new InstanceException(e);
-				}
-			}
-		}
-	}
-	
-	// try to get port from lock file
-	private int lockFile() throws InstanceException {
-		// lock file path
-		String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
-		File file = new File(filePath);
-		
-		// try to get port from lock file
-		if (file.exists()) {
-			BufferedReader br = null;
-			try {
-				br = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-				return Integer.parseInt(br.readLine());
-			} catch (IOException e) {
-				throw new InstanceException(e);
-			} catch (NumberFormatException e) {
-				// do nothing
-			} finally {
-				try {
-					if (br != null) br.close();
-				} catch (IOException e) {
-					throw new InstanceException(e);
-				}
-			}
-		}
-		
-		return -1;
-	}
-	
-	// try to write port to lock file
-	private void lockFile(int port) throws InstanceException {
-		// lock file path
-		String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
-		File file = new File(filePath);
-		
-		// try to write port to lock file
-		BufferedWriter bw = null;
-		try {
-			bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)));
-			bw.write(String.valueOf(port));
-		} catch (IOException e) {
-			throw new InstanceException(e);
-		} finally {
-			try {
-				if (bw != null) bw.close();
-			} catch (IOException e) {
-				throw new InstanceException(e);
-			}
-		}
-		
-		// try to obtain file lock
-		try {
-			lockRAF = new RandomAccessFile(file, "rw");
-			FileChannel fc = lockRAF.getChannel();
-			fileLock = fc.tryLock(0, Long.MAX_VALUE, true);
-			if (fileLock == null) {
-				throw new InstanceException("Failed to obtain file lock");
-			}
-		} catch (FileNotFoundException e) {
-			throw new InstanceException(e);
-		} catch (IOException e) {
-			throw new InstanceException(e);
-		}
-	}
-	
-	/**
-	 * Free the lock if possible. This is only required to be called from the first instance.
-	 * 
-	 * @deprecated Use <code>freeLock()</code> instead.
-	 * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
-	 */
-	@Deprecated
-	public void free() throws InstanceException {
-		freeLock();
-	}
-	
-	/**
-	 * Free the lock if possible. This is only required to be called from the first instance.
-	 * 
-	 * @since 1.2
-	 * 
-	 * @return true if able to release lock, false otherwise
-	 * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
-	 */
-	public boolean freeLock() throws InstanceException {
-		try {
-			// close server socket
-			if (server != null) {
-				server.close();
-			
-				// lock file path
-				String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
-				File file = new File(filePath);
-				
-				// try to release file lock
-				if (fileLock != null) {
-					fileLock.release();
-				}
-				
-				// try to close lock file RAF object
-				if (lockRAF != null) {
-					lockRAF.close();
-				}
-				
-				// try to delete lock file
-				if (file.exists()) {
-					file.delete();
-				}
-				
-				return true;
-			}
-			
-			return false;
-		} catch (IOException e) {
-			throw new InstanceException(e);
-		}
-	}
-	
-	/**
-	 * Method used in first instance to receive messages from subsequent instances.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @param message message received by first instance from subsequent instances
-	 */
-	protected abstract void receiveMessage(String message);
-	
-	/**
-	 * Method used in subsequent instances to send message to first instance.<br><br>
-	 * 
-	 * It is not recommended to perform blocking (long running) tasks here. Use <code>beforeExit()</code> method instead.<br>
-	 * One exception to this rule is if you intend to perform some user interaction before sending the message.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @return message sent from subsequent instances
-	 */
-	protected abstract String sendMessage();
-	
-	/**
-	 * Method to receive and handle exceptions occurring while first instance is listening for subsequent instances.<br><br>
-	 * 
-	 * By default prints stack trace of all exceptions. Override this method to handle exceptions explicitly.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @param exception exception occurring while first instance is listening for subsequent instances
-	 */
-	protected void handleException(Exception exception) {
+    public final String applicationId;
+    private final boolean autoExit;
+
+    private Selector selector;
+    private ServerSocketChannel serverChannel;
+
+    public Instance(final String applicationId) {
+        this(applicationId, true);
+    }
+
+    public Instance(final String applicationId, final boolean autoExit) {
+        this.applicationId = applicationId;
+        this.autoExit = autoExit;
+    }
+
+    /**
+     * Try to obtain lock. If not possible, send data to first instance.
+     *
+     * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
+     */
+    public void acquireLock(boolean findExisting) throws InstanceException {
+        Path lockFile = getLockFile(findExisting);
+
+        if(!Files.exists(lockFile)) {
+            startServer(lockFile);
+        } else {
+            doClient(lockFile);
+        }
+    }
+
+    private void startServer(Path lockFile) throws InstanceException {
+        try {
+            selector = Selector.open();
+            UnixDomainSocketAddress socketAddress = UnixDomainSocketAddress.of(lockFile);
+            serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
+            serverChannel.bind(socketAddress);
+            serverChannel.configureBlocking(false);
+            serverChannel.register(selector, SelectionKey.OP_ACCEPT);
+            lockFile.toFile().deleteOnExit();
+        } catch(Exception e) {
+            throw new InstanceException("Could not open UNIX socket lock file for instance at " + lockFile.toAbsolutePath(), e);
+        }
+
+        Thread thread = new Thread(() -> {
+            while(true) {
+                try {
+                    selector.select();
+                    Set<SelectionKey> selectedKeys = selector.selectedKeys();
+                    Iterator<SelectionKey> iter = selectedKeys.iterator();
+                    while(iter.hasNext()) {
+                        SelectionKey key = iter.next();
+                        if(key.isAcceptable()) {
+                            SocketChannel client = serverChannel.accept();
+                            client.configureBlocking(false);
+                            client.register(selector, SelectionKey.OP_READ);
+                        }
+                        if(key.isReadable()) {
+                            try(SocketChannel clientChannel = (SocketChannel)key.channel()) {
+                                String message = readMessage(clientChannel);
+                                clientChannel.write(ByteBuffer.wrap(applicationId.getBytes(StandardCharsets.UTF_8)));
+                                receiveMessage(message);
+                            }
+                        }
+                        iter.remove();
+                    }
+                } catch(SocketException e) {
+                    if(serverChannel.isOpen()) {
+                        handleException(new InstanceException(e));
+                    }
+                } catch(Exception e) {
+                    handleException(new InstanceException(e));
+                }
+            }
+        });
+
+        thread.setDaemon(true);
+        thread.setName("SparrowInstanceListener");
+        thread.start();
+
+        createSymlink(lockFile);
+    }
+
+    private void doClient(Path lockFile) throws InstanceException {
+        try(SocketChannel client = SocketChannel.open(UnixDomainSocketAddress.of(lockFile))) {
+            String message = sendMessage();
+            client.write(ByteBuffer.wrap(message.getBytes(StandardCharsets.UTF_8)));
+            client.shutdownOutput();
+
+            String response = readMessage(client);
+            if(response.equals(applicationId) && autoExit) {
+                beforeExit();
+                System.exit(0);
+            }
+        } catch(ConnectException e) {
+            try {
+                Files.deleteIfExists(lockFile);
+                startServer(lockFile);
+            } catch(Exception ex) {
+                throw new InstanceException("Could not delete lock file from previous instance", e);
+            }
+        } catch(Exception e) {
+            throw new InstanceException("Could not open client connection to existing instance", e);
+        }
+    }
+
+    private static String readMessage(SocketChannel clientChannel) throws IOException {
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+        StringBuilder messageBuilder = new StringBuilder();
+        while(clientChannel.read(buffer) != -1) {
+            buffer.flip();
+            messageBuilder.append(new String(buffer.array(), 0, buffer.limit()));
+            buffer.clear();
+        }
+
+        return messageBuilder.toString();
+    }
+
+    private Path getLockFile(boolean findExisting) {
+        if(findExisting) {
+            Path pointer = getUserLockFilePointer();
+            try {
+                if(pointer != null && Files.exists(pointer)) {
+                    if(Files.isSymbolicLink(pointer)) {
+                        return Files.readSymbolicLink(pointer);
+                    } else {
+                        Path lockFile = Path.of(Files.readString(pointer, StandardCharsets.UTF_8));
+                        if(Files.exists(lockFile)) {
+                            return lockFile;
+                        }
+                    }
+                }
+            } catch(IOException e) {
+                log.warn("Could not find lock file at " + pointer.toAbsolutePath());
+            } catch(Exception e) {
+                //ignore
+            }
+        }
+
+        return Storage.getSparrowDir().toPath().resolve(applicationId + ".lock");
+    }
+
+    private void createSymlink(Path lockFile) {
+        Path pointer = getUserLockFilePointer();
+        try {
+            if(pointer != null && !Files.exists(pointer, LinkOption.NOFOLLOW_LINKS)) {
+                Files.createSymbolicLink(pointer, lockFile);
+                pointer.toFile().deleteOnExit();
+            }
+        } catch(IOException e) {
+            log.debug("Could not create symlink " + pointer.toAbsolutePath() + " to lockFile at " + lockFile.toAbsolutePath() + ", writing as normal file", e);
+
+            try {
+                Files.writeString(pointer, lockFile.toAbsolutePath().toString(), StandardCharsets.UTF_8);
+                pointer.toFile().deleteOnExit();
+            } catch(IOException ex) {
+                log.warn("Could not create pointer " + pointer.toAbsolutePath() + " to lockFile at " + lockFile.toAbsolutePath(), ex);
+            }
+        } catch(Exception e) {
+            //ignore
+        }
+    }
+
+    private Path getUserLockFilePointer() {
+        if(Boolean.parseBoolean(System.getenv(LINK_ENV_PROPERTY))) {
+            return null;
+        }
+
+        try {
+            File sparrowHome = Storage.getSparrowHome(true);
+            if(!sparrowHome.exists()) {
+                Storage.createOwnerOnlyDirectory(sparrowHome);
+            }
+
+            return sparrowHome.toPath().resolve(applicationId + ".default");
+        } catch(Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * Free the lock if possible. This is only required to be called from the first instance.
+     *
+     * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
+     */
+    public void freeLock() throws InstanceException {
+        try {
+            if(serverChannel != null && serverChannel.isOpen()) {
+                serverChannel.close();
+            }
+            if(getUserLockFilePointer() != null) {
+                Files.deleteIfExists(getUserLockFilePointer());
+            }
+            Files.deleteIfExists(getLockFile(false));
+        } catch(Exception e) {
+            throw new InstanceException(e);
+        }
+    }
+
+    /**
+     * Method used in first instance to receive messages from subsequent instances.<br><br>
+     *
+     * This method is not synchronized.
+     *
+     * @param message message received by first instance from subsequent instances
+     */
+    protected abstract void receiveMessage(String message);
+
+    /**
+     * Method used in subsequent instances to send message to first instance.<br><br>
+     *
+     * It is not recommended to perform blocking (long running) tasks here. Use <code>beforeExit()</code> method instead.<br>
+     * One exception to this rule is if you intend to perform some user interaction before sending the message.<br><br>
+     *
+     * This method is not synchronized.
+     *
+     * @return message sent from subsequent instances
+     */
+    protected abstract String sendMessage();
+
+    /**
+     * Method to receive and handle exceptions occurring while first instance is listening for subsequent instances.<br><br>
+     *
+     * By default prints stack trace of all exceptions. Override this method to handle exceptions explicitly.<br><br>
+     *
+     * This method is not synchronized.
+     *
+     * @param exception exception occurring while first instance is listening for subsequent instances
+     */
+    protected void handleException(Exception exception) {
         log.error("Error listening for instances", exception);
-	}
-	
-	/**
-	 * This method is called before exiting from subsequent instances.<br><br>
-	 * 
-	 * Override this method to perform blocking tasks before exiting from subsequent instances.<br>
-	 * This method is not invoked if auto exit is turned off.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @since 1.2
-	 */
-	protected void beforeExit() {}
-	
+    }
+
+    /**
+     * This method is called before exiting from subsequent instances.<br><br>
+     *
+     * Override this method to perform blocking tasks before exiting from subsequent instances.<br>
+     * This method is not invoked if auto exit is turned off.<br><br>
+     *
+     * This method is not synchronized.
+     */
+    protected void beforeExit() {}
 }

src/main/java/com/sparrowwallet/sparrow/instance/InstanceList.java

@@ -7,88 +7,14 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 
-/**
- * The <code>InstanceList</code> class is a logical entry point to the library which extends the functionality of the <code>Instance</code> class.<br>
- * It allows to create an application lock or free it and send and receive messages between first and subsequent instances.<br><br>
- * 
- * This class is intended for passing a list of strings instead of a single string from the subsequent instance to the first instance.<br><br>
- * 
- * <pre>
- *	// unique application ID
- *	String APP_ID = "tk.pratanumandal.unique4j-mlsdvo-20191511-#j.6";
- *	
- *	// create Instance instance
- *	Instance unique = new InstanceList(APP_ID) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected List&lt;String&gt; sendMessageList() {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;List&lt;String&gt; messageList = new ArrayList&lt;String&gt;();
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 1");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 2");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 3");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 4");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return messageList;
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected void receiveMessageList(List&lt;String&gt; messageList) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (String message : messageList) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;System.out.println(message);
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *	};
- *	
- *	// try to obtain lock
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.acquireLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- *	
- *	...
- *	
- *	// try to free the lock before exiting program
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.freeLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- * </pre>
- * 
- * @author Pratanu Mandal
- * @since 1.3
- *
- */
 public abstract class InstanceList extends Instance {
 	
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor configures to automatically exit the application for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 */
-	public InstanceList(String APP_ID) {
-		super(APP_ID);
+	public InstanceList(String applicationId) {
+		super(applicationId);
 	}
 	
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor allows to explicitly specify the exit strategy for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 * @param AUTO_EXIT If true, automatically exit the application for subsequent instances
-	 */
-	public InstanceList(String APP_ID, boolean AUTO_EXIT) {
-		super(APP_ID, AUTO_EXIT);
+	public InstanceList(String applicationId, boolean autoExit) {
+		super(applicationId, autoExit);
 	}
 
 	/**
@@ -101,16 +27,15 @@ public abstract class InstanceList extends Instance {
 	 */
 	@Override
 	protected final void receiveMessage(String message) {
-		if (message == null) {
+		if(message == null) {
 			receiveMessageList(null);
-		}
-		else {
+		} else {
 			// parse the JSON array string into an array of string arguments
 	        JsonArray jsonArgs = JsonParser.parseString(message).getAsJsonArray();
 	        
 	        List<String> stringArgs = new ArrayList<String>(jsonArgs.size());
 	        
-	        for (int i = 0; i < jsonArgs.size(); i++) {
+	        for(int i = 0; i < jsonArgs.size(); i++) {
 	            JsonElement element = jsonArgs.get(i);
 	            stringArgs.add(element.getAsString());
 	        }
@@ -137,10 +62,11 @@ public abstract class InstanceList extends Instance {
         JsonArray jsonArgs = new JsonArray();
         
         List<String> stringArgs = sendMessageList();
+        if(stringArgs == null) {
+            return null;
+        }
         
-        if (stringArgs == null) return null;
-        
-        for (String arg : stringArgs) {
+        for(String arg : stringArgs) {
             jsonArgs.add(arg);
         }
 
@@ -168,5 +94,4 @@ public abstract class InstanceList extends Instance {
 	 * @return list of messages sent from subsequent instances
 	 */
 	protected abstract List<String> sendMessageList();
-	
 }

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();